主题修改和bug修改

app/src/main/AndroidManifest.xml

@@ -45,7 +45,7 @@
         android:icon="@mipmap/icon"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppThemes">
+        android:theme="@style/AppTheme">
 
         <activity
             android:name=".wxapi.WXEntryActivity"
@@ -260,7 +260,7 @@
             android:hardwareAccelerated="true"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
-            android:theme="@style/ACTMAIN"
+            android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustPan|stateHidden">
             <category android:name="android.intent.category.DEFAULT" />
             <intent-filter>

app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -231,4 +231,24 @@ public class SplashAct extends BaseActivity implements SplashContract.View, Easy
                 break;
         }
     }
+
+    @Override
+    public void onActivityReenter(int resultCode, Intent data) {
+        super.onActivityReenter(resultCode, data);
+        try{
+            mHandler.sendEmptyMessageDelayed(0, 1000);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        try{
+            mHandler.removeMessages(0);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }

app/src/main/res/values-v23/style_theme.xml

@@ -1,6 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="AppTheme" parent="Theme.AppCompat.Light">
+
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorControlHighlight">@color/black</item>
+
+        <item name="main_color">@color/theme_app_main</item>
+        <item name="main_color_dark">@color/theme_app_dark</item>
+        <item name="main_color_mid">@color/theme_app_mid</item>
+        <item name="main_color_accent">@color/theme_app_highlight</item>
+        <item name="main_color_light">@color/theme_app_highlight_more</item>
+        <item name="star_unselect">@drawable/xina</item>
+        <item name="star_select">@drawable/xinb</item>
+        <!--下面的属性全是为了兼容安卓4.0！多了好多文件啊-->
+        <item name="line_short">@drawable/sp_line_vertical</item>
+        <item name="star_style">@style/ratingbar_main</item>
+        <item name="radio_btn">@drawable/sel_circle_dot</item>
+        <item name="button_full_normal">@drawable/selector_button_full_main</item>
+        <item name="full.button">@style/full.button_main</item>
+        <item name="small.button">@style/small.button_main</item>
+        <item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>
+        <item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_main</item>
+        <item name="sp_search_edt">@drawable/sp_search_edt_main</item>
+        <item name="btn_color">@color/btn_color_main</item>
+    </style>
+    <style name="AppTheme_bug" parent="Theme.AppCompat.Light">
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="colorPrimary">@color/colorPrimary</item>

app/src/main/res/values/common.xml

@@ -2,7 +2,7 @@
 <resources>
     <!--APP的相关主要颜色值-->
     <color name="colorPrimary">@color/white_DEDEDE</color>
-    <color name="colorPrimaryDark">@color/txt_black_818181</color>
+    <color name="colorPrimaryDark">@color/blue_FF53BBF2</color>
     <color name="colorAccent">#FF842C</color>
     <color name="colorGreen">#4ADE15</color>
     <!--APP中的文本颜色主要值-->

app/src/main/res/values/gamegroup_color.xml

@@ -34,6 +34,7 @@
     <color name="green_start">#76eab8</color>
     <color name="green_end">#02ca73</color>
     <color name="blue_34a6e7">#34a6e7</color>
+    <color name="blue_FF53BBF2">#FF53BBF2</color>
     <color name="white_DEDEDE">#DEDEDE</color>
     <color name="white_ededed">#ededed</color>
     <color name="white_FFF7F7F7">#FFF7F7F7</color>

app/src/main/res/values/style_theme.xml

@@ -1,35 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <!--<style name="AppTheme" parent="Theme.AppCompat.Light">-->
-        <!--<item name="android:windowContentOverlay">@null</item>-->
-        <!--<item name="colorPrimary">@color/colorPrimary</item>-->
-        <!--<item name="colorPrimaryDark">@color/theme_app_main</item>-->
-        <!--<item name="colorAccent">@color/colorAccent</item>-->
-        <!--<item name="colorControlHighlight">@color/theme_app_highlight_more</item>-->
-        <!--<item name="windowActionBar">false</item>-->
-        <!--<item name="windowNoTitle">true</item>-->
-        <!--<item name="android:windowBackground">@color/theme_app_main</item>-->
-        <!--<item name="android:windowIsTranslucent">true</item>-->
-        <!--<item name="main_color">@color/theme_app_main</item>-->
-        <!--<item name="main_color_dark">@color/theme_app_dark</item>-->
-        <!--<item name="main_color_mid">@color/theme_app_mid</item>-->
-        <!--<item name="main_color_accent">@color/theme_app_highlight</item>-->
-        <!--<item name="main_color_light">@color/theme_app_highlight_more</item>-->
-        <!--<item name="star_unselect">@drawable/xina</item>-->
-        <!--<item name="star_select">@drawable/xinb</item>-->
-        <!--&lt;!&ndash;下面的属性全是为了兼容安卓4.0！多了好多文件啊&ndash;&gt;-->
-        <!--<item name="line_short">@drawable/sp_line_vertical</item>-->
-        <!--<item name="star_style">@style/ratingbar_main</item>-->
-        <!--<item name="radio_btn">@drawable/sel_circle_dot</item>-->
-        <!--<item name="button_full_normal">@drawable/selector_button_full_main</item>-->
-        <!--<item name="full.button">@style/full.button_main</item>-->
-        <!--<item name="small.button">@style/small.button_main</item>-->
-        <!--<item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>-->
-        <!--<item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_main</item>-->
-        <!--<item name="sp_search_edt">@drawable/sp_search_edt_main</item>-->
-        <!--<item name="btn_color">@color/btn_color_main</item>-->
-    <!--</style>-->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorControlHighlight">@color/theme_app_highlight_more</item>
+
+        <item name="main_color">@color/theme_app_main</item>
+        <item name="main_color_dark">@color/theme_app_dark</item>
+        <item name="main_color_mid">@color/theme_app_mid</item>
+        <item name="main_color_accent">@color/theme_app_highlight</item>
+        <item name="main_color_light">@color/theme_app_highlight_more</item>
+        <item name="star_unselect">@drawable/xina</item>
+        <item name="star_select">@drawable/xinb</item>
+        <!--下面的属性全是为了兼容安卓4.0！多了好多文件啊-->
+        <item name="line_short">@drawable/sp_line_vertical</item>
+        <item name="star_style">@style/ratingbar_main</item>
+        <item name="radio_btn">@drawable/sel_circle_dot</item>
+        <item name="button_full_normal">@drawable/selector_button_full_main</item>
+        <item name="full.button">@style/full.button_main</item>
+        <item name="small.button">@style/small.button_main</item>
+        <item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>
+        <item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_main</item>
+        <item name="sp_search_edt">@drawable/sp_search_edt_main</item>
+        <item name="btn_color">@color/btn_color_main</item>
+    </style>
+    <style name="AppTheme_bug." parent="Theme.AppCompat.Light">
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/theme_app_main</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorControlHighlight">@color/theme_app_highlight_more</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowBackground">@color/theme_app_main</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="main_color">@color/theme_app_main</item>
+        <item name="main_color_dark">@color/theme_app_dark</item>
+        <item name="main_color_mid">@color/theme_app_mid</item>
+        <item name="main_color_accent">@color/theme_app_highlight</item>
+        <item name="main_color_light">@color/theme_app_highlight_more</item>
+        <item name="star_unselect">@drawable/xina</item>
+        <item name="star_select">@drawable/xinb</item>
+        <!--下面的属性全是为了兼容安卓4.0！多了好多文件啊-->
+        <item name="line_short">@drawable/sp_line_vertical</item>
+        <item name="star_style">@style/ratingbar_main</item>
+        <item name="radio_btn">@drawable/sel_circle_dot</item>
+        <item name="button_full_normal">@drawable/selector_button_full_main</item>
+        <item name="full.button">@style/full.button_main</item>
+        <item name="small.button">@style/small.button_main</item>
+        <item name="sp_dot_rota">@drawable/sp_dot_rota_main</item>
+        <item name="theme_bg_btn_corner">@drawable/theme_bg_btn_corner_main</item>
+        <item name="sp_search_edt">@drawable/sp_search_edt_main</item>
+        <item name="btn_color">@color/btn_color_main</item>
+    </style>
 
 
     <attr name="sp_search_edt" format="reference" />

app/src/main/res/values/styles.xml

@@ -20,7 +20,7 @@
     <!--透明，有任务栏电量时间等-->
     <style name="NoTitleTranslucentTheme" parent="Trans">
         <item name="android:windowNoTitle">true</item>
-        <item name="android:windowBackground">@color/theme_app_main</item>
+        <item name="android:windowBackground">@color/translate</item>
         <item name="android:windowIsTranslucent">true</item>
     </style>