refactor(更新)

- 统一使用`CommonUtils.getStr`获取字符串资源
- 统一使用`showToast`替代`PopTip`显示提示信息
- 调整`QuickEntranceConfigDialog`中`FlexboxLayoutManager`的对齐方式

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

@@ -19,6 +19,7 @@ import com.grkj.iscs.features.login.activity.LoginActivity
 import com.grkj.shared.model.EventBean
 import com.grkj.shared.utils.KeyboardUtils
 import com.grkj.ui_base.base.BaseFragment
+import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.event.CardSwipeEvent
 import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.extension.saveMMKVData
@@ -112,7 +113,7 @@ class InitPointRfidRegistrationFragment : BaseFragment<FragmentInitPointRfidRegi
             EventConstants.EVENT_CARD_SWIPE -> {
                 val cardSwipeEvent = (event.data as CardSwipeEvent)
                 if (pointRfidData.contains(cardSwipeEvent.cardNo)) {
-                    PopTip.tip(R.string.rfid_already_registration)
+                    showToast(CommonUtils.getStr("rfid_already_registration"))
                     return
                 }
                 pointRfidData.add(cardSwipeEvent.cardNo)

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

@@ -45,7 +45,7 @@ class InitSetAdminAccountFragment : BaseFragment<FragmentInitSetAdminAccountBind
 
     private fun checkData(): Boolean {
         if (binding.adminUsernameEt.text.toString().isEmpty()) {
-            PopTip.tip(R.string.please_input_admin_username)
+            showToast(CommonUtils.getStr("please_input_admin_username"))
             return false
         }
         val username = binding.adminUsernameEt.text.toString()
@@ -54,11 +54,11 @@ class InitSetAdminAccountFragment : BaseFragment<FragmentInitSetAdminAccountBind
             return false
         }
         if (binding.passwordEt.text.toString().isEmpty()) {
-            PopTip.tip(com.grkj.ui_base.R.string.please_input_password)
+            showToast(CommonUtils.getStr("please_input_password"))
             return false
         }
         if (binding.repeatPasswordEt.text.toString().isEmpty()) {
-            PopTip.tip(R.string.please_input_repeat_password)
+            showToast(CommonUtils.getStr("please_input_repeat_password"))
             return false
         }
         val password = binding.passwordEt.text.toString()

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

@@ -6,6 +6,7 @@ import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentInitSetRemoteServerBinding
 import com.grkj.iscs.utils.ServerUtils
 import com.grkj.ui_base.base.BaseFragment
+import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.event.RestartAppEvent
 import com.kongzue.dialogx.dialogs.PopTip
 import com.sik.sikcore.extension.saveMMKVData
@@ -41,12 +42,12 @@ class InitSetRemoteServerFragment : BaseFragment<FragmentInitSetRemoteServerBind
     private fun checkData(): Boolean {
         serverAddress = binding.serverAddressEt.text.toString().lowercase()
         if (serverAddress?.isEmpty() == true) {
-            PopTip.tip(R.string.please_input_remote_server_address)
+            showToast(CommonUtils.getStr("please_input_remote_server_address"))
             return false
         }
         serverAddress = ServerUtils.normalizeServerUrl(serverAddress ?: "")
         if (serverAddress == null) {
-            PopTip.tip(R.string.server_address_error)
+            showToast(CommonUtils.getStr("server_address_error"))
             return false
         }
         return true

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

@@ -37,15 +37,15 @@ class LoginDialog(
     private var inFaceChecking: Boolean = false
     private val mPairList = mutableListOf(
         Pair(
-            SIKCore.getApplication().getString(com.grkj.ui_base.R.string.please_scan_face),
+            CommonUtils.getStr("please_scan_face"),
             R.mipmap.icon_login_menu_face
         ),
         Pair(
-            SIKCore.getApplication().getString(com.grkj.ui_base.R.string.please_scan_fingerprint),
+            CommonUtils.getStr("please_scan_fingerprint"),
             R.mipmap.icon_login_menu_fingerprint
         ),
         Pair(
-            SIKCore.getApplication().getString(com.grkj.ui_base.R.string.please_swipe_card),
+            CommonUtils.getStr("please_swipe_card"),
             R.mipmap.icon_login_menu_card
         )
     )
@@ -196,7 +196,7 @@ class LoginDialog(
                     }
                 }
                 LoadingEvent.sendLoadingEvent(
-                    context.getString(com.grkj.ui_base.R.string.face_detected_do_login),
+                    CommonUtils.getStr("face_detected_do_login"),
                     true
                 )
             }

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

@@ -35,13 +35,13 @@ class CheckFaceDialog(
     private var dialog: CustomDialog? = null
     private val mPairList = mutableListOf(
         Pair(
-            SIKCore.getApplication().getString(com.grkj.ui_base.R.string.please_scan_face),
+            CommonUtils.getStr("please_scan_face"),
             R.mipmap.icon_login_menu_face
         ), Pair(
-            SIKCore.getApplication().getString(com.grkj.ui_base.R.string.please_scan_fingerprint),
+            CommonUtils.getStr("please_scan_fingerprint"),
             R.mipmap.icon_login_menu_fingerprint
         ), Pair(
-            SIKCore.getApplication().getString(com.grkj.ui_base.R.string.please_swipe_card),
+            CommonUtils.getStr("please_swipe_card"),
             R.mipmap.icon_login_menu_card
         )
     )
@@ -113,7 +113,7 @@ class CheckFaceDialog(
                                 customDialog.dismiss()
                                 callBack?.invoke(it)
                             } else {
-                                PopTip.tip(R.string.verify_failed)
+                                PopTip.tip(CommonUtils.getStr("verify_failed"))
                             }
                         }
 
@@ -171,16 +171,14 @@ class CheckFaceDialog(
                             ArcSoftUtil.stop()
                             dialog?.dismiss()
                             callBack?.invoke(it)
-                            PopTip.tip(R.string.face_login_failed)
+                            PopTip.tip(CommonUtils.getStr("face_login_failed"))
                         } else {
                             ArcSoftUtil.stop()
                             dialog?.dismiss()
                             callBack?.invoke(it)
                         }
                     }
