add 优化代码

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

 package com.yidian.shenghuoquan.newscontent.ui
 
+import android.Manifest
 import android.content.Intent
 import android.os.Bundle
 import com.orhanobut.hawk.Hawk
+import com.tbruyelle.rxpermissions3.RxPermissions
 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.common.http.HttpResult
@@ -16,6 +17,7 @@ import com.yidian.shenghuoquan.newscontent.http.httpbean.IGuestLoginCallback
 import com.yidian.shenghuoquan.newscontent.subscription.subscriptionManager
 import com.yidian.shenghuoquan.newscontent.ui.dialog.ProtocolDialog
 import com.yidian.shenghuoquan.newscontent.utils.AccountUtil
+import com.yidian.utils.ToastUtil
 
 class FlashActivity: BaseActivity<ActivityFlashBinding>() {
     private var protocolDialog: ProtocolDialog? = null
@@ -35,17 +37,7 @@ class FlashActivity: BaseActivity<ActivityFlashBinding>() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        val loginStatus = Hawk.get<Boolean>(HawkConfig.LoginStatus, false)
-        if(!loginStatus){
-            guestLogin()
-        }else{
-            subscriptionManager.initAuthorSubscribeList()
-        }
-        ApiService.getExpression()
-        val tempMap = intent?.getSerializableExtra(XRouterPathConstants.ParamsKey)
-        if(tempMap != null){
-            paramsMap = tempMap as HashMap<String, Any?>
-        }
+        getPermissions()
     }
 
     override fun onPostCreate(savedInstanceState: Bundle?) {
@@ -61,10 +53,10 @@ class FlashActivity: BaseActivity<ActivityFlashBinding>() {
                 startActivity(Intent(this@FlashActivity, TempListActivity::class.java))
                 finish()
             }, 2000)
-        }else{
-            viewBind.clRoot.postDelayed( {
-                protocolPopupShow()
-            },1000)
+//        }else{
+//            viewBind.clRoot.postDelayed( {
+//                protocolPopupShow()
+//            },1000)
         }
     }
 
@@ -88,11 +80,29 @@ class FlashActivity: BaseActivity<ActivityFlashBinding>() {
         }
     }
 
-    private fun guestLogin(){
+    private fun guestLogin() {
         val username = AccountUtil.getGuestUsername()
         val password = AccountUtil.getPassword(username)
         val tok = AccountUtil.getToken(username, password)
         val requestBean = GuestLoginBean.Request(username, password, tok)
         ApiService.guestLogin(guestLoginImpl, requestBean)
     }
+
+    private fun getPermissions() {
+        val rxPermissions = RxPermissions(this)
+        rxPermissions.request(
+            Manifest.permission.WRITE_EXTERNAL_STORAGE,
+            Manifest.permission.READ_PHONE_STATE,
+            Manifest.permission.CAMERA
+        )
+            .subscribe {
+                if (it) {
+
+                    startActivity(Intent(this@FlashActivity, TempListActivity::class.java))
+                    finish()
+                } else {
+                    ToastUtil.showToast(this, "请在设置里同意读取存储卡权限")
+                }
+            }
+    }
 }
\ No newline at end of file

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

@@ -2,6 +2,7 @@ package com.yidian.shenghuoquan.newscontent.ui.dialog
 
 import android.app.Activity
 import android.app.Dialog
+import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
 import android.os.Handler
@@ -23,6 +24,7 @@ import com.yidian.common.XRouterPathConstants
 import com.yidian.nightmode.widget.YdTextView
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.ui.ProtocolActivity
+import com.yidian.shenghuoquan.newscontent.ui.TempListActivity
 import com.yidian.xpage.XPageManager
 
 
@@ -96,7 +98,8 @@ class ProtocolDialog(private val activity: Activity, themeResId: Int, private va
             Hawk.put(HawkConfig.ProtocolIsAgree, true)
             dismiss()
             Handler().postDelayed({
-                XPageManager.push(XRouterPathConstants.NEWS_MAIN, paramsMap)
+//                XPageManager.push(XRouterPathConstants.NEWS_MAIN, paramsMap)
+                activity.startActivity(Intent(this.activity, TempListActivity::class.java))
                 activity.finish()
             }, 1000)
         }

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

 <resources>
-    <string name="app_name">YDSubway</string>
+    <string name="app_name">生活圈商家版</string>
     <string name="action_settings">Settings</string>
     <!-- Strings used for fragments for navigation -->
     <string name="first_fragment_label">First Fragment</string>