refactor(更新)

- 全部布局的颜色替换attr模式，适应皮肤

app/src/main/java/com/grkj/iscs/features/login/activity/LoginActivity.kt

@@ -1,12 +1,16 @@
 package com.grkj.iscs.features.login.activity
 
 import android.content.Intent
+import android.content.res.ColorStateList
 import android.graphics.Bitmap
+import android.graphics.drawable.GradientDrawable
 import android.view.InputDevice
 import android.view.KeyEvent
 import android.widget.LinearLayout
 import androidx.activity.viewModels
+import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
+import androidx.core.widget.ImageViewCompat
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.divider
@@ -36,6 +40,7 @@ import com.grkj.shared.utils.i18n.LanguageStore
 import com.grkj.shared.utils.i18n.LocaleUtils
 import com.grkj.ui_base.base.BaseActivity
 import com.grkj.ui_base.utils.CommonUtils
+import com.grkj.ui_base.utils.changeBgTint
 import com.grkj.ui_base.utils.event.LoadingEvent
 import com.grkj.ui_base.utils.extension.getAppVersionName
 import com.grkj.ui_base.utils.fingerprint.FingerprintUtil
@@ -108,7 +113,12 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
         val item = holder.getModel<LoginMenuEntity>()
         itemBinding.loginTipV.isVisible = item.needTip
         itemBinding.loginMethodTv.text = item.menuText
