房间榜排行数字，靓号显示，首页默认tab后台配置

app/src/main/java/com/yizhuan/erban/avroom/adapter/RoomConsumerListAdapterTemp.java

@@ -180,10 +180,10 @@ public class RoomConsumerListAdapterTemp extends BaseMultiItemQuickAdapter<RoomR
 
         ImageView numberImage = baseViewHolder.getView(R.id.auction_number_image);
         numberImage.setVisibility(View.GONE);
-        int drawable = RoomRankDialogUtils.getNumberImage(roomContributeUserInfo.getRanking());
-        if (drawable != 0) {
-            baseViewHolder.setImageResource(R.id.iv_number, drawable);
-        }
+
+        baseViewHolder.setText(R.id.auction_number_text,roomContributeUserInfo.getRanking()+"");
+
+        baseViewHolder.setGone(R.id.iv_number,true);
         setCommonView(baseViewHolder, roomContributeUserInfo);
     }
 

app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java

@@ -68,6 +68,7 @@ import com.yizhuan.xchat_android_core.home.bean.HomeConcernsInfo;
 import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
 import com.yizhuan.xchat_android_core.home.bean.TagListInfo;
 import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent;
+import com.yizhuan.xchat_android_core.initial.InitialModel;
 import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
 import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel;
 import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
@@ -292,6 +293,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
         magicIndicatorAdapter.setOnBottomItemSelectListener(this);
         commonNavigator.setAdapter(magicIndicatorAdapter);
         mBinding.magicIndicatorBottom.setNavigator(commonNavigator);
+
         commonNavigator.getTitleContainer().setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE);
         mBinding.viewPagerBottom.setOffscreenPageLimit(5);
         mBinding.viewPagerBottom.setAdapter(new RoomContributeListAdapter(getChildFragmentManager(), mFragmentsBottom));
@@ -301,7 +303,10 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
 
             }
         });
+        mBinding.magicIndicatorBottom.onPageSelected(InitialModel.get().getDefaultHomeTab());
+        mBinding.viewPagerBottom.setCurrentItem(InitialModel.get().getDefaultHomeTab());
         ViewPagerHelper.bind(mBinding.magicIndicatorBottom, mBinding.viewPagerBottom);
+
         scrollToView();
     }
 

app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java

@@ -16,6 +16,7 @@ import androidx.core.widget.NestedScrollView;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.alibaba.security.biometrics.service.build.V;
 import com.jude.rollviewpager.hintview.TextHintView;
 import com.netease.nim.uikit.impl.cache.NimUserInfoCache;
 import com.netease.nimlib.sdk.RequestCallbackWrapper;
@@ -285,6 +286,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
 
             mBinding.tvFansCount.setText(String.valueOf(userInfo.getFansNum()));
             mBinding.tvErbanId.setText(getString(R.string.me_user_id, userInfo.getErbanNo()));
+            mBinding.ivGoodNumber.setVisibility(userInfo.isHasPrettyErbanNo()?View.VISIBLE:View.GONE);
 
             //等级魅力值
             setUserLevel(userInfo.getUserLevelVo());

app/src/main/res/layout/activity_user_info.xml

@@ -146,6 +146,16 @@
                         android:layout_marginTop="@dimen/dp_10"
                         android:orientation="horizontal">
 
+                        <ImageView
+                            android:id="@+id/iv_good_number"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:src="@mipmap/ic_good_num"
+                            android:visibility="gone"
+                            tools:visibility="visible"
+                            android:layout_marginEnd="@dimen/dp_5"
+                            />
+
                         <TextView
                             android:id="@+id/tv_erban_id"
                             android:layout_width="wrap_content"
@@ -154,6 +164,7 @@
                             android:includeFontPadding="false"
                             android:textColor="@color/color_999999"
                             android:textSize="11dp"
+                            android:gravity="center_vertical"
                             tools:text="ID:7958626" />
 
                         <LinearLayout

app/src/main/res/layout/dialog_user_info.xml

@@ -30,7 +30,7 @@
             android:id="@+id/iv_avatar_bg"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="fitXY"
+            android:scaleType="centerCrop"
             app:riv_corner_radius_top_left="@dimen/dp_10"
             app:riv_corner_radius_top_right="@dimen/dp_10"
             tools:contentDescription="头像高斯模糊做背景" />
@@ -200,10 +200,10 @@
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/iv_good_number"
-                    android:layout_width="@dimen/dp_10"
-                    android:layout_height="@dimen/dp_10"
+                    android:layout_width="16dp"
+                    android:layout_height="15dp"
                     android:layout_marginEnd="3dp"
-                    android:src="@mipmap/ic_pretty_account_10dp"
+                    android:src="@mipmap/ic_good_num"
                     android:visibility="gone"
                     tools:visibility="visible" />
 

core/src/main/java/com/yizhuan/xchat_android_core/initial/IInitialModel.java

@@ -49,4 +49,6 @@ public interface IInitialModel extends IModel {
     int getRoomRefresh();
 
     int getDynamicRefresh();
+
+    int getDefaultHomeTab();
 }

core/src/main/java/com/yizhuan/xchat_android_core/initial/InitialModel.java

@@ -103,6 +103,10 @@ public class InitialModel extends BaseModel implements IInitialModel {
      * 首页动态刷新频率
      */
     private int dynamicRefresh;
+    /**
+     * 首页默认TAB
+     */
+    private int defaultHomeTab;
 
     public static IInitialModel get() {
         if (model == null) {
@@ -257,6 +261,8 @@ public class InitialModel extends BaseModel implements IInitialModel {
 
         this.dynamicRefresh = initInfo.getDynamicRefresh();
 
+        this.defaultHomeTab = initInfo.getDefaultHomeTab();
+
         // 客户端更新 URL
         if (initInfo.getUpdateUrl() != null &&
                 !TextUtils.isEmpty(initInfo.getUpdateUrl().getAndroidUrl())) {
@@ -461,6 +467,11 @@ public class InitialModel extends BaseModel implements IInitialModel {
         return dynamicRefresh;
     }
 
+    @Override
+    public int getDefaultHomeTab() {
+        return defaultHomeTab;
+    }
+
     private interface Api {
         /**
          * 客户端初始化

core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java

@@ -56,6 +56,10 @@ public class InitInfo implements Serializable {
      * 梦幻许愿池开关
      */
     private boolean diamondBoxSwitch;
+    /**
+     * 首页TAB默认位置（动态、聊天交友）
+     */
+    private int defaultHomeTab;
     /**
      * 许愿池图标
      */

core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java

@@ -269,13 +269,13 @@ public final class UserModel extends BaseModel implements IUserModel {
             return getCurrentUserInfo();
         }
 
-        UserInfo tmp = cache.get(userId);
-        if (tmp != null) {
-            return Single.just(tmp);
-        } else {
-            return getUserInfoFromServer(userId);
-
-        }
+        //缓存用户信息
+//        UserInfo tmp = cache.get(userId);
+//        if (tmp != null) {
+//            return Single.just(tmp);
+//        } else {
+        return getUserInfoFromServer(userId);
+//        }
 
     }