From 004a5b2a532326b266bf0173d85c9fb007bad577 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 23 Jan 2024 11:14:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/common/event/FloatWarOrderEvent.java  | 16 ++++++++++++++++
 common/src/main/res/layout/activity_sud_game.xml | 11 ++++++-----
 .../main/res/layout/item_home_sud_game_list.xml  |  6 +++---
 .../layout/view_sud_game_chat_item_holder.xml    |  1 +
 .../layout/view_sud_game_user_list_holder.xml    | 10 +++++-----
 config.gradle                                    |  4 ++--
 .../com/yunbao/main/activity/MainActivity.java   | 12 ++++++++++--
 .../yunbao/main/views/MainHomeViewHolder.java    | 10 +++++++---
 8 files changed, 50 insertions(+), 20 deletions(-)
 create mode 100644 common/src/main/java/com/yunbao/common/event/FloatWarOrderEvent.java

diff --git a/common/src/main/java/com/yunbao/common/event/FloatWarOrderEvent.java b/common/src/main/java/com/yunbao/common/event/FloatWarOrderEvent.java
new file mode 100644
index 000000000..73ddeda8f
--- /dev/null
+++ b/common/src/main/java/com/yunbao/common/event/FloatWarOrderEvent.java
@@ -0,0 +1,16 @@
+package com.yunbao.common.event;
+
+import com.yunbao.common.bean.BaseModel;
+
+public class FloatWarOrderEvent extends BaseModel {
+    private boolean floatWarOrder;
+
+    public boolean isFloatWarOrder() {
+        return floatWarOrder;
+    }
+
+    public FloatWarOrderEvent setFloatWarOrder(boolean floatWarOrder) {
+        this.floatWarOrder = floatWarOrder;
+        return this;
+    }
+}
diff --git a/common/src/main/res/layout/activity_sud_game.xml b/common/src/main/res/layout/activity_sud_game.xml
index 509fdd08c..57b2fa29c 100644
--- a/common/src/main/res/layout/activity_sud_game.xml
+++ b/common/src/main/res/layout/activity_sud_game.xml
@@ -21,7 +21,7 @@
         android:layout_width="150dp"
         android:layout_height="50dp"
         android:layout_marginStart="23dp"
-        android:layout_marginTop="25dp"
+        android:layout_marginTop="28dp"
         android:background="@drawable/bg_live_sud_game_top_new"
         android:gravity="start|center_vertical">
 
@@ -146,14 +146,15 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginTop="80dp"
-        android:gravity="center">
+        android:layout_height="70dp"
+        android:layout_marginTop="75dp">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/user_list"
+            android:layout_marginStart="11dp"
+            android:layout_marginEnd="20dp"
             android:layout_width="wrap_content"
-            android:layout_height="50dp" />
+            android:layout_height="match_parent" />
     </LinearLayout>
 
 
diff --git a/common/src/main/res/layout/item_home_sud_game_list.xml b/common/src/main/res/layout/item_home_sud_game_list.xml
index 266e1d844..a15051431 100644
--- a/common/src/main/res/layout/item_home_sud_game_list.xml
+++ b/common/src/main/res/layout/item_home_sud_game_list.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="88dp"
     android:layout_marginStart="15dp"
-
+    android:layout_marginTop="2dp"
     android:layout_marginEnd="15dp"
     android:background="@mipmap/background_home_sud_game_list"
     android:orientation="horizontal">
@@ -48,11 +48,11 @@
 
         <TextView
             android:id="@+id/room_name"
-            android:ellipsize="end"
-            android:singleLine="true"
             android:layout_width="150dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
+            android:ellipsize="end"
+            android:singleLine="true"
             android:text="@string/interactive_game_create_room_name"
             android:textColor="#000"
             android:textSize="14sp" />
diff --git a/common/src/main/res/layout/view_sud_game_chat_item_holder.xml b/common/src/main/res/layout/view_sud_game_chat_item_holder.xml
index d697f53ab..a79050490 100644
--- a/common/src/main/res/layout/view_sud_game_chat_item_holder.xml
+++ b/common/src/main/res/layout/view_sud_game_chat_item_holder.xml
@@ -15,6 +15,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="9dp"
+            android:paddingBottom="2dp"
             android:layout_marginEnd="5dp"
             android:layout_marginBottom="5dp"
             android:gravity="center_vertical"
diff --git a/common/src/main/res/layout/view_sud_game_user_list_holder.xml b/common/src/main/res/layout/view_sud_game_user_list_holder.xml
index d1cf29387..42c914407 100644
--- a/common/src/main/res/layout/view_sud_game_user_list_holder.xml
+++ b/common/src/main/res/layout/view_sud_game_user_list_holder.xml
@@ -9,8 +9,8 @@
 
     <ImageView
         android:id="@+id/vacancy_sud_game"
