From 0ff0cb52f66780b89ba4ee862d3c134d99522cb6 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 14 May 2024 17:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BB=E9=A1=B5=E6=88=98?=
 =?UTF-8?q?=E4=BB=A4=E6=82=AC=E6=B5=AE=E9=97=AE=E9=A2=98=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E8=8E=B7=E5=8F=96=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=AE=BE=E7=BD=AE=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.gradle                                 |  4 +--
 .../yunbao/main/activity/MainActivity.java    | 25 ++++++++++++-------
 .../com/yunbao/main/http/MainHttpUtil.java    |  3 +++
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/config.gradle b/config.gradle
index 4d7ec170a..fd33bfeaf 100644
--- a/config.gradle
+++ b/config.gradle
@@ -21,10 +21,10 @@ ext {
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 
 //            true表示谷歌支付 false    0 链接包   1 谷歌包   2华为包  3 samsung包
-            isGooglePlay     : 1,
+            isGooglePlay     : 0,
             //是否上报异常日志
             isUploadLog      : true,
             //是否打包成插件包模式
-            isPluginModel    : false,
+            isPluginModel    : true,
     ]
 }
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 984c0ecf5..60c1a7fa3 100644
--- a/main/src/main/java/com/yunbao/main/activity/MainActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/MainActivity.java
@@ -637,6 +637,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
                 }
                 if (data.getShowWarOrder() == 0) {
                     floatWarOrder.setVisibility(View.GONE);
+                    floatWarOrder.setTag(null);
                     //战令关闭情况下，在判断一次Banner是否足够
                     if (data.getListShow() == 1 && data.getList().size() > 2) {
                         floatBanner.setVisibility(View.VISIBLE);
@@ -649,8 +650,10 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
                 } else {
                     if (mainHomeViewHolder != null && mainHomeViewHolder.isFloatWarOrder()) {
                         floatWarOrder.setVisibility(View.GONE);
+                        floatWarOrder.setTag(null);
                     } else {
                         floatWarOrder.setVisibility(View.VISIBLE);
+                        floatWarOrder.setTag(data);
                     }
 
                     floatBanner.setVisibility(View.GONE);
@@ -798,18 +801,17 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
 
     private void showStartDialog() {
 
-            if (isReady == true) {
-                MainStartDialogFragment dialogFragment = new MainStartDialogFragment();
-                dialogFragment.setMainStartChooseCallback(true, this);
-                dialogFragment.show(getSupportFragmentManager(), "MainStartDialogFragment");
-            } else {
-                ToastUtil.show("正在初始化，請稍等....");
-            }
+        if (isReady == true) {
+            MainStartDialogFragment dialogFragment = new MainStartDialogFragment();
+            dialogFragment.setMainStartChooseCallback(true, this);
+            dialogFragment.show(getSupportFragmentManager(), "MainStartDialogFragment");
+        } else {
+            ToastUtil.show("正在初始化，請稍等....");
+        }
 
     }
 
 
-
     /**
      * 检查版本更新
      */
@@ -1499,10 +1501,15 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onFloatWarOrderEvent(FloatWarOrderEvent event) {
-        if (event.isFloatWarOrder()) {
+      /*  if (event.isFloatWarOrder()) {
             floatWarOrder.setVisibility(View.GONE);
         } else {
             floatWarOrder.setVisibility(View.VISIBLE);
+        }*/
+        if(floatWarOrder.getTag()!=null){
+            floatWarOrder.setVisibility(View.VISIBLE);
+        }else{
+            floatWarOrder.setVisibility(View.GONE);
         }
     }
 
diff --git a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java
index 48ad065a4..eef8e6b27 100644
--- a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java
+++ b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java
@@ -517,6 +517,7 @@ public class MainHttpUtil {
                 .params("mobile", mobile)
                 .params("sign", sign)
                 .params("source", "1")
+                .params("langue", WordUtil.isNewZh()?"chinese":"english")
                 .execute(callback);
     }
 
@@ -539,6 +540,7 @@ public class MainHttpUtil {
                 .params("MacAddress", macUitl.getNewMac())
                 .params("Imei", uuid)
                 .params("source", "1")
+                .params("langue", WordUtil.isNewZh()?"chinese":"english")
                 .execute(callback);
     }
 
@@ -647,6 +649,7 @@ public class MainHttpUtil {
                 .params("mobile", mobile)
                 .params("country_code", country_code)
                 .params("source", "1")
+                .params("langue", WordUtil.isNewZh()?"chinese":"english")
                 .execute(callback);
     }