From bf1c7b07b36a10b7ae6840755d35868de23479d3 Mon Sep 17 00:00:00 2001
From: huangjian <547527489@qq.com>
Date: Fri, 8 May 2020 14:56:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=AE=B1=E5=AD=90UI=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  4 ++--
 .../erban/home/fragment/GameHomeFragment.java |  1 -
 app/src/main/res/values-v23/styles.xml        | 11 ----------
 app/src/main/res/values/styles.xml            | 20 -------------------
 .../activity/TreasureBoxActivity.java         |  3 ++-
 .../activity/TreasureBoxHonourActivity.java   |  3 ++-
 6 files changed, 6 insertions(+), 36 deletions(-)
 delete mode 100644 app/src/main/res/values-v23/styles.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6cc321896..9a95a5219 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -842,11 +842,11 @@
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".treasure_box.activity.TreasureBoxActivity"
-            android:theme="@style/box_activity" />
+            android:theme="@style/dialog_web_view_activity" />
 
         <activity
             android:name=".treasure_box.activity.TreasureBoxHonourActivity"
-            android:theme="@style/box_activity" />
+            android:theme="@style/dialog_web_view_activity" />
 
         <activity android:name=".ui.setting.VerifyPhoneActivity" />
         <activity android:name=".ui.setting.ModifyPwdActivity" />
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
index 8b903fe3d..643e96966 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
@@ -320,7 +320,6 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
         ViewPagerHelper.bind(mBinding.magicIndicatorBottom, mBinding.viewPagerBottom);
     }
 
-
     private void openRoom() {
         UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
         if (userInfo != null && !userInfo.isCertified()) {
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
deleted file mode 100644
index b314bfb02..000000000
--- a/app/src/main/res/values-v23/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resources>
-
-    <style name="box_activity" parent="MyMaterialTheme">
-        <item name="android:windowBackground">#80000000</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:statusBarColor">@color/transparent</item>
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-    </style>
-
-</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dc9235f4f..a417c6a9a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -162,26 +162,6 @@
         <item name="android:backgroundDimEnabled">true</item>
     </style>
 
-    <style name="box_activity" parent="Theme.AppCompat.Dialog">
-        <item name="android:windowFullscreen">false</item>
-        <!--设置dialog的背景-->
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <!--设置Dialog的windowFrame框为无-->
-        <item name="android:windowFrame">@null</item>
-        <!--设置无标题-->
-        <item name="windowNoTitle">true</item>
-        <!--是否浮现在activity之上-->
-        <item name="android:windowIsFloating">true</item>
-        <!--是否半透明-->
-        <item name="android:windowIsTranslucent">true</item>
-        <!--设置窗口内容不覆盖-->
-        <item name="android:windowContentOverlay">@null</item>
-        <!--设置动画，在这里使用让它继承系统的Animation.Dialog-->
-        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-        <!--背景是否模糊显示-->
-        <item name="android:backgroundDimEnabled">true</item>
-    </style>
-
     <style name="dialog_web_view_activity" parent="Theme.AppCompat.Dialog">
         <item name="android:windowFullscreen">true</item>
         <!--设置dialog的背景-->
diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java
index 162fc01ec..2341b1755 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java
@@ -60,7 +60,8 @@ public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBox
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+        //这里的height用MATCH_PARENT状态栏会被顶上去,不知道什么鬼
+        getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, ScreenUtil.screenHeight);
         getWindow().setGravity(Gravity.CENTER);
         subscribeEvent();
     }
diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java
index aced8f06b..820001cc7 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java
@@ -59,7 +59,8 @@ public class TreasureBoxHonourActivity extends BaseBindingActivity<ActivityTreas
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+        //这里的height用MATCH_PARENT状态栏会被顶上去,不知道什么鬼
+        getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, ScreenUtil.screenHeight);
         getWindow().setGravity(Gravity.CENTER);
         subscribeEvent();
     }