-        itemBinding.loginMethodIv.setBackgroundResource(item.menuIconId)
+        itemBinding.loginMethodIv.setImageResource(item.menuIconId)
+        ImageViewCompat.setImageTintList(
+            itemBinding.loginMethodIv,
+            ColorStateList.valueOf(item.menuTint)
+        )
+        itemBinding.loginContainer.changeBgTint(item.menuBg)
         holder.itemView.setDebouncedClickListener {
             LoginDialog.show(this@LoginActivity, viewModel, item.loginType) {
                 LoadingEvent.sendLoadingEvent()
@@ -179,7 +189,9 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
         loginMenuList.apply {
             add(
                 LoginMenuEntity(
-                    R.drawable.icon_login_menu_face,
+                    R.mipmap.icon_login_menu_face,
+                    CommonUtils.getColor(com.grkj.ui_base.R.attr.colorWhite),
+                    CommonUtils.getColor(com.grkj.ui_base.R.attr.colorFaceLogin),
                     CommonUtils.getStr("face_login"),
                     false,
                     0
@@ -187,7 +199,9 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
             )
             add(
                 LoginMenuEntity(
-                    R.drawable.icon_login_menu_password,
+                    R.mipmap.icon_login_menu_password,
+                    CommonUtils.getColor(com.grkj.ui_base.R.attr.colorWhite),
+                    CommonUtils.getColor(com.grkj.ui_base.R.attr.colorUserLogin),
                     CommonUtils.getStr("account_login"),
                     false,
                     3
@@ -196,6 +210,8 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
             add(
                 LoginMenuEntity(
                     R.mipmap.icon_login_menu_fingerprint,
+                    CommonUtils.getColor(com.grkj.ui_base.R.attr.colorWhite),
+                    CommonUtils.getColor(com.grkj.ui_base.R.attr.colorFingerprint),
                     CommonUtils.getStr("fingerprint_login"),
                     true,
                     1
@@ -203,7 +219,9 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
             )
             add(
                 LoginMenuEntity(
-                    R.drawable.icon_login_menu_card,
+                    R.mipmap.icon_login_menu_card,
+                    CommonUtils.getColor(com.grkj.ui_base.R.attr.colorWhite),
+                    CommonUtils.getColor(com.grkj.ui_base.R.attr.colorCardLogin),
                     CommonUtils.getStr("card_login"),
                     true,
                     2

app/src/main/java/com/grkj/iscs/features/login/dialog/LoginDialog.kt

@@ -38,7 +38,7 @@ class LoginDialog(
     private val mPairList = mutableListOf(
         Pair(
             SIKCore.getApplication().getString(com.grkj.ui_base.R.string.please_scan_face),
-            R.drawable.icon_login_menu_face
+            R.mipmap.icon_login_menu_face
         ),
         Pair(
             SIKCore.getApplication().getString(com.grkj.ui_base.R.string.please_scan_fingerprint),
@@ -46,7 +46,7 @@ class LoginDialog(
         ),
         Pair(
             SIKCore.getApplication().getString(com.grkj.ui_base.R.string.please_swipe_card),
-            R.drawable.icon_login_menu_card
+            R.mipmap.icon_login_menu_card
         )
     )
 
@@ -54,7 +54,7 @@ class LoginDialog(
 
     override fun onBind(customDialog: CustomDialog, contentView: View) {
         mBinding = DialogLoginBinding.bind(contentView)
-        customDialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        customDialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         customDialog.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
             override fun onDismiss(dialog: CustomDialog?) {
                 ArcSoftUtil.stop()

app/src/main/java/com/grkj/iscs/features/main/activity/MainActivity.kt

@@ -104,19 +104,16 @@ class MainActivity() : BaseActivity<ActivityMainBinding>() {
                 binding.avatar.load(avatar)
             }
         }
-        // 1. 拆出两个可选控件
-        // 2. 清空原有菜单
         binding.navBar.let {
             it.menu.clear()
-        }
-
-        binding.navBar.let {
             tabConfigs.forEachIndexed { index, cfg ->
                 if (MainDomainData.permissions.contains(cfg.permission)) {
                     binding.navBar.menu.add(Menu.NONE, cfg.id, index, cfg.title)
                         .setIcon(cfg.icon)
                 }
             }
+            // 这里很关键：通知 NavBar 重建子视图
+            it.notifyMenuChanged()   // ★
             // 构造 map: menuItemId -> navGraphId
             val graphMap = tabConfigs.filter { binding.navBar.menu.findItem(it.id) != null }
                 .associate { it.id to it.graphRes }

app/src/main/java/com/grkj/iscs/features/main/dialog/CheckFaceDialog.kt

@@ -36,13 +36,13 @@ class CheckFaceDialog(
     private val mPairList = mutableListOf(
         Pair(
             SIKCore.getApplication().getString(com.grkj.ui_base.R.string.please_scan_face),
-            R.drawable.icon_login_menu_face
+            R.mipmap.icon_login_menu_face
         ), Pair(
             SIKCore.getApplication().getString(com.grkj.ui_base.R.string.please_scan_fingerprint),
             R.mipmap.icon_login_menu_fingerprint
         ), Pair(
             SIKCore.getApplication().getString(com.grkj.ui_base.R.string.please_swipe_card),
-            R.drawable.icon_login_menu_card
+            R.mipmap.icon_login_menu_card
         )
     )
 
@@ -51,7 +51,7 @@ class CheckFaceDialog(
     override fun onBind(customDialog: CustomDialog, contentView: View) {
         mBinding = DialogCheckFaceBinding.bind(contentView)
         dialog = customDialog
-        customDialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        customDialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         customDialog.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
             override fun onDismiss(dialog: CustomDialog?) {
                 ArcSoftUtil.stop()

app/src/main/java/com/grkj/iscs/features/main/dialog/ColockOperationTipDialog.kt

@@ -19,7 +19,7 @@ class ColockOperationTipDialog() : OnBindView<CustomDialog>(R.layout.dialog_colo
     private val mPairList = mutableListOf(
         Pair(
             SIKCore.getApplication().getString(com.grkj.ui_base.R.string.please_swipe_card),
-            R.drawable.icon_login_menu_card
+            R.mipmap.icon_login_menu_card
         )
     )
 
@@ -27,7 +27,7 @@ class ColockOperationTipDialog() : OnBindView<CustomDialog>(R.layout.dialog_colo
 
     override fun onBind(customDialog: CustomDialog, contentView: View) {
         mBinding = DialogColockOperationTipBinding.bind(contentView)
-        customDialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        customDialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         mBinding.closeIv.setDebouncedClickListener {
             customDialog.dismiss()
         }

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/AddPointDialog.kt

@@ -31,7 +31,7 @@ class AddPointDialog(
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogAddPointBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         binding.powerTypeTv.setDebouncedClickListener {
             val list = IsolationPointPowerTypeEnum.values().map {

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/AddRoleDialog.kt

@@ -39,7 +39,7 @@ class AddRoleDialog(
         binding = DialogAddRoleBinding.bind(v)
         dialog?.isCancelable = false
         // 遮罩色
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 关闭
         binding.closeIv.setDebouncedClickListener {

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/AddUserDialog.kt

@@ -34,7 +34,7 @@ class AddUserDialog(
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogAddUserBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 根据配置显示/隐藏工作站选择
         binding.workstationTv.isVisible = ISCSConfig.isWorkstationOn

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/AddWorkstationDialog.kt

@@ -24,7 +24,7 @@ class AddWorkstationDialog(
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogAddWorkstationBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
         binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/FilterPointDialog.kt

@@ -30,7 +30,7 @@ class FilterPointDialog(
     override fun onBind(dialog: CustomDialog?, v: View) {
         binding = DialogFilterPointBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 电源类型单选
         binding.powerTypeTv.setDebouncedClickListener {

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/FilterRoleDialog.kt

@@ -24,7 +24,7 @@ class FilterRoleDialog(
     override fun onBind(dialog: CustomDialog?, v: View) {
         binding = DialogFilterRoleBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 关闭/取消
         binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/FilterUserDialog.kt

@@ -26,7 +26,7 @@ class FilterUserDialog(
         binding = DialogFilterUserBinding.bind(v)
         dialog?.isCancelable = false
         // 设置遮罩色
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         // 根据配置显示/隐藏工作站输入
         binding.workstationLayout.isVisible = ISCSConfig.isWorkstationOn
 

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/UpdatePointDialog.kt

@@ -43,7 +43,7 @@ class UpdatePointDialog(
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogUpdatePointBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 初始化
         binding.pointNameTv.setText(pointVo.pointName)

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/UpdateRoleDialog.kt

@@ -40,7 +40,7 @@ class UpdateRoleDialog(
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogUpdateRoleBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 预填数据
         binding.roleNameEt.setText(updateEntity.roleName)

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/UpdateUserDialog.kt

@@ -36,7 +36,7 @@ class UpdateUserDialog(
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogUpdateUserBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 显示或隐藏工作站选项
         binding.workstationTv.isVisible = ISCSConfig.isWorkstationOn

app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/UpdateWorkstationDialog.kt

@@ -24,7 +24,7 @@ class UpdateWorkstationDialog(
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogAddWorkstationBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         binding.workstationNameEt.setText(workstationName)
         binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
         binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/AddCardDialog.kt

@@ -35,7 +35,7 @@ class AddCardDialog(
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogAddCardBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         if (!EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().register(this)
         }

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/AddKeyDialog.kt

@@ -25,7 +25,7 @@ class AddKeyDialog(
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogAddKeyBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 取消/关闭
         binding.cancel.setDebouncedClickListener { dialog?.dismiss() }

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/AddLockDialog.kt

@@ -25,7 +25,7 @@ class AddLockDialog(
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogAddLockBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 取消/关闭
         binding.cancel.setDebouncedClickListener { dialog?.dismiss() }

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/AddRfidTokenDialog.kt

@@ -32,7 +32,7 @@ class AddRfidTokenDialog(
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogAddRfidTokenBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         if (!EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().register(this)
         }

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/FilterCardDialog.kt

@@ -27,7 +27,7 @@ class FilterCardDialog(
     override fun onBind(dialog: CustomDialog?, v: View) {
         binding = DialogFilterCardBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         binding.usernameTv.isVisible = userData.isNotEmpty()
 
         // 用户选择

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/FilterKeyDialog.kt

@@ -23,7 +23,7 @@ class FilterKeyDialog(
     override fun onBind(dialog: CustomDialog?, v: View) {
         binding = DialogFilterKeyBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 取消/关闭
         binding.cancel.setDebouncedClickListener { dialog?.dismiss() }

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/FilterLockDialog.kt

@@ -22,7 +22,7 @@ class FilterLockDialog(
     override fun onBind(dialog: CustomDialog?, v: View) {
         binding = DialogFilterLockBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 关闭/取消
         binding.cancel.setDebouncedClickListener { dialog?.dismiss() }

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/FilterRfidTokenDialog.kt

@@ -22,7 +22,7 @@ class FilterRfidTokenDialog(
     override fun onBind(dialog: CustomDialog?, v: View) {
         binding = DialogFilterRfidTokenBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 取消/关闭
         binding.cancel.setDebouncedClickListener { dialog?.dismiss() }

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/SlotsExceptionReportDialog.kt

@@ -25,7 +25,7 @@ class SlotsExceptionReportDialog(
     override fun onBind(dialog: CustomDialog, contentView: View) {
         binding = DialogSlotsExceptionReportBinding.bind(contentView)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         binding.hardwareInfo.text = context.getString(
             com.grkj.ui_base.R.string.hardware_info,
             "${getDeviceTypeStr(slotType)},${context.getString(com.grkj.ui_base.R.string.number)} 行${row},列${col}"

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/UpdateCardDialog.kt

@@ -39,7 +39,7 @@ class UpdateCardDialog(
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogUpdateCardBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         if (!EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().register(this)
         }

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/UpdateKeyDialog.kt

@@ -28,7 +28,7 @@ class UpdateKeyDialog(
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogUpdateKeyBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 预填数据
         binding.keyCodeEt.setText(isKey.keyCode)

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/UpdateLockDialog.kt

@@ -28,7 +28,7 @@ class UpdateLockDialog(
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogUpdateLockBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 预填数据
         binding.lockCodeEt.setText(isLock.lockCode)

app/src/main/java/com/grkj/iscs/features/main/dialog/hardware_manage/UpdateRfidTokenDialog.kt

@@ -35,7 +35,7 @@ class UpdateRfidTokenDialog(
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogUpdateRfidTokenBinding.bind(v)
         dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         if (!EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().register(this)
         }

app/src/main/java/com/grkj/iscs/features/main/dialog/job_manage/TodoPointDetailDialog.kt

@@ -11,6 +11,7 @@ import com.grkj.data.model.vo.IsJobTicketPointsDataVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogTodoPointDetailBinding
 import com.grkj.iscs.databinding.ItemJobExecutePointBinding
+import com.grkj.ui_base.utils.CommonUtils
 import com.kongzue.dialogx.dialogs.FullScreenDialog
 import com.kongzue.dialogx.interfaces.OnBindView
 import com.kongzue.dialogx.util.views.ActivityScreenShotImageView
@@ -47,9 +48,8 @@ class TodoPointDetailDialog(var ticketPoints: List<IsJobTicketPointsDataVo>) :
         when (item.pointStatus) {
             "1" -> {
                 itemBinding.lockStatusTv.setTextColor(
-                    ContextCompat.getColor(
-                        context,
-                        R.color.white
+                    CommonUtils.getColor(
+                        com.grkj.ui_base.R.attr.colorWhite
                     )
                 )
                 itemBinding.lockStatusLayout.setBackgroundResource(R.drawable.bg_btn_job_execute_go_locking)
@@ -58,9 +58,8 @@ class TodoPointDetailDialog(var ticketPoints: List<IsJobTicketPointsDataVo>) :
 
             "2" -> {
                 itemBinding.lockStatusTv.setTextColor(
-                    ContextCompat.getColor(
-                        context,
-                        R.color.white
+                    CommonUtils.getColor(
+                        com.grkj.ui_base.R.attr.colorWhite
                     )
                 )
                 itemBinding.lockStatusLayout.setBackgroundResource(R.drawable.bg_btn_job_execute_go_unlocking)
@@ -69,12 +68,11 @@ class TodoPointDetailDialog(var ticketPoints: List<IsJobTicketPointsDataVo>) :
 
             else -> {
                 itemBinding.lockStatusTv.setTextColor(
-                    ContextCompat.getColor(
-                        context,
-                        R.color.black
+                    CommonUtils.getColor(
+                        com.grkj.ui_base.R.attr.colorWhite
                     )
                 )
-                itemBinding.lockStatusLayout.setBackgroundColor(context.getColor(R.color.white))
+                itemBinding.lockStatusLayout.setBackgroundColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorWhite))
                 itemBinding.lockStatusIv.setImageResource(0)
             }
         }

app/src/main/java/com/grkj/iscs/features/main/dialog/user_info/AddFingerprintDialog.kt

@@ -20,7 +20,7 @@ class AddFingerprintDialog(
     private lateinit var binding: DialogAddFingerprintBinding
     override fun onBind(dialog: CustomDialog, p1: View) {
         binding = DialogAddFingerprintBinding.bind(p1)
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
+        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         dialog.isCancelable = false
         updateTip(binding.pressTip)
         binding.pressTip.text = CommonUtils.getStr("fingerprint_scan_tip",3)

app/src/main/java/com/grkj/iscs/features/main/entity/MenuItemEntity.kt

@@ -1,8 +1,6 @@
 package com.grkj.iscs.features.main.entity
 
-import com.drake.brv.annotaion.ItemOrientation
-import com.drake.brv.item.ItemDrag
-import com.google.android.material.badge.BadgeDrawable
+import com.grkj.ui_base.utils.CommonUtils
 
 /**
  * 菜单实体
@@ -14,4 +12,5 @@ data class MenuItemEntity(
     val menuText: String,
     val permission: String,
     var badgeNum: Int = 0,
+    val menuBgTint: Int = CommonUtils.getColor(com.grkj.ui_base.R.attr.colorHomeMenuBgTint),
 )

app/src/main/java/com/grkj/iscs/features/main/entity/QuickEntranceMenuItemEntity.kt

@@ -43,15 +43,15 @@ data class QuickEntranceMenuItemEntity(
                 RoleFunctionalPermissionsEnum.SLOT_MANAGE -> R.mipmap.dock_no_key
                 RoleFunctionalPermissionsEnum.KEY_MANAGE -> R.mipmap.dock_has_key
                 RoleFunctionalPermissionsEnum.LOCK_MANAGE -> R.drawable.icon_ticket_lock
-                RoleFunctionalPermissionsEnum.CARD_MANAGE -> R.drawable.icon_login_menu_card
-                RoleFunctionalPermissionsEnum.RFID_MANAGE -> R.drawable.icon_login_menu_card
+                RoleFunctionalPermissionsEnum.CARD_MANAGE -> R.mipmap.icon_login_menu_card
+                RoleFunctionalPermissionsEnum.RFID_MANAGE -> R.mipmap.icon_login_menu_card
                 RoleFunctionalPermissionsEnum.EXCEPTION_REPORT -> R.mipmap.icon_exception
                 RoleFunctionalPermissionsEnum.EXCEPTION_MANAGE -> R.mipmap.icon_bottom_menu_exception_manage
                 RoleFunctionalPermissionsEnum.USER_INFO -> R.mipmap.icon_data_manage_menu_user_manage
-                RoleFunctionalPermissionsEnum.RESET_PASSWORD -> R.drawable.icon_login_menu_password
+                RoleFunctionalPermissionsEnum.RESET_PASSWORD -> R.mipmap.icon_login_menu_password
                 RoleFunctionalPermissionsEnum.FINGERPRINT_SETTING -> com.grkj.ui_base.R.drawable.icon_fingerprint
-                RoleFunctionalPermissionsEnum.FACE_SETTING -> R.drawable.icon_login_menu_face
-                RoleFunctionalPermissionsEnum.CARD_SETTING -> R.drawable.icon_login_menu_card
+                RoleFunctionalPermissionsEnum.FACE_SETTING -> R.mipmap.icon_login_menu_face
+                RoleFunctionalPermissionsEnum.CARD_SETTING -> R.mipmap.icon_login_menu_card
                 else -> 0
             }
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/common/EditJobWorkflowSettingFragment.kt

@@ -178,12 +178,12 @@ class EditJobWorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingB
         if (item.stepId == viewModel.currentStep?.stepId) {
             if (bg is GradientDrawable) {
                 bg.mutate()  // 拷贝一份，避免影响到其它引用了同一个 drawable 的 view
-                bg.setColor(requireContext().getColor(R.color.color_ffec99))
+                bg.setColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorHomeBlockOngoing))
             }
         } else {
             if (bg is GradientDrawable) {
                 bg.mutate()  // 拷贝一份，避免影响到其它引用了同一个 drawable 的 view
-                bg.setColor(requireContext().getColor(R.color.color_e9ecf4))
+                bg.setColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorLightGray))
             }
         }
         itemBinding.stepLayout.setDebouncedClickListener {

app/src/main/java/com/grkj/iscs/features/main/fragment/common/EditSopWorkflowSettingFragment.kt

@@ -178,12 +178,12 @@ class EditSopWorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingB
         if (item.stepId == viewModel.currentStep?.stepId) {
             if (bg is GradientDrawable) {
                 bg.mutate()  // 拷贝一份，避免影响到其它引用了同一个 drawable 的 view
-                bg.setColor(requireContext().getColor(R.color.color_ffec99))
+                bg.setColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorHomeBlockOngoing))
             }
         } else {
             if (bg is GradientDrawable) {
                 bg.mutate()  // 拷贝一份，避免影响到其它引用了同一个 drawable 的 view
-                bg.setColor(requireContext().getColor(R.color.color_e9ecf4))
+                bg.setColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorLightGray))
             }
         }
         itemBinding.stepLayout.setDebouncedClickListener {

app/src/main/java/com/grkj/iscs/features/main/fragment/common/SelectMemberFragment.kt

@@ -402,17 +402,15 @@ class SelectMemberFragment : BaseFragment<FragmentSelectMemeberBinding>() {
     private fun checkSelectArea() {
         if (isLockerSelect) {
             binding.lockerRv.setBackgroundColor(
-                ContextCompat.getColor(
-                    requireContext(),
-                    R.color.color_4d2196f3
+                CommonUtils.getColor(
+                    com.grkj.ui_base.R.attr.colorSelectedLightBlue
                 )
             )
             binding.colockerRv.background = null
         } else {
             binding.colockerRv.setBackgroundColor(
-                ContextCompat.getColor(
-                    requireContext(),
-                    R.color.color_4d2196f3
+                CommonUtils.getColor(
+                    com.grkj.ui_base.R.attr.colorSelectedLightBlue
                 )
             )
             binding.lockerRv.background = null

app/src/main/java/com/grkj/iscs/features/main/fragment/common/WorkflowSettingFragment.kt

@@ -180,12 +180,12 @@ class WorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingBinding>
         if (item.stepId == viewModel.currentStep?.stepId) {
             if (bg is GradientDrawable) {
                 bg.mutate()  // 拷贝一份，避免影响到其它引用了同一个 drawable 的 view
-                bg.setColor(requireContext().getColor(R.color.color_ffec99))
+                bg.setColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorHomeBlockOngoing))
             }
         } else {
             if (bg is GradientDrawable) {
                 bg.mutate()  // 拷贝一份，避免影响到其它引用了同一个 drawable 的 view
-                bg.setColor(requireContext().getColor(R.color.color_e9ecf4))
+                bg.setColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorLightGray))
             }
         }
         itemBinding.stepLayout.setDebouncedClickListener {

app/src/main/java/com/grkj/iscs/features/main/fragment/data_manage/DataManageHomeFragment.kt

@@ -1,6 +1,10 @@
 package com.grkj.iscs.features.main.fragment.data_manage
 
+import android.content.res.ColorStateList
+import android.graphics.drawable.GradientDrawable
 import androidx.annotation.OptIn
+import androidx.core.view.ViewCompat
+import androidx.core.widget.ImageViewCompat
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.dividerSpace
@@ -16,7 +20,9 @@ import com.grkj.iscs.databinding.ItemHomeMenuBinding
 import com.grkj.iscs.features.main.entity.MenuItemEntity
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.config.ISCSConfig
+import com.grkj.ui_base.utils.changeBgTint
 import com.grkj.ui_base.utils.event.BottomNavVisibilityEvent
+import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint
 
 /**
@@ -93,7 +99,8 @@ class DataManageHomeFragment : BaseFragment<FragmentDataManageHomeBinding>() {
         val item = holder.getModel<MenuItemEntity>()
         itemBinding.homeMenuIv.setImageResource(item.menuIconId)
         itemBinding.homeMenuTv.text = item.menuText
-        itemBinding.root.setOnClickListener {
+        itemBinding.homeMenuLayout.changeBgTint(item.menuBgTint)
+        itemBinding.root.setDebouncedClickListener {
             onMenuClick(item.type)
         }
     }

app/src/main/java/com/grkj/iscs/features/main/fragment/exception_manage/ExceptionJobFragment.kt

@@ -148,7 +148,7 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
         }
         binding.fullScreen.setDebouncedClickListener {
             toggleExpandView(binding.fullScreenRootLayout, binding.dataLayout, false)
-            binding.dataLayout.setBackgroundColor(requireContext().getColor(R.color.white))
+            binding.dataLayout.setBackgroundColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorWhite))
             binding.fullScreen.isVisible = false
             binding.spaceView.isVisible = true
         }
@@ -306,7 +306,7 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
             "1" -> {
                 if (bg is GradientDrawable) {
                     bg.mutate()  // 拷贝一份，避免影响到其它引用了同一个 drawable 的 view
-                    bg.setColor(requireContext().getColor(R.color.color_b2f2bb))
+                    bg.setColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorConfirm))
                 }
             }
 
@@ -314,7 +314,7 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
                 if (item.stepId == viewModel.currentStepData?.stepId) {
                     if (bg is GradientDrawable) {
                         bg.mutate()  // 拷贝一份，避免影响到其它引用了同一个 drawable 的 view
-                        bg.setColor(requireContext().getColor(R.color.color_ffec99))
+                        bg.setColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorHomeBlockOngoing))
                     }
                 } else {
                     itemBinding.stepLayout.backgroundTintList = null

app/src/main/java/com/grkj/iscs/features/main/fragment/exception_manage/ExceptionManageHomeFragment.kt

@@ -1,6 +1,9 @@
 package com.grkj.iscs.features.main.fragment.exception_manage
 
+import android.content.res.ColorStateList
 import android.widget.LinearLayout
+import androidx.core.view.ViewCompat
+import androidx.core.widget.ImageViewCompat
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.dividerSpace
@@ -15,7 +18,9 @@ import com.grkj.iscs.databinding.FragmentExceptionManageHomeBinding
 import com.grkj.iscs.databinding.ItemHomeMenuBinding
 import com.grkj.iscs.features.main.entity.MenuItemEntity
 import com.grkj.ui_base.base.BaseFragment
+import com.grkj.ui_base.utils.changeBgTint
 import com.grkj.ui_base.utils.event.BottomNavVisibilityEvent
+import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint
 
 /**
@@ -76,7 +81,8 @@ class ExceptionManageHomeFragment : BaseFragment<FragmentExceptionManageHomeBind
         val item = holder.getModel<MenuItemEntity>()
         itemBinding.homeMenuIv.setImageResource(item.menuIconId)
         itemBinding.homeMenuTv.text = item.menuText
-        itemBinding.root.setOnClickListener {
+        itemBinding.homeMenuLayout.changeBgTint(item.menuBgTint)
+        itemBinding.root.setDebouncedClickListener {
             onMenuClick(item.type)
         }
     }

app/src/main/java/com/grkj/iscs/features/main/fragment/hardware_manage/HardwareManageHomeFragment.kt

@@ -1,6 +1,9 @@
 package com.grkj.iscs.features.main.fragment.hardware_manage
 
+import android.content.res.ColorStateList
 import android.widget.LinearLayout
+import androidx.core.view.ViewCompat
+import androidx.core.widget.ImageViewCompat
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.dividerSpace
@@ -15,7 +18,9 @@ import com.grkj.iscs.databinding.FragmentHardwareManageHomeBinding
 import com.grkj.iscs.databinding.ItemHomeMenuBinding
 import com.grkj.iscs.features.main.entity.MenuItemEntity
 import com.grkj.ui_base.base.BaseFragment
+import com.grkj.ui_base.utils.changeBgTint
 import com.grkj.ui_base.utils.event.BottomNavVisibilityEvent
+import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint
 
 /**
@@ -88,7 +93,8 @@ class HardwareManageHomeFragment : BaseFragment<FragmentHardwareManageHomeBindin
         val item = holder.getModel<MenuItemEntity>()
         itemBinding.homeMenuIv.setImageResource(item.menuIconId)
         itemBinding.homeMenuTv.text = item.menuText
-        itemBinding.root.setOnClickListener {
+        itemBinding.homeMenuLayout.changeBgTint(item.menuBgTint)
+        itemBinding.root.setDebouncedClickListener {
             onMenuClick(item.type)
         }
     }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/JobExecuteFragment.kt

@@ -144,7 +144,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
         }
         binding.fullScreen.setDebouncedClickListener {
             toggleExpandView(binding.fullScreenRootLayout, binding.dataLayout, false)
-            binding.dataLayout.setBackgroundColor(requireContext().getColor(R.color.white))
+            binding.dataLayout.setBackgroundColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorWhite))
             binding.fullScreen.isVisible = false
             binding.spaceView.isVisible = true
         }
@@ -238,7 +238,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
             "1" -> {
                 if (bg is GradientDrawable) {
                     bg.mutate()  // 拷贝一份，避免影响到其它引用了同一个 drawable 的 view
-                    bg.setColor(requireContext().getColor(R.color.color_b2f2bb))
+                    bg.setColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorConfirm))
                 }
             }
 
@@ -246,7 +246,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
                 if (item.stepId == viewModel.currentStepData?.stepId) {
                     if (bg is GradientDrawable) {
                         bg.mutate()  // 拷贝一份，避免影响到其它引用了同一个 drawable 的 view
-                        bg.setColor(requireContext().getColor(R.color.color_ffec99))
+                        bg.setColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorHomeBlockOngoing))
                     }
                 } else {
                     itemBinding.stepLayout.backgroundTintList = null
@@ -435,9 +435,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
         when (item.pointStatus) {
             "1" -> {
                 itemBinding.lockStatusTv.setTextColor(
-                    ContextCompat.getColor(
-                        requireContext(), R.color.white
-                    )
+                    CommonUtils.getColor(com.grkj.ui_base.R.attr.colorWhite)
                 )
                 itemBinding.lockStatusLayout.setBackgroundResource(R.drawable.bg_btn_job_execute_go_locking)
                 itemBinding.lockStatusIv.setImageResource(R.drawable.icon_ticket_lock)
@@ -445,9 +443,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
 
             "2" -> {
                 itemBinding.lockStatusTv.setTextColor(
-                    ContextCompat.getColor(
-                        requireContext(), R.color.white
-                    )
+                    CommonUtils.getColor( com.grkj.ui_base.R.attr.colorWhite)
                 )
                 itemBinding.lockStatusLayout.setBackgroundResource(R.drawable.bg_btn_job_execute_go_unlocking)
                 itemBinding.lockStatusIv.setImageResource(R.drawable.icon_ticket_unlock)
@@ -455,11 +451,9 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
 
             else -> {
                 itemBinding.lockStatusTv.setTextColor(
-                    ContextCompat.getColor(
-                        requireContext(), R.color.black
-                    )
+                    CommonUtils.getColor(com.grkj.ui_base.R.attr.colorBlack)
                 )
-                itemBinding.lockStatusLayout.setBackgroundColor(requireContext().getColor(R.color.white))
+                itemBinding.lockStatusLayout.setBackgroundColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorWhite))
                 itemBinding.lockStatusIv.setImageResource(0)
             }
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/JobManageHomeFragment.kt

@@ -1,5 +1,8 @@
 package com.grkj.iscs.features.main.fragment.job_manage
 
+import android.content.res.ColorStateList
+import androidx.core.view.ViewCompat
+import androidx.core.widget.ImageViewCompat
 import androidx.fragment.app.viewModels
 import cn.bingoogolapple.badgeview.BGABadgeViewHelper
 import com.drake.brv.BindingAdapter
@@ -16,7 +19,10 @@ import com.grkj.iscs.databinding.ItemHomeMenuBinding
 import com.grkj.iscs.features.main.entity.MenuItemEntity
 import com.grkj.iscs.features.main.viewmodel.job_manage.JobManageHomeViewModel
 import com.grkj.ui_base.base.BaseFragment
+import com.grkj.ui_base.utils.CommonUtils
+import com.grkj.ui_base.utils.changeBgTint
 import com.grkj.ui_base.utils.event.BottomNavVisibilityEvent
+import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint
 
 /**
@@ -36,7 +42,8 @@ class JobManageHomeFragment : BaseFragment<FragmentJobManageHomeBinding>() {
             1,
             R.mipmap.icon_job_manage_in_progress_job,
             RoleFunctionalPermissionsEnum.IN_PROGRESS_JOB.description,
-            RoleFunctionalPermissionsEnum.IN_PROGRESS_JOB.functionalPermission
+            RoleFunctionalPermissionsEnum.IN_PROGRESS_JOB.functionalPermission,
+            menuBgTint = CommonUtils.getColor(com.grkj.ui_base.R.attr.colorJobManageHomeInProgressBg),
         ),
         MenuItemEntity(
             2,
@@ -54,7 +61,8 @@ class JobManageHomeFragment : BaseFragment<FragmentJobManageHomeBinding>() {
             4,
             R.mipmap.icon_data_manage_menu_point_manage,
             RoleFunctionalPermissionsEnum.EXCEPTION_JOB.description,
-            RoleFunctionalPermissionsEnum.EXCEPTION_JOB.functionalPermission
+            RoleFunctionalPermissionsEnum.EXCEPTION_JOB.functionalPermission,
+            menuBgTint = CommonUtils.getColor(com.grkj.ui_base.R.attr.colorJobManageHomeExceptionJobBg),
         ),
         MenuItemEntity(
             5,
@@ -124,8 +132,8 @@ class JobManageHomeFragment : BaseFragment<FragmentJobManageHomeBinding>() {
                 this.hiddenBadge()
             }
         }
-
-        itemBinding.root.setOnClickListener {
+        itemBinding.homeMenuLayout.changeBgTint(item.menuBgTint)
+        itemBinding.root.setDebouncedClickListener {
             onMenuClick(item.type)
         }
     }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/MyTodoListFragment.kt

@@ -262,9 +262,9 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
         itemBinding.todoTitle.text =
             "${getTodoTitlePrefix(item)}${item.todoType.todoTitle}${item.groupName?.let { if (it.isEmpty()) "(${item.todoTitle})" else "(${it})" }}"
         if (item.todoStatus == TodoStatusEnum.TODO) {
-            itemBinding.todoTitle.setTextColor(requireContext().getColor(R.color.tag_error))
+            itemBinding.todoTitle.setTextColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorStatusRed))
         } else {
-            itemBinding.todoTitle.setTextColor(requireContext().getColor(R.color.text_primary))
+            itemBinding.todoTitle.setTextColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorTextPrimary))
         }
         itemBinding.jobName.text = item.ticketName
         itemBinding.currentStep.isVisible = item.todoStatus == TodoStatusEnum.TODO

app/src/main/java/com/grkj/iscs/features/main/fragment/user_info/UserInfoHomeFragment.kt

@@ -1,5 +1,8 @@
 package com.grkj.iscs.features.main.fragment.user_info
 
+import android.content.res.ColorStateList
+import androidx.core.view.ViewCompat
+import androidx.core.widget.ImageViewCompat
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.dividerSpace
@@ -14,6 +17,7 @@ import com.grkj.iscs.databinding.FragmentUserInfoHomeBinding
 import com.grkj.iscs.databinding.ItemHomeMenuBinding
 import com.grkj.iscs.features.main.entity.MenuItemEntity
 import com.grkj.ui_base.base.BaseFragment
+import com.grkj.ui_base.utils.changeBgTint
 import com.grkj.ui_base.utils.event.LogoutEvent
 import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint
@@ -44,13 +48,13 @@ class UserInfoHomeFragment : BaseFragment<FragmentUserInfoHomeBinding>() {
         ),
         MenuItemEntity(
             3,
-            R.drawable.icon_login_menu_face,
+            R.mipmap.icon_login_menu_face,
             RoleFunctionalPermissionsEnum.FACE_SETTING.description,
             RoleFunctionalPermissionsEnum.FACE_SETTING.functionalPermission
         ),
         MenuItemEntity(
             4,
-            R.drawable.icon_login_menu_card,
+            R.mipmap.icon_login_menu_card,
             RoleFunctionalPermissionsEnum.CARD_SETTING.description,
             RoleFunctionalPermissionsEnum.CARD_SETTING.functionalPermission
         ),
@@ -100,6 +104,7 @@ class UserInfoHomeFragment : BaseFragment<FragmentUserInfoHomeBinding>() {
         val item = holder.getModel<MenuItemEntity>()
         itemBinding.homeMenuIv.setImageResource(item.menuIconId)
         itemBinding.homeMenuTv.text = item.menuText
+        itemBinding.homeMenuLayout.changeBgTint(item.menuBgTint)
         itemBinding.root.setDebouncedClickListener {
             onMenuClick(item.type)
         }

app/src/main/res/color/text_color_item_group_title_text.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 选中时的颜色 -->
-    <item android:color="@color/white" android:state_selected="true" />
+    <item android:color="?attr/colorWhite" android:state_selected="true" />
     <!-- 默认未选中时的颜色 -->
-    <item android:color="@color/black" />
+    <item android:color="?attr/colorBlack" />
 </selector>

app/src/main/res/color/text_color_workstation_item.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/white" android:state_selected="true" />
-    <item android:color="@color/black" />
+    <item android:color="?attr/colorWhite" android:state_selected="true" />
+    <item android:color="?attr/colorBlack" />
 </selector>

app/src/main/res/drawable-land/bg_job_execute_step.xml

@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/common_spacing_2x" />
-    <solid android:color="@color/color_e9ecf4" />
+    <solid android:color="?attr/colorLightGray" />
     <stroke
         android:width="2dp"
-        android:color="@color/black" />
+        android:color="?attr/colorBlack" />
 </shape>

app/src/main/res/drawable/bg_btn_job_execute_go_locking.xml

@@ -3,7 +3,7 @@
     android:shape="rectangle">
     <stroke
         android:width="@dimen/divider_line_space"
-        android:color="@color/black" />
-    <solid android:color="@color/common_status_red" />
+        android:color="?attr/colorBlack" />
+    <solid android:color="?attr/colorStatusRed" />
     <corners android:radius="4dp" />
 </shape>

app/src/main/res/drawable/bg_btn_job_execute_go_unlocking.xml

@@ -3,7 +3,7 @@
     android:shape="rectangle">
     <stroke
         android:width="@dimen/divider_line_space"
-        android:color="@color/black" />
-    <solid android:color="@color/common_status_green" />
+        android:color="?attr/colorBlack" />
+    <solid android:color="?attr/colorStatusGreen" />
     <corners android:radius="4dp" />
 </shape>

app/src/main/res/drawable/bg_btn_job_execute_normal.xml

@@ -3,7 +3,7 @@
     android:shape="rectangle">
     <stroke
         android:width="@dimen/divider_line_space"
-        android:color="@color/black" />
-    <solid android:color="@color/white" />
+        android:color="?attr/colorBlack" />
+    <solid android:color="?attr/colorWhite" />
     <corners android:radius="4dp" />
 </shape>

app/src/main/res/drawable/bg_card_item.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white20" />
-    <corners android:radius="30dp" />
+    <solid android:color="?attr/colorWhite20" />
+    <corners android:radius="20dp" />
 </shape>

app/src/main/res/drawable/bg_card_item_land.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white20" />
-    <corners android:radius="51dp" />
+    <solid android:color="?attr/colorWhite20" />
+    <corners android:radius="34dp" />
 </shape>

app/src/main/res/drawable/bg_card_white_r8.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white" />
+    <solid android:color="?attr/colorWhite" />
     <corners android:radius="8dp" />
 </shape>

app/src/main/res/drawable/bg_common_input_disable.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/common_selected_gray" />
+    <solid android:color="?attr/colorSelectedGray" />
     <stroke
         android:width="@dimen/divider_line_space"
-        android:color="@color/black" />
+        android:color="?attr/colorBlack" />
     <corners android:radius="4dp" />
 </shape>

app/src/main/res/drawable/bg_common_input_disable_land.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke
         android:width="0.5dp"
-        android:color="@color/black" />
-    <solid android:color="@color/common_light_gray" />
+        android:color="?attr/colorBlack" />
+    <solid android:color="?attr/colorLightGray" />
 </shape>

app/src/main/res/drawable/bg_common_input_normal.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke
         android:width="@dimen/divider_line_space"
-        android:color="@color/black" />
+        android:color="?attr/colorBlack" />
     <corners android:radius="4dp" />
-    <solid android:color="@color/white" />
+    <solid android:color="?attr/colorWhite" />
 </shape>

app/src/main/res/drawable/bg_common_input_normal_land.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke
         android:width="0.5dp"
-        android:color="@color/black" />
+        android:color="?attr/colorBlack" />
 </shape>

app/src/main/res/drawable/bg_common_select_selected.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/common_selected_gray" />
+    <solid android:color="?attr/colorSelectedGray" />
 </shape>

app/src/main/res/drawable/bg_group_name_input_normal.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke
         android:width="@dimen/divider_line_space"
-        android:color="@color/black" />
+        android:color="?attr/colorBlack" />
     <corners android:radius="4dp" />
 </shape>

app/src/main/res/drawable/bg_home_card_num.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/common_spacing" />
-    <solid android:color="@color/white30" />
+    <solid android:color="?attr/colorWhite30" />
 </shape>

app/src/main/res/drawable/bg_home_card_num_land.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/common_spacing_small" />
-    <solid android:color="@color/white30" />
+    <solid android:color="?attr/colorWhite30" />
 </shape>

app/src/main/res/drawable/bg_home_menu_item.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white30" />
+    <solid android:color="?attr/colorWhite30" />
     <corners android:radius="@dimen/common_spacing_2x" />
 </shape>

app/src/main/res/drawable/bg_home_menu_item_land.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white30" />
+    <solid android:color="?attr/colorWhite30" />
     <corners android:radius="@dimen/common_spacing" />
 </shape>

app/src/main/res/drawable/bg_item_group_title_normal.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke android:width="1dp" />
-    <solid android:color="@color/white" />
+    <solid android:color="?attr/colorWhite" />
 </shape>

app/src/main/res/drawable/bg_item_group_title_selected.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke android:width="1dp" />
-    <solid android:color="@color/color_1daeff" />
+    <solid android:color="?attr/colorPrimary" />
 </shape>

app/src/main/res/drawable/bg_job_execute_step.xml

@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/common_spacing_2x" />
-    <solid android:color="@color/color_e9ecf4" />
+    <solid android:color="?attr/colorLightGray" />
     <stroke
         android:width="2dp"
-        android:color="@color/black" />
+        android:color="?attr/colorBlack" />
 </shape>

app/src/main/res/drawable/bg_job_execute_step_index.xml

@@ -3,5 +3,5 @@
     android:shape="oval">
     <stroke
         android:width="@dimen/divider_line_space"
-        android:color="@color/black" />
+        android:color="?attr/colorBlack" />
 </shape>

app/src/main/res/drawable/bg_main_color_tip.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/main_color" />
+    <solid android:color="?attr/colorPrimary" />
     <corners android:radius="@dimen/common_radius" />
 </shape>

app/src/main/res/drawable/bg_main_nav_bar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/white80" />
+    <solid android:color="?attr/colorWhite80" />
     <corners android:radius="@dimen/common_spacing_2x" />
 </shape>

app/src/main/res/drawable/bg_point_normal.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <stroke android:width="@dimen/divider_line_space" android:color="@color/black"/>
-    <solid android:color="@color/white"/>
+    <stroke android:width="@dimen/divider_line_space" android:color="?attr/colorBlack"/>
+    <solid android:color="?attr/colorWhite"/>
 </shape>

app/src/main/res/drawable/bg_point_selected.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <stroke android:width="@dimen/divider_line_space" android:color="@color/black"/>
-    <solid android:color="@color/color_a5d8ff"/>
+    <stroke android:width="@dimen/divider_line_space" android:color="?attr/colorBlack"/>
+    <solid android:color="?attr/colorSelectedLightBlue"/>
 </shape>

app/src/main/res/drawable/bg_select_member_btn.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/common_tip_dialog_info" />
+    <solid android:color="?attr/colorInfo" />
     <stroke
         android:width="@dimen/divider_line_space"
-        android:color="@color/black" />
+        android:color="?attr/colorBlack" />
     <corners android:radius="6dp" />
 </shape>

app/src/main/res/drawable/bg_status_chip.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/common_radius_small" />
-    <solid android:color="@color/tag_lock" />
+    <solid android:color="?attr/colorInfo" />
 </shape>

app/src/main/res/drawable/bg_text_drop_down.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/white" />
+    <solid android:color="?attr/colorWhite" />
     <stroke
         android:width="@dimen/divider_line_space"
-        android:color="@color/black" />
+        android:color="?attr/colorBlack" />
 </shape>

app/src/main/res/drawable/bg_workstation_item_normal.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/white" />
+    <solid android:color="?attr/colorWhite" />
     <stroke
         android:width="@dimen/divider_line_space"
-        android:color="@color/black" />
+        android:color="?attr/colorBlack" />
 </shape>

app/src/main/res/drawable/bg_workstation_item_selected.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/common_tip_dialog_info" />
+    <solid android:color="?attr/colorInfo" />
 </shape>

app/src/main/res/drawable/card_white_bg.xml

@@ -3,6 +3,6 @@
     android:shape="rectangle">
     <stroke
         android:width="@dimen/divider_line_space"
-        android:color="@color/black" />
-    <solid android:color="@color/color_e9ecf4" />
+        android:color="?attr/colorBlack" />
+    <solid android:color="?attr/colorLightGray" />
 </shape>

app/src/main/res/drawable/circle_image_bg.xml

@@ -3,5 +3,5 @@
     android:shape="oval">
     <stroke
         android:width="2dp"
-        android:color="@color/black"/>
+        android:color="?attr/colorBlack"/>
 </shape>

app/src/main/res/drawable/common_btn_green_bg.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/common_radius_small" />
-    <solid android:color="@color/common_btn_green_bg" />
+    <solid android:color="?attr/colorStatusGreen" />
 </shape>

app/src/main/res/drawable/common_btn_red_bg.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/common_radius_small" />
-    <solid android:color="@color/common_btn_red_bg" />
+    <solid android:color="?attr/colorStatusRed" />
 </shape>

app/src/main/res/drawable/common_status_circle.xml

@@ -4,5 +4,5 @@
     <size
         android:width="@dimen/common_status_circle_small"
         android:height="@dimen/common_status_circle_small" />
-    <solid android:color="@color/common_status_red" />
+    <solid android:color="?attr/colorStatusRed" />
 </shape>

app/src/main/res/drawable/divider_table.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/black" />
+    <solid android:color="?attr/colorBlack" />
     <size
         android:width="@dimen/divider_line_space"
         android:height="@dimen/divider_line_space" />

app/src/main/res/drawable/home_card_bg.xml

@@ -3,7 +3,7 @@
     android:shape="rectangle">
     <stroke
         android:width="@dimen/divider_line_space"
-        android:color="@color/black" />
-    <solid android:color="@color/white" />
+        android:color="?attr/colorBlack" />
+    <solid android:color="?attr/colorWhite" />
     <corners android:radius="2dp" />
 </shape>

app/src/main/res/drawable/icon_add_box_disable.xml

@@ -2,12 +2,12 @@
     android:width="24dp"
     android:height="24dp"
     android:autoMirrored="true"
-    android:tint="@color/color_black50"
+    android:tint="?attr/colorBlack50"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/color_77797c"
+        android:fillColor="?attr/colorDisable"
         android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14zM11,17h2v-4h4v-2h-4L13,7h-2v4L7,11v2h4z" />
 
 </vector>

app/src/main/res/drawable/icon_add_box_enable.xml

@@ -2,7 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:autoMirrored="true"
-    android:tint="@color/color_black80"
+    android:tint="?attr/colorBlack80"
     android:viewportWidth="24"
     android:viewportHeight="24">
 

app/src/main/res/drawable/icon_login_menu_card.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="117dp"
-    android:height="91dp"
-    android:viewportWidth="117"
-    android:viewportHeight="91">
-  <path
-      android:pathData="M16.26,90.22C6.06,90.22 0.93,85.19 0.93,75.13V15.46C0.93,5.4 6.06,0.32 16.26,0.32H100.74C110.99,0.32 116.07,5.4 116.07,15.46V75.13C116.07,85.19 110.99,90.22 100.74,90.22H16.26ZM16.36,82.36H100.64C105.47,82.36 108.21,79.77 108.21,74.69V15.9C108.21,10.82 105.47,8.19 100.64,8.19H16.36C11.48,8.19 8.79,10.82 8.79,15.9V74.69C8.79,79.77 11.48,82.36 16.36,82.36ZM38.19,45.05C32.28,45.05 27.49,40.07 27.49,33.38C27.49,27.13 32.28,21.96 38.19,21.96C44.14,21.96 48.88,27.13 48.88,33.38C48.88,40.07 44.14,45.1 38.19,45.05ZM70.02,29.18C68.27,29.18 66.95,27.86 66.95,26.15C66.95,24.49 68.27,23.18 70.02,23.18H96.68C98.39,23.18 99.71,24.49 99.71,26.15C99.71,27.86 98.39,29.18 96.68,29.18H70.02ZM70.02,48.32C68.27,48.32 66.95,46.96 66.95,45.25C66.95,43.59 68.27,42.32 70.02,42.32H96.68C98.39,42.32 99.71,43.59 99.71,45.25C99.71,46.96 98.39,48.32 96.68,48.32H70.02ZM19.14,67.41C17.53,67.41 16.75,66.34 16.75,64.88C16.75,60.29 23.59,48.47 38.19,48.47C52.79,48.47 59.67,60.29 59.67,64.88C59.67,66.34 58.89,67.41 57.28,67.41H19.14ZM70.02,67.41C68.27,67.41 66.95,66.14 66.95,64.48C66.95,62.78 68.27,61.41 70.02,61.41H96.68C98.39,61.41 99.71,62.78 99.71,64.48C99.71,66.14 98.39,67.41 96.68,67.41H70.02Z"
-      android:fillColor="#D7D2D2"/>
-</vector>

app/src/main/res/drawable/icon_login_menu_password.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="103dp"
-    android:height="101dp"
-    android:viewportWidth="103"
-    android:viewportHeight="101">
-  <path
-      android:pathData="M42,42.93C31.55,42.93 22.47,33.55 22.47,21.44C22.47,9.48 31.55,0.35 42,0.35C52.45,0.35 61.53,9.29 61.53,21.35C61.53,33.55 52.5,42.93 42,42.93ZM87.07,40.05C95.66,40.05 102.6,47.03 102.6,55.57C102.6,62.36 98.4,67.83 90.88,70.91L97.42,77.4C98.01,77.99 98.01,78.72 97.52,79.16L90.83,85.7L95.66,90.54C96.15,91.02 96.15,91.71 95.66,92.24L87.9,99.96C87.36,100.5 86.68,100.45 86.19,99.96L82.09,95.86C81.7,95.37 81.4,94.93 81.4,94.34V70.17C75.4,67.83 71.49,62.21 71.49,55.57C71.49,47.03 78.38,40.05 87.07,40.05ZM87.02,47.32C84.33,47.32 82.19,49.47 82.19,52.11C82.19,54.84 84.38,56.99 87.02,56.99C89.66,56.99 91.8,54.84 91.8,52.11C91.8,49.47 89.66,47.32 87.02,47.32ZM9.24,88.14C4.01,88.14 0.89,85.7 0.89,81.65C0.89,69.05 16.66,51.67 42,51.67C50.89,51.67 58.6,53.82 64.85,57.14C65.29,64.22 69,70.42 74.71,74.18V88.14H9.24Z"
-      android:fillColor="#D7D2D2"/>
-</vector>

app/src/main/res/drawable/init_step_circle.xml

@@ -4,5 +4,5 @@
     <size
         android:width="@dimen/common_spacing"
         android:height="@dimen/common_spacing" />
-    <solid android:color="@color/init_step_circle" />
+    <solid android:color="?attr/colorPrimary" />
 </shape>

app/src/main/res/drawable/login_tip_circle.xml

@@ -4,5 +4,5 @@
     <size
         android:width="@dimen/common_spacing"
         android:height="@dimen/common_spacing" />
-    <solid android:color="@color/login_tip_circle_bg" />
+    <solid android:color="?attr/colorPrimaryLight" />
 </shape>

app/src/main/res/drawable/mask_vector_circle.xml

@@ -23,5 +23,5 @@
         android:fillType="nonZero"
         android:pathData="M0,0L24,0L24,24L0,24L0,0Z"
         android:strokeWidth="0.2"
-        android:strokeColor="@color/black" />
+        android:strokeColor="?attr/colorBlack" />
 </vector>

app/src/main/res/drawable/oval_shape.xml

@@ -5,5 +5,5 @@
     <!-- 背景色可随意 -->
     <stroke
         android:width="2dp"
-        android:color="@color/black" />
+        android:color="?attr/colorBlack" />
 </shape>

app/src/main/res/drawable/selectable_input_text_bg.xml

@@ -2,11 +2,11 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/white" />
+            <solid android:color="?attr/colorWhite" />
             <corners android:radius="@dimen/selectable_input_radius" />
             <stroke
                 android:width="@dimen/selectable_input_stroke"
-                android:color="@color/main_color" />
+                android:color="?attr/colorPrimary" />
         </shape>
     </item>
 </layer-list>

app/src/main/res/layout-land/activity_login.xml

@@ -6,7 +6,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@mipmap/bg_main"
+        android:background="?attr/colorBg"
         android:fitsSystemWindows="true"
         android:orientation="vertical">
 
@@ -14,7 +14,9 @@
             android:id="@+id/header_layout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/header_height"
-            android:paddingHorizontal="@dimen/header_padding">
+            android:layout_margin="@dimen/common_spacing_2x"
+            android:background="@drawable/bg_card_white_r8"
+            android:paddingHorizontal="@dimen/common_spacing_2x">
 
             <ImageView
                 android:layout_width="@dimen/header_logo_width"
@@ -26,26 +28,21 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="right"
-                android:format12Hour="yyyy-MM-dd HH:mm:ss"
-                android:format24Hour="yyyy-MM-dd HH:mm:ss"
+                android:format12Hour="yyyy-MM-dd    HH:mm"
+                android:format24Hour="yyyy-MM-dd    HH:mm"
                 android:gravity="center_vertical"
-                android:textColor="@color/white"
-                android:textSize="@dimen/header_time_text_size" />
+                android:textColor="?attr/colorBlack"
+                android:textSize="@dimen/header_time_text_size"
+                android:textStyle="bold|italic" />
         </FrameLayout>
 
-        <View
-            android:id="@+id/header_line"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line_height"
-            android:layout_below="@+id/header_layout"
-            android:background="@color/white30" />
-
         <LinearLayout
             android:id="@+id/main_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_above="@+id/tec_support"
-            android:layout_below="@+id/header_line"
+            android:layout_below="@+id/header_layout"
+            android:layout_marginTop="@dimen/common_spacing"
             android:orientation="vertical">
 
             <TextView
@@ -54,37 +51,37 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
                 android:layout_marginTop="@dimen/common_spacing"
-                android:layout_marginRight="@dimen/common_spacing"
+                android:layout_marginRight="@dimen/common_spacing_2x"
                 android:background="@drawable/common_btn_white_board"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="@dimen/common_spacing_small"
                 android:text="EN"
                 android:textAllCaps="true"
-                android:textColor="@color/white"
+                android:textColor="?attr/colorWhite"
                 android:textSize="@dimen/common_text_size" />
 
 
-            <com.grkj.ui_base.widget.ShadowTextView
+            <TextView
                 android:id="@+id/title_cn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="@dimen/login_main_title_margin_top"
-                android:textColor="@color/white"
+                android:textColor="?attr/colorWhite"
                 android:textSize="@dimen/login_main_title_text_size"
                 android:textStyle="bold"
                 app:i18nKey='@{"loto"}' />
 
-            <com.grkj.ui_base.widget.ShadowTextView
+            <TextView
                 android:id="@+id/title_en"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="@dimen/login_sub_title_margin_top"
-                app:i18nKey='@{"loto_en"}'
-                android:textColor="@color/white"
+                android:textColor="?attr/colorWhite"
                 android:textSize="@dimen/login_sub_title_text_size"
-                android:textStyle="bold" />
+                android:textStyle="bold|italic"
+                app:i18nKey='@{"loto_en"}' />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -119,9 +116,9 @@
                         android:layout_height="wrap_content"
                         android:layout_alignParentBottom="true"
                         android:gravity="center_horizontal"
-                        app:i18nKey='@{"login_tip"}'
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/login_tip_text_size" />
+                        android:textColor="?attr/colorWhite"
+                        android:textSize="@dimen/login_tip_text_size"
+                        app:i18nKey='@{"login_tip"}' />
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
@@ -134,9 +131,9 @@
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="@dimen/common_spacing"
             android:gravity="center_horizontal"
-            app:i18nKey='@{"tec_support"}'
-            android:textColor="@color/white"
-            android:textSize="@dimen/login_tec_support_text_size" />
+            android:textColor="?attr/colorWhite"
+            android:textSize="@dimen/login_tec_support_text_size"
+            app:i18nKey='@{"tec_support"}' />
 
         <TextView
             android:id="@+id/version"
@@ -145,8 +142,8 @@
             android:layout_alignParentRight="true"
             android:layout_alignParentBottom="true"
             android:layout_marginRight="@dimen/login_version_margin"
-            android:layout_marginBottom="@dimen/common_spacing"
-            android:textColor="@color/white"
+            android:layout_marginBottom="@dimen/common_spacing_2x"
+            android:textColor="?attr/colorWhite"
             android:textSize="@dimen/login_version_text_size"
             tools:text="v1.0" />
     </RelativeLayout>

app/src/main/res/layout-land/activity_main.xml

@@ -6,7 +6,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@mipmap/bg_main"
+        android:background="?attr/colorBg"
         android:fitsSystemWindows="true"
         android:orientation="vertical">
 
@@ -35,7 +35,7 @@
                     android:format24Hour="yyyy-MM-dd HH:mm:ss"
                     android:gravity="center_vertical"
                     android:paddingHorizontal="@dimen/header_time_padding"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/colorWhite"
                     android:textSize="@dimen/header_time_text_size" />
 
                 <LinearLayout
@@ -62,7 +62,7 @@
                         android:singleLine="true"
                         android:maxLength="4"
                         android:ellipsize="end"
-                        android:textColor="@color/white"
+                        android:textColor="?attr/colorWhite"
                         android:textSize="@dimen/home_nickname_text_size" />
                 </LinearLayout>
             </LinearLayout>
@@ -77,24 +77,18 @@
                 android:drawablePadding="@dimen/common_spacing"
                 android:gravity="center_vertical"
                 android:paddingHorizontal="@dimen/common_spacing"
-                android:textColor="@color/white"
+                android:textColor="?attr/colorWhite"
                 android:textSize="@dimen/common_btn_text_size"
                 android:visibility="gone" />
         </FrameLayout>
 
-        <View
-            android:id="@+id/header_line"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line_height"
-            android:layout_below="@+id/header_layout"
-            android:background="@color/white30" />
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/nav_host_fragment"
             android:name="androidx.navigation.fragment.NavHostFragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@+id/header_line"
+            android:layout_below="@+id/header_layout"
             android:layout_toRightOf="@+id/nav_bar"
             app:defaultNavHost="true"
             app:navGraph="@navigation/nav_home" />
@@ -103,8 +97,7 @@
             android:id="@+id/nav_bar"
             android:layout_width="@dimen/home_bottom_nav_size"
             android:layout_height="match_parent"
-            android:layout_below="@+id/header_line"
-            android:layout_margin="@dimen/common_spacing"
+            android:layout_below="@+id/header_layout"
             app:navIconSize="@dimen/home_bottom_nav_icon_size"
             app:navOrientation="vertical"
             app:navTextSize="@dimen/home_bottom_nav_text_size" />

app/src/main/res/layout-land/dialog_check_face.xml

@@ -6,8 +6,8 @@
         android:layout_width="@dimen/login_dialog_width"
         android:layout_height="@dimen/login_dialog_height"
         android:gravity="center"
-        app:cardBackgroundColor="@color/dialog_card_login_bg"
-        app:strokeColor="@color/common_transparent">
+        app:cardBackgroundColor="?attr/colorBlue80"
+        app:strokeColor="?attr/colorTransparent">
 
         <LinearLayout
             android:id="@+id/ll_easy_container"
@@ -48,6 +48,6 @@
             android:layout_gravity="right"
             android:padding="@dimen/common_spacing"
             android:src="@drawable/icon_close"
-            android:tint="@color/white" />
+            android:tint="?attr/colorWhite" />
     </com.google.android.material.card.MaterialCardView>
 </layout>

app/src/main/res/layout-land/dialog_colock_operation_tip.xml

@@ -6,8 +6,8 @@
         android:layout_width="@dimen/login_dialog_width"
         android:layout_height="@dimen/login_dialog_height"
         android:gravity="center"
-        app:cardBackgroundColor="@color/dialog_card_login_bg"
-        app:strokeColor="@color/common_transparent">
+        app:cardBackgroundColor="?attr/colorBlue80"
+        app:strokeColor="?attr/colorTransparent">
 
         <LinearLayout
             android:id="@+id/ll_easy_container"
@@ -48,6 +48,6 @@
             android:layout_gravity="right"
             android:padding="@dimen/common_spacing"
             android:src="@drawable/icon_close"
-            android:tint="@color/white" />
+            android:tint="?attr/colorWhite" />
     </com.google.android.material.card.MaterialCardView>
 </layout>

app/src/main/res/layout-land/dialog_login.xml

@@ -6,8 +6,8 @@
         android:layout_width="@dimen/login_dialog_width"
         android:layout_height="@dimen/login_dialog_height"
         android:gravity="center"
-        app:cardBackgroundColor="@color/dialog_card_login_bg"
-        app:strokeColor="@color/common_transparent">
+        app:cardBackgroundColor="?attr/colorBlue80"
+        app:strokeColor="?attr/colorTransparent">
 
         <LinearLayout
             android:id="@+id/ll_easy_container"

app/src/main/res/layout-land/dialog_slots_exception_report.xml

@@ -12,11 +12,11 @@
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tip_dialog_header_height"
-            android:background="@color/common_tip_dialog_info"
+            android:background="?attr/colorInfo"
             android:gravity="center_vertical"
             android:paddingHorizontal="@dimen/common_spacing"
             app:i18nKey='@{"slots_exception_report"}'
-            android:textColor="@color/white"
+            android:textColor="?attr/colorWhite"
             android:textSize="@dimen/common_btn_text_size" />
 
 
@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/common_spacing"
                 android:layout_marginTop="@dimen/common_spacing"
-                android:textColor="@color/black"
+                android:textColor="?attr/colorBlack"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="@string/hardware_info" />
@@ -52,7 +52,7 @@
                 android:gravity="left|top"
                 app:i18nHint='@{"please_input_exception_reason"}'
                 android:padding="@dimen/selectable_input_edit_padding"
-                android:textColor="@color/black"
+                android:textColor="?attr/colorBlack"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/hardware_info" />
@@ -81,7 +81,7 @@
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 app:i18nKey='@{"confirm"}'
-                android:textColor="@color/white"
+                android:textColor="?attr/colorWhite"
                 android:textSize="@dimen/common_btn_text_size" />
 
             <TextView
@@ -96,7 +96,7 @@
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 app:i18nKey='@{"cancel"}'
-                android:textColor="@color/white"
+                android:textColor="?attr/colorWhite"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
     </RelativeLayout>