-                    LoadingEvent.sendLoadingEvent(
-                        context.getString(com.grkj.ui_base.R.string.doing_checking), true
-                    )
+                    LoadingEvent.sendLoadingEvent(CommonUtils.getStr("doing_checking"))
                 }
             }
         }

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

@@ -18,7 +18,7 @@ import com.sik.sikcore.extension.setDebouncedClickListener
 class ColockOperationTipDialog() : OnBindView<CustomDialog>(R.layout.dialog_colock_operation_tip) {
     private val mPairList = mutableListOf(
         Pair(
-            SIKCore.getApplication().getString(com.grkj.ui_base.R.string.please_swipe_card),
+            CommonUtils.getStr("please_swipe_card"),
             R.mipmap.icon_login_menu_card
         )
     )

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

@@ -108,7 +108,6 @@ class QuickEntranceConfigDialog(private val save: (String) -> Unit) :
         binding.allRvList.apply {
             layoutManager = FlexboxLayoutManager(context).apply {
                 flexDirection = FlexDirection.ROW        // 横向布局
-                justifyContent = JustifyContent.CENTER   // 主轴居中
                 alignItems = AlignItems.CENTER           // 交叉轴居中
             }
         }.setup {

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

@@ -99,11 +99,11 @@ class UpdateUserDialog(
             val name = binding.nicknameEt.text.trim().toString()
             val card = binding.cardcodeEt.text.trim().toString()
             if (name.isBlank()) return@setDebouncedClickListener PopTip.build()
-                .tip(R.string.please_input_nickname)
+                .tip(CommonUtils.getStr("please_input_nickname"))
             if (selectedRoles.isEmpty()) return@setDebouncedClickListener PopTip.build()
-                .tip(R.string.please_select_role)
+                .tip(CommonUtils.getStr("please_select_role"))
             if (ISCSConfig.isWorkstationOn && selectedWorkstations.isEmpty()) return@setDebouncedClickListener PopTip.build()
-                .tip(R.string.please_select_area)
+                .tip(CommonUtils.getStr("please_select_area"))
             val isActive = binding.statusRg.checkedRadioButtonId == binding.activateRb.id
             val updateVo = UpdateUserDataVo(
                 userVo.userId,

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

@@ -26,14 +26,14 @@ class SlotsExceptionReportDialog(
         binding = DialogSlotsExceptionReportBinding.bind(contentView)
         dialog?.isCancelable = false
         dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.scrim))
-        binding.hardwareInfo.text = context.getString(
-            com.grkj.ui_base.R.string.hardware_info,
-            "${getDeviceTypeStr(slotType)},${context.getString(com.grkj.ui_base.R.string.number)} 行${row},列${col}"
+        binding.hardwareInfo.text = CommonUtils.getStr(
+            "hardware_info",
+            "${getDeviceTypeStr(slotType)},${CommonUtils.getStr("number")} 行${row},列${col}"
         )
         binding.confirmBtn.setDebouncedClickListener {
             val exceptionReason = binding.exceptionEt.text?.toString()
             if (exceptionReason?.isEmpty() == true) {
-                PopTip.tip(com.grkj.ui_base.R.string.please_input_exception_reason)
+                PopTip.tip(CommonUtils.getStr("please_input_exception_reason"))
                 return@setDebouncedClickListener
             }
             onConfirm(exceptionReason!!)
@@ -47,9 +47,9 @@ class SlotsExceptionReportDialog(
 
     private fun getDeviceTypeStr(slotType: Int): String {
         return when (slotType) {
-            0 -> context.getString(com.grkj.ui_base.R.string.hardware_key)
-            1 -> context.getString(com.grkj.ui_base.R.string.hardware_lock)
-            else -> context.getString(com.grkj.ui_base.R.string.hardware_unknown)
+            0 -> CommonUtils.getStr("hardware_key")
+            1 -> CommonUtils.getStr("hardware_lock")
+            else -> CommonUtils.getStr("hardware_unknown")
         }
     }
 

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

@@ -72,7 +72,7 @@ class EditJobWorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingB
                 return@setDebouncedClickListener
             }
             viewModel.saveStepsData().observe(this) {
-                PopTip.tip(com.grkj.ui_base.R.string.save_success)
+                showToast(CommonUtils.getStr("save_success"))
                 resetFormDirty()
             }
         }
@@ -127,7 +127,7 @@ class EditJobWorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingB
                     )
                 }
             if (filterUsers.isEmpty()) {
-                PopTip.tip(R.string.current_role_no_user)
+                showToast(CommonUtils.getStr("current_role_no_user"))
                 return@setDebouncedClickListener
             }
             TextDropDownDialog.showSingle(filterUsers.map {
@@ -247,7 +247,7 @@ class EditJobWorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingB
         viewModel.getSettingData().observe(this) {
             viewModel.getWorkflowSteps().observe(this) {
                 if (viewModel.workflowSteps.isEmpty()) {
-                    PopTip.tip(R.string.current_workflow_mode_error)
+                    showToast(CommonUtils.getStr("current_workflow_mode_error"))
                     navController.popBackStack()
                     return@observe
                 }

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

@@ -72,7 +72,7 @@ class EditSopWorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingB
                 return@setDebouncedClickListener
             }
             viewModel.saveStepsData().observe(this) {
-                PopTip.tip(com.grkj.ui_base.R.string.save_success)
+                showToast(CommonUtils.getStr("save_success"))
                 resetFormDirty()
             }
         }
@@ -127,7 +127,7 @@ class EditSopWorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingB
                     )
                 }
             if (filterUsers.isEmpty()) {
-                PopTip.tip(R.string.current_role_no_user)
+                showToast(CommonUtils.getStr("current_role_no_user"))
                 return@setDebouncedClickListener
             }
             TextDropDownDialog.showSingle(filterUsers.map {
@@ -247,7 +247,7 @@ class EditSopWorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingB
         viewModel.getSettingData().observe(this) {
             viewModel.getWorkflowSteps().observe(this) {
                 if (viewModel.workflowSteps.isEmpty()) {
-                    PopTip.tip(R.string.current_workflow_mode_error)
+                    showToast(CommonUtils.getStr("current_workflow_mode_error"))
                     navController.popBackStack()
                     return@observe
                 }

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

@@ -372,8 +372,8 @@ class SelectMemberFragment : BaseFragment<FragmentSelectMemeberBinding>() {
             if (selectedLockerData.isNotEmpty()) {
                 viewModel.currentSelectGroup = selectedLockerData.firstOrNull()?.jobTicketGroupInfo
                 binding.selectMemberTip.text =
-                    getString(
-                        R.string.select_locker_tip,
+                    CommonUtils.getStr(
+                        "select_locker_tip",
                         viewModel.currentSelectGroup?.groupName ?: ""
                     )
             }

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

@@ -66,8 +66,8 @@ class SelectPointFragment : BaseFragment<FragmentSelectPointBinding>() {
             viewModel.selectedPointData.add(
                 JobTicketGroupDataVo(
                     JobTicketGroupInfoVo(
-                        groupName = getString(
-                            R.string.new_group,
+                        groupName = CommonUtils.getStr(
+                            "new_group",
                             viewModel.selectedPointData.size
                         )
                     ), mutableListOf()

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

@@ -70,7 +70,7 @@ class WorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingBinding>
                 return@setDebouncedClickListener
             }
             viewModel.saveStepsData().observe(this) {
-                PopTip.tip(com.grkj.ui_base.R.string.save_success)
+                showToast(CommonUtils.getStr("save_success"))
                 resetFormDirty()
             }
         }
@@ -129,7 +129,7 @@ class WorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingBinding>
                     )
                 }
             if (filterUsers.isEmpty()) {
-                PopTip.tip(R.string.current_role_no_user)
+                showToast(CommonUtils.getStr("current_role_no_user"))
                 return@setDebouncedClickListener
             }
             TextDropDownDialog.showSingle(filterUsers.map {
@@ -247,7 +247,7 @@ class WorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingBinding>
         viewModel.getSettingData().observe(this) {
             viewModel.getWorkflowSteps().observe(this) {
                 if (viewModel.workflowSteps.isEmpty()) {
-                    PopTip.tip(R.string.current_workflow_mode_error)
+                    showToast(CommonUtils.getStr("current_workflow_mode_error"))
                     navController.popBackStack()
                     return@observe
                 }

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

@@ -389,12 +389,12 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
     override fun initData() {
         super.initData()
         if (!GlobalDataTempStore.getInstance().hasData(DataTransferConstants.KEY_JOB_TICKET_ID)) {
-            PopTip.tip(R.string.job_lost)
+            showToast(CommonUtils.getStr("job_lost"))
             navController.popBackStack()
             return
         }
         if (!GlobalDataTempStore.getInstance().hasData(DataTransferConstants.KEY_EXCEPTION_ID)) {
-            PopTip.tip(R.string.exception_lost)
+            showToast(CommonUtils.getStr("exception_lost"))
             navController.popBackStack()
             return
         }
@@ -403,12 +403,12 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
         val exceptionId = GlobalDataTempStore.getInstance()
             .getData<Long>(DataTransferConstants.KEY_EXCEPTION_ID)
         if (ticketId == null) {
-            PopTip.tip(R.string.job_lost)
+            showToast(CommonUtils.getStr("job_lost"))
             navController.popBackStack()
             return
         }
         if (exceptionId == null) {
-            PopTip.tip(R.string.exception_lost)
+            showToast(CommonUtils.getStr("exception_lost"))
             navController.popBackStack()
             return
         }
@@ -472,20 +472,20 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
             binding.waitToColockRv.models =
                 it.filter { it.jobStatus == "0" && it.userRole == RoleEnum.JTCOLOCKER.roleKey }
             binding.waitToColock.text =
-                getString(
-                    R.string.wait_to_colock,
+                CommonUtils.getStr(
+                    "wait_to_colock",
                     it.count { it.jobStatus == "0" && it.userRole == RoleEnum.JTCOLOCKER.roleKey })
             binding.alreadyColockRv.models =
                 it.filter { it.jobStatus == "1" && it.userRole == RoleEnum.JTCOLOCKER.roleKey }
             binding.alreadyColock.text =
-                getString(
-                    R.string.already_colock,
+                CommonUtils.getStr(
+                    "already_colock",
                     it.count { it.jobStatus == "1" && it.userRole == RoleEnum.JTCOLOCKER.roleKey })
             binding.alreadyUncolockRv.models =
                 it.filter { it.jobStatus == "2" && it.userRole == RoleEnum.JTCOLOCKER.roleKey }
             binding.alreadyUncolock.text =
-                getString(
-                    R.string.already_uncolock,
+                CommonUtils.getStr(
+                    "already_uncolock",
                     it.count { it.jobStatus == "2" && it.userRole == RoleEnum.JTCOLOCKER.roleKey })
         }
     }

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

@@ -160,7 +160,7 @@ class CardManageFragment : BaseFragment<FragmentCardManageBinding>() {
      */
     private fun deleteSelectedCards() {
         if (viewModel.cardManageDataList.none { it.isSelected }) {
-            PopTip.tip(R.string.please_select_card); return
+            showToast(CommonUtils.getStr("please_select_card")); return
         }
         TipDialog.show(
             msg = CommonUtils.getStr("check_delete_card"),

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

@@ -189,7 +189,7 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
 
     private fun deleteSelected() {
         if (viewModel.keyManageDataList.none { it.isSelected }) {
-            PopTip.tip(R.string.please_select_key)
+            showToast(CommonUtils.getStr("please_select_key"))
             return
         }
         viewModel.checkKeyInUse().observe(this){

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

@@ -157,7 +157,7 @@ class LockManageFragment : BaseFragment<FragmentLockManageBinding>() {
 
     private fun deleteSelectedLocks() {
         if (viewModel.lockManageDataList.none { it.isSelected }) {
-            PopTip.tip(R.string.please_select_lock); return
+            showToast(CommonUtils.getStr("please_select_lock")); return
         }
         viewModel.lockInUse().observe(this){
             if (!it){

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

@@ -160,7 +160,7 @@ class RfidTokenManageFragment : BaseFragment<FragmentRfidTokenManageBinding>() {
 
     private fun deleteSelectedTokens() {
         if (viewModel.rfidTokenManageDataList.none { it.isSelected }) {
-            PopTip.tip(R.string.please_select_rfid_token); return
+            showToast(CommonUtils.getStr("please_select_rfid_token")); return
         }
         if (viewModel.rfidTokenManageDataList.map { it.rfidId }
                 .any { it in viewModel.inUseRfidIds }) {

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

@@ -141,7 +141,7 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
         }
         binding.noSelectedPointLayout.setDebouncedClickListener {
             if (selectedWorkstationId == null) {
-                PopTip.tip(R.string.please_select_job_workstation)
+                showToast(CommonUtils.getStr("please_select_job_workstation"))
                 return@setDebouncedClickListener
             }
             GlobalDataTempStore.getInstance()
@@ -171,11 +171,11 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
         }
         binding.noSelectedMemberLayout.setDebouncedClickListener {
             if (selectedWorkstationId == null) {
-                PopTip.tip(R.string.please_select_job_workstation)
+                showToast(CommonUtils.getStr("please_select_job_workstation"))
                 return@setDebouncedClickListener
             }
             if (selectedModeId == null) {
-                PopTip.tip(R.string.please_select_flow_mode)
+                showToast(CommonUtils.getStr("please_select_flow_mode"))
                 return@setDebouncedClickListener
             }
             GlobalDataTempStore.getInstance().saveData(
@@ -215,7 +215,7 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
         }
         binding.workflowModeSettingTv.setDebouncedClickListener {
             if (selectedModeId == null) {
-                PopTip.tip(R.string.please_select_workflow_mode)
+                showToast(CommonUtils.getStr("please_select_workflow_mode"))
                 return@setDebouncedClickListener
             }
             GlobalDataTempStore.getInstance()
@@ -237,7 +237,7 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
         }
         binding.selectPointTv.setDebouncedClickListener {
             if (selectedWorkstationId == null) {
-                PopTip.tip(R.string.please_select_job_workstation)
+                showToast(CommonUtils.getStr("please_select_job_workstation"))
                 return@setDebouncedClickListener
             }
             GlobalDataTempStore.getInstance()
@@ -267,11 +267,11 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
         }
         binding.selectMemberTv.setDebouncedClickListener {
             if (selectedWorkstationId == null) {
-                PopTip.tip(R.string.please_select_job_workstation)
+                showToast(CommonUtils.getStr("please_select_job_workstation"))
                 return@setDebouncedClickListener
             }
             if (selectedModeId == null) {
-                PopTip.tip(R.string.please_select_flow_mode)
+                showToast(CommonUtils.getStr("please_select_flow_mode"))
                 return@setDebouncedClickListener
             }
 
@@ -445,28 +445,28 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
      */
     private fun checkData(): Boolean {
         if (selectedWorkstationId == null) {
-            PopTip.tip(R.string.please_select_job_workstation)
+            showToast(CommonUtils.getStr("please_select_job_workstation"))
             return false
         }
         if (selectedModeId == null) {
-            PopTip.tip(R.string.please_select_flow_mode)
+            showToast(CommonUtils.getStr("please_select_flow_mode"))
             return false
         }
         if (binding.jobNameEt.text.isEmpty()) {
-            PopTip.tip(R.string.please_input_job_name)
+            showToast(CommonUtils.getStr("please_input_job_name"))
             return false
         }
         if (selectedPointData.isEmpty()) {
-            PopTip.tip(R.string.please_must_select_at_least_one_point)
+            showToast(CommonUtils.getStr("please_must_select_at_least_one_point"))
             return false
         }
         if (selectedLockerData.map { it.jobTicketGroupDataList }.any { it.isEmpty() }) {
-            PopTip.tip(com.grkj.ui_base.R.string.select_locker)
+            showToast(CommonUtils.getStr("select_locker"))
             return false
         }
         if (viewModel.workflowModes.find { it.modeId == selectedModeId }?.isColockSupport == true && selectedColockerData.isEmpty()
         ) {
-            PopTip.tip(com.grkj.ui_base.R.string.select_coloker)
+            showToast(CommonUtils.getStr("select_coloker"))
             return false
         }
         return true

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

@@ -335,27 +335,27 @@ class CreateSopFragment : BaseFormFragment<FragmentCreateSopBinding>() {
      */
     private fun checkData(): Boolean {
         if (selectedWorkstationId == null) {
-            PopTip.tip(R.string.please_select_sop_workstation)
+            showToast(CommonUtils.getStr("please_select_sop_workstation"))
             return false
         }
         if (selectedModeId == null) {
-            PopTip.tip(R.string.please_select_flow_mode)
+            showToast(CommonUtils.getStr("please_select_flow_mode"))
             return false
         }
         if (binding.sopNameEt.text.isEmpty()) {
-            PopTip.tip(R.string.please_input_sop_name)
+            showToast(CommonUtils.getStr("please_input_sop_name"))
             return false
         }
         if (selectedPointData.isEmpty()) {
-            PopTip.tip(R.string.please_must_select_at_least_one_point)
+            showToast(CommonUtils.getStr("please_must_select_at_least_one_point"))
             return false
         }
         if (selectedLockerData.map { it.jobTicketGroupDataList }.any { it.isEmpty() }) {
-            PopTip.tip(com.grkj.ui_base.R.string.select_locker)
+            showToast(CommonUtils.getStr("select_locker"))
             return false
         }
         if (viewModel.workflowModes.find { it.modeId == selectedModeId }?.isColockSupport == true && selectedColockerData.isEmpty()) {
-            PopTip.tip(com.grkj.ui_base.R.string.select_coloker)
+            showToast(CommonUtils.getStr("select_coloker"))
             return false
         }
         return true

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

@@ -125,7 +125,7 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
         }
         binding.workflowModeSettingTv.setDebouncedClickListener {
             if (selectedSop == null) {
-                PopTip.tip(R.string.please_select_sop)
+                showToast(CommonUtils.getStr("please_select_sop"))
                 return@setDebouncedClickListener
             }
             GlobalDataTempStore.getInstance()
@@ -147,7 +147,7 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
         }
         binding.sopTv.setDebouncedClickListener {
             if (selectedWorkstationId == null) {
-                PopTip.tip(R.string.please_select_sop_workstation)
+                showToast(CommonUtils.getStr("please_select_sop_workstation"))
                 return@setDebouncedClickListener
             } else {
                 viewModel.getSopByWorkstation(selectedWorkstationId!!).observe(this) {
@@ -157,7 +157,7 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
         }
         binding.selectMemberTv.setDebouncedClickListener {
             if (selectedWorkstationId == null) {
-                PopTip.tip(R.string.please_select_sop_workstation)
+                showToast(CommonUtils.getStr("please_select_sop_workstation"))
                 return@setDebouncedClickListener
             }
             GlobalDataTempStore.getInstance().saveData(
@@ -310,25 +310,25 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
      */
     private fun checkData(): Boolean {
         if (selectedWorkstationId == null) {
-            PopTip.tip(R.string.please_select_sop_workstation)
+            showToast(CommonUtils.getStr("please_select_sop_workstation"))
             return false
         }
         if (selectedSopId == null) {
-            PopTip.tip(R.string.please_select_sop)
+            showToast(CommonUtils.getStr("please_select_sop"))
             return false
         }
         if (binding.jobNameEt.text.isEmpty()) {
-            PopTip.tip(R.string.please_input_job_name)
+            showToast(CommonUtils.getStr("please_input_job_name"))
             return false
         }
         if (selectedLockerData.map { it.jobTicketGroupDataList }.any { it.isEmpty() }) {
-            PopTip.tip(com.grkj.ui_base.R.string.select_locker)
+            showToast(CommonUtils.getStr("select_locker"))
             return false
         }
         if (viewModel.workflowModes.find { it.modeId == selectedSop?.modeId }?.isColockSupport == true &&
             selectedColockerData.isEmpty()
         ) {
-            PopTip.tip(com.grkj.ui_base.R.string.select_coloker)
+            showToast(CommonUtils.getStr("select_coloker"))
             return false
         }
         return true

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

@@ -265,9 +265,9 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
                         return@observe
                     }
                     if (item.stepId != viewModel.currentStepData?.stepId && !workflowStep.enableSetLocker && !workflowStep.enableSetColocker) {
-                        PopTip(
-                            getString(
-                                R.string.please_done_operation,
+                        showToast(
+                            CommonUtils.getStr(
+                                "please_done_operation",
                                 viewModel.currentStepData?.androidStepContent
                             )
                         )
@@ -443,7 +443,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
 
             "2" -> {
                 itemBinding.lockStatusTv.setTextColor(
-                    CommonUtils.getColor( com.grkj.ui_base.R.attr.colorWhite)
+                    CommonUtils.getColor(com.grkj.ui_base.R.attr.colorWhite)
                 )
                 itemBinding.lockStatusLayout.setBackgroundResource(R.drawable.bg_btn_job_execute_go_unlocking)
                 itemBinding.lockStatusIv.setImageResource(R.drawable.icon_ticket_unlock)
@@ -495,12 +495,10 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
                                                 viewModel.colockerStatusChange(colocker)
                                                     .observe(this) {
                                                         if (it) {
-                                                            PopTip.build()
-                                                                .tip(R.string.colock_complete)
+                                                            showToast(CommonUtils.getStr("colock_complete"))
                                                             checkStepComplete()
                                                         } else {
-                                                            PopTip.build()
-                                                                .tip(R.string.colock_failed)
+                                                            showToast(CommonUtils.getStr("colock_failed"))
                                                         }
                                                         refreshTicketUser()
                                                     }
@@ -516,19 +514,16 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
                                                 viewModel.colockerStatusChange(colocker)
                                                     .observe(this) {
                                                         if (it) {
-                                                            PopTip.build()
-                                                                .tip(R.string.uncolock_complete)
+                                                            showToast(CommonUtils.getStr("uncolock_complete"))
                                                             checkStepComplete()
                                                         } else {
-                                                            PopTip.build()
-                                                                .tip(R.string.uncolock_failed)
+                                                            showToast(CommonUtils.getStr("uncolock_failed"))
                                                         }
                                                         refreshTicketUser()
                                                     }
                                             })
                                     } else {
-                                        PopTip.build()
-                                            .tip(R.string.currently_unable_to_lock_together)
+                                        showToast(CommonUtils.getStr("currently_unable_to_lock_together"))
                                     }
                                 } ?: showToast(CommonUtils.getStr("invalid_user"))
                             } ?: showToast(CommonUtils.getStr("invalid_card"))
@@ -546,8 +541,8 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
 
             EventConstants.EVENT_TICKET_FINISHED -> {
                 TipDialog.show(
-                    title = getString(com.grkj.ui_base.R.string.action_hint),
-                    msg = getString(com.grkj.ui_base.R.string.job_already_finished),
+                    title = CommonUtils.getStr("action_hint"),
+                    msg = CommonUtils.getStr("job_already_finished"),
                     dialogType = TipDialog.DialogType.ERROR,
                     showCancel = false,
                     onConfirmClick = {
@@ -597,7 +592,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
         binding.cancelJob.isVisible = false
         binding.finishJob.isVisible = false
         FlashTipEvent.sendFlashTipEvent(viewModel.getCurrentStepTip())
-        viewModel.checkMyTodoForHandleKey().observe(this){}
+        viewModel.checkMyTodoForHandleKey().observe(this) {}
         binding.lockInfo.text =
             "${viewModel.ticketPoints.size}/${viewModel.ticketPoints.count { it.pointStatus?.toInt() ?: 0 >= 1 }}/${viewModel.ticketPoints.count { it.pointStatus == "2" }}"
         binding.colockInfo.text =
@@ -681,18 +676,18 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
         viewModel.ticketUser.let {
             binding.waitToColockRv.models =
                 it.filter { it.jobStatus == "0" && it.userRole == RoleEnum.JTCOLOCKER.roleKey }
-            binding.waitToColock.text = getString(
-                R.string.wait_to_colock,
+            binding.waitToColock.text = CommonUtils.getStr(
+                "wait_to_colock",
                 it.count { it.jobStatus == "0" && it.userRole == RoleEnum.JTCOLOCKER.roleKey })
             binding.alreadyColockRv.models =
                 it.filter { it.jobStatus == "1" && it.userRole == RoleEnum.JTCOLOCKER.roleKey }
-            binding.alreadyColock.text = getString(
-                R.string.already_colock,
+            binding.alreadyColock.text = CommonUtils.getStr(
+                "already_colock",
                 it.count { it.jobStatus == "1" && it.userRole == RoleEnum.JTCOLOCKER.roleKey })
             binding.alreadyUncolockRv.models =
                 it.filter { it.jobStatus == "2" && it.userRole == RoleEnum.JTCOLOCKER.roleKey }
-            binding.alreadyUncolock.text = getString(
-                R.string.already_uncolock,
+            binding.alreadyUncolock.text = CommonUtils.getStr(
+                "already_uncolock",
                 it.count { it.jobStatus == "2" && it.userRole == RoleEnum.JTCOLOCKER.roleKey })
         }
     }

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

@@ -448,13 +448,11 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
                                                 jobExecuteViewModel.colockerStatusChange(colocker)
                                                     .observe(this) {
                                                         if (it) {
-                                                            PopTip.build()
-                                                                .tip(R.string.colock_complete)
+                                                            showToast(CommonUtils.getStr("colock_complete"))
                                                             checkStepComplete()
                                                             getData()
                                                         } else {
-                                                            PopTip.build()
-                                                                .tip(R.string.colock_failed)
+                                                           showToast(CommonUtils.getStr("colock_failed"))
                                                         }
                                                     }
                                             })
@@ -469,19 +467,16 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
                                                 jobExecuteViewModel.colockerStatusChange(colocker)
                                                     .observe(this) {
                                                         if (it) {
-                                                            PopTip.build()
-                                                                .tip(R.string.uncolock_complete)
+                                                            showToast(CommonUtils.getStr("uncolock_complete"))
                                                             checkStepComplete()
                                                             getData()
                                                         } else {
-                                                            PopTip.build()
-                                                                .tip(R.string.uncolock_failed)
+                                                            showToast(CommonUtils.getStr("uncolock_failed"))
                                                         }
                                                     }
                                             })
                                     } else {
-                                        PopTip.build()
-                                            .tip(R.string.currently_unable_to_lock_together)
+                                        showToast(CommonUtils.getStr("currently_unable_to_lock_together"))
                                     }
                                 } ?:
                                 showToast(CommonUtils.getStr("invalid_user"))

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

@@ -65,7 +65,7 @@ class SopManageFragment : BaseFragment<FragmentSopManageBinding>() {
 
     private fun deleteSelectedSop() {
         if (viewModel.sopManageDataList.none { it.isSelected }) {
-            PopTip.tip(R.string.please_select_sop)
+            showToast(CommonUtils.getStr("please_select_sop"))
             return
         }
         viewModel.checkSopHasOnGoingJob().observe(this) {

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

@@ -63,15 +63,15 @@ class ResetPasswordFragment : BaseFragment<FragmentResetPasswordBinding>() {
                 MainDomainData.userInfo?.password ?: ""
             )
         ) {
-            PopTip.tip(R.string.old_password_error)
+            showToast(CommonUtils.getStr("old_password_error"))
             return false
         }
         if (binding.oldPasswordEt.text.toString().isEmpty()) {
-            PopTip.tip(R.string.please_input_old_password)
+            showToast(CommonUtils.getStr("please_input_old_password"))
             return false
         }
         if (binding.newPasswordEt.text.toString().isEmpty()) {
-            PopTip.tip(R.string.please_input_new_password)
+            showToast(CommonUtils.getStr("please_input_new_password"))
             return false
         }
         if (!RegexUtils.isMatch(

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

@@ -61,8 +61,8 @@ class SetFingerprintFragment : BaseFragment<FragmentSetFingerprintBinding>() {
                 it.dismiss()
             }) {
                 pressTip = it
-                it.text = getString(
-                    com.grkj.ui_base.R.string.fingerprint_scan_tip,
+                it.text = CommonUtils.getStr(
+                    "fingerprint_scan_tip",
                     maxPressTimes - mFingerprintPressTimes
                 )
             }.apply {
@@ -150,14 +150,14 @@ class SetFingerprintFragment : BaseFragment<FragmentSetFingerprintBinding>() {
                         mFingerprintPressTimes++
                         if (mFingerprintPressTimes == maxPressTimes) {
                             dialog?.dismiss()
-                            showToast(getString(com.grkj.ui_base.R.string.fingerprint_add_success_tip))
+                            showToast(CommonUtils.getStr("fingerprint_add_success_tip"))
                             getData()
                         } else if (mFingerprintInputErrorTimes == inputFingerprintErrorTimes) {
                             mFingerprintGroupName = UUID.randomUUID().toString()
                             mFingerprintPressTimes = 0
                             mFingerprintInputErrorTimes = 0
-                            pressTip?.text = getString(
-                                com.grkj.ui_base.R.string.fingerprint_scan_tip,
+                            pressTip?.text = CommonUtils.getStr(
+                                "fingerprint_scan_tip",
                                 maxPressTimes - mFingerprintPressTimes
                             )
                             viewModel.deleteFingerprintByIds(inputFingerprintIds)
@@ -178,8 +178,8 @@ class SetFingerprintFragment : BaseFragment<FragmentSetFingerprintBinding>() {
                             mFingerprintGroupName = UUID.randomUUID().toString()
                             mFingerprintPressTimes = 0
                             mFingerprintInputErrorTimes = 0
-                            pressTip?.text = getString(
-                                com.grkj.ui_base.R.string.fingerprint_scan_tip,
+                            pressTip?.text = CommonUtils.getStr(
+                                "fingerprint_scan_tip",
                                 maxPressTimes - mFingerprintPressTimes
                             )
                             viewModel.deleteFingerprintByIds(inputFingerprintIds)

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

@@ -52,7 +52,7 @@ class SetJobCardFragment : BaseFragment<FragmentSetJobCardBinding>() {
                 viewModel.saveUserJobCard((event.data as RFIDCardReadEvent).rfidNo)
                     .observe(this@SetJobCardFragment) {
                         TipDialog.show(
-                            msg = getString(com.grkj.ui_base.R.string.save_success),
+                            msg = CommonUtils.getStr("save_success"),
                             onConfirmClick = {
                                 getData()
                             },

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

@@ -154,15 +154,15 @@ class UserInfoFragment : BaseFragment<FragmentUserInfoBinding>() {
 
     private fun checkData(): Boolean {
         if (binding.nicknameEt.text.toString().isEmpty()) {
-            PopTip.tip(R.string.please_input_nickname)
+            showToast(CommonUtils.getStr("please_input_nickname"))
             return false
         }
         if (binding.phoneEt.text.toString().isEmpty()) {
-            PopTip.tip(R.string.please_input_phone)
+            showToast(CommonUtils.getStr("please_input_phone"))
             return false
         }
         if (!RegexUtils.isMatch(binding.phoneEt.text.toString(), CommonConstants.REGEX_MOBILE)) {
-            PopTip.tip(R.string.please_input_correct_phone)
+            showToast(CommonUtils.getStr("please_input_correct_phone"))
             return false
         }
         return true

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

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

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

@@ -82,15 +82,15 @@ class EditSopWorkflowSettingViewModel @Inject constructor(
             stepFunction.add(CommonUtils.getStr("colock").toString())
         }
         if (currentStep?.enableAddColocker == true) {
-            val str = SIKCore.getApplication().getString(
-                R.string.add_colocker,
+            val str = CommonUtils.getStr(
+                "add_colocker",
                 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,
+            val str = CommonUtils.getStr(
+                "reduce_colocker",
                 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

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

ui-base/src/main/java/com/grkj/ui_base/business/ModbusBusinessManager.kt

@@ -182,8 +182,8 @@ object ModbusBusinessManager {
                                 if (mDeviceTakeList.any { it.deviceType == DeviceConst.DEVICE_TYPE_LOCK && it.ticketId == info.ticketId }) {
                                     logger.info("Waiting all locks to take out")
                                     LoadingEvent.sendLoadingEvent(
-                                        SIKCore.getApplication().getString(
-                                            R.string.take_out_lock_tip,
+                                        CommonUtils.getStr(
+                                            "take_out_lock_tip",
                                             mDeviceTakeList.count { it.deviceType == DeviceConst.DEVICE_TYPE_LOCK && it.ticketId == info.ticketId }),
                                         true
                                     )
@@ -194,7 +194,7 @@ object ModbusBusinessManager {
                                 }
                                 if (SPUtils.getTicketTakeLockException(info.ticketId)) {
                                     PopTip.build()
-                                        .tip(R.string.current_ticket_report_lock_take_exception_tip)
+                                        .tip(CommonUtils.getStr("current_ticket_report_lock_take_exception_tip"))
                                     logger.info("当前作业获取挂锁异常")
                                     return@runOnMain
                                 }