-        android:layout_width="34dp"
-        android:layout_height="34dp"
+        android:layout_width="45dp"
+        android:layout_height="45dp"
         android:layout_marginStart="12dp"
         android:src="@mipmap/icon_vacancy_sud_game"
         android:visibility="visible" />
@@ -18,14 +18,14 @@
     <FrameLayout
         android:id="@+id/user_layout"
         android:layout_width="wrap_content"
-        android:layout_height="50dp"
+        android:layout_height="60dp"
         android:visibility="visible">
 
 
         <com.makeramen.roundedimageview.RoundedImageView
             android:id="@+id/sud_game_user"
-            android:layout_width="34dp"
-            android:layout_height="34dp"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="12dp"
             android:scaleType="centerCrop"
diff --git a/config.gradle b/config.gradle
index 7f16e5253..1ccac4e22 100644
--- a/config.gradle
+++ b/config.gradle
@@ -9,9 +9,9 @@ ext {
     ]
     manifestPlaceholders = [
             //正式、
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
 //             测试
-            serverHost       : " https://ceshi.yaoulive.com",
+//            serverHost       : " https://ceshi.yaoulive.com",
 
             //百度语音识别
 
diff --git a/main/src/main/java/com/yunbao/main/activity/MainActivity.java b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
index 5834fbab6..670e7d49f 100644
--- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
@@ -68,6 +68,7 @@ import com.yunbao.common.custom.TabButtonGroup;
 import com.yunbao.common.dialog.HintDialog;
 import com.yunbao.common.dialog.InstructorOperationDialog;
 import com.yunbao.common.event.CompleteInformationEvent;
+import com.yunbao.common.event.FloatWarOrderEvent;
 import com.yunbao.common.event.InstructorOperationEvent;
 import com.yunbao.common.event.LiveFloatEvent;
 import com.yunbao.common.event.MainHomeCommunityToChatEvent;
@@ -104,9 +105,7 @@ import com.yunbao.common.views.APKUpdateCustomPopup;
 import com.yunbao.common.views.AbsMainViewHolder;
 import com.yunbao.common.views.floatingview.APPEasyFloat;
 import com.yunbao.common.views.weight.LiveFloatView;
-import com.yunbao.live.activity.LiveActivity;
 import com.yunbao.live.activity.LiveAudienceActivity;
-import com.yunbao.live.dialog.LiveUserDialogFragment;
 import com.yunbao.live.utils.LiveStorge;
 import com.yunbao.main.R;
 import com.yunbao.main.adapter.FullAdToBannerTransition;
@@ -1476,6 +1475,15 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
         }
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onFloatWarOrderEvent(FloatWarOrderEvent event) {
+        if (event.isFloatWarOrder()) {
+            floatWarOrder.setVisibility(View.GONE);
+        } else {
+            floatWarOrder.setVisibility(View.VISIBLE);
+        }
+    }
+
     private void initRedPacket() {
         ImageView title = floatRedPacket.findViewById(R.id.title);
         if (WordUtil.isNewZh()) {
diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
index 2fc9f7c2c..3996e16cb 100644
--- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
@@ -1,18 +1,18 @@
 package com.yunbao.main.views;
 
 import android.content.Context;
-import android.util.Log;
-import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
 import com.umeng.analytics.MobclickAgent;
 import com.yunbao.common.activity.AbsActivity;
+import com.yunbao.common.event.FloatWarOrderEvent;
 import com.yunbao.common.glide.ImgLoader;
-import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.main.R;
 
+import org.greenrobot.eventbus.EventBus;
+
 /**
  * Created by cxf on 2018/9/22.
  * MainActivity 首页  删除
@@ -61,15 +61,19 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
         switch (position) {
             case 0:
                 MobclickAgent.onEvent(mContext, "home_page_follow", "首页关注列表按钮");
+                EventBus.getDefault().post(new FloatWarOrderEvent().setFloatWarOrder(false));
                 break;
             case 1:
                 MobclickAgent.onEvent(mContext, "home_page_hot", "首页热门列表按钮");
+                EventBus.getDefault().post(new FloatWarOrderEvent().setFloatWarOrder(false));
                 break;
             case 2:
                 MobclickAgent.onEvent(mContext, "home_page_recommend", "首页推荐列表按钮");
+                EventBus.getDefault().post(new FloatWarOrderEvent().setFloatWarOrder(false));
                 break;
             case 3:
                 MobclickAgent.onEvent(mContext, "home_page_redpk", "首页红包列表按钮");
+                EventBus.getDefault().post(new FloatWarOrderEvent().setFloatWarOrder(true));
                 break;
         }
         if (mViewHolders == null) {