修复部分手机冷启动闪烁问题

CommonLib/Common/src/main/java/com/yidian/common/XRouterPathConstants.kt

@@ -57,5 +57,26 @@ class XRouterPathConstants {
     const val LIFE_ACCOUNT_MODIFY_NAME = "/lifeAccountModifyName"
     // 商户认证信息
     const val MERCHANT_AUTH_INFO = "/merchantAuthInfo"
+
+    // 钱包 —— 我的钱包
+    const val MY_WALLET = "/wallet/MyWalletActivity"
+
+    // 钱包 —— 验证身份
+    const val VERIFY_IDENTITY = "/wallet/VerifyIdentityActivity"
+
+    // 钱包 —— 微信授权
+    const val WECHAT_AUTHORIZE = "/wallet/WeChatAuthorizeActivity"
+
+    // 钱包 —— 提现
+    const val WITHDRAW = "/wallet/WithdrawActivity"
+
+    // 钱包 —— 交易列表
+    const val TRANSACTION_LIST = "/wallet/TransactionListActivity"
+
+    // 钱包 —— 交易明细
+    const val TRANSACTION_DETAILS = "/wallet/TransactionDetailsActivity"
+
+    // 钱包 —— 常见问题
+    const val COMMON_PROBLEM = "/wallet/CommonProblemActivity"
   }
 }

CommonLib/Common/src/main/java/com/yidian/common/base/BaseActivity.kt

@@ -29,9 +29,11 @@ abstract class BaseActivity<VB :ViewBinding> : NightAppCompatActivity(), XPageVi
     }
 
     override fun updateCover(isNight: Boolean) {}
+
     override fun getCurrentTheme(isNight: Boolean): Int {
         return if (isNight) R.style.subway_theme_night else R.style.subway_theme_day
     }
+
     override fun setContentView(view:View){
         SystemBarUtils.setStatusBarTransparent(this.window)
         if (allowChangeStatusBarTextColor() ) {
@@ -79,4 +81,4 @@ abstract class BaseActivity<VB :ViewBinding> : NightAppCompatActivity(), XPageVi
 
     protected open fun init(savedInstanceState: Bundle?) {}
 
-}
+}
\ No newline at end of file

CommonLib/Common/src/main/res/values/styles.xml

@@ -38,12 +38,12 @@
 
     <style name="YDSubwayCommonTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowAnimationStyle">@style/AnimationActivity</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowDisablePreview">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowEnterAnimation">@anim/slide_right_in</item>
-        <item name="android:windowExitAnimation">@anim/slide_right_out</item>
-        <item name="android:icon">@android:color/transparent</item>
+<!--        <item name="android:windowIsTranslucent">true</item>-->
+<!--        <item name="android:windowDisablePreview">true</item>-->
+<!--        <item name="android:windowContentOverlay">@null</item>-->
+<!--        <item name="android:windowEnterAnimation">@anim/slide_right_in</item>-->
+<!--        <item name="android:windowExitAnimation">@anim/slide_right_out</item>-->
+<!--        <item name="android:icon">@android:color/transparent</item>-->
     </style>
 
     <style name="subway_theme_day" parent="YDSubwayCommonTheme">
@@ -61,7 +61,6 @@
 
     <style name="subway_theme_night" parent="YDSubwayCommonTheme">
         <item name="black_first">#bababa</item>
-
         <item name="main_bg">#333333</item>
         <item name="title_text">#222222</item>
         <item name="summary_text">#919191</item>

Components/newscontent/src/main/AndroidManifest.xml

@@ -69,8 +69,7 @@
             android:theme="@style/Transparent" />
 
         <activity
-            android:name=".ui.LoginLifeCircleActivity"
-            android:theme="@style/Transparent" />
+            android:name=".ui.LoginLifeCircleActivity" />
 
         <activity
             android:name=".ui.auth.LifeAccountIdentityActivity"

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/app/NewsContentApplication.kt

@@ -99,7 +99,8 @@ class NewsContentApplication : YdBaseApplication() {
               intent.putExtra(XRouterPathConstants.ParamsKey, params as HashMap)
             }
             intent.setClass(context, LoginLifeCircleActivity::class.java)
