refactor(更新)

- 多语言适配

app/src/main/java/com/grkj/iscs/features/init/fragment/InitDeviceRegistrationKeyAndLockFragment.kt

@@ -90,8 +90,8 @@ class InitDeviceRegistrationKeyAndLockFragment :
         }
         viewModel.isLoadComplete.observe(this) {
             binding.stepHint.text =
-                if (!it) getString(R.string.init_device_registration_key_and_lock_step_hint) else getString(
-                    R.string.init_device_registration_key_and_lock_complete_step_hint
+                if (!it) CommonUtils.getStr("init_device_registration_key_and_lock_step_hint") else CommonUtils.getStr(
+                    "init_device_registration_key_and_lock_complete_step_hint"
                 )
             binding.dockRv.isVisible = it
 //            binding.checkDeviceInfo.isVisible = it
@@ -126,12 +126,12 @@ class InitDeviceRegistrationKeyAndLockFragment :
                 val allDevice = newKeyDockList + portableDock + lockDock
                 val newKeyCount =
                     newKeyDock.keyData.count { it.newHardware && it.rfid != null && it.mac != null } + portableDock.map { it.deviceData }
-                        .count { it is DockBean.KeyBean&& it.newHardware && it.rfid != null&& it.mac != null  }
+                        .count { it is DockBean.KeyBean && it.newHardware && it.rfid != null && it.mac != null }
                 val newLockCount = lockDock.map { it.lockData }.flatten()
                     .count { it.newHardware && it.rfid != null } + portableDock.map { it.deviceData }
                     .count { it is DockBean.LockBean && it.newHardware && it.rfid != null }
                 binding.checkDeviceInfo.text =
-                    getString(R.string.check_device_info, newKeyCount, newLockCount)
+                    CommonUtils.getStr("check_device_info", newKeyCount, newLockCount)
                 binding.dockRv.models = allDevice
             }
         }

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

