游戏修改，粉丝团提示修改

app/proguard-rules.pro

@@ -254,4 +254,26 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class com.opensource.svgaplayer.**{
     public <methods>;
     public static <fields>;
-}
+}
+# json序列化的混淆
+-keep class tech.sud.mgp.hello.ui.scenes.ticket.model.** {*;}
+-keep class tech.sud.mgp.hello.service.game.req.** {*;}
+-keep class tech.sud.mgp.hello.service.game.resp.** {*;}
+-keep class tech.sud.mgp.hello.service.login.req.** {*;}
+-keep class tech.sud.mgp.hello.service.login.resp.** {*;}
+-keep class tech.sud.mgp.hello.service.main.req.** {*;}
+-keep class tech.sud.mgp.hello.service.main.resp.** {*;}
+-keep class tech.sud.mgp.hello.service.main.config.** {*;}
+-keep class tech.sud.mgp.hello.service.room.req.** {*;}
+-keep class tech.sud.mgp.hello.service.room.resp.** {*;}
+-keep class tech.sud.mgp.hello.service.room.model.** {*;}
+-keep class tech.sud.mgp.hello.ui.main.home.model.** {*;}
+-keep class tech.sud.mgp.hello.ui.scenes.base.model.** {*;}
+-keep class tech.sud.mgp.hello.ui.scenes.common.cmd.** {*;}
+-keep class tech.sud.mgp.hello.ui.scenes.custom.model.** {*;}
+-keep class tech.sud.mgp.hello.ui.scenes.orderentertainment.model.** {*;}
+-keep class tech.sud.mgp.hello.ui.main.settings.model.** {*;}
+-keep class tech.sud.mgp.hello.ui.main.nft.model.** {*;}
+-keep class tech.sud.mgp.hello.common.event.model.** {*;}
+
+-keep class com.yunbao.common.sud.** {*;}

common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java

@@ -92,6 +92,13 @@ public class CreateSudGamePopup extends BottomPopupView {
                         .show();
             }
         });
+        ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.room_back),
+                new ViewClicksAntiShake.ViewClicksCallBack() {
+                    @Override
+                    public void onViewClicks() {
+                        dismiss();
+                    }
+                });
         ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.create_room), new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {

common/src/main/java/com/yunbao/common/sud/QuickStartGameViewModel.java

@@ -10,11 +10,13 @@ import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.bean.SudgameCodeModel;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.sud.model.GameConfigModel;
 import com.yunbao.common.sud.model.GameViewInfoModel;
 import com.yunbao.common.sud.state.SudMGPMGState;
 
 import java.util.List;
+import java.util.Locale;
 
 import tech.sud.mgp.core.ISudFSMMG;
 import tech.sud.mgp.core.ISudFSMStateHandle;
@@ -62,6 +64,11 @@ public class QuickStartGameViewModel extends BaseGameViewModel {
      */
     @Override
     protected void getCode(Activity activity, String userId, String appId, GameGetCodeListener listener) {
+        if (IMLoginManager.get(activity).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
+            languageCode = "zh-CN";
+        }else {
+            languageCode = "en-US";
+        }
         // TODO: 2022/6/10 注意，这里是演示使用OkHttpClient请求hello-sud服务
         // TODO: 2022/6/10 开发者在与后端联调时需将其改成自己的网络请求方式向自己的服务器获取code
         LiveNetManager.get(activity)

common/src/main/res/layout/dialog_create_sud_game.xml

@@ -29,6 +29,7 @@
             android:textStyle="bold" />
 
         <ImageView
+            android:id="@+id/room_back"
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:layout_gravity="end|center_vertical"

common/src/main/res/layout/dialog_home_create_sud_game.xml

@@ -30,6 +30,7 @@
             android:textStyle="bold" />
 
         <ImageView
+            android:id="@+id/room_back"
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:layout_gravity="end|center_vertical"

common/src/main/res/layout/item_home_sud_game_list.xml

@@ -65,13 +65,25 @@
             android:layout_width="150dp"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            android:layout_marginBottom="15dp"
+            android:layout_marginBottom="5dp"
             android:ellipsize="end"
             android:singleLine="true"
             android:text="@string/interactive_game_player_we_are"
             android:textColor="#B3000000"
             android:textSize="12sp" />
 
+        <TextView
+            android:id="@+id/player_we_are_2"
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="3dp"
+            android:layout_marginBottom="3dp"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:text="@string/interactive_game_player_we_are_2"
+            android:textColor="#000"
+            android:textSize="12sp" />
+
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -174,17 +186,6 @@
             android:layout_marginTop="10dp"
             android:gravity="bottom">
 
-            <TextView
-                android:id="@+id/player_we_are_2"
-                android:layout_width="70dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="3dp"
-                android:layout_marginBottom="10dp"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:text="@string/interactive_game_player_we_are_2"
-                android:textColor="#000"
-                android:textSize="12sp" />
 
             <ImageView
                 android:id="@+id/game_icon"

common/src/main/res/layout/item_sud_game_list.xml

@@ -66,13 +66,25 @@
             android:layout_width="150dp"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
+            android:layout_marginBottom="5dp"
             android:ellipsize="end"
             android:singleLine="true"
-            android:layout_marginBottom="20dp"
             android:text="@string/interactive_game_player_we_are"
             android:textColor="#80ffffff"
             android:textSize="12sp" />
 
+        <TextView
+            android:id="@+id/player_we_are_2"
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="3dp"
+            android:layout_marginBottom="3dp"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:text="@string/interactive_game_player_we_are_2"
+            android:textColor="@color/white"
+            android:textSize="12sp" />
+
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -174,17 +186,6 @@
             android:layout_marginTop="10dp"
             android:gravity="bottom">
 
-            <TextView
-                android:id="@+id/player_we_are_2"
-                android:layout_width="70dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="3dp"
-                android:layout_marginBottom="10dp"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:text="@string/interactive_game_player_we_are_2"
-                android:textColor="@color/white"
-                android:textSize="12sp" />
 
             <ImageView
                 android:id="@+id/game_icon"

live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java

@@ -469,6 +469,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
                 .enableDrag(false)
                 .asCustom(new LiveNewRolePopup(mContext, mRedPointPrivilege.getVisibility() == View.VISIBLE))
                 .show();
+        mRedPointPrivilege.setVisibility(View.GONE);
     }