From a0a75bc3cb063d6e967daea44c46c3aff3647ac5 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Fri, 17 Dec 2021 20:34:18 +0800
Subject: [PATCH] =?UTF-8?q?1.GameCfg=E4=B8=8D=E6=B7=B7=E6=B7=86=202.?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E7=8A=B6=E6=80=81=E6=A0=8F=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java  | 1 -
 app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt | 2 +-
 app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java  | 1 -
 .../main/java/com/yizhuan/erban/ui/relation/FansListActivity.kt | 1 +
 .../java/com/yizhuan/xchat_android_core/room}/game/GameCfg.kt   | 2 +-
 gradle.properties                                               | 2 +-
 xplan-flutter                                                   | 2 +-
 7 files changed, 5 insertions(+), 6 deletions(-)
 rename {app/src/main/java/com/yizhuan/erban/avroom => core/src/main/java/com/yizhuan/xchat_android_core/room}/game/GameCfg.kt (98%)

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
index 021b5fcf9..83c0191c0 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
@@ -869,7 +869,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
     protected void setStatusBar() {
         super.setStatusBar();
         StatusBarUtil.transparencyBar(this);
-        StatusBarUtil.StatusBarLightMode(this);
     }
 
     @Override
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt b/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt
index cc67999a9..a522e8ec3 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt
@@ -3,7 +3,6 @@ package com.yizhuan.erban.avroom.game
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
-import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.text.TextUtils
@@ -14,6 +13,7 @@ import android.widget.FrameLayout
 import com.google.gson.Gson
 import com.yizhuan.xchat_android_core.auth.AuthModel
 import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
+import com.yizhuan.xchat_android_core.room.game.GameCfg
 import com.yizhuan.xchat_android_core.room.game.GameModel
 import com.yizhuan.xchat_android_core.room.game.GameStatus
 import com.yizhuan.xchat_android_core.room.model.HomePartyModel
diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java
index af5801e60..d046c64f3 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java
@@ -625,7 +625,6 @@ public class ChargeActivity extends BaseActivity {
     protected void setStatusBar() {
         super.setStatusBar();
         StatusBarUtil.transparencyBar(this);
-        StatusBarUtil.StatusBarLightMode(this);
     }
 
     @Override
diff --git a/app/src/main/java/com/yizhuan/erban/ui/relation/FansListActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/relation/FansListActivity.kt
index 1e6c01fef..4cc3a8bd6 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/relation/FansListActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/ui/relation/FansListActivity.kt
@@ -62,6 +62,7 @@ class FansListActivity : BaseActivity() {
     override fun setStatusBar() {
         super.setStatusBar()
         StatusBarUtil.transparencyBar(this)
+        StatusBarUtil.StatusBarLightMode(this)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/game/GameCfg.kt b/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCfg.kt
similarity index 98%
rename from app/src/main/java/com/yizhuan/erban/avroom/game/GameCfg.kt
rename to core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCfg.kt
index 3cc9bf7f2..65f47ad14 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/game/GameCfg.kt
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCfg.kt
@@ -1,4 +1,4 @@
-package com.yizhuan.erban.avroom.game
+package com.yizhuan.xchat_android_core.room.game
 
 /***
  *
diff --git a/gradle.properties b/gradle.properties
index 0a0efc59d..37e6fbea8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@ android.enableD8=true
 android.injected.testOnly=false
 android.useAndroidX=true
 android.enableJetifier=true
-version_name=4.0.1.0
+version_name=4.0.0
 version_code=400
 
 with_flutter_aar=true
diff --git a/xplan-flutter b/xplan-flutter
index 11d027780..a46a357c5 160000
--- a/xplan-flutter
+++ b/xplan-flutter
@@ -1 +1 @@
-Subproject commit 11d027780d95724a5e4c854c366bc91ac72f97cc
+Subproject commit a46a357c589ca6b1905e25390864b85171e1cec9