@@ -198,7 +198,7 @@ class SelectMemberFragment : BaseFragment<FragmentSelectMemeberBinding>() {
             itemBinding.groupName.isSelected = true
             viewModel.currentSelectGroup = item.jobTicketGroupInfo
             binding.selectMemberTip.text =
-                getString(R.string.select_locker_tip, viewModel.currentSelectGroup?.groupName ?: "")
+                CommonUtils.getStr("select_locker_tip", viewModel.currentSelectGroup?.groupName ?: "")
             binding.allUserRv.models =
                 viewModel.userData.filter { it.roleKeys.contains(RoleEnum.JTLOCKER.roleKey) }
                     .onEach {
@@ -325,7 +325,7 @@ class SelectMemberFragment : BaseFragment<FragmentSelectMemeberBinding>() {
         isLockerSelect = true
         checkSelectArea()
         binding.selectMemberTip.text =
-            getString(R.string.select_locker_tip, viewModel.currentSelectGroup?.groupName ?: "")
+            CommonUtils.getStr("select_locker_tip", viewModel.currentSelectGroup?.groupName ?: "")
         binding.lockerRv.models = selectedLockerData
         binding.allUserRv.models =
             viewModel.userData.filter {

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

@@ -124,7 +124,7 @@ class SelectPointFragment : BaseFragment<FragmentSelectPointBinding>() {
             adapter.notifyDataSetChanged()
         }
         itemBinding.editOrSave.setDebouncedClickListener {
-            if (itemBinding.editOrSave.text == getString(R.string.edit)) {
+            if (itemBinding.editOrSave.text == CommonUtils.getStr("edit")) {
                 itemBinding.groupName.isEnabled = true
                 itemBinding.groupName.isFocusable = true
                 itemBinding.groupName.isFocusableInTouchMode = true
@@ -133,10 +133,10 @@ class SelectPointFragment : BaseFragment<FragmentSelectPointBinding>() {
                 val imm =
                     requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
                 imm.showSoftInput(itemBinding.groupName, InputMethodManager.SHOW_IMPLICIT)
-                itemBinding.editOrSave.text = getString(R.string.save)
+                itemBinding.editOrSave.text = CommonUtils.getStr("save")
             } else {
                 if (itemBinding.groupName.text.toString().isEmpty()) {
-                    showToast(getString(R.string.group_name_must_not_empty))
+                    showToast(CommonUtils.getStr("group_name_must_not_empty"))
                     return@setDebouncedClickListener
                 }
                 itemBinding.groupName.isFocusable = false
@@ -147,7 +147,7 @@ class SelectPointFragment : BaseFragment<FragmentSelectPointBinding>() {
                     requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
                 imm.hideSoftInputFromWindow(itemBinding.groupName.windowToken, 0)
                 item.jobTicketGroupInfo.groupName = itemBinding.groupName.text.toString()
-                itemBinding.editOrSave.text = getString(R.string.edit)
+                itemBinding.editOrSave.text = CommonUtils.getStr("edit")
                 adapter?.notifyDataSetChanged()
             }
         }
@@ -214,7 +214,7 @@ class SelectPointFragment : BaseFragment<FragmentSelectPointBinding>() {
                     Type.pointGroupType
                 ) ?: mutableListOf()
         if (viewModel.selectedPointData.isEmpty()) {
-            val emptyOriginGroupName = getString(R.string.selected_point_info_title)
+            val emptyOriginGroupName = CommonUtils.getStr("selected_point_info_title")
             val jobTicketGroupVo = JobTicketGroupInfoVo(groupName = emptyOriginGroupName)
             viewModel.selectedPointData.add(
                 JobTicketGroupDataVo(jobTicketGroupVo, mutableListOf())

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

@@ -43,11 +43,11 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
             }
         }
         binding.cancelException.setDebouncedClickListener {
-            TipDialog.showInfo(getString(R.string.confirm_cancel_exception), onConfirmClick = {
+            TipDialog.showInfo(CommonUtils.getStr("confirm_cancel_exception"), onConfirmClick = {
                 viewModel.cancelException().observe(this) {
                     if (it) {
                         TipDialog.showSuccess(
-                            getString(R.string.cancel_exception_success),
+                            CommonUtils.getStr("cancel_exception_success"),
                             onConfirmClick = {
                                 binding.handleException.isVisible = false
                                 binding.cancelException.isVisible = false
@@ -57,7 +57,7 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
                                 binding.cancelException.isVisible = false
                             })
                     } else {
-                        TipDialog.showError(getString(R.string.cancel_exception_failed))
+                        TipDialog.showError(CommonUtils.getStr("cancel_exception_failed"))
                     }
                 }
             })
@@ -79,7 +79,7 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
      */
     private fun showSimpleConfirmHandleDialog() {
         TipDialog.showInfo(
-            getString(R.string.confirm_handle_exception),
+            CommonUtils.getStr("confirm_handle_exception"),
             onConfirmClick = {
                 viewModel.handleException().observe(this) { result ->
                     if (result.first) {
@@ -97,7 +97,7 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
      */
     private fun showHandleSuccessDialog() {
         TipDialog.showSuccess(
-            getString(R.string.handle_exception_success),
+            CommonUtils.getStr("handle_exception_success"),
             onConfirmClick = ::hideHandleButtons,
             onCancelClick = ::hideHandleButtons
         )
@@ -151,8 +151,8 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
      */
     private fun showCoLockReleaseWarning(onConfirm: () -> Unit) {
         TipDialog.show(
-            title = getString(R.string.warn),
-            msg = getString(R.string.handle_exception_will_release_all_colock),
+            title = CommonUtils.getStr("warn"),
+            msg = CommonUtils.getStr("handle_exception_will_release_all_colock"),
             dialogType = TipDialog.DialogType.ERROR,
             onConfirmClick = onConfirm
         )
@@ -163,8 +163,8 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
      */
     private fun showCrossJobWarning(onConfirm: () -> Unit) {
         TipDialog.show(
-            title = getString(R.string.warn),
-            msg = getString(R.string.current_job_has_cross_job),
+            title = CommonUtils.getStr("warn"),
+            msg = CommonUtils.getStr("current_job_has_cross_job"),
             dialogType = TipDialog.DialogType.ERROR,
             onConfirmClick = onConfirm
         )
@@ -178,12 +178,12 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
             when (it) {
                 NextJobPrompt.NO_NEW_JOB -> {
                     TipDialog.showInfo(
-                        getString(R.string.confirm_handle_exception),
+                        CommonUtils.getStr("confirm_handle_exception"),
                         onConfirmClick = {
                             viewModel.handleException().observe(this) {
                                 if (it.first) {
                                     TipDialog.showSuccess(
-                                        getString(R.string.handle_exception_success),
+                                        CommonUtils.getStr("handle_exception_success"),
                                         onConfirmClick = {
                                             navController.popBackStack()
                                         },
@@ -199,17 +199,17 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
 
                 NextJobPrompt.CREATE_LOCK_JOB -> {
                     TipDialog.showInfo(
-                        getString(R.string.confirm_handle_exception),
+                        CommonUtils.getStr("confirm_handle_exception"),
                         onConfirmClick = {
                             viewModel.handleException().observe(this) {
                                 if (it.first) {
                                     TipDialog.showInfo(
-                                        getString(R.string.confirm_create_lock_job),
+                                        CommonUtils.getStr("confirm_create_lock_job"),
                                         onConfirmClick = {
                                             exceptionJobViewModel.createLockJob().observe(this) {
                                                 if (it) {
                                                     TipDialog.showSuccess(
-                                                        getString(R.string.handle_exception_success),
+                                                        CommonUtils.getStr("handle_exception_success"),
                                                         onConfirmClick = {
                                                             navController.popBackStack()
                                                         },
@@ -217,12 +217,12 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
                                                             navController.popBackStack()
                                                         })
                                                 } else {
-                                                    TipDialog.showError(getString(R.string.create_job_failed))
+                                                    TipDialog.showError(CommonUtils.getStr("create_job_failed"))
                                                 }
                                             }
                                         }, onCancelClick = {
                                             TipDialog.showSuccess(
-                                                getString(R.string.handle_exception_success),
+                                                CommonUtils.getStr("handle_exception_success"),
                                                 onConfirmClick = {
                                                     navController.popBackStack()
                                                 },
@@ -238,18 +238,17 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
                 }
 
                 NextJobPrompt.CREATE_UNLOCK_JOB -> {
-                    TipDialog.showInfo(
-                        getString(R.string.confirm_handle_exception),
+                    TipDialog.showInfo(CommonUtils.getStr("confirm_handle_exception"),
                         onConfirmClick = {
                             viewModel.handleException().observe(this) {
                                 if (it.first) {
                                     TipDialog.showInfo(
-                                        getString(R.string.confirm_create_unlock_job),
+                                        CommonUtils.getStr("confirm_create_unlock_job"),
                                         onConfirmClick = {
                                             exceptionJobViewModel.createUnlockJob().observe(this) {
                                                 if (it) {
                                                     TipDialog.showSuccess(
-                                                        getString(R.string.handle_exception_success),
+                                                        CommonUtils.getStr("handle_exception_success"),
                                                         onConfirmClick = {
                                                             navController.popBackStack()
                                                         },
@@ -257,12 +256,12 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
                                                             navController.popBackStack()
                                                         })
                                                 } else {
-                                                    TipDialog.showError(getString(R.string.create_job_failed))
+                                                    TipDialog.showError(CommonUtils.getStr("create_job_failed"))
                                                 }
                                             }
                                         }, onCancelClick = {
                                             TipDialog.showSuccess(
-                                                getString(R.string.handle_exception_success),
+                                                CommonUtils.getStr("handle_exception_success"),
                                                 onConfirmClick = {
                                                     navController.popBackStack()
                                                 },

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

@@ -69,11 +69,11 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
             }
         }
         binding.cancelException.setDebouncedClickListener {
-            TipDialog.showInfo(getString(R.string.confirm_cancel_exception), onConfirmClick = {
+            TipDialog.showInfo(CommonUtils.getStr("confirm_cancel_exception"), onConfirmClick = {
                 viewModel.cancelException().observe(this) {
                     if (it) {
                         TipDialog.showSuccess(
-                            getString(R.string.cancel_exception_success),
+                            CommonUtils.getStr("cancel_exception_success"),
                             onConfirmClick = {
                                 navController.popBackStack()
                             },
@@ -81,7 +81,7 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
                                 navController.popBackStack()
                             })
                     } else {
-                        TipDialog.showError(getString(R.string.cancel_exception_failed))
+                        TipDialog.showError(CommonUtils.getStr("cancel_exception_failed"))
                     }
                 }
             })
@@ -93,14 +93,14 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
                 viewModel.checkJobHasCoLockAndCrossJob().observe(this) {
                     if (it.first) {
                         TipDialog.show(
-                            title = getString(R.string.warn),
-                            msg = getString(R.string.handle_exception_will_release_all_colock),
+                            title = CommonUtils.getStr("warn"),
+                            msg = CommonUtils.getStr("handle_exception_will_release_all_colock"),
                             dialogType = TipDialog.DialogType.ERROR,
                             onConfirmClick = {
                                 if (it.second) {
                                     TipDialog.show(
-                                        title = getString(R.string.warn),
-                                        msg = getString(R.string.current_job_has_cross_job),
+                                        title = CommonUtils.getStr("warn"),
+                                        msg = CommonUtils.getStr("current_job_has_cross_job"),
                                         dialogType = TipDialog.DialogType.ERROR,
                                         onConfirmClick = {
                                             handleExceptionCheck()
@@ -112,8 +112,8 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
                     } else {
                         if (it.second) {
                             TipDialog.show(
-                                title = getString(R.string.warn),
-                                msg = getString(R.string.current_job_has_cross_job),
+                                title = CommonUtils.getStr("warn"),
+                                msg = CommonUtils.getStr("current_job_has_cross_job"),
                                 dialogType = TipDialog.DialogType.ERROR,
                                 onConfirmClick = {
                                     handleExceptionCheck()
@@ -168,12 +168,12 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
             when (it) {
                 NextJobPrompt.NO_NEW_JOB -> {
                     TipDialog.showInfo(
-                        getString(R.string.confirm_handle_exception),
+                        CommonUtils.getStr("confirm_handle_exception"),
                         onConfirmClick = {
                             viewModel.handleException().observe(this) {
                                 if (it.first) {
                                     TipDialog.showSuccess(
-                                        getString(R.string.handle_exception_success),
+                                        CommonUtils.getStr("handle_exception_success"),
                                         onConfirmClick = {
                                             navController.popBackStack()
                                         },
@@ -189,17 +189,17 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
 
                 NextJobPrompt.CREATE_LOCK_JOB -> {
                     TipDialog.showInfo(
-                        getString(R.string.confirm_handle_exception),
+                        CommonUtils.getStr("confirm_handle_exception"),
                         onConfirmClick = {
                             viewModel.handleException().observe(this) {
                                 if (it.first) {
                                     TipDialog.showInfo(
-                                        getString(R.string.confirm_create_lock_job),
+                                        CommonUtils.getStr("confirm_create_lock_job"),
                                         onConfirmClick = {
                                             viewModel.createLockJob().observe(this) {
                                                 if (it) {
                                                     TipDialog.showSuccess(
-                                                        getString(R.string.handle_exception_success),
+                                                        CommonUtils.getStr("handle_exception_success"),
                                                         onConfirmClick = {
                                                             navController.popBackStack()
                                                         },
@@ -207,12 +207,12 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
                                                             navController.popBackStack()
                                                         })
                                                 } else {
-                                                    TipDialog.showError(getString(R.string.create_job_failed))
+                                                    TipDialog.showError(CommonUtils.getStr("create_job_failed"))
                                                 }
                                             }
                                         }, onCancelClick = {
                                             TipDialog.showSuccess(
-                                                getString(R.string.handle_exception_success),
+                                                CommonUtils.getStr("handle_exception_success"),
                                                 onConfirmClick = {
                                                     navController.popBackStack()
                                                 },
@@ -229,17 +229,17 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
 
                 NextJobPrompt.CREATE_UNLOCK_JOB -> {
                     TipDialog.showInfo(
-                        getString(R.string.confirm_handle_exception),
+                        CommonUtils.getStr("confirm_handle_exception"),
                         onConfirmClick = {
                             viewModel.handleException().observe(this) {
                                 if (it.first) {
                                     TipDialog.showInfo(
-                                        getString(R.string.confirm_create_unlock_job),
+                                        CommonUtils.getStr("confirm_create_unlock_job"),
                                         onConfirmClick = {
                                             viewModel.createUnlockJob().observe(this) {
                                                 if (it) {
                                                     TipDialog.showSuccess(
-                                                        getString(R.string.handle_exception_success),
+                                                        CommonUtils.getStr("handle_exception_success"),
                                                         onConfirmClick = {
                                                             navController.popBackStack()
                                                         },
@@ -247,12 +247,12 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
                                                             navController.popBackStack()
                                                         })
                                                 } else {
-                                                    TipDialog.showError(getString(R.string.create_job_failed))
+                                                    TipDialog.showError(CommonUtils.getStr("create_job_failed"))
                                                 }
                                             }
                                         }, onCancelClick = {
                                             TipDialog.showSuccess(
-                                                getString(R.string.handle_exception_success),
+                                                CommonUtils.getStr("handle_exception_success"),
                                                 onConfirmClick = {
                                                     navController.popBackStack()
                                                 },
@@ -431,7 +431,7 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
                 viewModel.isUnlockFirst(viewModel.ticketData?.modeId!!).observe(this) {}
                 viewModel.getWorkflowSteps().observe(this) {
                     binding.exceptionJob.text = viewModel.ticketData!!.ticketName
-                    binding.jobNameTv.text = getString(R.string.exception_job_title)
+                    binding.jobNameTv.text = CommonUtils.getStr("exception_job_title")
                     binding.listRv.models = viewModel.ticketPoints
                     binding.stepRv.models = viewModel.ticketStep
                     viewModel.currentStepData =

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

@@ -16,6 +16,7 @@ import com.grkj.iscs.databinding.ItemExceptionManageBinding
 import com.grkj.iscs.features.main.viewmodel.exception_manage.ExceptionViewModel
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.dialog.TipDialog
+import com.grkj.ui_base.utils.CommonUtils
 import com.sik.sikcore.data.GlobalDataTempStore
 import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint
@@ -35,7 +36,7 @@ class ExceptionManageFragment : BaseFragment<FragmentExceptionManageBinding>() {
         binding.oneKeyHandle.setDebouncedClickListener {
             viewModel.handleSelectedException().observe(this) {
                 if (it.first) {
-                    TipDialog.showSuccess(getString(R.string.handle_exception_success))
+                    TipDialog.showSuccess(CommonUtils.getStr("handle_exception_success"))
                     getData()
                 } else {
                     TipDialog.showError(it.second)
@@ -44,7 +45,7 @@ class ExceptionManageFragment : BaseFragment<FragmentExceptionManageBinding>() {
         }
         binding.oneKeyCancel.setDebouncedClickListener {
             viewModel.cancelSelectedException().observe(this) {
-                TipDialog.showSuccess(getString(R.string.cancel_exception_success))
+                TipDialog.showSuccess(CommonUtils.getStr("cancel_exception_success"))
                 getData()
             }
         }

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

@@ -51,7 +51,7 @@ class ExceptionReportFragment : BaseFormFragment<FragmentExceptionReportBinding>
             if (checkData()){
                 viewModel.exceptionReport().observe(this) {
                     TipDialog.showSuccess(
-                        msg = getString(R.string.exception_report_success),
+                        msg = CommonUtils.getStr("exception_report_success"),
                         onConfirmClick = {
                             clearData()
                             resetFormDirty()
@@ -77,7 +77,7 @@ class ExceptionReportFragment : BaseFormFragment<FragmentExceptionReportBinding>
         binding.exceptionSource.setDebouncedClickListener {
             if (viewModel.selectedExceptionType == viewModel.exceptionType.find { it.dictLabel == "硬件异常" }?.dictValue) {
                 if (viewModel.exceptionSourceData.isEmpty()){
-                    showToast(getString(R.string.currently_no_hardware_can_be_report))
+                    showToast(CommonUtils.getStr("currently_no_hardware_can_be_report"))
                     return@setDebouncedClickListener
                 }
                 TextDropDownDialog.showMultiTree(viewModel.exceptionSourceData.map {
@@ -109,7 +109,7 @@ class ExceptionReportFragment : BaseFormFragment<FragmentExceptionReportBinding>
                 }
             } else {
                 if (viewModel.exceptionSourceData.isEmpty()){
-                    showToast(getString(R.string.currently_no_job_can_be_report))
+                    showToast(CommonUtils.getStr("currently_no_job_can_be_report"))
                     return@setDebouncedClickListener
                 }
                 TextDropDownDialog.showSingle(viewModel.exceptionSourceData.map {

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

@@ -27,6 +27,7 @@ import com.grkj.iscs.features.main.viewmodel.hardware_manage.SlotsManageViewMode
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.config.ISCSConfig
 import com.grkj.ui_base.dialog.TipDialog
+import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.event.LoadingEvent
 import com.grkj.ui_base.utils.modbus.DeviceConst
 import com.grkj.ui_base.utils.modbus.DockBean
@@ -98,7 +99,7 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
             viewModel.tagSlotsException(deviceBean.row, modelPosition + 1, it)
                 .observe(this) {
                     TipDialog.showSuccess(
-                        msg = getString(R.string.exception_report_success),
+                        msg = CommonUtils.getStr("exception_report_success"),
                         onConfirmClick = {
                             binding.dockRv.adapter?.notifyDataSetChanged()
                         },
@@ -115,7 +116,7 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
     private fun detectSlot(deviceBean: DockBean.DeviceBean) {
         when (deviceBean) {
             is DockBean.KeyBean -> {
-                LoadingEvent.sendLoadingEvent(getString(R.string.start_detect_key_slot))
+                LoadingEvent.sendLoadingEvent(CommonUtils.getStr("start_detect_key_slot"))
                 ThreadUtils.runOnIO {
                     ModBusController.readKeyRfidStr(
                         deviceBean.addr,
@@ -125,13 +126,13 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
                             viewModel.checkKeyRfidIsNewDevice(keyRfid)
                                 .observe(this@SlotsManageFragment) {
                                     if (it) {
-                                        LoadingEvent.sendLoadingEvent(getString(R.string.start_scan_key_mac))
+                                        LoadingEvent.sendLoadingEvent(CommonUtils.getStr("start_scan_key_mac"))
                                         viewModel.detectKeyMac(deviceBean)
                                             .observe(this@SlotsManageFragment) { keyMac ->
                                                 LoadingEvent.sendLoadingEvent()
                                                 ThreadUtils.runOnMain {
                                                     TipDialog.showInfo(
-                                                        msg = getString(R.string.check_new_key_need_register),
+                                                        msg = CommonUtils.getStr("check_new_key_need_register"),
                                                         onConfirmClick = {
                                                             viewModel.registerKeyInfo(
                                                                 keyRfid,
@@ -140,11 +141,11 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
                                                                 .observe(this@SlotsManageFragment) {
                                                                     if (it) {
                                                                         TipDialog.showSuccess(
-                                                                            getString(R.string.register_success)
+                                                                            CommonUtils.getStr("register_success")
                                                                         )
                                                                     } else {
                                                                         TipDialog.showError(
-                                                                            getString(R.string.register_failed)
+                                                                            CommonUtils.getStr("register_failed")
                                                                         )
                                                                     }
                                                                 }
@@ -153,7 +154,7 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
                                             }
                                     } else {
                                         LoadingEvent.sendLoadingEvent()
-                                        showToast(getString(R.string.key_info_already_exists))
+                                        showToast(CommonUtils.getStr("key_info_already_exists"))
                                     }
 
                                 }
@@ -163,29 +164,33 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
             }
 
             is DockBean.LockBean -> {
-                LoadingEvent.sendLoadingEvent(getString(R.string.start_detect_lock_slot))
+                LoadingEvent.sendLoadingEvent(CommonUtils.getStr("start_detect_lock_slot"))
                 ThreadUtils.runOnIO {
                     ModBusController.readLockRfidStr(deviceBean.addr, deviceBean.idx) { lockRfid ->
                         ThreadUtils.runOnMain {
-                            LoadingEvent.sendLoadingEvent(getString(R.string.check_lock_is_new_device))
+                            LoadingEvent.sendLoadingEvent(CommonUtils.getStr("check_lock_is_new_device"))
                             viewModel.checkLockRfidIsNewDevice(lockRfid)
                                 .observe(this@SlotsManageFragment) {
                                     LoadingEvent.sendLoadingEvent()
                                     if (it) {
                                         TipDialog.showInfo(
-                                            msg = getString(R.string.check_new_lock_need_register),
+                                            msg = CommonUtils.getStr("check_new_lock_need_register"),
                                             onConfirmClick = {
                                                 viewModel.registerLockInfo(lockRfid)
                                                     .observe(this@SlotsManageFragment) {
                                                         if (it) {
-                                                            TipDialog.showSuccess(getString(R.string.register_success))
+                                                            TipDialog.showSuccess(
+                                                                CommonUtils.getStr(
+                                                                    "register_success"
+                                                                )
+                                                            )
                                                         } else {
-                                                            TipDialog.showError(getString(R.string.register_failed))
+                                                            TipDialog.showError(CommonUtils.getStr("register_failed"))
                                                         }
                                                     }
                                             })
                                     } else {
-                                        showToast(getString(R.string.lock_already_exists))
+                                        showToast(CommonUtils.getStr("lock_already_exists"))
                                     }
                                 }
                         }
@@ -256,7 +261,7 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
                 }
                 itemKeyBinding.detect.setDebouncedClickListener {
                     if (!itemKey.isExist) {
-                        showToast(getString(R.string.current_slot_has_no_key))
+                        showToast(CommonUtils.getStr("current_slot_has_no_key"))
                         return@setDebouncedClickListener
                     }
                     detectSlot(itemKey)
@@ -278,7 +283,7 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
                         MainDomainData.roleKeys?.contains(RoleEnum.SYSCONFIG.roleKey) == true
                     ) {
                         TipDialog.showInfo(
-                            getString(R.string.do_you_want_to_remove_exception),
+                            CommonUtils.getStr("do_you_want_to_remove_exception"),
                             onConfirmClick = {
                                 if (viewModel.exceptionSlotsData.any {
                                         it.row?.toInt() == itemKey.row && it.col?.toInt() == (modelPosition + 1)
@@ -336,7 +341,7 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
                 }
                 itemLockBinding.detect.setDebouncedClickListener {
                     if (!itemLock.isExist) {
-                        showToast(getString(R.string.current_slot_has_no_lock))
+                        showToast(CommonUtils.getStr("current_slot_has_no_lock"))
                         return@setDebouncedClickListener
                     }
                     detectSlot(itemLock)
@@ -358,7 +363,7 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
                         MainDomainData.roleKeys?.contains(RoleEnum.SYSCONFIG.roleKey) == true
                     ) {
                         TipDialog.showInfo(
-                            getString(R.string.do_you_want_to_remove_exception),
+                            CommonUtils.getStr("do_you_want_to_remove_exception"),
                             onConfirmClick = {
                                 if (viewModel.exceptionSlotsData.any {
                                         it.row?.toInt() == itemLock.row && it.col?.toInt() == (modelPosition + 1)
@@ -417,7 +422,7 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
                         }
                         itemKeyBinding.detect.setDebouncedClickListener {
                             if (!itemPortable.isExist) {
-                                showToast(getString(R.string.current_slot_has_no_key))
+                                showToast(CommonUtils.getStr("current_slot_has_no_key"))
                                 return@setDebouncedClickListener
                             }
                             detectSlot(itemPortable)
@@ -439,7 +444,7 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
                                 MainDomainData.roleKeys?.contains(RoleEnum.SYSCONFIG.roleKey) == true
                             ) {
                                 TipDialog.showInfo(
-                                    getString(R.string.do_you_want_to_remove_exception),
+                                    CommonUtils.getStr("do_you_want_to_remove_exception"),
                                     onConfirmClick = {
                                         if (viewModel.exceptionSlotsData.any {
                                                 it.row?.toInt() == itemPortable.row && it.col?.toInt() == (modelPosition + 1)
@@ -486,7 +491,7 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
                         }
                         itemLockBinding.detect.setDebouncedClickListener {
                             if (!itemPortable.isExist) {
-                                showToast(getString(R.string.current_slot_has_no_lock))
+                                showToast(CommonUtils.getStr("current_slot_has_no_lock"))
                                 return@setDebouncedClickListener
                             }
                             detectSlot(itemPortable)
@@ -508,7 +513,7 @@ class SlotsManageFragment : BaseFragment<FragmentSlotsManageBinding>() {
                                 MainDomainData.roleKeys?.contains(RoleEnum.SYSCONFIG.roleKey) == true
                             ) {
                                 TipDialog.showInfo(
-                                    getString(R.string.do_you_want_to_remove_exception),
+                                    CommonUtils.getStr("do_you_want_to_remove_exception"),
                                     onConfirmClick = {
                                         if (viewModel.exceptionSlotsData.any {
                                                 it.row?.toInt() == itemPortable.row && it.col?.toInt() == (modelPosition + 1)

app/src/main/java/com/grkj/iscs/features/main/fragment/home/HomeFragment.kt

@@ -82,12 +82,12 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
         binding.quickEntranceConfig.setDebouncedClickListener {
             quickEntranceConfig()
         }
-        binding.realTimeDataZone.text = getString(R.string.all)
-        binding.overviewDataZone.text = getString(R.string.all)
-        binding.lockMode.text = getString(R.string.all)
+        binding.realTimeDataZone.text = CommonUtils.getStr("all")
+        binding.overviewDataZone.text = CommonUtils.getStr("all")
+        binding.lockMode.text = CommonUtils.getStr("all")
         binding.realTimeDataZone.setDebouncedClickListener {
             setWorkstationData(binding.realTimeDataZone) {
-                if (it.getShowText() == getString(R.string.all)) {
+                if (it.getShowText() == CommonUtils.getStr("all")) {
                     viewModel.realTimeDataZoneId = null
                 } else {
                     viewModel.realTimeDataZoneId = it.getId()
@@ -99,7 +99,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
         }
         binding.overviewDataZone.setDebouncedClickListener {
             setWorkstationData(binding.overviewDataZone) {
-                if (it.getShowText() == getString(R.string.all)) {
+                if (it.getShowText() == CommonUtils.getStr("all")) {
                     viewModel.overviewDataZoneId = null
                 } else {
                     viewModel.overviewDataZoneId = it.getId()
@@ -251,7 +251,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
                 }.toMutableList().apply {
                     add(
                         0, TextDropDownDialog.SimpleTextDropDownEntity(
-                            dataId = 0, dataText = getString(R.string.all)
+                            dataId = 0, dataText = CommonUtils.getStr("all")
                         )
                     )
                 }, workstationTv
@@ -273,13 +273,13 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
                 }.toMutableList().apply {
                     add(
                         0, TextDropDownDialog.SimpleTextDropDownEntity(
-                            dataId = 0, dataText = getString(R.string.all)
+                            dataId = 0, dataText =CommonUtils.getStr("all")
                         )
                     )
                 }, binding.lockMode
             ) {
                 binding.lockMode.text = it.getShowText()
-                if (it.getShowText() == getString(R.string.all)) {
+                if (it.getShowText() == CommonUtils.getStr("all")) {
                     viewModel.selectedWorkflowMode = null
                 } else {
                     viewModel.selectedWorkflowMode = it.getId()

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

@@ -114,7 +114,7 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
                             if (!it) {
                                 createSopJob(true)
                             } else {
-                                TipDialog.showError(getString(R.string.current_sop_has_job_in_progress))
+                                TipDialog.showError(CommonUtils.getStr("current_sop_has_job_in_progress"))
                             }
                         }
                     })

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

@@ -118,7 +118,7 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
                             if (!it) {
                                 saveSopJob(true)
                             } else {
-                                TipDialog.showError(getString(R.string.current_sop_has_job_in_progress))
+                                TipDialog.showError(CommonUtils.getStr("current_sop_has_job_in_progress"))
                             }
                         }
                     })

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

@@ -83,14 +83,14 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
             }
         }
         binding.cancelJob.setDebouncedClickListener {
-            TipDialog.showInfo(getString(R.string.cancel_job_tip), onConfirmClick = {
+            TipDialog.showInfo(CommonUtils.getStr("cancel_job_tip"), onConfirmClick = {
                 viewModel.cancelJob().observe(this) {
                     navController.popBackStack()
                 }
             })
         }
         binding.finishJob.setDebouncedClickListener {
-            TipDialog.showInfo(getString(R.string.finish_job_tip), onConfirmClick = {
+            TipDialog.showInfo(CommonUtils.getStr("finish_job_tip"), onConfirmClick = {
                 viewModel.finishJob().observe(this) {
                     navController.popBackStack()
                 }
@@ -162,7 +162,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
     private fun toLock(groupId: Long) {
         val groupKey = viewModel.ticketKey.find { it.groupId == groupId && it.ticketType == 0 }
         if (groupKey?.collectTime != null && groupKey.giveBackTime == null) {
-            showToast(getString(R.string.group_job_in_progress))
+            showToast(CommonUtils.getStr("group_job_in_progress"))
             return
         }
         viewModel.toLock(groupId).observe(this) {
@@ -173,7 +173,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
     private fun toUnLock(groupId: Long) {
         val groupKey = viewModel.ticketKey.find { it.groupId == groupId && it.ticketType == 1 }
         if (groupKey?.collectTime != null && groupKey.giveBackTime == null) {
-            showToast(getString(R.string.group_job_in_progress))
+            showToast(CommonUtils.getStr("group_job_in_progress"))
             return
         }
         viewModel.toUnLock(groupId).observe(this) {

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

@@ -73,7 +73,7 @@ class JobManageFragment : BaseFragment<FragmentJobManageBinding>() {
                     JobTicketStatusEnum.FINISHED.status
                 )
             }) {
-            TipDialog.showError(getString(R.string.has_job_in_progress))
+            TipDialog.showError(CommonUtils.getStr("has_job_in_progress"))
             return
         }
         TipDialog.show(

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

@@ -55,18 +55,18 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
     private var isFirstEnter: Boolean = true
     private val tabKey: List<String> by lazy {
         listOf(
-            getString(R.string.wait_header),
-            getString(R.string.todo_header),
-            getString(R.string.done_header)
+            CommonUtils.getStr("wait_header"),
+            CommonUtils.getStr("todo_header"),
+            CommonUtils.getStr("done_header")
         )
     }
 
     private val handleTimeData: List<String> by lazy {
         listOf(
-            getString(R.string.all),
-            getString(R.string.handle_time_last_7_days),
-            getString(R.string.handle_time_last_30_days),
-            getString(R.string.handle_time_custom_time_range)
+            CommonUtils.getStr("all"),
+            CommonUtils.getStr("handle_time_last_7_days"),
+            CommonUtils.getStr("handle_time_last_30_days"),
+            CommonUtils.getStr("handle_time_custom_time_range")
         )
     }
 
@@ -98,7 +98,7 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
      * 设置处理时间
      */
     private fun setupHandleTime() {
-        binding.handleTime.text = getString(R.string.all)
+        binding.handleTime.text = CommonUtils.getStr("all")
         binding.handleTime.setDebouncedClickListener {
             TextDropDownDialog.showSingle(
                 handleTimeData.map {
@@ -190,9 +190,9 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
 
     private fun setupTabs() {
         val tabTitles = listOf(
-            getString(R.string.wait_header),
-            getString(R.string.todo_header),
-            getString(R.string.done_header)
+            CommonUtils.getStr("wait_header"),
+            CommonUtils.getStr("todo_header"),
+            CommonUtils.getStr("done_header")
         )
         tabTitles.forEach { title ->
             binding.tabLayout.addTab(
@@ -316,7 +316,7 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
         }
         itemBinding.btnHandle.setDebouncedClickListener {
             if (item.todoType == OperationTypeEnum.UNKNOWN) {
-                TipDialog.showError(getString(R.string.handle_unknown))
+                TipDialog.showError(CommonUtils.getStr("handle_unknown"))
                 return@setDebouncedClickListener
             }
             TipDialog.showInfo(viewModel.getHandleTip(item), onConfirmClick = {
@@ -326,11 +326,11 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
                         when (item.todoType) {
                             OperationTypeEnum.LOCK_TAKE_KEY -> item.groupId?.let {
                                 jobExecuteViewModel.toLock(it).observe(this) {}
-                            } ?: showToast(getString(R.string.not_group_can_lock))
+                            } ?: showToast(CommonUtils.getStr("not_group_can_lock"))
 
                             OperationTypeEnum.UNLOCK_TAKE_KEY -> item.groupId?.let {
                                 jobExecuteViewModel.toUnLock(it).observe(this) {}
-                            } ?: showToast(getString(R.string.not_group_can_unlock))
+                            } ?: showToast(CommonUtils.getStr("not_group_can_unlock"))
 
                             OperationTypeEnum.COLOCK -> {
                                 viewModel.startReadCard = true
@@ -520,7 +520,7 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
                 item.updateTime = TimeUtils.nowString(TimeUtils.DEFAULT_DATE_HOUR_MIN_SEC_FORMAT)
                 jobExecuteViewModel.updateStepStatus(item).observe(this@MyTodoListFragment) {
                     if (it == false) {
-                        showToast(getString(R.string.handle_failed))
+                        showToast(CommonUtils.getStr("handle_failed"))
                     } else {
                         getData()
                     }

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

@@ -70,7 +70,7 @@ class SopManageFragment : BaseFragment<FragmentSopManageBinding>() {
         }
         viewModel.checkSopHasOnGoingJob().observe(this) {
             if (it) {
-                TipDialog.showError(getString(R.string.has_job_in_progress))
+                TipDialog.showError(CommonUtils.getStr("has_job_in_progress"))
             } else {
                 TipDialog.show(
                     msg = CommonUtils.getStr("check_delete_sop").toString(),

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

@@ -59,7 +59,7 @@ class WorkflowManageFragment : BaseFragment<FragmentWorkflowManageBinding>() {
 
     private fun deleteSelected() {
         if (viewModel.workflowModeData.none { it.isSelected }) {
-            showToast(getString(R.string.please_select_workflow_mode))
+            showToast(CommonUtils.getStr("please_select_workflow_mode"))
             return
         }
         TipDialog.show(
@@ -113,9 +113,9 @@ class WorkflowManageFragment : BaseFragment<FragmentWorkflowManageBinding>() {
             item.status = checked
             viewModel.updateWorkflowMode(item).observe(this@WorkflowManageFragment) {
                 if (it) {
-                    showToast(getString(R.string.workflow_mode_status_update_succeed))
+                    showToast(CommonUtils.getStr("workflow_mode_status_update_succeed"))
                 } else {
-                    showToast(getString(R.string.workflow_mode_status_update_failed))
+                    showToast(CommonUtils.getStr("workflow_mode_status_update_failed"))
                 }
             }
         }

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

@@ -79,19 +79,19 @@ class ResetPasswordFragment : BaseFragment<FragmentResetPasswordBinding>() {
                 CommonConstants.REGEX_PASSWORD
             )
         ) {
-            showToast(getString(R.string.password_regex_tip))
+            showToast(CommonUtils.getStr("password_regex_tip"))
             return false
         }
         if (binding.repeatNewPasswordEt.text.toString().isEmpty()) {
-            PopTip.tip(R.string.please_input_repeat_new_password)
+            showToast(CommonUtils.getStr("please_input_repeat_new_password"))
             return false
         }
         if (binding.newPasswordEt.text.toString() != binding.repeatNewPasswordEt.text.toString()) {
-            PopTip.tip(R.string.new_password_and_repeat_new_password_not_same)
+            showToast(CommonUtils.getStr("new_password_and_repeat_new_password_not_same"))
             return false
         }
         if (binding.newPasswordEt.text.toString() == binding.oldPasswordEt.text.toString()) {
-            PopTip.tip(R.string.new_password_cannot_be_the_same_as_the_old_password)
+            showToast(CommonUtils.getStr("new_password_cannot_be_the_same_as_the_old_password"))
             return false
         }
         return true

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

@@ -13,6 +13,7 @@ import com.grkj.iscs.features.main.viewmodel.user_info.UserInfoViewModel
 import com.grkj.shared.utils.ArcSoftUtil
 import com.grkj.shared.utils.CancellableTimer
 import com.grkj.ui_base.base.BaseFragment
+import com.grkj.ui_base.utils.CommonUtils
 import com.sik.sikcore.date.TimeUtils
 import com.sik.sikcore.extension.file
 import com.sik.sikcore.extension.setDebouncedClickListener
@@ -38,7 +39,7 @@ class SetFaceFragment : BaseFragment<FragmentSetFaceBinding>() {
         binding.image.visibility = View.VISIBLE
         binding.recapture.visibility = View.VISIBLE
         binding.confirm.visibility = View.VISIBLE
-        binding.countDownTip.text = getString(R.string.detect_face_tip)
+        binding.countDownTip.text = CommonUtils.getStr("detect_face_tip")
         binding.countDownTip.isVisible = false
     }
     private val reCaptureTimer = CancellableTimer(2000, 1000, {}) {
@@ -121,8 +122,8 @@ class SetFaceFragment : BaseFragment<FragmentSetFaceBinding>() {
             binding.faceNotSetIv.isVisible = viewModel.faceData.isEmpty()
             binding.faceSetIv.isVisible = viewModel.faceData.isNotEmpty()
             if (viewModel.faceData.isEmpty()) {
-                binding.setOrResetFace.text = getString(R.string.set_data_tv)
-                binding.faceSetTipTv.text = getString(R.string.face_not_set_tip)
+                binding.setOrResetFace.text = CommonUtils.getStr("set_data_tv")
+                binding.faceSetTipTv.text = CommonUtils.getStr("face_not_set_tip")
             } else {
                 logger.info("人脸图片地址:${viewModel.faceData.toJson()}")
                 val faceFile = viewModel.faceData[0].content.file()
@@ -131,8 +132,8 @@ class SetFaceFragment : BaseFragment<FragmentSetFaceBinding>() {
                     val faceBitmap = ImageConvertUtils.base64ToBitmap(faceBase64)
                     binding.faceSetIv.setImageBitmap(faceBitmap)
                 }
-                binding.setOrResetFace.text = getString(R.string.reset_data_tv)
-                binding.faceSetTipTv.text = getString(R.string.face_set_tip)
+                binding.setOrResetFace.text = CommonUtils.getStr("reset_data_tv")
+                binding.faceSetTipTv.text = CommonUtils.getStr("face_set_tip")
             }
         }
     }
@@ -151,14 +152,14 @@ class SetFaceFragment : BaseFragment<FragmentSetFaceBinding>() {
             binding.tipTv.isVisible = faceSize > 1 || alive == false
             logger.info("人脸检测结果: ${bitmap == null},$faceSize,$alive")
             if (faceSize > 1) {
-                binding.tipTv.text = getString(R.string.only_one_person_allowed)
+                binding.tipTv.text = CommonUtils.getStr("only_one_person_allowed")
                 ArcSoftUtil.inDetecting = false
                 stopCountDown()
                 return@initCamera
             }
             if (alive == false) {
                 binding.tipTv.text =
-                    getString(R.string.real_person_verification_required)
+                    CommonUtils.getStr("real_person_verification_required")
                 ArcSoftUtil.inDetecting = false
                 stopCountDown()
                 return@initCamera
@@ -176,14 +177,14 @@ class SetFaceFragment : BaseFragment<FragmentSetFaceBinding>() {
 
     private fun startCountDown() {
         isInCountDown = true
-        binding.countDownTip.text = getString(R.string.detect_face_tip)
+        binding.countDownTip.text = CommonUtils.getStr("detect_face_tip")
         binding.countDownTip.isVisible = true
         captureTimer.start()
     }
 
     private fun stopCountDown() {
         isInCountDown = false
-        binding.countDownTip.text = getString(R.string.detect_face_tip)
+        binding.countDownTip.text = CommonUtils.getStr("detect_face_tip")
         binding.countDownTip.isVisible = false
         captureTimer.cancel()
     }

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

@@ -82,7 +82,7 @@ class SetFingerprintFragment : BaseFragment<FragmentSetFingerprintBinding>() {
                         .observe(this) {
                             if (it) {
                                 TipDialog.showSuccess(
-                                    getString(R.string.delete_success),
+                                    CommonUtils.getStr("delete_success"),
                                     onConfirmClick = {
                                         getData()
                                     })
@@ -102,19 +102,19 @@ class SetFingerprintFragment : BaseFragment<FragmentSetFingerprintBinding>() {
                 val itemBinding = getBinding<ItemSetFingerprintBinding>()
                 val item = getModel<FingerprintDataVo>()
                 itemBinding.fingerprintCode.text =
-                    getString(R.string.fingerprint_code_str, item.group?.take(6))
+                    CommonUtils.getStr("fingerprint_code_str", item.group?.take(6))
                 itemBinding.delete.setDebouncedClickListener {
                     TipDialog.showInfo(
                         CommonUtils.getStr(
                             "fingerprint_delete_confirm_tip",
-                            getString(R.string.fingerprint_code_str, item.group?.take(6))
+                            CommonUtils.getStr("fingerprint_code_str", item.group?.take(6))
                         ).toString(),
                         countDownTime = 10,
                         onConfirmClick = {
                             viewModel.deleteFingerprintByIds(item.fingerprintData.map { it.recordId })
                                 .observe(this@SetFingerprintFragment) {
                                     if (it) {
-                                        TipDialog.showSuccess(getString(R.string.delete_success))
+                                        TipDialog.showSuccess(CommonUtils.getStr("delete_success"))
                                         getData()
                                     }
                                 }
@@ -164,13 +164,13 @@ class SetFingerprintFragment : BaseFragment<FragmentSetFingerprintBinding>() {
                                 .observe(this@SetFingerprintFragment) {
                                     getData()
                                 }
-                            showToast(getString(R.string.please_re_press_fingerprint_again))
+                            showToast(CommonUtils.getStr("please_re_press_fingerprint_again"))
                         } else {
-                            pressTip?.text = getString(
-                                com.grkj.ui_base.R.string.fingerprint_scan_tip,
+                            pressTip?.text = CommonUtils.getStr(
+                                "fingerprint_scan_tip",
                                 maxPressTimes - mFingerprintPressTimes
                             )
-                            showToast(getString(R.string.please_press_fingerprint_again))
+                            showToast(CommonUtils.getStr("please_press_fingerprint_again"))
                         }
                     } else {
                         mFingerprintInputErrorTimes++
@@ -186,7 +186,7 @@ class SetFingerprintFragment : BaseFragment<FragmentSetFingerprintBinding>() {
                                 .observe(this@SetFingerprintFragment) {
                                     getData()
                                 }
-                            showToast(getString(R.string.please_re_press_fingerprint_again))
+                            showToast(CommonUtils.getStr("please_re_press_fingerprint_again"))
                         }
                     }
                 }

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

@@ -9,6 +9,7 @@ import com.grkj.iscs.features.main.viewmodel.user_info.UserInfoViewModel
 import com.grkj.shared.model.EventBean
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.dialog.TipDialog
+import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.event.RFIDCardReadEvent
 import com.sik.sikcore.extension.setDebouncedClickListener
 import dagger.hilt.android.AndroidEntryPoint
@@ -75,11 +76,11 @@ class SetJobCardFragment : BaseFragment<FragmentSetJobCardBinding>() {
             binding.jobCardSetIv.isVisible = viewModel.jobCardDataVo.isNotEmpty()
             binding.jobCardNotSetIv.isVisible = viewModel.jobCardDataVo.isEmpty()
             if (viewModel.jobCardDataVo.isEmpty()) {
-                binding.jobCardSetTipTv.text = getString(R.string.job_card_not_set_tip)
-                binding.setOrResetJobCard.text = getString(R.string.set_data_tv)
+                binding.jobCardSetTipTv.text = CommonUtils.getStr("job_card_not_set_tip")
+                binding.setOrResetJobCard.text = CommonUtils.getStr("set_data_tv")
             } else {
-                binding.jobCardSetTipTv.text = getString(R.string.job_card_set_tip)
-                binding.setOrResetJobCard.text = getString(R.string.reset_data_tv)
+                binding.jobCardSetTipTv.text = CommonUtils.getStr("job_card_set_tip")
+                binding.setOrResetJobCard.text = CommonUtils.getStr("reset_data_tv")
             }
         }
     }

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

@@ -43,7 +43,7 @@ class UserInfoFragment : BaseFragment<FragmentUserInfoBinding>() {
         binding.image.visibility = View.VISIBLE
         binding.recapture.visibility = View.VISIBLE
         binding.setAvatarConfirm.visibility = View.VISIBLE
-        binding.countDownTip.text = getString(R.string.detect_face_tip)
+        binding.countDownTip.text = CommonUtils.getStr("detect_face_tip")
         binding.countDownTip.isVisible = false
     }
     private val reCaptureTimer = CancellableTimer(2000, 1000, {}) {
@@ -182,14 +182,14 @@ class UserInfoFragment : BaseFragment<FragmentUserInfoBinding>() {
             binding.tipTv.isVisible = faceSize > 1 || alive == false
             logger.info("人脸检测结果: ${bitmap == null},$faceSize,$alive")
             if (faceSize > 1) {
-                binding.tipTv.text = getString(R.string.only_one_person_allowed)
+                binding.tipTv.text = CommonUtils.getStr("only_one_person_allowed")
                 ArcSoftUtil.inDetecting = false
                 stopCountDown()
                 return@initCamera
             }
             if (alive == false) {
                 binding.tipTv.text =
-                    getString(R.string.real_person_verification_required)
+                    CommonUtils.getStr("real_person_verification_required")
                 ArcSoftUtil.inDetecting = false
                 stopCountDown()
                 return@initCamera
@@ -207,14 +207,14 @@ class UserInfoFragment : BaseFragment<FragmentUserInfoBinding>() {
 
     private fun startCountDown() {
         isInCountDown = true
-        binding.countDownTip.text = getString(R.string.detect_face_tip)
+        binding.countDownTip.text = CommonUtils.getStr("detect_face_tip")
         binding.countDownTip.isVisible = true
         captureTimer.start()
     }
 
     private fun stopCountDown() {
         isInCountDown = false
-        binding.countDownTip.text = getString(R.string.detect_face_tip)
+        binding.countDownTip.text = CommonUtils.getStr("detect_face_tip")
         binding.countDownTip.isVisible = false
         captureTimer.cancel()
     }

app/src/main/java/com/grkj/iscs/features/main/viewmodel/common/EditJobWorkflowSettingViewModel.kt

@@ -84,16 +84,20 @@ class EditJobWorkflowSettingViewModel @Inject constructor(
         if (currentStep?.enableAddColocker == true) {
             val str = SIKCore.getApplication().getString(
                 R.string.add_colocker,
-                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else SIKCore.getApplication()
-                    .getString(R.string.navigate_to_step, currentStep?.gotoStepAfterAddingColocker)
+                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else CommonUtils.getStr(
+                    "navigate_to_step",
+                    currentStep?.gotoStepAfterAddingColocker
+                )
             )
             stepFunction.add(str)
         }
         if (currentStep?.enableReduceColocker == true) {
             val str = SIKCore.getApplication().getString(
                 R.string.reduce_colocker,
-                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else SIKCore.getApplication()
-                    .getString(R.string.navigate_to_step, currentStep?.gotoStepAfterAddingColocker)
+                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else CommonUtils.getStr(
+                    "navigate_to_step",
+                    currentStep?.gotoStepAfterAddingColocker
+                )
             )
             stepFunction.add(str)
         }

app/src/main/java/com/grkj/iscs/features/main/viewmodel/common/EditSopWorkflowSettingViewModel.kt

@@ -84,16 +84,14 @@ class EditSopWorkflowSettingViewModel @Inject constructor(
         if (currentStep?.enableAddColocker == true) {
             val str = SIKCore.getApplication().getString(
                 R.string.add_colocker,
-                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else SIKCore.getApplication()
-                    .getString(R.string.navigate_to_step, currentStep?.gotoStepAfterAddingColocker)
+                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else CommonUtils.getStr("navigate_to_step", currentStep?.gotoStepAfterAddingColocker)
             )
             stepFunction.add(str)
         }
         if (currentStep?.enableReduceColocker == true) {
             val str = SIKCore.getApplication().getString(
                 R.string.reduce_colocker,
-                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else SIKCore.getApplication()
-                    .getString(R.string.navigate_to_step, currentStep?.gotoStepAfterAddingColocker)
+                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else CommonUtils.getStr("navigate_to_step", currentStep?.gotoStepAfterAddingColocker)
             )
             stepFunction.add(str)
         }

app/src/main/java/com/grkj/iscs/features/main/viewmodel/common/WorkflowSettingViewModel.kt

@@ -81,16 +81,20 @@ class WorkflowSettingViewModel @Inject constructor(
         if (currentStep?.enableAddColocker == true) {
             val str = SIKCore.getApplication().getString(
                 R.string.add_colocker,
-                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else SIKCore.getApplication()
-                    .getString(R.string.navigate_to_step, currentStep?.gotoStepAfterAddingColocker)
+                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else CommonUtils.getStr(
+                    "navigate_to_step",
+                    currentStep?.gotoStepAfterAddingColocker
+                )
             )
             stepFunction.add(str)
         }
         if (currentStep?.enableReduceColocker == true) {
             val str = SIKCore.getApplication().getString(
                 R.string.reduce_colocker,
-                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else SIKCore.getApplication()
-                    .getString(R.string.navigate_to_step, currentStep?.gotoStepAfterAddingColocker)
+                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else CommonUtils.getStr(
+                    "navigate_to_step",
+                    currentStep?.gotoStepAfterAddingColocker
+                )
             )
             stepFunction.add(str)
         }

ui-base/src/main/java/com/grkj/ui_base/utils/CommonUtils.kt

@@ -33,11 +33,11 @@ object CommonUtils {
     fun getStr(textKey: String): String {
         return I18nManager.t(textKey)
     }
-    
+
     /**
      * 获取资源文本
      */
-    fun getStr(textKey: String, vararg args: Any): String {
+    fun getStr(textKey: String, vararg args: Any?): String {
         val argMap = args.withIndex().associate { it.index.toString() to it.value }
         return I18nManager.t(textKey, argMap)
     }