feat: 第一次UI 走查

app/src/main/java/com/chwl/app/avroom/fragment/BaseRoomFragment.kt

@@ -1669,7 +1669,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P1 : BaseRoomPresenter<V>?> :
 
 
 
-    //横幅相关消息
+    //通用消息
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onNotifyEvent(event: NotifyEvent) {
         when (event.action) {

app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java

@@ -456,13 +456,6 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
         gameMainBinding.setHasAnimationEffect(AvRoomDataManager.get().mIsNeedGiftEffect);
     }
 
-    /**
-     * 更新特效开关提示
-     */
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void updateHasAnimation(HasAnimationEffect event) {
-        updateHasAnimationEffect();
-    }
 
     @Override
     public void onClick(View v) {
@@ -522,10 +515,6 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
 
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onFollowRoomEvent(FollowRoomEvent event) {
-        ivFollowRoom.setImageResource(AvRoomDataManager.get().isRoomFans ? R.drawable.room_ic_collect_yes : R.drawable.room_ic_collect_no);
-    }
 
     @Override
     public void onDestroy() {
@@ -568,13 +557,15 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
      */
     private void onReceiveGiftMsg(GiftReceiveInfo giftReceiveInfo) {
         if (giftReceiveInfo == null || !isResumed()) return;
-        if (giftReceiveInfo.getGift() != null && giftReceiveInfo.getGift().getNotifyFull() == 1)
-            return; //全服礼物交给 onReceiveGiftMsgAllService() 来处理
+
+        gameMainBinding.giftComboLayout.onRoomCustomMsg(GiftToolbox.transformToGiftMultiReceiverInfo(giftReceiveInfo));
+        if (giftReceiveInfo.getGift() != null && giftReceiveInfo.getGift().getNotifyFull() == 1) return;
+        //全服礼物 的 特效播放交给 onReceiveGiftMsgAllService() 35消息来处理 , 但是连击旧消息处理
+
         if (giftView == null) {
             giftView = (GiftV2View) mVsGift2View.inflate();
         }
         giftView.onReceiveGiftMsg(giftReceiveInfo);
-        gameMainBinding.giftComboLayout.onRoomCustomMsg(GiftToolbox.transformToGiftMultiReceiverInfo(giftReceiveInfo));
     }
 
     /**
@@ -582,14 +573,16 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
      */
     private void onReceiveMultiGiftMsg(GiftMultiReceiverInfo giftMultiReceiverInfo) {
         if (giftMultiReceiverInfo == null || !isResumed()) return;
-        if (giftMultiReceiverInfo.getGift() != null && giftMultiReceiverInfo.getGift().getNotifyFull() == 1)
-            return; //全服礼物交给 onReceiveGiftMsgAllService() 来处理
+
+        gameMainBinding.giftComboLayout.onRoomCustomMsg(giftMultiReceiverInfo);
+        if (giftMultiReceiverInfo.getGift() != null && giftMultiReceiverInfo.getGift().getNotifyFull() == 1) return;
+        //全服礼物 的 特效播放交给 onReceiveGiftMsgAllService() 35消息来处理 , 但是连击旧消息处理
+
         if (giftView == null) {
             giftView = (GiftV2View) mVsGift2View.inflate();
         }
         giftView.onReceiveGiftToMultiMsg(giftMultiReceiverInfo);
         giftMultiReceiverInfo.isMulti = true;
-        gameMainBinding.giftComboLayout.onRoomCustomMsg(giftMultiReceiverInfo);
     }
 
     /**
@@ -597,13 +590,15 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
      */
     private void onReceiveAllMicGiftMsg(MultiGiftReceiveInfo multiGiftReceiveInfo) {
         if (multiGiftReceiveInfo == null || !isResumed()) return;
-        if (multiGiftReceiveInfo.getGift() != null && multiGiftReceiveInfo.getGift().getNotifyFull() == 1)
-            return; //全服礼物交给 onReceiveGiftMsgAllService() 来处理
+
+        gameMainBinding.giftComboLayout.onRoomCustomMsg(GiftToolbox.transformToGiftMultiReceiverInfo(multiGiftReceiveInfo));
+        if (multiGiftReceiveInfo.getGift() != null && multiGiftReceiveInfo.getGift().getNotifyFull() == 1) return;
+        //全服礼物 的 特效播放交给 onReceiveGiftMsgAllService() 35消息来处理 , 但是连击旧消息处理
+
         if (giftView == null) {
             giftView = (GiftV2View) mVsGift2View.inflate();
         }
         giftView.onReceiveMultiGiftMsg(multiGiftReceiveInfo);
-        gameMainBinding.giftComboLayout.onRoomCustomMsg(GiftToolbox.transformToGiftMultiReceiverInfo(multiGiftReceiveInfo));
     }
 
     /**
@@ -615,7 +610,8 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
             giftView = (GiftV2View) mVsGift2View.inflate();
         }
         giftView.onReceiveGiftMsg(giftReceiveInfo);
-        gameMainBinding.giftComboLayout.onRoomCustomMsg(GiftToolbox.transformToGiftMultiReceiverInfo(giftReceiveInfo));
+        // 35 是 全服, 是服务器发的, 服务器发送的不带本地连击数, 所以不处理这个 连击横幅view , 让31 处理
+//        gameMainBinding.giftComboLayout.onRoomCustomMsg(GiftToolbox.transformToGiftMultiReceiverInfo(giftReceiveInfo));
     }
 
 
@@ -852,4 +848,19 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
     }
 
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onFollowRoomEvent(FollowRoomEvent event) {
+        ivFollowRoom.setImageResource(AvRoomDataManager.get().isRoomFans ? R.drawable.room_ic_collect_yes : R.drawable.room_ic_collect_no);
+    }
+
+    /**
+     * 更新特效开关提示
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void updateHasAnimation(HasAnimationEffect event) {
+        updateHasAnimationEffect();
+    }
+
+
+
 }

app/src/main/java/com/chwl/app/avroom/fragment/OnlineUserFragment.java

@@ -6,31 +6,25 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.chwl.core.room.bean.RoomOnlineUserBean;
-import com.netease.nim.uikit.common.util.sys.NetworkUtil;
-import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
-import com.orhanobut.logger.Logger;
-import com.scwang.smartrefresh.layout.SmartRefreshLayout;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
-import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener;
 import com.chwl.app.R;
 import com.chwl.app.avroom.adapter.OnlineUserAdapter;
 import com.chwl.app.avroom.presenter.HomePartyUserListPresenter;
 import com.chwl.app.avroom.view.IHomePartyUserListView;
 import com.chwl.app.base.BaseMvpFragment;
 import com.chwl.app.ui.widget.UserInfoDialog;
-import com.chwl.core.Constants;
 import com.chwl.core.manager.AvRoomDataManager;
 import com.chwl.core.room.bean.OnlineChatMember;
 import com.chwl.core.room.bean.RoomInfo;
-import com.chwl.core.super_admin.util.SuperAdminUtil;
+import com.chwl.core.room.bean.RoomOnlineUserBean;
 import com.chwl.library.base.factory.CreatePresenter;
-import com.chwl.library.utils.JavaUtil;
 import com.chwl.library.utils.ListUtils;
 import com.chwl.library.utils.ResUtil;
+import com.netease.nim.uikit.common.util.sys.NetworkUtil;
+import com.orhanobut.logger.Logger;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 
-import java.util.Iterator;
 import java.util.List;
 
 /**

app/src/main/java/com/chwl/app/home/fragment/HomeRecommendFragment.kt

@@ -37,6 +37,7 @@ import com.chwl.core.DemoCache
 import com.chwl.core.home.bean.BannerInfo
 import com.chwl.core.home.bean.HomeTagInfo
 import com.chwl.library.common.util.isVerify
+import com.chwl.library.common.util.setVis
 import com.chwl.library.common.util.toColor
 import com.chwl.library.utils.ListUtils
 import com.example.lib_utils.ktx.getColor
@@ -68,6 +69,7 @@ class HomeRecommendFragment : BaseViewBindingFragment<FragmentHomeRecommendBindi
                 onVisibleChanged(it, isFirstVisible)
             }
         }
+
         homeViewModel.getHomeTabInfo()
         homeViewModel.getBannerInfo()
         homeViewModel.getHomeResourceInfo()
@@ -78,6 +80,15 @@ class HomeRecommendFragment : BaseViewBindingFragment<FragmentHomeRecommendBindi
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        if (!tabList.isVerify()){
+            binding.refreshLayout.autoRefresh()
+        }
+
+    }
+
     private fun initListener() {
         binding.refreshLayout.setOnRefreshListener {
             it.finishRefresh()
@@ -247,9 +258,16 @@ class HomeRecommendFragment : BaseViewBindingFragment<FragmentHomeRecommendBindi
         }
 
         changePage()
+
+        //显示更多按钮
+        if (list.size > 6) {
+            binding.tabLayoutMore.setVis(true)
+            binding.tabLayoutMarks.setVis(true)
+        }
     }
 
     private fun selectTabView(pos:Int) {
+        if (mPosition == pos) return
         //取消选中
         tabViewList?.getOrNull(mPosition)?.let { oldView->
             val tabView = ItemHomeRecommentdTagBinding.bind(oldView)

app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java

@@ -14,6 +14,7 @@ import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.Window;
 import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -141,6 +142,8 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
 
     private SkillPicsAdapter picsAdapter;
 
+    private boolean mIsNeedGiftItem = true;
+
 
     private UserInfoDialog(Context context, UserInfo userInfo, long uid, List<ViewItem> buttons, boolean isInRoom, GiftDialog.OnGiftDialogBtnClickListener listener) {
         super(context, R.style.ErbanUserInfoDialog);
@@ -154,6 +157,19 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
         this.isInRoom = isInRoom;
         this.giftDialogBtnClickListener = listener;
     }
+    private UserInfoDialog(Context context, UserInfo userInfo, long uid, List<ViewItem> buttons, boolean isInRoom, GiftDialog.OnGiftDialogBtnClickListener listener,boolean isNeedRoomItem) {
+        super(context, R.style.ErbanUserInfoDialog);
+        this.context = context;
+        this.uid = uid;
+        this.buttons = buttons;
+        this.userInfo = userInfo;
+        isMySelf = (this.uid == AuthModel.get().getCurrentUid());
+        homePartyModel = new HomePartyModel();
+        mSuperAdminModel = new SuperAdminModel();
+        this.isInRoom = isInRoom;
+        this.giftDialogBtnClickListener = listener;
+        this.mIsNeedGiftItem = isNeedRoomItem;
+    }
 
     public static void showNewUserInfoDialog(Context context, long uid) {
         showNewUserInfoDialog(context, uid, true, true, true, null);
@@ -180,7 +196,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
                             isInRoom,
                             listener
                     );
-                    new UserInfoDialog(context, userInfo, uid, list, isInRoom, listener).show();
+                    new UserInfoDialog(context, userInfo, uid, list, isInRoom, listener,isNeedGiftItem).show();
                     loadingDialog.dismiss();
                 }, throwable -> {
                     SingleToastUtil.showToast(throwable.getMessage());
@@ -199,10 +215,17 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
         setContentView(mBinding.getRoot());
         setCanceledOnTouchOutside(true);
         //设置全屏
-        WindowManager.LayoutParams params = getWindow().getAttributes();
-        params.width = WindowManager.LayoutParams.MATCH_PARENT;
-        params.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        params.gravity = Gravity.BOTTOM;
+        Window window = getWindow();
+        if (window != null) {
+            WindowManager.LayoutParams params = window.getAttributes();
+            params.width = WindowManager.LayoutParams.MATCH_PARENT;
+            params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+            params.gravity = Gravity.BOTTOM;
+
+        }
+
+
+
 
         myUid = AuthModel.get().getCurrentUid();
 
@@ -265,7 +288,14 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
         mBinding.aite.setOnClickListener(this);
         mBinding.follow.setOnClickListener(this);
 
-        mBinding.gift.setVisibility(View.VISIBLE);
+
+        if (mIsNeedGiftItem) {
+            if (!SuperAdminUtil.isSuperAdmin()) {
+                mBinding.gift.setVisibility(View.VISIBLE);
+            }
+        }
+
+
         if (!isMySelf){
             mBinding.send.setVisibility(View.VISIBLE);
             mBinding.aite.setVisibility(View.VISIBLE);
@@ -476,7 +506,9 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
             mBinding.ivCopy.setOnClickListener(view -> copyName());
             mBinding.tvGenderAge.setBirthDay(userInfo.getBirth());
             mBinding.tvGenderAge.setGender(userInfo.getGender());
-            VipHelper.loadVipIcon(mBinding.ivVipIcon, userInfo.getUserVipInfoVO());
+
+            //1.0.21版本 隐藏 vip icon
+//            VipHelper.loadVipIcon(mBinding.ivVipIcon, userInfo.getUserVipInfoVO());
 
             //设置家族
             if (FamilyInfo.NO_FAMILY_ID.equals(userInfo.getFamilyId())

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

@@ -61,6 +61,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_marginHorizontal="15dp"
+        tools:listitem="@layout/item_country_select"
         android:layout_marginTop="12dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/search" />

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

@@ -33,7 +33,6 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toTopOf="@id/fl_avatar_layout" />
 
-
         <!--        用户装扮资料卡-->
         <FrameLayout
             android:id="@+id/userCardWearLayout"
@@ -47,7 +46,6 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:visibility="visible" />
 
-
         <!--            用户没有装扮时 加载 头像为背景-->
         <com.makeramen.roundedimageview.RoundedImageView
             android:id="@+id/iv_avatar_bg"
@@ -131,7 +129,6 @@
             android:id="@+id/infoLayout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
             android:gravity="center_horizontal"
             android:orientation="vertical"
             app:layout_constraintEnd_toEndOf="@+id/fl_avatar_layout"
@@ -140,6 +137,8 @@
 
             <LinearLayout
                 android:layout_width="wrap_content"
+                android:layout_marginTop="5dp"
+                android:gravity="center_vertical"
                 android:layout_height="wrap_content">
 
                 <TextView
@@ -203,7 +202,7 @@
                     android:id="@+id/tv_erban_id"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="#7b7b7d"
+                    android:textColor="@color/color_313131"
                     android:textSize="@dimen/sp_12"
                     tools:text="ID123456" />
 
@@ -371,6 +370,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="12dp"
                 android:layout_marginTop="6dp"
+                android:visibility="gone"
+                tools:visibility="visible"
                 android:layout_marginEnd="12dp"
                 android:layout_marginBottom="@dimen/dp_8" />
 
@@ -428,17 +429,25 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <View
+            android:id="@+id/flexboxLine"
+            android:layout_width="wrap_content"
+            android:layout_height="1dp"
+            android:layout_marginTop="16dp"
+            android:background="#e4e4e4"
+            app:layout_constraintTop_toBottomOf="@id/btnLayout" />
+
 
         <HorizontalScrollView
             android:id="@+id/flexboxLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
             android:overScrollMode="never"
+            android:paddingVertical="12dp"
             android:paddingHorizontal="10dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnLayout"
+            app:layout_constraintTop_toBottomOf="@id/flexboxLine"
             tools:layout_height="20dp">
 
             <LinearLayout
@@ -452,13 +461,7 @@
 
         </HorizontalScrollView>
 
-        <View
-            android:id="@+id/flexboxLine"
-            android:layout_width="wrap_content"
-            android:layout_height="1dp"
-            android:layout_marginTop="-12dp"
-            android:background="#e4e4e4"
-            app:layout_constraintTop_toTopOf="@id/flexboxLayout" />
+
 
         <com.coorchice.library.SuperTextView
             android:id="@+id/tv_select_him"
@@ -466,13 +469,12 @@
             android:layout_height="36dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginStart="70dp"
-            android:layout_marginTop="10dp"
             android:layout_marginEnd="70dp"
             android:layout_marginBottom="15dp"
             android:gravity="center"
             android:text="@string/layout_dialog_user_info_010"
             android:textColor="#FFFEFE"
-            android:textSize="13sp"
+            android:textSize="14sp"
             android:visibility="gone"
             app:corner="117dp"
             app:layout_constraintBottom_toBottomOf="parent"

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

@@ -128,7 +128,9 @@
                     android:layout_gravity="end"
                     app:dt_drawableType="shape"
                     app:dt_startColor="@color/transparent"
-                    app:dt_endColor="@color/black"
+                    app:dt_endColor="@color/transparent"
+                    android:visibility="gone"
+                    tools:visibility="visible"
                     android:layout_marginTop="9dp"
                     android:layout_marginEnd="15dp" />
 
@@ -139,6 +141,8 @@
                     app:tint="@color/black"
                     android:src="@drawable/icon_date_arrow"
                     android:layout_gravity="end"
+                    android:visibility="gone"
+                    tools:visibility="visible"
                     android:layout_marginTop="6dp"
                     android:layout_marginEnd="10dp" />
 

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

@@ -7,7 +7,7 @@
 
     <ImageView
         android:id="@+id/icon"
-        android:layout_width="29dp"
+        android:layout_width="36dp"
         android:layout_height="22dp"
         android:src="@drawable/default_avatar"
         app:layout_constraintBottom_toBottomOf="@+id/text"
@@ -32,16 +32,16 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/text"
         app:layout_constraintBottom_toBottomOf="@+id/text"
-        android:src="@drawable/ic_pay_selected"
+        android:src="@drawable/icon_select"
         android:visibility="gone"
         tools:visibility="visible"
-        android:layout_width="25dp"
-        android:layout_height="25dp"/>
+        android:layout_width="20dp"
+        android:layout_height="20dp"/>
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="#e4e4e4"
+        android:layout_height="0.5dp"
+        android:background="#E4E4E4"
         app:layout_constraintBottom_toBottomOf="@+id/text" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values-ar/strings.xml

@@ -5357,4 +5357,5 @@
     <string name="forbidDescHint">يرجى إدخال سبب الحظر، والذي سيكون مرئيًا في الخلفية</string>
     <string name="forbidTime">%s ساعات</string>
     <string name="ageLimitHint">التطبيق يقصر التسجيل على المستخدمين الذين تقل أعمارهم عن 18 عاماً</string>
+    <string name="regionTips">حدد بلدك</string>
 </resources>

app/src/main/res/values-tr/strings.xml

@@ -5153,4 +5153,5 @@ Toplam imza alın, ilgili ödülü alın
     <string name="forbidDescHint">Lütfen arka planda görünecek olan engelleme nedenini girin</string>
     <string name="forbidTime">%s saat</string>
     <string name="ageLimitHint">Bu uygulamada 18 yaş altında olan kişiler hesabı açmaz.</string>
+    <string name="regionTips">Ülkenizi seçin</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -5300,5 +5300,6 @@
     <string name="forbidDescHint">请输入封禁原因，该原因将在后台可见</string>
     <string name="forbidTime">%s 小时</string>
     <string name="ageLimitHint">APP限制18歲以下用戶註冊。</string>
+    <string name="regionTips">選擇你的國家</string>
 
 </resources>

app/src/main/res/values/strings.xml

@@ -5369,7 +5369,7 @@ You cannot join again within 24 hours after leaving</string>
     <string name="ageLimitHint">APP restricts registration to users under 18 years old.</string>
 
 
-    <string name="regionTips">必须选择国家/地区</string>
+    <string name="regionTips">Select your country</string>
 
 </resources>
 

core/src/main/java/com/chwl/core/gift/event/NotifyEvent.java

@@ -2,7 +2,7 @@ package com.chwl.core.gift.event;
 
 import lombok.Data;
 
-//处理 公屏推送 相关消息,如 boom飘屏点击事件
+//处理通用消息 公屏推送 相关消息,如 boom飘屏点击事件
 @Data
 public class NotifyEvent {
 
@@ -27,6 +27,7 @@ public class NotifyEvent {
 
     public @interface Action{
         int ACT_BAI_SHUN_GAME = 1; // 遊戲橫幅被點擊
+        int ACT_ONLINE_USER_CARD_DIALOG = 2; //  在线列表弹起用户弹窗
 
     }
 }