refactor(Dialogs):

- 统一将`CustomDialog?`的可空类型修改为`CustomDialog`非空类型，增强代码健壮性。
- 移除部分模块中不再使用的import语句。

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

@@ -57,7 +57,7 @@ class LoginDialog(
         mBinding = DialogLoginBinding.bind(contentView)
         customDialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         customDialog.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-            override fun onDismiss(dialog: CustomDialog?) {
+            override fun onDismiss(dialog: CustomDialog) {
                 ArcSoftUtil.stop()
                 super.onDismiss(dialog)
             }
@@ -83,7 +83,7 @@ class LoginDialog(
             }
         }
         customDialog.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-            override fun onDismiss(dialog: CustomDialog?) {
+            override fun onDismiss(dialog: CustomDialog) {
                 when (mLoginType) {
                     0 -> {
                         ArcSoftUtil.stop()

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

@@ -49,9 +49,9 @@ class CheckFaceDialog(
     override fun onBind(customDialog: CustomDialog, contentView: View) {
         mBinding = DialogCheckFaceBinding.bind(contentView)
         dialog = customDialog
-        customDialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
+        customdialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         customDialog.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-            override fun onDismiss(dialog: CustomDialog?) {
+            override fun onDismiss(dialog: CustomDialog) {
                 ArcSoftUtil.stop()
                 super.onDismiss(dialog)
             }
@@ -69,7 +69,7 @@ class CheckFaceDialog(
             customDialog.dismiss()
         }
         customDialog.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-            override fun onDismiss(dialog: CustomDialog?) {
+            override fun onDismiss(dialog: CustomDialog) {
                 when (mLoginType) {
                     0 -> {
                         ArcSoftUtil.stop()
@@ -168,12 +168,12 @@ class CheckFaceDialog(
                         LoadingEvent.sendLoadingEvent()
                         if (it == LoginResultEnum.FACE_VERIFY_FAILED) {
                             ArcSoftUtil.stop()
-                            dialog?.dismiss()
+                            dialog.dismiss()
                             callBack?.invoke(it)
                             PopTip.tip(CommonUtils.getStr("face_login_failed"))
                         } else {
                             ArcSoftUtil.stop()
-                            dialog?.dismiss()
+                            dialog.dismiss()
                             callBack?.invoke(it)
                         }
                     }

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

@@ -25,7 +25,7 @@ class SwipCardOperationTipDialog() :
 
     override fun onBind(customDialog: CustomDialog, contentView: View) {
         mBinding = DialogSwipCardOperationTipBinding.bind(contentView)
-        customDialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.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/TextDropDownDialog.kt

@@ -38,7 +38,7 @@ class TextDropDownDialog(
     private lateinit var binding: DialogDropDownListBinding
     private val indentPx: Int by lazy { AutoSizeUtils.dp2px(binding.root.context, 20f) }
 
-    override fun onBind(dialog: CustomDialog?, v: View) {
+    override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogDropDownListBinding.bind(v)
         binding.searchKey.isVisible = showSearchView
         binding.searchKey.addTextChangedListener(onTextChanged = { text, _, _, _ ->
@@ -82,7 +82,7 @@ class TextDropDownDialog(
                             }
                         } else {
                             onSelect(item)
-                            dialog?.dismiss()
+                            dialog.dismiss()
                         }
                     }
                 }
@@ -115,7 +115,7 @@ class TextDropDownDialog(
                             onMultiSelect(selected)
                         } else {
                             onSelect(item)
-                            dialog?.dismiss()
+                            dialog.dismiss()
                         }
                     }
                 }

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

@@ -36,8 +36,8 @@ 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.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         binding.powerTypeTv.setDebouncedClickListener {
             val list = IsolationPointPowerTypeEnum.values().map {
                 TextDropDownDialog.SimpleTextDropDownEntity(
@@ -70,7 +70,7 @@ class AddPointDialog(
                 binding.rfidTagTv.text = item.getShowText()
                 binding.rfidTagTv.tag = item.getId()
             }.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-                override fun onDismiss(dialog: CustomDialog?) {
+                override fun onDismiss(dialog: CustomDialog) {
                     rfidSelectDialogShow = false
                     super.onDismiss(dialog)
                 }
@@ -78,8 +78,8 @@ class AddPointDialog(
         }
 
         // 关闭
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
 
         // 确认
         binding.confirm.setDebouncedClickListener {
@@ -115,7 +115,7 @@ class AddPointDialog(
                 binding.rfidTagTv.text = item.getShowText()
                 binding.rfidTagTv.tag = item.getId()
             }.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-                override fun onDismiss(dialog: CustomDialog?) {
+                override fun onDismiss(dialog: CustomDialog) {
                     rfidSelectDialogShow = false
                     super.onDismiss(dialog)
                 }

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

@@ -38,13 +38,13 @@ class AddRoleDialog(
 
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogAddRoleBinding.bind(v)
-        dialog?.isCancelable = false
+        dialog.isCancelable = false
         // 遮罩色
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 关闭
         binding.closeIv.setDebouncedClickListener {
-            dialog?.dismiss()
+            dialog.dismiss()
         }
         // 确认
         binding.confirm.setDebouncedClickListener {
@@ -70,7 +70,7 @@ class AddRoleDialog(
         }
         // 取消
         binding.cancel.setDebouncedClickListener {
-            dialog?.dismiss()
+            dialog.dismiss()
         }
 
         // 列表

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

@@ -23,11 +23,11 @@ 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.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
         binding.confirm.setDebouncedClickListener {
             val name = binding.workstationNameEt.text.trim().toString()
             if (name.isEmpty()) {

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

@@ -28,10 +28,10 @@ class FilterPointDialog(
 
     private lateinit var binding: DialogFilterPointBinding
 
-    override fun onBind(dialog: CustomDialog?, v: View) {
+    override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogFilterPointBinding.bind(v)
-        dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 电源类型单选
         binding.powerTypeTv.setDebouncedClickListener {
@@ -58,8 +58,8 @@ class FilterPointDialog(
         }
 
         // 关闭
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
 
         // 确认
         binding.confirm.setDebouncedClickListener {
@@ -72,7 +72,7 @@ class FilterPointDialog(
                 binding.rfidTagEt.text.toString()
             )
             onConfirm(filter)
-            dialog?.dismiss()
+            dialog.dismiss()
             clearFields()
         }
     }

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

@@ -21,14 +21,14 @@ class FilterRoleDialog(
 
     private lateinit var binding: DialogFilterRoleBinding
 
-    override fun onBind(dialog: CustomDialog?, v: View) {
+    override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogFilterRoleBinding.bind(v)
-        dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 关闭/取消
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
 
         // 确认筛选
         binding.confirm.setDebouncedClickListener {
@@ -40,7 +40,7 @@ class FilterRoleDialog(
                 else -> null
             }
             onConfirm(RoleManageFilterVo(name, key, status))
-            dialog?.dismiss()
+            dialog.dismiss()
             clearFields()
         }
     }

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

@@ -22,18 +22,18 @@ class FilterUserDialog(
 
     private lateinit var binding: DialogFilterUserBinding
 
-    override fun onBind(dialog: CustomDialog?, v: View) {
+    override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogFilterUserBinding.bind(v)
-        dialog?.isCancelable = false
+        dialog.isCancelable = false
         // 设置遮罩色
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         // 根据配置显示/隐藏工作站输入
         binding.areaTv.isVisible = ISCSConfig.isWorkstationOn
         binding.workstationEt.isVisible = ISCSConfig.isWorkstationOn
 
         // 关闭/取消
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
 
         // 确认
         binding.confirm.setDebouncedClickListener {
@@ -46,7 +46,7 @@ class FilterUserDialog(
                 else -> null
             }
             onConfirm(UserManageFilterVo(name, card, station, status))
-            dialog?.dismiss()
+            dialog.dismiss()
             clearFields()
         }
     }

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

@@ -47,8 +47,8 @@ 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.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 初始化
         binding.pointNameTv.setText(pointVo.pointName)
@@ -96,7 +96,7 @@ class UpdatePointDialog(
                 binding.rfidTagTv.text = item.getShowText()
                 binding.rfidTagTv.tag = item.getId()
             }.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-                override fun onDismiss(dialog: CustomDialog?) {
+                override fun onDismiss(dialog: CustomDialog) {
                     rfidSelectDialogShow = false
                     super.onDismiss(dialog)
                 }
@@ -104,8 +104,8 @@ class UpdatePointDialog(
         }
 
         // 关闭/取消
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
 
         // 确认
         binding.confirm.setDebouncedClickListener {
@@ -141,7 +141,7 @@ class UpdatePointDialog(
                 binding.rfidTagTv.text = item.getShowText()
                 binding.rfidTagTv.tag = item.getId()
             }.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-                override fun onDismiss(dialog: CustomDialog?) {
+                override fun onDismiss(dialog: CustomDialog) {
                     rfidSelectDialogShow = false
                     super.onDismiss(dialog)
                 }

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

@@ -40,8 +40,8 @@ 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.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 预填数据
 
@@ -108,7 +108,7 @@ class UpdateRoleDialog(
         }
 
         // 取消
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
         binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
 
         // 确认

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

@@ -29,15 +29,15 @@ class UpdateWorkstationDialog(
 
     override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogUpdateWorkstationBinding.bind(v)
-        dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         binding.workstationNameEt.setText(workstationName)
         binding.setDefault.isChecked =
             MainDomainData.defaultWorkstationId.getMMKVData(
                 0L
             ) == workstationId
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
         binding.confirm.setDebouncedClickListener {
             val name = binding.workstationNameEt.text.trim().toString()
             if (name.isEmpty()) {

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

@@ -34,13 +34,13 @@ 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.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         if (!EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().register(this)
         }
-        dialog?.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-            override fun onDismiss(dialog: CustomDialog?) {
+        dialog.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
+            override fun onDismiss(dialog: CustomDialog) {
                 super.onDismiss(dialog)
                 if (EventBus.getDefault().isRegistered(this)) {
                     EventBus.getDefault().unregister(this)
@@ -56,8 +56,8 @@ class AddCardDialog(
         }
 
         // 取消/关闭
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
 
         // 确认
         binding.confirm.setDebouncedClickListener {

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

@@ -24,12 +24,12 @@ 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.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 取消/关闭
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
 
         // 确认
         binding.confirm.setDebouncedClickListener {

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

@@ -24,11 +24,11 @@ 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.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 取消/关闭
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
         binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
 
         // 确认

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

@@ -31,13 +31,13 @@ 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.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         if (!EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().register(this)
         }
-        dialog?.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-            override fun onDismiss(dialog: CustomDialog?) {
+        dialog.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
+            override fun onDismiss(dialog: CustomDialog) {
                 super.onDismiss(dialog)
                 if (EventBus.getDefault().isRegistered(this)) {
                     EventBus.getDefault().unregister(this)
@@ -45,8 +45,8 @@ class AddRfidTokenDialog(
             }
         })
         // 取消/关闭
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
         // 确认
         binding.confirm.setDebouncedClickListener {
             val code = binding.rfidCodeEt.text.trim().toString()

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

@@ -24,10 +24,10 @@ class FilterCardDialog(
     private lateinit var binding: DialogFilterCardBinding
     private var selectedUser: TextDropDownDialog.TextDropDownEntity? = null
 
-    override fun onBind(dialog: CustomDialog?, v: View) {
+    override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogFilterCardBinding.bind(v)
-        dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         binding.usernameTv.isVisible = userData.isNotEmpty()
 
         // 用户选择
@@ -39,8 +39,8 @@ class FilterCardDialog(
         }
 
         // 取消/关闭
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
 
         // 确认筛选
         binding.confirm.setDebouncedClickListener {
@@ -52,7 +52,7 @@ class FilterCardDialog(
                 else -> null
             }
             onConfirm(CardManageFilterVo(nfc, username, status))
-            dialog?.dismiss()
+            dialog.dismiss()
             clearFields()
         }
     }

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

@@ -20,14 +20,14 @@ class FilterKeyDialog(
 
     private lateinit var binding: DialogFilterKeyBinding
 
-    override fun onBind(dialog: CustomDialog?, v: View) {
+    override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogFilterKeyBinding.bind(v)
-        dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 取消/关闭
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
 
         // 确认筛选
         binding.confirm.setDebouncedClickListener {
@@ -53,7 +53,7 @@ class FilterKeyDialog(
             binding.keyMacEt.text?.clear()
             binding.statusRg.clearCheck()
             // 关闭对话框
-            dialog?.dismiss()
+            dialog.dismiss()
         }
     }
 

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

@@ -19,14 +19,14 @@ class FilterLockDialog(
 
     private lateinit var binding: DialogFilterLockBinding
 
-    override fun onBind(dialog: CustomDialog?, v: View) {
+    override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogFilterLockBinding.bind(v)
-        dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 关闭/取消
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
 
         // 确认筛选
         binding.confirm.setDebouncedClickListener {
@@ -44,7 +44,7 @@ class FilterLockDialog(
             binding.lockNfcEt.text?.clear()
             binding.statusRg.clearCheck()
             // 关闭对话框
-            dialog?.dismiss()
+            dialog.dismiss()
         }
     }
 

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

@@ -19,14 +19,14 @@ class FilterRfidTokenDialog(
 
     private lateinit var binding: DialogFilterRfidTokenBinding
 
-    override fun onBind(dialog: CustomDialog?, v: View) {
+    override fun onBind(dialog: CustomDialog, v: View) {
         binding = DialogFilterRfidTokenBinding.bind(v)
-        dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 取消/关闭
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
 
         // 确认筛选
         binding.confirm.setDebouncedClickListener {
@@ -44,7 +44,7 @@ class FilterRfidTokenDialog(
             binding.rfidEt.text?.clear()
             binding.statusRg.clearCheck()
             // 关闭对话框
-            dialog?.dismiss()
+            dialog.dismiss()
         }
     }
 

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

@@ -24,8 +24,8 @@ class SlotsExceptionReportDialog(
     private lateinit var binding: DialogSlotsExceptionReportBinding
     override fun onBind(dialog: CustomDialog, contentView: View) {
         binding = DialogSlotsExceptionReportBinding.bind(contentView)
-        dialog?.isCancelable = false
-        dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         binding.hardwareInfo.text = CommonUtils.getStr(
             "hardware_info",
             "${getDeviceTypeStr(slotType)},${CommonUtils.getStr("number")} 行${row},列${col}"

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

@@ -39,13 +39,13 @@ 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.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         if (!EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().register(this)
         }
-        dialog?.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-            override fun onDismiss(dialog: CustomDialog?) {
+        dialog.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
+            override fun onDismiss(dialog: CustomDialog) {
                 super.onDismiss(dialog)
                 if (EventBus.getDefault().isRegistered(this)) {
                     EventBus.getDefault().unregister(this)

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

@@ -28,8 +28,8 @@ 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.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 预填数据
         binding.keyCodeEt.setText(isKey.keyCode)
@@ -42,8 +42,8 @@ class UpdateKeyDialog(
         binding.deactivateRb.isChecked = !binding.activateRb.isChecked
 
         // 取消/关闭
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
 
         // 确认
         binding.confirm.setDebouncedClickListener {

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

@@ -28,8 +28,8 @@ 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.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
 
         // 预填数据
         binding.lockCodeEt.setText(isLock.lockCode)
@@ -41,8 +41,8 @@ class UpdateLockDialog(
         binding.deactivateRb.isChecked = !binding.activateRb.isChecked
 
         // 取消/关闭
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
 
         // 确认
         binding.confirm.setDebouncedClickListener {

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

@@ -35,13 +35,13 @@ 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.attr.scrim))
+        dialog.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
         if (!EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().register(this)
         }
-        dialog?.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-            override fun onDismiss(dialog: CustomDialog?) {
+        dialog.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
+            override fun onDismiss(dialog: CustomDialog) {
                 super.onDismiss(dialog)
                 if (EventBus.getDefault().isRegistered(this)) {
                     EventBus.getDefault().unregister(this)
@@ -61,8 +61,8 @@ class UpdateRfidTokenDialog(
         }
 
         // 取消/关闭
-        binding.cancel.setDebouncedClickListener { dialog?.dismiss() }
-        binding.closeIv.setDebouncedClickListener { dialog?.dismiss() }
+        binding.cancel.setDebouncedClickListener { dialog.dismiss() }
+        binding.closeIv.setDebouncedClickListener { dialog.dismiss() }
 
         // 确认
         binding.confirm.setDebouncedClickListener {

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.attr.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/fragment/data_manage/PointMangeFragment.kt

@@ -112,7 +112,7 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                     }
                 }
             }.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-                override fun onDismiss(dialog: CustomDialog?) {
+                override fun onDismiss(dialog: CustomDialog) {
                     viewModel.startReadCard = false
                     viewModel.isDialogRead = false
                     addPointDialog = null
@@ -192,7 +192,7 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
             viewModel.currentChangeRfidItem = item
             SwipRfidOperationTipDialog.show().setDialogLifecycleCallback(object :
                 DialogLifecycleCallback<CustomDialog>() {
-                override fun onDismiss(dialog: CustomDialog?) {
+                override fun onDismiss(dialog: CustomDialog) {
                     viewModel.startReadCard = false
                     super.onDismiss(dialog)
                 }
@@ -256,7 +256,7 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                     }
                 }
             }.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-                override fun onDismiss(dialog: CustomDialog?) {
+                override fun onDismiss(dialog: CustomDialog) {
                     viewModel.startReadCard = false
                     viewModel.isDialogRead = false
                     updatePointDialog = null

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

@@ -140,7 +140,7 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
                     viewModel.clearNoUserFingerprint().observe(this@UserManageFragment) {}
                     viewModel.clearNoUserFace().observe(this@UserManageFragment) {}
                 }).setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-                    override fun onDismiss(dialog: CustomDialog?) {
+                    override fun onDismiss(dialog: CustomDialog) {
                         viewModel.startReadCard = false
                         viewModel.isDialogRead = false
                         super.onDismiss(dialog)
@@ -202,7 +202,7 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
             viewModel.currentHandleUser = item
             SwipCardOperationTipDialog.show().setDialogLifecycleCallback(object :
                 DialogLifecycleCallback<CustomDialog>() {
-                override fun onDismiss(dialog: CustomDialog?) {
+                override fun onDismiss(dialog: CustomDialog) {
                     viewModel.startReadCard = false
                     viewModel.isDialogRead = false
                     super.onDismiss(dialog)
@@ -293,7 +293,7 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
                         viewModel.clearNoUserFingerprint().observe(this@UserManageFragment) {}
                         viewModel.clearNoUserFace().observe(this@UserManageFragment) {}
                     }).setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-                        override fun onDismiss(dialog: CustomDialog?) {
+                        override fun onDismiss(dialog: CustomDialog) {
                             viewModel.startReadCard = false
                             viewModel.isDialogRead = false
                             super.onDismiss(dialog)

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

@@ -335,7 +335,7 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
                                 viewModel.startReadCard = true
                                 SwipCardOperationTipDialog.show().setDialogLifecycleCallback(object :
                                     DialogLifecycleCallback<CustomDialog>() {
-                                    override fun onDismiss(dialog: CustomDialog?) {
+                                    override fun onDismiss(dialog: CustomDialog) {
                                         viewModel.startReadCard = false
                                         super.onDismiss(dialog)
                                     }
@@ -346,7 +346,7 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
                                 viewModel.startReadCard = true
                                 SwipCardOperationTipDialog.show().setDialogLifecycleCallback(object :
                                     DialogLifecycleCallback<CustomDialog>() {
-                                    override fun onDismiss(dialog: CustomDialog?) {
+                                    override fun onDismiss(dialog: CustomDialog) {
                                         viewModel.startReadCard = false
                                         super.onDismiss(dialog)
                                     }

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

@@ -165,7 +165,7 @@ class SetFingerprintFragment : BaseFragment<FragmentSetFingerprintBinding>() {
                         inputFingerprintIds.add(it)
                         mFingerprintPressTimes++
                         if (mFingerprintPressTimes == maxPressTimes) {
-                            dialog?.dismiss()
+                            dialog.dismiss()
                             showToast(CommonUtils.getStr("fingerprint_add_success_tip"))
                             getData()
                         } else if (mFingerprintInputErrorTimes == inputFingerprintErrorTimes) {

data/src/main/java/com/grkj/data/enums/BackupFrequencyWeekEnum.kt

@@ -1,6 +1,5 @@
 package com.grkj.data.enums
 
-import com.grkj.shared.utils.i18n.I18nManager
 import com.sik.sikcore.bit.BitTypeUtils
 
 /**

shared/src/main/java/com/grkj/shared/config/AESConfig.kt

@@ -1,6 +1,5 @@
 package com.grkj.shared.config
 
-import com.sik.sikcore.data.ConvertUtils
 import com.sik.sikencrypt.EncryptAlgorithm
 import com.sik.sikencrypt.EncryptMode
 import com.sik.sikencrypt.EncryptPadding

ui-base/src/main/java/com/grkj/ui_base/dialog/LoadingDialog.kt

@@ -19,7 +19,7 @@ class LoadingDialog : OnBindView<CustomDialog>(R.layout.common_dialog_loading_pr
         binding.tvCommonProgress.isVisible = content != null
         binding.tvCommonProgress.text = content
         p0?.setDialogLifecycleCallback(object : DialogLifecycleCallback<CustomDialog>() {
-            override fun onDismiss(dialog: CustomDialog?) {
+            override fun onDismiss(dialog: CustomDialog) {
                 binding.avlivCommon.smoothToHide()
                 super.onDismiss(dialog)
             }
@@ -37,7 +37,7 @@ class LoadingDialog : OnBindView<CustomDialog>(R.layout.common_dialog_loading_pr
         @JvmStatic
         fun show(msg: String? = null,canCancel: Boolean = true) {
             ThreadUtils.runOnMain {
-                loadingDialog?.dismiss()
+                loadingdialog.dismiss()
                 loadingDialog = CustomDialog.build().apply {
                     setCustomView(LoadingDialog().apply {
                         setMessage(msg)
@@ -52,7 +52,7 @@ class LoadingDialog : OnBindView<CustomDialog>(R.layout.common_dialog_loading_pr
 
         @JvmStatic
         fun hide() {
-            loadingDialog?.dismiss()
+            loadingdialog.dismiss()
         }
     }
 }

ui-base/src/main/java/com/grkj/ui_base/dialog/TipDialog.kt

@@ -38,22 +38,22 @@ class TipDialog : OnBindView<CustomDialog>(R.layout.dialog_tip) {
     private var dialog: CustomDialog? = null
     private var countDownJob: Job? = null
     private val scope = CoroutineScope(Dispatchers.Main + SupervisorJob())
-    override fun onBind(dialog: CustomDialog?, contentView: View) {
+    override fun onBind(dialog: CustomDialog, contentView: View) {
         this.dialog = dialog
         binding = DialogTipBinding.bind(contentView)
-        dialog?.setMaskColor(CommonUtils.getColor(R.attr.scrim))
-        dialog?.isCancelable = false
+        dialog.setMaskColor(CommonUtils.getColor(R.attr.scrim))
+        dialog.isCancelable = false
         // 确定按钮
         binding.confirmBtn.setDebouncedClickListener {
             countDownJob?.cancel()
             onConfirmClick()
-            dialog?.dismiss()
+            dialog.dismiss()
         }
         // 取消按钮
         binding.cancelBtn.setDebouncedClickListener {
             countDownJob?.cancel()
             onCancelClick()
-            dialog?.dismiss()
+            dialog.dismiss()
         }
         binding.title.text = title
         binding.content.text = content
@@ -91,7 +91,7 @@ class TipDialog : OnBindView<CustomDialog>(R.layout.dialog_tip) {
                     }
                     // 倒计时结束后自动确认
                     onCancelClick()
-                    dialog?.dismiss()
+                    dialog.dismiss()
                 }
             }
         } else {