-            intent.flags = (Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+//            intent.flags = (Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
             context.startActivity(intent)
           }
         }),

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/FlashActivity.kt

@@ -6,7 +6,6 @@ import com.yidian.common.HawkConfig
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.XRouterPathConstants.Companion.FLASH
 import com.yidian.common.base.BaseActivity
-import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityFlashBinding
 import com.yidian.shenghuoquan.newscontent.http.ApiService
 import com.yidian.shenghuoquan.newscontent.http.callback.IGetLifeAccountListCallback
@@ -22,10 +21,6 @@ class FlashActivity : BaseActivity<ActivityFlashBinding>(), IGetLifeAccountListC
     return ActivityFlashBinding.inflate(layoutInflater)
   }
 
-  override fun getCurrentTheme(isNight: Boolean): Int {
-    return R.style.AppTheme
-  }
-
   override fun getXPageName(): String {
     return FLASH
   }
@@ -46,9 +41,8 @@ class FlashActivity : BaseActivity<ActivityFlashBinding>(), IGetLifeAccountListC
         // 未登录 跳转登录
         XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
         XPageManager.pop(null)
+        finish()
       }
-    } else {
-      // TODO: 6/12/21 协议dialog
     }
   }
 

Components/newscontent/src/main/res/layout/activity_flash.xml

 <?xml version="1.0" encoding="utf-8"?>
-<com.yidian.nightmode.widget.YdRelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.yidian.nightmode.widget.YdRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/clRoot"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.FlashActivity"
-    android:id="@+id/clRoot"
+    android:background="@mipmap/launcher_bg"
     android:fitsSystemWindows="true"
-    android:background="@mipmap/launcher_bg">
+    tools:context=".ui.FlashActivity">
 
 </com.yidian.nightmode.widget.YdRelativeLayout>
\ No newline at end of file

Components/newscontent/src/main/res/values/styles.xml

 <resources>
     <!-- Base application theme. -->
     <style name="FlashTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/transparent</item>
-        <item name="colorPrimaryDark">@color/transparent</item>
-        <item name="colorAccent">@color/colorAccent</item>
         <item name="android:windowIsTranslucent" >false</item>
         <item name="android:windowFullscreen" >false</item>
         <item name="android:windowBackground" >@mipmap/launcher_bg</item>
     </style>
-    <style name="NewsContentTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="colorPrimary">@color/transparent</item>
-        <item name="colorPrimaryDark">@color/transparent</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowIsTranslucent" >true</item>
-        <item name="android:windowDisablePreview">true</item>
-        <item name="android:windowEnterAnimation">@anim/slide_right_in</item>
-        <item name="android:windowExitAnimation">@anim/slide_right_out</item>
-    </style>
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/transparent</item>
-        <item name="colorPrimaryDark">@color/transparent</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowDisablePreview">true</item>
-        <item name="android:windowNoDisplay">false</item>
-        <item name="android:windowFullscreen">false</item>
-        <item name="android:icon">@android:color/transparent</item>
-        <item name="android:windowBackground">@mipmap/launcher_bg</item>
-    </style>
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <!--首页下标类需要使用material theme-->
-    <style name="HomePageTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <item name="colorPrimary">@color/transparent</item>
-        <item name="colorPrimaryDark">@color/transparent</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowDisablePreview">true</item>
-        <item name="android:windowNoDisplay">false</item>
-        <item name="android:windowFullscreen">false</item>
-        <item name="android:icon">@android:color/transparent</item>
-        <item name="android:windowBackground">@mipmap/launcher_bg</item>
-    </style>
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 

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

@@ -5,17 +5,6 @@
         <item name="colorPrimary">@color/transparent</item>
         <item name="colorPrimaryDark">@color/transparent</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowDisablePreview">true</item>
-        <item name="android:windowNoDisplay">false</item>
-        <item name="android:windowFullscreen">false</item>
-        <item name="android:icon">@android:color/transparent</item>
-        <item name="android:windowBackground">@mipmap/launcher_bg</item>
-    </style>
-
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
     </style>
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />