add 添加退出登录弹框

CommonLib/Common/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file

CommonLib/Common/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file

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

 package com.yidian.shenghuoquan.newscontent.personnel.ui
 
 import android.os.Bundle
+import com.orhanobut.hawk.Hawk
+import com.yidian.common.HawkConfig
 import com.yidian.common.XRouterPathConstants
 import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_MY_STAFF
 import com.yidian.common.base.BaseActivity
@@ -44,10 +46,13 @@ class MyStaffActivity : BaseActivity<ActivityMyStaffBinding>(), IPersonalAccount
   }
 
   private fun requestAccountList() {
+    val lifeAccountId = Hawk.get(HawkConfig.LifeAccountId, "")
+    if (lifeAccountId.isNotBlank()) {
       val paramsMap = HashMap<String, String?>()
-    paramsMap["life_account_id"] = "7470213157388289"
+      paramsMap["life_account_id"] = lifeAccountId
       PersonalRemoteDataSource.getAccountList(this, paramsMap)
     }
+  }
 
   private fun initView() {
     initTitleBar(viewBind.include.toolbar, viewBind.include.tvTitle, resources.getString(R.string.my_staff))

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

 package com.yidian.shenghuoquan.newscontent.ui.dialog
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
 import android.view.View
@@ -26,10 +27,14 @@ class HintDialog(
   val callback: OnHintOptionCallback?
 ) : BaseDialog<DialogHintBinding>(context), View.OnClickListener {
 
+  private var leftBtnColor: Int = R.color.color_333333
+  private var rightBtnColor: Int = R.color.color_333333
+
   override fun createViewBinding(): DialogHintBinding {
     return DialogHintBinding.inflate(layoutInflater)
   }
 
+  @SuppressLint("ResourceAsColor")
   override fun initView() {
     viewBinding.tvContent.text = content
     when (options.size) {
@@ -37,10 +42,13 @@ class HintDialog(
         viewBinding.btnRight.text = options[0].option
         viewBinding.btnLeft.isVisible = false
         viewBinding.viewVerticalDivider.isVisible = false
+        viewBinding.btnRight.setTextColor(rightBtnColor)
       }
       2 -> {
         viewBinding.btnLeft.text = options[0].option
         viewBinding.btnRight.text = options[1].option
+        viewBinding.btnLeft.setTextColor(leftBtnColor)
+        viewBinding.btnRight.setTextColor(rightBtnColor)
       }
     }
   }
@@ -89,14 +97,14 @@ class HintDialog(
    * 设置左侧按钮颜色
    */
   fun setLeftBtnColor(@ColorInt color: Int) {
-    viewBinding.btnLeft.setTextColor(color)
+    leftBtnColor = color
   }
 
   /***
    * 设置右侧按钮颜色
    */
   fun setRightBtnColor(@ColorInt color: Int) {
-    viewBinding.btnRight.setTextColor(color)
+    rightBtnColor = color
   }
 
 }

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

 package com.yidian.shenghuoquan.newscontent.ui.setting
 
 import android.os.Bundle
+import androidx.core.content.ContextCompat
 import com.orhanobut.hawk.Hawk
 import com.yidian.common.HawkConfig
 import com.yidian.common.XRouterPathConstants
@@ -9,9 +10,11 @@ import com.yidian.common.base.BaseActivity
 import com.yidian.common.extensions.initTitleBar
 import com.yidian.common.utils.SystemSettingUtils
 import com.yidian.shenghuoquan.newscontent.R
+import com.yidian.shenghuoquan.newscontent.bean.HintOptionBean
 import com.yidian.shenghuoquan.newscontent.databinding.ActivitySystemSettingBinding
 import com.yidian.shenghuoquan.newscontent.http.ApiService
 import com.yidian.shenghuoquan.newscontent.http.callback.IUserLogoutCallBack
+import com.yidian.shenghuoquan.newscontent.ui.dialog.HintDialog
 import com.yidian.shenghuoquan.newscontent.utils.SensitiveInfoUtil
 import com.yidian.utils.ToastUtil
 import com.yidian.xarc.xbase.utils.AppUtils
@@ -53,8 +56,24 @@ class SystemSettingActivity : BaseActivity<ActivitySystemSettingBinding>() {
     }
     // 退出登录
     viewBind.tvLogout.setOnClickListener {
+      showConfirmDialog()
+    }
+  }
+
+  private fun showConfirmDialog() {
+    val dialog = HintDialog(this, resources.getString(R.string.conform_logout),
+      arrayListOf(HintOptionBean("取消"), HintOptionBean("确定")),
+      object : HintDialog.OnHintOptionCallback {
+
+        override fun onLeftOption() {
+        }
+
+        override fun onRightOption() {
           ApiService.userLogout(logoutCallBack)
         }
+      })
+    dialog.setRightBtnColor(ContextCompat.getColor(this, R.color.color_FFFF3A3A))
+    dialog.show()
   }
 
   private val logoutCallBack = object : IUserLogoutCallBack {

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

@@ -117,9 +117,9 @@
         android:layout_marginTop="@dimen/dp10"
         android:background="@color/white"
         android:gravity="center"
+        android:text="退出登录"
         android:textColor="@color/color_333333"
-        android:textSize="@dimen/sp16"
-        tools:text="版本1.0.1" />
+        android:textSize="@dimen/sp16" />
 
 
 </LinearLayout>
\ No newline at end of file

Components/newscontent/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file

Components/newscontent/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file

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

@@ -150,6 +150,7 @@
     <string name="manager_register_tips">未注册生活圈的手机号，登录时将自动注册，且代表你已经同意《用户协议》《隐私政策》。</string>
     <string name="dissolve_relationship">解除关系后此账号将不再有权限管理企业信息，账号已产生内容仍属企业</string>
     <string name="setting">设置</string>
+    <string name="conform_logout">确定退出登录</string>
     <string name="life_account_name">名称</string>
     <string name="life_account_auth_info">认证信息</string>
     <string name="merchant_upgrade">商户升级</string>

Components/userinfo/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file

Components/userinfo/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file