refactor(更新)

- 多语言适配

app/src/main/assets/i18n/en-US.csv

@@ -76,7 +76,7 @@ check_delete_role,text,删除角色时的二次确认弹窗文本,您确认要
 check_delete_sop,text,删除SOP时的二次确认弹窗文本,您确定要删除选中的SOP吗
 check_delete_user,text,删除用户时的二次确认弹窗文本,您确认要删除用户吗?
 check_delete_workflow_mode,text,删除流程模式时的二次确认弹窗文本,确定要删除选中的流程模式吗
-check_delete_workstation,text,删除区域时的二次确认弹窗文本,"您确定要删除区域\""{0}\""吗"
+check_delete_workstation,text,删除区域时的二次确认弹窗文本,您确定要删除区域"{0}"吗
 check_device_info,text,初始化界面检测硬件完成之后的检测信息结果文本,"检测到未注册钥匙{0}把,未注册挂锁{1}把"
 check_key_and_lock,text,初始化界面检测硬件时的文本,正在检查钥匙和挂锁
 check_lock_is_new_device,text,仓位管理检查挂锁的加载弹窗的文本,检查挂锁是否为新硬件
@@ -99,7 +99,7 @@ create_job_failed,text,处理异常之后新建作业创建时创建失败的弹
 create_job_name,text,创建作业/编辑作业的基本信息中的作业名称文本,作业名称
 create_job_title,text,新建作业的标题文本,新建作业
 create_sop_job_sop,text,新建SOP作业选择Sop文本,SOP
-create_sop_job_tip,text,保存并执行作业时的二次确认弹窗,"确定要执行作业\""{0}\""吗？"
+create_sop_job_tip,text,保存并执行作业时的二次确认弹窗,确定要执行作业"{0}"吗？
 create_sop_job_title,text,新建SOP作业标题,新建SOP作业
 create_sop_name,text,新建SOP的sop名称文本,SOP名称
 create_sop_title,text,新建SOP的标题,新建SOP
@@ -260,8 +260,8 @@ job_manage_delete_failed,text,作业管理删除作业失败时的弹窗提示
 job_manage_delete_succeed,text,作业管理删除作业成功时的弹窗提示文本,删除选中的作业成功
 job_manage_title,text,作业管理标题,作业管理
 job_name,text,作业观猎列表表头,作业名称
-job_save_and_execute_tip,text,保存并执行作业时二次确认弹窗文本,"确定要执行作业\""{0}\""吗？"
-job_save_tip,text,保存作业二次确认弹窗文本,"确定要保存作业\""{0}\""吗？"
+job_save_and_execute_tip,text,保存并执行作业时二次确认弹窗文本,确定要执行作业"{0}"吗？
+job_save_tip,text,保存作业二次确认弹窗文本,确定要保存作业"{0}"吗？
 job_status,text,锁定中的点位表头,作业状态
 job_workstation,text,创建/修改作业的基本信息的文本,作业区域
 key_exception_tag,text,还钥匙的时候如果钥匙异常提示,该钥匙已被标记异常
@@ -537,7 +537,7 @@ sop_manage_title,text,SOP管理标题,SOP管理
 sop_manage_workstation,text,SOP管理表头,所属岗位
 sop_save_failed,text,SOP保存失败时弹窗文本,SOP保存失败
 sop_save_succeed,text,SOP保存成功时弹窗文本,SOP保存成功
-sop_save_tip,text,SOP保存时二次确认弹窗文本,"确定要保存\""{0}\""吗？"
+sop_save_tip,text,SOP保存时二次确认弹窗文本,确定要保存"{0}"吗？
 sop_workstation,text,创建修改SOP作业界面SOP区域选择文本,SOP区域
 start,text,初始化欢迎界面开始按钮文本,开始
 start_detect_key_slot,text,仓位管理检测钥匙仓位开始时加载弹窗文本,开始检测钥匙仓位
@@ -628,8 +628,8 @@ workflow_step_title_short,text,流程模式设置项标题,步骤标题缩写
 workstation_already_exists,text,添加区域是检查同级是否已经存在区域，存在时弹窗文本,区域已存在
 workstation_is_in_bottom,text,区域下移时检测是否已经到底部，到底部提示文本,区域已经在底部
 workstation_is_in_top,text,区域上移时检测是否已经到顶部，到顶部提示文本,区域已经在顶部
-workstation_manage_delete_failed,text,区域删除时检查是否有正在使用的作业，有的话提示无法删除,"无法删除区域\""{0}\"""
-workstation_manage_delete_succeed,text,区域删除成功时提示,"删除区域\""{0}\""成功"
+workstation_manage_delete_failed,text,区域删除时检查是否有正在使用的作业，有的话提示无法删除,无法删除区域"{0}"
+workstation_manage_delete_succeed,text,区域删除成功时提示,删除区域"{0}"成功
 workstation_manage_new_workstation,text,新增区域标题,新增区域
 workstation_manage_title,text,区域管理标题,区域管理
 workstation_manage_workstation_name,text,新增区域显示文本,区域名称

app/src/main/assets/i18n/zh-CN.csv

@@ -76,7 +76,7 @@ check_delete_role,text,删除角色时的二次确认弹窗文本,您确认要
 check_delete_sop,text,删除SOP时的二次确认弹窗文本,您确定要删除选中的SOP吗
 check_delete_user,text,删除用户时的二次确认弹窗文本,您确认要删除用户吗?
 check_delete_workflow_mode,text,删除流程模式时的二次确认弹窗文本,确定要删除选中的流程模式吗
-check_delete_workstation,text,删除区域时的二次确认弹窗文本,"您确定要删除区域\""{0}\""吗"
+check_delete_workstation,text,删除区域时的二次确认弹窗文本,您确定要删除区域"{0}"吗
 check_device_info,text,初始化界面检测硬件完成之后的检测信息结果文本,"检测到未注册钥匙{0}把,未注册挂锁{1}把"
 check_key_and_lock,text,初始化界面检测硬件时的文本,正在检查钥匙和挂锁
 check_lock_is_new_device,text,仓位管理检查挂锁的加载弹窗的文本,检查挂锁是否为新硬件
@@ -99,7 +99,7 @@ create_job_failed,text,处理异常之后新建作业创建时创建失败的弹
 create_job_name,text,创建作业/编辑作业的基本信息中的作业名称文本,作业名称
 create_job_title,text,新建作业的标题文本,新建作业
 create_sop_job_sop,text,新建SOP作业选择Sop文本,SOP
-create_sop_job_tip,text,保存并执行作业时的二次确认弹窗,"确定要执行作业\""{0}\""吗？"
+create_sop_job_tip,text,保存并执行作业时的二次确认弹窗,确定要执行作业"{0}"吗？
 create_sop_job_title,text,新建SOP作业标题,新建SOP作业
 create_sop_name,text,新建SOP的sop名称文本,SOP名称
 create_sop_title,text,新建SOP的标题,新建SOP
@@ -260,8 +260,8 @@ job_manage_delete_failed,text,作业管理删除作业失败时的弹窗提示
 job_manage_delete_succeed,text,作业管理删除作业成功时的弹窗提示文本,删除选中的作业成功
 job_manage_title,text,作业管理标题,作业管理
 job_name,text,作业观猎列表表头,作业名称
-job_save_and_execute_tip,text,保存并执行作业时二次确认弹窗文本,"确定要执行作业\""{0}\""吗？"
-job_save_tip,text,保存作业二次确认弹窗文本,"确定要保存作业\""{0}\""吗？"
+job_save_and_execute_tip,text,保存并执行作业时二次确认弹窗文本,确定要执行作业"{0}"吗？
+job_save_tip,text,保存作业二次确认弹窗文本,确定要保存作业"{0}"吗？
 job_status,text,锁定中的点位表头,作业状态
 job_workstation,text,创建/修改作业的基本信息的文本,作业区域
 key_exception_tag,text,还钥匙的时候如果钥匙异常提示,该钥匙已被标记异常
@@ -537,7 +537,7 @@ sop_manage_title,text,SOP管理标题,SOP管理
 sop_manage_workstation,text,SOP管理表头,所属岗位
 sop_save_failed,text,SOP保存失败时弹窗文本,SOP保存失败
 sop_save_succeed,text,SOP保存成功时弹窗文本,SOP保存成功
-sop_save_tip,text,SOP保存时二次确认弹窗文本,"确定要保存\""{0}\""吗？"
+sop_save_tip,text,SOP保存时二次确认弹窗文本,"确定要保存"{0}"吗？
 sop_workstation,text,创建修改SOP作业界面SOP区域选择文本,SOP区域
 start,text,初始化欢迎界面开始按钮文本,开始
 start_detect_key_slot,text,仓位管理检测钥匙仓位开始时加载弹窗文本,开始检测钥匙仓位
@@ -628,8 +628,8 @@ workflow_step_title_short,text,流程模式设置项标题,步骤标题缩写
 workstation_already_exists,text,添加区域是检查同级是否已经存在区域，存在时弹窗文本,区域已存在
 workstation_is_in_bottom,text,区域下移时检测是否已经到底部，到底部提示文本,区域已经在底部
 workstation_is_in_top,text,区域上移时检测是否已经到顶部，到顶部提示文本,区域已经在顶部
-workstation_manage_delete_failed,text,区域删除时检查是否有正在使用的作业，有的话提示无法删除,"无法删除区域\""{0}\"""
-workstation_manage_delete_succeed,text,区域删除成功时提示,"删除区域\""{0}\""成功"
+workstation_manage_delete_failed,text,区域删除时检查是否有正在使用的作业，有的话提示无法删除,无法删除区域"{0}"
+workstation_manage_delete_succeed,text,区域删除成功时提示,删除区域"{0}"成功
 workstation_manage_new_workstation,text,新增区域标题,新增区域
 workstation_manage_title,text,区域管理标题,区域管理
 workstation_manage_workstation_name,text,新增区域显示文本,区域名称

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

@@ -16,6 +16,7 @@ import com.grkj.iscs.features.init.viewmodel.InitViewModel
 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.grkj.ui_base.utils.extension.tip
 import com.kongzue.dialogx.dialogs.PopTip
@@ -104,7 +105,7 @@ class InitCardRegistrationFragment : BaseFragment<FragmentInitCardRegistrationBi
             EventConstants.EVENT_CARD_SWIPE -> {
                 val cardSwipeEvent = (event.data as CardSwipeEvent)
                 if (cardRfidData.contains(cardSwipeEvent.cardNo)) {
-                    PopTip.build().tip(R.string.card_already_registration)
+                    showToast(CommonUtils.getStr("card_already_registration"))
                     return
                 }
                 cardRfidData.add(cardSwipeEvent.cardNo)

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

@@ -24,6 +24,7 @@ import com.grkj.iscs.features.init.model.DockData
 import com.grkj.iscs.features.init.viewmodel.InitDeviceRegistrationKeyAndLockViewModel
 import com.grkj.shared.model.EventBean
 import com.grkj.ui_base.base.BaseFragment
+import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.extension.tip
 import com.grkj.ui_base.utils.modbus.DeviceConst
 import com.grkj.ui_base.utils.modbus.DockBean
@@ -57,7 +58,7 @@ class InitDeviceRegistrationKeyAndLockFragment :
         }
         binding.nextBtn.setDebouncedClickListener {
             if (viewModel.isLoadComplete.value == false) {
-                PopTip.build().tip(R.string.device_in_detect)
+                showToast(CommonUtils.getStr("device_in_detect"))
                 return@setDebouncedClickListener
             }
             viewModel.deviceRegistrationData().observe(this) {

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

@@ -50,7 +50,7 @@ class InitSetAdminAccountFragment : BaseFragment<FragmentInitSetAdminAccountBind
         }
         val username = binding.adminUsernameEt.text.toString()
         if (!RegexUtils.isMatch(username, CommonConstants.REGEX_USERNAME)){
-            showToast(CommonUtils.getStr(R.string.username_regex_tip).toString())
+            showToast(CommonUtils.getStr("username_regex_tip"))
             return false
         }
         if (binding.passwordEt.text.toString().isEmpty()) {
@@ -63,11 +63,11 @@ class InitSetAdminAccountFragment : BaseFragment<FragmentInitSetAdminAccountBind
         }
         val password = binding.passwordEt.text.toString()
         if (!RegexUtils.isMatch(password, CommonConstants.REGEX_PASSWORD)){
-            showToast(CommonUtils.getStr(R.string.password_regex_tip).toString())
+            showToast(CommonUtils.getStr("password_regex_tip"))
             return false
         }
         if (binding.passwordEt.text.toString() != binding.repeatPasswordEt.text.toString()) {
-            PopTip.tip(R.string.password_and_repeat_password_not_same)
+            showToast(CommonUtils.getStr("password_and_repeat_password_not_same"))
             return false
         }
         return true

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

@@ -34,12 +34,12 @@ class InitWelcomeFragment : BaseFragment<FragmentInitWelcomeBinding>() {
             }
         }
         if (MMKVConstants.KEY_PORT_CONFIG.getMMKVData("").isEmpty()) {
-            binding.startBtn.text = CommonUtils.getStr(R.string.detect_port)
+            binding.startBtn.text = CommonUtils.getStr("detect_port")
         } else {
             viewModel.createLockCabinetData().observe(this){
 
             }
-            binding.startBtn.text = CommonUtils.getStr(R.string.start)
+            binding.startBtn.text = CommonUtils.getStr("start")
             binding.startBtn.setDebouncedClickListener {
                 navController.navigate(R.id.action_initWelcomeFragment_to_initSetAdminAccountFragment)
             }

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

@@ -113,49 +113,49 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
                 LoadingEvent.sendLoadingEvent()
                 when (it) {
                     LoginResultEnum.FINGERPRINTER_VERIFY_SUCCESS -> {
-                        showToast(CommonUtils.getStr(R.string.fingerprint_login_success).toString())
+                        showToast(CommonUtils.getStr("fingerprint_login_success"))
                         startActivity(Intent(this@LoginActivity, MainActivity::class.java))
                         finish()
                     }
 
                     LoginResultEnum.FINGERPRINTER_VERIFY_FAILED -> showToast(
-                        CommonUtils.getStr(R.string.fingerprint_login_failed).toString()
+                        CommonUtils.getStr("fingerprint_login_failed")
                     )
 
                     LoginResultEnum.FACE_VERIFY_SUCCESS -> {
-                        showToast(CommonUtils.getStr(R.string.face_login_success).toString())
+                        showToast(CommonUtils.getStr("face_login_success"))
                         startActivity(Intent(this@LoginActivity, MainActivity::class.java))
                         finish()
                     }
 
                     LoginResultEnum.FACE_VERIFY_FAILED -> showToast(
-                        CommonUtils.getStr(R.string.face_login_failed).toString()
+                        CommonUtils.getStr("face_login_failed")
                     )
 
                     LoginResultEnum.USERNAME_PASSWORD_LOGIN_SUCCESS -> {
                         showToast(
-                            CommonUtils.getStr(R.string.username_passowrd_login_success).toString()
+                            CommonUtils.getStr("username_passowrd_login_success")
                         )
                         startActivity(Intent(this@LoginActivity, MainActivity::class.java))
                         finish()
                     }
 
                     LoginResultEnum.USERNAME_OR_PASSWORD_ERROR -> showToast(
-                        CommonUtils.getStr(R.string.username_or_password_error).toString()
+                        CommonUtils.getStr("username_or_password_error")
                     )
 
                     LoginResultEnum.USERNAME_PASSWORD_NOT_EXISTS -> showToast(
-                        CommonUtils.getStr(R.string.username_password_not_exists).toString()
+                        CommonUtils.getStr("username_password_not_exists")
                     )
 
                     LoginResultEnum.JOB_CARD_LOGIN_SUCCESS -> {
-                        showToast(CommonUtils.getStr(R.string.job_card_login_success).toString())
+                        showToast(CommonUtils.getStr("job_card_login_success"))
                         startActivity(Intent(this@LoginActivity, MainActivity::class.java))
                         finish()
                     }
 
                     LoginResultEnum.JOB_CARD_LOGIN_FAILED -> showToast(
-                        CommonUtils.getStr(R.string.job_card_login_failed).toString()
+                        CommonUtils.getStr("job_card_login_failed")
                     )
                 }
             }
@@ -179,7 +179,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
             add(
                 LoginMenuEntity(
                     R.drawable.icon_login_menu_face,
-                    CommonUtils.getStr(R.string.face_login).toString(),
+                    CommonUtils.getStr("face_login"),
                     false,
                     0
                 )
@@ -187,7 +187,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
             add(
                 LoginMenuEntity(
                     R.drawable.icon_login_menu_password,
-                    CommonUtils.getStr(R.string.account_login).toString(),
+                    CommonUtils.getStr("account_login"),
                     false,
                     3
                 )
@@ -195,7 +195,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
             add(
                 LoginMenuEntity(
                     R.mipmap.icon_login_menu_fingerprint,
-                    CommonUtils.getStr(R.string.fingerprint_login).toString(),
+                    CommonUtils.getStr("fingerprint_login"),
                     true,
                     1
                 )
@@ -203,7 +203,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
             add(
                 LoginMenuEntity(
                     R.drawable.icon_login_menu_card,
-                    CommonUtils.getStr(R.string.card_login).toString(),
+                    CommonUtils.getStr("card_login"),
                     true,
                     2
                 )
@@ -221,7 +221,7 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
         FingerprintUtil.setScanListener(object : FingerprintUtil.OnScanListener {
             override fun onScan(bitmap: Bitmap) {
                 LoadingEvent.sendLoadingEvent(
-                    CommonUtils.getStr(com.grkj.ui_base.R.string.doing_login),
+                    CommonUtils.getStr("doing_login"),
                     true
                 )
                 viewModel.loginWithFingerprint(
@@ -229,11 +229,11 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
                 ).observe(this@LoginActivity) { isSuccess ->
                     LoadingEvent.sendLoadingEvent()
                     if (isSuccess == LoginResultEnum.FINGERPRINTER_VERIFY_SUCCESS) {
-                        showToast(CommonUtils.getStr(R.string.fingerprint_login_success).toString())
+                        showToast(CommonUtils.getStr("fingerprint_login_success"))
                         startActivity(Intent(this@LoginActivity, MainActivity::class.java))
                         finish()
                     } else {
-                        showToast(CommonUtils.getStr(R.string.fingerprint_login_failed).toString())
+                        showToast(CommonUtils.getStr("fingerprint_login_failed"))
                     }
                 }
             }
@@ -256,20 +256,20 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
                     cardNo = cardNo.toLong().toByteArrays().toHexStrings(false)
                     logger.info("Swipe card login: $cardNo")
                     LoadingEvent.sendLoadingEvent(
-                        CommonUtils.getStr(com.grkj.ui_base.R.string.doing_login),
+                        CommonUtils.getStr("doing_login"),
                         true
                     )
                     viewModel.loginWithCard(cardNo).observe(this) { isSuccess ->
                         LoadingEvent.sendLoadingEvent()
                         if (isSuccess == LoginResultEnum.JOB_CARD_LOGIN_SUCCESS) {
                             showToast(
-                                CommonUtils.getStr(R.string.job_card_login_success).toString()
+                                CommonUtils.getStr("job_card_login_success")
                             )
                             startActivity(Intent(this@LoginActivity, MainActivity::class.java))
                             finish()
                         } else {
                             showToast(
-                                CommonUtils.getStr(R.string.job_card_login_failed).toString()
+                                CommonUtils.getStr("job_card_login_failed")
                             )
                         }
                     }

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

@@ -63,15 +63,15 @@ class LoginDialog(
         })
         mBinding.tvLogin.setDebouncedClickListener {
             if (mBinding.etAccount.text.toString().isEmpty()) {
-                PopTip.tip(CommonUtils.getStr(com.grkj.ui_base.R.string.please_input_account))
+                PopTip.tip(CommonUtils.getStr("please_input_account"))
                 return@setDebouncedClickListener
             }
             if (mBinding.etPassword.text.toString().isEmpty()) {
-                PopTip.tip(CommonUtils.getStr(com.grkj.ui_base.R.string.please_input_password))
+                PopTip.tip(CommonUtils.getStr("please_input_password"))
                 return@setDebouncedClickListener
             }
             LoadingEvent.sendLoadingEvent(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.doing_login),
+                CommonUtils.getStr("doing_login"),
                 true
             )
             viewModel.loginWithAccount(
@@ -113,7 +113,7 @@ class LoginDialog(
                 0 -> {
                     if (!ArcSoftUtil.isActivated) {
                         PopTip.tip(
-                            CommonUtils.getStr(com.grkj.ui_base.R.string.face_can_not_process)
+                            CommonUtils.getStr("face_can_not_process")
                                 .toString()
                         )
                     }
@@ -126,7 +126,7 @@ class LoginDialog(
                     FingerprintUtil.setScanListener(object : FingerprintUtil.OnScanListener {
                         override fun onScan(bitmap: Bitmap) {
                             LoadingEvent.sendLoadingEvent(
-                                CommonUtils.getStr(com.grkj.ui_base.R.string.doing_login),
+                                CommonUtils.getStr("doing_login"),
                                 true
                             )
                             viewModel.loginWithFingerprint(

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

@@ -91,8 +91,7 @@ class CheckFaceDialog(
             0 -> {
                 if (!ArcSoftUtil.isActivated) {
                     PopTip.tip(
-                        CommonUtils.getStr(com.grkj.ui_base.R.string.face_can_not_process)
-                            .toString()
+                        CommonUtils.getStr("face_can_not_process")
                     )
                 }
                 startFace()
@@ -104,7 +103,7 @@ class CheckFaceDialog(
                 FingerprintUtil.setScanListener(object : FingerprintUtil.OnScanListener {
                     override fun onScan(bitmap: Bitmap) {
                         LoadingEvent.sendLoadingEvent(
-                            CommonUtils.getStr(com.grkj.ui_base.R.string.doing_checking), true
+                            CommonUtils.getStr("doing_checking"), true
                         )
                         viewModel.checkFinger(
                             ImageConvertUtils.bitmapToBase64(bitmap).toString()

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

@@ -20,6 +20,7 @@ import com.grkj.iscs.databinding.DialogQuickEntranceConfigBinding
 import com.grkj.iscs.databinding.ItemQuickEntranceConfigBinding
 import com.grkj.iscs.databinding.ItemQuickEntranceNotConfigBinding
 import com.grkj.iscs.features.main.entity.QuickEntranceMenuItemEntity
+import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.extension.tip
 import com.kongzue.dialogx.dialogs.FullScreenDialog
 import com.kongzue.dialogx.dialogs.PopTip
@@ -140,7 +141,7 @@ class QuickEntranceConfigDialog(private val save: (String) -> Unit) :
         itemBinding.root.setDebouncedClickListener {
             if (showAdd) {
                 if (selectedQuickEntranceConfig.size == 8) {
-                    PopTip.build().tip(R.string.quick_entrance_most_set_tip)
+                    PopTip.build().tip(CommonUtils.getStr("quick_entrance_most_set_tip"))
                     return@setDebouncedClickListener
                 }
                 item.itemOrientationDrag = ItemOrientation.ALL
@@ -168,7 +169,7 @@ class QuickEntranceConfigDialog(private val save: (String) -> Unit) :
         itemBinding.root.setDebouncedClickListener {
             if (showAdd) {
                 if (selectedQuickEntranceConfig.size == 8) {
-                    PopTip.build().tip(R.string.quick_entrance_most_set_tip)
+                    PopTip.build().tip(CommonUtils.getStr("quick_entrance_most_set_tip"))
                     return@setDebouncedClickListener
                 }
                 item.itemOrientationDrag = ItemOrientation.ALL

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

@@ -83,23 +83,23 @@ class AddPointDialog(
 
     private fun checkData(): Boolean {
         if (binding.pointNameTv.text.isNullOrBlank()) {
-            PopTip.build().tip(R.string.please_input_point_name)
+            PopTip.build().tip(CommonUtils.getStr("please_input_point_name"))
             return false
         }
         if (binding.functionEt.text.isNullOrBlank()) {
-            PopTip.build().tip(R.string.please_input_point_function)
+            PopTip.build().tip(CommonUtils.getStr("please_input_point_function"))
             return false
         }
         if (binding.powerTypeTv.text.isNullOrBlank()) {
-            PopTip.build().tip(R.string.please_select_power_type)
+            PopTip.build().tip(CommonUtils.getStr("please_select_power_type"))
             return false
         }
         if (binding.workstationTv.text.isNullOrBlank()) {
-            PopTip.build().tip(R.string.please_select_workstation)
+            PopTip.build().tip(CommonUtils.getStr("please_select_workstation"))
             return false
         }
         if (binding.rfidTagTv.text.isNullOrBlank()) {
-            PopTip.build().tip(R.string.please_select_rfid_token)
+            PopTip.build().tip(CommonUtils.getStr("please_select_rfid_token"))
             return false
         }
         return true

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

@@ -5,6 +5,7 @@ import androidx.core.view.isVisible
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
+import com.google.android.gms.common.internal.service.Common
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogAddRoleBinding
 import com.grkj.iscs.databinding.ItemRoleBinding
@@ -47,11 +48,11 @@ class AddRoleDialog(
         // 确认
         binding.confirm.setDebouncedClickListener {
             if (binding.roleNameEt.text.isNullOrBlank()) {
-                PopTip.build().tip(R.string.please_input_role_name)
+                PopTip.build().tip(CommonUtils.getStr("please_input_role_name"))
                 return@setDebouncedClickListener
             }
             if (binding.roleKeyEt.text.isNullOrBlank()) {
-                PopTip.build().tip(R.string.please_input_permission_characters)
+                PopTip.build().tip(CommonUtils.getStr("please_input_permission_characters"))
                 return@setDebouncedClickListener
             }
             val data = AddRoleDataEntity().apply {

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

@@ -85,23 +85,23 @@ class AddUserDialog(
 
     private fun checkData(): Boolean {
         if (binding.usernameEt.text.isNullOrBlank()) {
-            PopTip.build().tip(R.string.please_input_username)
+            PopTip.build().tip(CommonUtils.getStr("please_input_username"))
             return false
         }
         if (binding.nicknameEt.text.isNullOrBlank()) {
-            PopTip.build().tip(R.string.please_input_nickname)
+            PopTip.build().tip(CommonUtils.getStr("please_input_nickname"))
             return false
         }
         if (selectedRoles.isEmpty()) {
-            PopTip.build().tip(R.string.please_select_role)
+            PopTip.build().tip(CommonUtils.getStr("please_select_role"))
             return false
         }
         if (ISCSConfig.isWorkstationOn && selectedWorkstations.isEmpty()) {
-            PopTip.build().tip(R.string.please_select_area)
+            PopTip.build().tip(CommonUtils.getStr("please_select_area"))
             return false
         }
         if (binding.statusRg.checkedRadioButtonId == -1) {
-            PopTip.build().tip(R.string.please_select_status)
+            PopTip.build().tip(CommonUtils.getStr("please_select_status"))
             return false
         }
         return true

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

@@ -31,7 +31,7 @@ class AddWorkstationDialog(
         binding.confirm.setDebouncedClickListener {
             val name = binding.workstationNameEt.text.trim().toString()
             if (name.isEmpty()) {
-                PopTip.build().tip(R.string.please_input_workstation_name)
+                PopTip.build().tip(CommonUtils.getStr("please_input_workstation_name"))
             } else {
                 onConfirm(name,dialog)
             }

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

@@ -104,23 +104,23 @@ class UpdatePointDialog(
 
     private fun validate(): Boolean {
         if (binding.pointNameTv.text.isNullOrBlank()) {
-            PopTip.build().tip(R.string.please_input_point_name)
+            PopTip.build().tip(CommonUtils.getStr("please_input_point_name"))
             return false
         }
         if (binding.functionEt.text.isNullOrBlank()) {
-            PopTip.build().tip(R.string.please_input_point_function)
+            PopTip.build().tip(CommonUtils.getStr("please_input_point_function"))
             return false
         }
         if (binding.powerTypeTv.tag == null) {
-            PopTip.build().tip(R.string.please_select_power_type)
+            PopTip.build().tip(CommonUtils.getStr("please_select_power_type"))
             return false
         }
         if (binding.workstationTv.tag == null) {
-            PopTip.build().tip(R.string.please_select_workstation)
+            PopTip.build().tip(CommonUtils.getStr("please_select_workstation"))
             return false
         }
         if (binding.rfidTagTv.tag == null) {
-            PopTip.build().tip(R.string.please_select_rfid_token)
+            PopTip.build().tip(CommonUtils.getStr("please_select_rfid_token"))
             return false
         }
         return true

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

@@ -95,11 +95,11 @@ class UpdateRoleDialog(
         // 确认
         binding.confirm.setDebouncedClickListener {
             if (binding.roleNameEt.text.isNullOrBlank()) {
-                PopTip.build().tip(R.string.please_input_role_name)
+                PopTip.build().tip(CommonUtils.getStr("please_input_role_name"))
                 return@setDebouncedClickListener
             }
             if (binding.roleKeyEt.text.isNullOrBlank()) {
-                PopTip.build().tip(R.string.please_input_permission_characters)
+                PopTip.build().tip(CommonUtils.getStr("please_input_permission_characters"))
                 return@setDebouncedClickListener
             }
             updateEntity.roleName = binding.roleNameEt.text.toString()

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

@@ -31,7 +31,7 @@ class UpdateWorkstationDialog(
         binding.confirm.setDebouncedClickListener {
             val name = binding.workstationNameEt.text.trim().toString()
             if (name.isEmpty()) {
-                PopTip.build().tip(R.string.please_input_workstation_name)
+                PopTip.build().tip(CommonUtils.getStr("please_input_workstation_name"))
             } else {
                 onConfirm(name, dialog)
             }

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

@@ -64,7 +64,7 @@ class AddCardDialog(
             val nfc = binding.cardNfcEt.text.trim().toString()
             val statusChecked = binding.statusRg.checkedRadioButtonId == binding.activateRb.id
             if (nfc.isEmpty()) {
-                PopTip.build().tip(R.string.please_input_card_nfc)
+                PopTip.build().tip(CommonUtils.getStr("please_input_card_nfc"))
                 return@setDebouncedClickListener
             }
             // 构造并回调

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

@@ -39,15 +39,15 @@ class AddKeyDialog(
             val statusChecked = binding.statusRg.checkedRadioButtonId == binding.activateRb.id
 
             if (code.isEmpty()) {
-                PopTip.build().tip(R.string.please_input_key_name)
+                PopTip.build().tip(CommonUtils.getStr("please_input_key_name"))
                 return@setDebouncedClickListener
             }
             if (nfc.isEmpty()) {
-                PopTip.build().tip(R.string.please_input_key_nfc)
+                PopTip.build().tip(CommonUtils.getStr("please_input_key_nfc"))
                 return@setDebouncedClickListener
             }
             if (mac.isEmpty()) {
-                PopTip.build().tip(R.string.please_input_key_mac)
+                PopTip.build().tip(CommonUtils.getStr("please_input_key_mac"))
                 return@setDebouncedClickListener
             }
             // 构建并回调（位置参数方式）

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

@@ -39,11 +39,11 @@ class AddLockDialog(
             val remark = binding.remarkEt.text.toString()
 
             if (code.isEmpty()) {
-                PopTip.build().tip(R.string.please_input_lock_code)
+                PopTip.build().tip(CommonUtils.getStr("please_input_lock_code"))
                 return@setDebouncedClickListener
             }
             if (nfc.isEmpty()) {
-                PopTip.build().tip(R.string.please_input_lock_nfc)
+                PopTip.build().tip(CommonUtils.getStr("please_input_lock_nfc"))
                 return@setDebouncedClickListener
             }
             // 构建并回调（位置参数方式，与VO构造器一致）

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

@@ -55,11 +55,11 @@ class AddRfidTokenDialog(
             val remark = binding.remarkEt.text.toString().takeIf { it.isNotBlank() }
 
             if (code.isEmpty()) {
-                PopTip.build().tip(R.string.please_input_rfid_code)
+                PopTip.build().tip(CommonUtils.getStr("please_input_rfid_code"))
                 return@setDebouncedClickListener
             }
             if (rfid.isEmpty()) {
-                PopTip.build().tip(R.string.please_input_rfid)
+                PopTip.build().tip(CommonUtils.getStr("please_input_rfid"))
                 return@setDebouncedClickListener
             }
             // 构造并回调（位置参数方式）

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

@@ -77,7 +77,7 @@ class UpdateCardDialog(
         // 确认
         binding.confirm.setDebouncedClickListener {
             val nfc = binding.cardNfcEt.text.trim().toString()
-            if (nfc.isBlank()) return@setDebouncedClickListener PopTip.build().tip(R.string.please_input_card_nfc)
+            if (nfc.isBlank()) return@setDebouncedClickListener PopTip.build().tip(CommonUtils.getStr("please_input_card_nfc"))
             val statusChecked = binding.statusRg.checkedRadioButtonId == binding.activateRb.id
             val vo = UpdateCardDataVo(
                 card.cardId,

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

@@ -52,15 +52,15 @@ class UpdateKeyDialog(
             val statusChecked = binding.statusRg.checkedRadioButtonId == binding.activateRb.id
 
             if (code.isEmpty()) {
-                PopTip.build().tip(R.string.please_input_key_name)
+                PopTip.build().tip(CommonUtils.getStr("please_input_key_name"))
                 return@setDebouncedClickListener
             }
             if (nfc.isEmpty()) {
-                PopTip.build().tip(R.string.please_input_key_nfc)
+                PopTip.build().tip(CommonUtils.getStr("please_input_key_nfc"))
                 return@setDebouncedClickListener
             }
             if (mac.isEmpty()) {
-                PopTip.build().tip(R.string.please_input_key_mac)
+                PopTip.build().tip(CommonUtils.getStr("please_input_key_mac"))
                 return@setDebouncedClickListener
             }
             // 构建 DTO 并回调

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

@@ -50,11 +50,11 @@ class UpdateLockDialog(
             val statusChecked = binding.statusRg.checkedRadioButtonId == binding.activateRb.id
 
             if (code.isBlank()) {
-                PopTip.build().tip(R.string.please_input_lock_code)
+                PopTip.build().tip(CommonUtils.getStr("please_input_lock_code"))
                 return@setDebouncedClickListener
             }
             if (nfc.isBlank()) {
-                PopTip.build().tip(R.string.please_input_lock_nfc)
+                PopTip.build().tip(CommonUtils.getStr("please_input_lock_nfc"))
                 return@setDebouncedClickListener
             }
             // 构造并回调

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

@@ -70,11 +70,11 @@ class UpdateRfidTokenDialog(
             val statusChecked = binding.statusRg.checkedRadioButtonId == binding.activateRb.id
 
             if (code.isEmpty()) {
-                PopTip.build().tip(R.string.please_input_rfid_code)
+                PopTip.build().tip(CommonUtils.getStr("please_input_rfid_code"))
                 return@setDebouncedClickListener
             }
             if (rfid.isEmpty()) {
-                PopTip.build().tip(R.string.please_input_rfid)
+                PopTip.build().tip(CommonUtils.getStr("please_input_rfid"))
                 return@setDebouncedClickListener
             }
             // 构造 DTO 并回调

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

@@ -23,7 +23,7 @@ class AddFingerprintDialog(
         dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
         dialog.isCancelable = false
         updateTip(binding.pressTip)
-        binding.pressTip.text = CommonUtils.getStr(com.grkj.ui_base.R.string.fingerprint_scan_tip,3).toString()
+        binding.pressTip.text = CommonUtils.getStr("fingerprint_scan_tip",3)
         binding.cancel.setDebouncedClickListener {
             onCancel(dialog)
         }

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

@@ -201,27 +201,27 @@ class EditJobWorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingB
     private fun getStepIcon(workflowStep: IsJobTicketStep): Int {
         return when {
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.recognize_work_content).toString()
+                CommonUtils.getStr("recognize_work_content")
             ) == true -> R.mipmap.icon_loto_step_1
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.power_isolation_way).toString()
+                CommonUtils.getStr("power_isolation_way")
             ) == true -> R.mipmap.icon_loto_step_2
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.shutdown).toString()
+                CommonUtils.getStr("shutdown")
             ) == true -> R.mipmap.icon_loto_step_4
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.ensure_power_isolation).toString()
+                CommonUtils.getStr("ensure_power_isolation")
             ) == true -> R.mipmap.icon_loto_step_6
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.check_before_unlocking).toString()
+                CommonUtils.getStr("check_before_unlocking")
             ) == true -> R.mipmap.icon_loto_step_7
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.unlock_and_restore_switch).toString()
+                CommonUtils.getStr("unlock_and_restore_switch")
             ) == true -> R.mipmap.icon_loto_step_8
 
             workflowStep.enableSetLocker || workflowStep.enableSetColocker -> R.mipmap.icon_step_select_member

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

@@ -201,27 +201,27 @@ class EditSopWorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingB
     private fun getStepIcon(workflowStep: IsSopWorkflowStep): Int {
         return when {
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.recognize_work_content).toString()
+                CommonUtils.getStr("recognize_work_content")
             ) == true -> R.mipmap.icon_loto_step_1
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.power_isolation_way).toString()
+                CommonUtils.getStr("power_isolation_way")
             ) == true -> R.mipmap.icon_loto_step_2
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.shutdown).toString()
+                CommonUtils.getStr("shutdown")
             ) == true -> R.mipmap.icon_loto_step_4
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.ensure_power_isolation).toString()
+                CommonUtils.getStr("ensure_power_isolation")
             ) == true -> R.mipmap.icon_loto_step_6
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.check_before_unlocking).toString()
+                CommonUtils.getStr("check_before_unlocking")
             ) == true -> R.mipmap.icon_loto_step_7
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.unlock_and_restore_switch).toString()
+                CommonUtils.getStr("unlock_and_restore_switch").toString()
             ) == true -> R.mipmap.icon_loto_step_8
 
             workflowStep.enableSetLocker || workflowStep.enableSetColocker -> R.mipmap.icon_step_select_member

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

@@ -78,11 +78,11 @@ class SelectMemberFragment : BaseFragment<FragmentSelectMemeberBinding>() {
         }
         binding.confirm.setDebouncedClickListener {
             if (selectedLockerData.flatMap { it.jobTicketGroupDataList }.isEmpty()) {
-                PopTip.build().tip(com.grkj.ui_base.R.string.please_select_locker)
+                showToast(CommonUtils.getStr("please_select_locker"))
                 return@setDebouncedClickListener
             }
             if (canSelectColoker && selectedColockerData.isEmpty()) {
-                PopTip.build().tip(com.grkj.ui_base.R.string.please_select_colocker)
+                showToast(CommonUtils.getStr("please_select_colocker"))
                 return@setDebouncedClickListener
             }
             GlobalDataTempStore.getInstance()
@@ -133,7 +133,7 @@ class SelectMemberFragment : BaseFragment<FragmentSelectMemeberBinding>() {
         itemBinding.root.setDebouncedClickListener {
             if (item.isSelected) {
                 if (!isLockerSelect && (selectedColockerData.size == 1 || (viewModel.ticketUsers.isNotEmpty() && viewModel.ticketUsers.find { it.userId == item.userId }?.jobStatus == "1"))) {
-                    PopTip.build().tip(com.grkj.ui_base.R.string.can_not_remove_current_colocker)
+                    showToast(CommonUtils.getStr("can_not_remove_current_colocker"))
                     return@setDebouncedClickListener
                 }
                 if (isLockerSelect) {
@@ -155,7 +155,7 @@ class SelectMemberFragment : BaseFragment<FragmentSelectMemeberBinding>() {
                 if ((item.avatar
                         ?: viewModel.userBiometricDataVo.find { it.userId == item.userId }?.content) == null
                 ) {
-                    PopTip.build().tip(R.string.current_user_has_not_face_data)
+                    showToast(CommonUtils.getStr("current_user_has_not_face_data"))
                 }
                 if (isLockerSelect) {
                     selectedLockerData.find { it.jobTicketGroupInfo.groupId == viewModel.currentSelectGroup?.groupId }?.jobTicketGroupDataList?.clear()
@@ -248,7 +248,7 @@ class SelectMemberFragment : BaseFragment<FragmentSelectMemeberBinding>() {
         } ?: itemBinding.lockerIcon.setImageResource(R.drawable.icon_select_member)
         itemBinding.root.setDebouncedClickListener {
             if (selectedLockerData.find { it.jobTicketGroupInfo.groupId == groupData.groupId }?.jobTicketGroupDataList?.size == 1 && viewModel.jobTicketData != null && viewModel.jobTicketData?.ticketStatus != JobTicketStatusEnum.SELECT_MEMBER.status) {
-                PopTip.build().tip(com.grkj.ui_base.R.string.can_not_remove_current_locker)
+                showToast(CommonUtils.getStr("can_not_remove_current_locker"))
                 return@setDebouncedClickListener
             }
             if (isLockerSelect) {
@@ -299,7 +299,7 @@ class SelectMemberFragment : BaseFragment<FragmentSelectMemeberBinding>() {
         } ?: itemBinding.lockerIcon.setImageResource(R.drawable.icon_select_member)
         itemBinding.root.setDebouncedClickListener {
             if (selectedColockerData.size == 1 || (viewModel.ticketUsers.isNotEmpty() && viewModel.ticketUsers.find { it.userId == item.userId }?.jobStatus == "1")) {
-                PopTip.build().tip(com.grkj.ui_base.R.string.can_not_remove_current_colocker)
+                showToast(CommonUtils.getStr("can_not_remove_current_colocker"))
                 return@setDebouncedClickListener
             }
             selectedColockerData.removeIf { it.userId == item.userId }
@@ -343,7 +343,7 @@ class SelectMemberFragment : BaseFragment<FragmentSelectMemeberBinding>() {
     private fun setColockerData() {
         isLockerSelect = false
         checkSelectArea()
-        binding.selectMemberTip.text = CommonUtils.getStr(R.string.select_colocker_tip)
+        binding.selectMemberTip.text = CommonUtils.getStr("select_colocker_tip")
         binding.colockerRv.models = selectedColockerData
         binding.allUserRv.models =
             viewModel.userData.filter { it.roleKeys.contains(RoleEnum.JTCOLOCKER.roleKey) && it.userId !in selectedColockerData.map { it.userId } }

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

@@ -46,7 +46,7 @@ class SelectPointFragment : BaseFragment<FragmentSelectPointBinding>() {
         }
         binding.confirm.setDebouncedClickListener {
             if (viewModel.selectedPointData.any { it.jobTicketGroupDataList.isEmpty() }){
-                showToast(CommonUtils.getStr(R.string.group_at_least_has_one_point).toString())
+                showToast(CommonUtils.getStr("group_at_least_has_one_point"))
                 return@setDebouncedClickListener
             }
             GlobalDataTempStore.getInstance()
@@ -189,7 +189,7 @@ class SelectPointFragment : BaseFragment<FragmentSelectPointBinding>() {
         itemBinding.pointIcon.isSelected = item.isSelected
         itemBinding.root.setDebouncedClickListener {
             if (viewModel.selectedPointData.find { it.jobTicketGroupInfo.groupId == viewModel.currentSelectGroupId } == null) {
-                showToast(CommonUtils.getStr(R.string.please_select_group).toString())
+                showToast(CommonUtils.getStr("please_select_group"))
                 return@setDebouncedClickListener
             }
             item.isSelected = true

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

@@ -203,27 +203,27 @@ class WorkflowSettingFragment : BaseFormFragment<FragmentWorkflowSettingBinding>
     private fun getStepIcon(workflowStep: WorkflowStep): Int {
         return when {
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.recognize_work_content).toString()
+                CommonUtils.getStr("recognize_work_content")
             ) == true -> R.mipmap.icon_loto_step_1
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.power_isolation_way).toString()
+                CommonUtils.getStr("power_isolation_way")
             ) == true -> R.mipmap.icon_loto_step_2
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.shutdown).toString()
+                CommonUtils.getStr("shutdown")
             ) == true -> R.mipmap.icon_loto_step_4
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.ensure_power_isolation).toString()
+                CommonUtils.getStr("ensure_power_isolation")
             ) == true -> R.mipmap.icon_loto_step_6
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.check_before_unlocking).toString()
+                CommonUtils.getStr("check_before_unlocking")
             ) == true -> R.mipmap.icon_loto_step_7
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.unlock_and_restore_switch).toString()
+                CommonUtils.getStr("unlock_and_restore_switch")
             ) == true -> R.mipmap.icon_loto_step_8
 
             workflowStep.enableSetLocker || workflowStep.enableSetColocker -> R.mipmap.icon_step_select_member

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

@@ -77,10 +77,9 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                         dialog.dismiss()
                         if (it) {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
-                                    .toString(),
+                                title = CommonUtils.getStr("action_succeed"),
                                 dialogType = TipDialog.DialogType.SUCCESS,
-                                msg = CommonUtils.getStr(R.string.add_point_succeed).toString(),
+                                msg = CommonUtils.getStr("add_point_succeed"),
                                 countDownTime = 10,
                                 showConfirm = false,
                                 onCancelClick = {
@@ -89,10 +88,9 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                             )
                         } else {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
-                                    .toString(),
+                                title = CommonUtils.getStr("action_failed"),
                                 dialogType = TipDialog.DialogType.ERROR,
-                                msg = CommonUtils.getStr(R.string.add_point_failed).toString(),
+                                msg = CommonUtils.getStr("add_point_failed"),
                                 countDownTime = 10,
                                 showConfirm = false,
                                 onCancelClick = {
@@ -173,7 +171,7 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
         }
         itemBinding.root.setDebouncedClickListener {
             if (item.pointId in viewModel.inUsePointIds) {
-                showToast(CommonUtils.getStr(R.string.point_in_use).toString())
+                showToast(CommonUtils.getStr("point_in_use"))
                 return@setDebouncedClickListener
             }
             UpdatePointDialog.show(item, viewModel.workstationData.map {
@@ -204,11 +202,9 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                     dialog.dismiss()
                     if (it) {
                         TipDialog.show(
-                            title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
-                                .toString(),
+                            title = CommonUtils.getStr("action_succeed"),
                             dialogType = TipDialog.DialogType.SUCCESS,
-                            msg = CommonUtils.getStr(R.string.update_point_succeed)
-                                .toString(),
+                            msg = CommonUtils.getStr("update_point_succeed"),
                             countDownTime = 10,
                             showConfirm = false,
                             onCancelClick = {
@@ -217,11 +213,9 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                         )
                     } else {
                         TipDialog.show(
-                            title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
-                                .toString(),
+                            title = CommonUtils.getStr("action_failed"),
                             dialogType = TipDialog.DialogType.ERROR,
-                            msg = CommonUtils.getStr(R.string.update_point_failed)
-                                .toString(),
+                            msg = CommonUtils.getStr("update_point_failed"),
                             countDownTime = 10,
                             showConfirm = false,
                             onCancelClick = {
@@ -267,16 +261,16 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
 
     private fun deleteSelectPoint() {
         if (viewModel.pointManageDataList.none { it.isSelected }) {
-            PopTip.build().tip(R.string.please_select_point)
+            showToast(CommonUtils.getStr("please_select_point"))
             return
         }
         if (viewModel.pointManageDataList.filter { it.isSelected }.map { it.pointId }
                 .any { it in viewModel.inUsePointIds }) {
-            showToast(CommonUtils.getStr(R.string.selected_point_already_in_use).toString())
+            showToast(CommonUtils.getStr("selected_point_already_in_use"))
             return
         }
         TipDialog.show(
-            msg = CommonUtils.getStr(R.string.check_delete_point).toString(),
+            msg = CommonUtils.getStr("check_delete_point"),
             countDownTime = 10,
             onConfirmClick = {
                 viewModel.deleteSelectedPoints(viewModel.pointManageDataList.filter { it.isSelected }
@@ -284,8 +278,7 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                     if (it) {
                         TipDialog.show(
                             dialogType = TipDialog.DialogType.SUCCESS,
-                            msg = CommonUtils.getStr(R.string.point_manage_delete_succeed)
-                                .toString(),
+                            msg = CommonUtils.getStr("point_manage_delete_succeed"),
                             showConfirm = false,
                             countDownTime = 10
                         )
@@ -293,8 +286,7 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
                     } else {
                         TipDialog.show(
                             dialogType = TipDialog.DialogType.ERROR,
-                            msg = CommonUtils.getStr(R.string.point_manage_delete_failed)
-                                .toString(),
+                            msg = CommonUtils.getStr("point_manage_delete_failed"),
                             showConfirm = false,
                             countDownTime = 10
                         )

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

@@ -53,10 +53,9 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
             AddRoleDialog.show { data, dialog ->
                 if (data.roleKeys in RoleEnum.values().map { it.roleKey }) {
                     TipDialog.show(
-                        title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
-                            .toString(),
+                        title = CommonUtils.getStr("action_failed"),
                         dialogType = TipDialog.DialogType.ERROR,
-                        msg = CommonUtils.getStr(R.string.role_key_already_exists).toString(),
+                        msg = CommonUtils.getStr("role_key_already_exists"),
                         countDownTime = 10,
                         showConfirm = false,
                         onCancelClick = {
@@ -70,10 +69,9 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                         dialog.dismiss()
                         if (it) {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
-                                    .toString(),
+                                title = CommonUtils.getStr("action_succeed"),
                                 dialogType = TipDialog.DialogType.SUCCESS,
-                                msg = CommonUtils.getStr(R.string.add_role_succeed).toString(),
+                                msg = CommonUtils.getStr("add_role_succeed"),
                                 countDownTime = 10,
                                 showConfirm = false,
                                 onCancelClick = {
@@ -82,10 +80,9 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                             )
                         } else {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
-                                    .toString(),
+                                title = CommonUtils.getStr("action_failed"),
                                 dialogType = TipDialog.DialogType.ERROR,
-                                msg = CommonUtils.getStr(R.string.add_role_failed).toString(),
+                                msg = CommonUtils.getStr("add_role_failed"),
                                 countDownTime = 10,
                                 showConfirm = false,
                                 onCancelClick = {
@@ -147,7 +144,7 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
         }
         itemBinding.root.setDebouncedClickListener {
             if (item.roleKey== RoleEnum.ADMIN.roleKey){
-                showToast(CommonUtils.getStr(R.string.admin_role_can_not_edit).toString())
+                showToast(CommonUtils.getStr("admin_role_can_not_edit"))
                 return@setDebouncedClickListener
             }
             viewModel.getFunctionalPermissionsByRoleId(item.roleId)
@@ -164,10 +161,10 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                                 .map { it.roleKey } && !data.isPreset
                         ) {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
+                                title = CommonUtils.getStr("action_failed")
                                     .toString(),
                                 dialogType = TipDialog.DialogType.ERROR,
-                                msg = CommonUtils.getStr(R.string.role_key_already_exists)
+                                msg = CommonUtils.getStr("role_key_already_exists")
                                     .toString(),
                                 countDownTime = 10,
                                 showConfirm = false,
@@ -181,11 +178,9 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                             dialog.dismiss()
                             if (it) {
                                 TipDialog.show(
-                                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
-                                        .toString(),
+                                    title = CommonUtils.getStr("action_succeed"),
                                     dialogType = TipDialog.DialogType.SUCCESS,
-                                    msg = CommonUtils.getStr(R.string.update_role_succeed)
-                                        .toString(),
+                                    msg = CommonUtils.getStr("update_role_succeed"),
                                     countDownTime = 10,
                                     showConfirm = false,
                                     onCancelClick = {
@@ -194,11 +189,9 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                                 )
                             } else {
                                 TipDialog.show(
-                                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
-                                        .toString(),
+                                    title = CommonUtils.getStr("action_failed"),
                                     dialogType = TipDialog.DialogType.ERROR,
-                                    msg = CommonUtils.getStr(R.string.update_role_failed)
-                                        .toString(),
+                                    msg = CommonUtils.getStr("update_role_failed"),
                                     countDownTime = 10,
                                     showConfirm = false,
                                     onCancelClick = {
@@ -244,19 +237,19 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
 
     private fun deleteSelect() {
         if (viewModel.roleManageDataList.none { it.isSelected }) {
-            PopTip.build().tip(R.string.please_select_role)
+            showToast(CommonUtils.getStr("please_select_role"))
             return
         }
         if (viewModel.roleManageDataList.any {
                 it.isSelected && it.roleKey in RoleEnum.values().map { it.roleKey }
             }) {
-            PopTip.build().tip(R.string.role_in_preset_tip)
+            showToast(CommonUtils.getStr("role_in_preset_tip"))
             return
         }
         viewModel.checkRoleInUse().observe(this){
             if (!it){
                 TipDialog.show(
-                    msg = CommonUtils.getStr(R.string.check_delete_role).toString(),
+                    msg = CommonUtils.getStr("check_delete_role"),
                     countDownTime = 10,
                     onConfirmClick = {
                         viewModel.deleteSelectedRoles(viewModel.roleManageDataList.filter { it.isSelected }
@@ -264,8 +257,7 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                             if (it) {
                                 TipDialog.show(
                                     dialogType = TipDialog.DialogType.SUCCESS,
-                                    msg = CommonUtils.getStr(R.string.role_manage_delete_succeed)
-                                        .toString(),
+                                    msg = CommonUtils.getStr("role_manage_delete_succeed"),
                                     showConfirm = false,
                                     countDownTime = 10
                                 )
@@ -273,8 +265,7 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                             } else {
                                 TipDialog.show(
                                     dialogType = TipDialog.DialogType.ERROR,
-                                    msg = CommonUtils.getStr(R.string.role_manage_delete_failed)
-                                        .toString(),
+                                    msg = CommonUtils.getStr("role_manage_delete_failed"),
                                     showConfirm = false,
                                     countDownTime = 10
                                 )
@@ -282,7 +273,7 @@ class RoleManageFragment : BaseFragment<FragmentRoleManageBinding>() {
                         }
                     })
             }else{
-                TipDialog.showError(CommonUtils.getStr(R.string.role_in_use).toString())
+                TipDialog.showError(CommonUtils.getStr("role_in_use").toString())
             }
         }
 

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

@@ -77,10 +77,9 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
                             dialog.dismiss()
                             if (it) {
                                 TipDialog.show(
-                                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
-                                        .toString(),
+                                    title = CommonUtils.getStr("action_succeed"),
                                     dialogType = TipDialog.DialogType.SUCCESS,
-                                    msg = CommonUtils.getStr(R.string.add_user_succeed).toString(),
+                                    msg = CommonUtils.getStr("add_user_succeed"),
                                     countDownTime = 10,
                                     showConfirm = false,
                                     onCancelClick = {
@@ -171,11 +170,9 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
                         dialog.dismiss()
                         if (it) {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
-                                    .toString(),
+                                title = CommonUtils.getStr("action_succeed"),
                                 dialogType = TipDialog.DialogType.SUCCESS,
-                                msg = CommonUtils.getStr(R.string.update_user_succeed)
-                                    .toString(),
+                                msg = CommonUtils.getStr("update_user_succeed"),
                                 countDownTime = 10,
                                 showConfirm = false,
                                 onCancelClick = {
@@ -184,11 +181,9 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
                             )
                         } else {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
-                                    .toString(),
+                                title = CommonUtils.getStr("action_failed"),
                                 dialogType = TipDialog.DialogType.ERROR,
-                                msg = CommonUtils.getStr(R.string.update_user_failed)
-                                    .toString(),
+                                msg = CommonUtils.getStr("update_user_failed"),
                                 countDownTime = 10,
                                 showConfirm = false,
                                 onCancelClick = {
@@ -233,13 +228,13 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
 
     private fun deleteSelectUser() {
         if (viewModel.userManageDataList.none { it.isSelected }) {
-            PopTip.build().tip(R.string.please_select_user)
+            showToast(CommonUtils.getStr("please_select_user"))
             return
         }
         viewModel.userInProgressJob().observe(this){
             if (!it){
                 TipDialog.show(
-                    msg = CommonUtils.getStr(R.string.check_delete_user).toString(),
+                    msg = CommonUtils.getStr("check_delete_user"),
                     countDownTime = 10,
                     onConfirmClick = {
                         viewModel.deleteSelectedUsers(viewModel.userManageDataList.filter { it.isSelected }
@@ -247,8 +242,7 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
                             if (it) {
                                 TipDialog.show(
                                     dialogType = TipDialog.DialogType.SUCCESS,
-                                    msg = CommonUtils.getStr(R.string.user_manage_delete_succeed)
-                                        .toString(),
+                                    msg = CommonUtils.getStr("user_manage_delete_succeed"),
                                     showConfirm = false,
                                     countDownTime = 10
                                 )
@@ -256,8 +250,7 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
                             } else {
                                 TipDialog.show(
                                     dialogType = TipDialog.DialogType.ERROR,
-                                    msg = CommonUtils.getStr(R.string.user_manage_delete_failed)
-                                        .toString(),
+                                    msg = CommonUtils.getStr("user_manage_delete_failed"),
                                     showConfirm = false,
                                     countDownTime = 10
                                 )
@@ -265,7 +258,7 @@ class UserManageFragment : BaseFragment<FragmentUserManageBinding>() {
                         }
                     })
             }else{
-                TipDialog.showError(CommonUtils.getStr(R.string.has_user_in_progress_job).toString())
+                TipDialog.showError(CommonUtils.getStr("has_user_in_progress_job"))
             }
         }
     }

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

@@ -43,7 +43,7 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
         }
         binding.edit.setDebouncedClickListener {
             if (viewModel.workstationManageData.none { it.isSelected }) {
-                PopTip.build().tip(R.string.please_select_workstation)
+                showToast(CommonUtils.getStr("please_select_workstation"))
                 return@setDebouncedClickListener
             }
             UpdateWorkstationDialog.show(viewModel.workstationManageData.first { it.isSelected }.workstationName) { data, dialog ->
@@ -54,11 +54,9 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
                         dialog.dismiss()
                         if (it) {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
-                                    .toString(),
+                                title = CommonUtils.getStr("action_succeed"),
                                 dialogType = TipDialog.DialogType.SUCCESS,
-                                msg = CommonUtils.getStr(R.string.update_workstation_succeed)
-                                    .toString(),
+                                msg = CommonUtils.getStr("update_workstation_succeed"),
                                 countDownTime = 10,
                                 showConfirm = false,
                                 onCancelClick = {
@@ -67,11 +65,9 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
                             )
                         } else {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
-                                    .toString(),
+                                title = CommonUtils.getStr("action_failed"),
                                 dialogType = TipDialog.DialogType.ERROR,
-                                msg = CommonUtils.getStr(R.string.update_workstation_failed)
-                                    .toString(),
+                                msg = CommonUtils.getStr("update_workstation_failed"),
                                 countDownTime = 10,
                                 showConfirm = false,
                                 onCancelClick = {
@@ -90,11 +86,9 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
                         dialog.dismiss()
                         if (it) {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
-                                    .toString(),
+                                title = CommonUtils.getStr("action_succeed"),
                                 dialogType = TipDialog.DialogType.SUCCESS,
-                                msg = CommonUtils.getStr(R.string.add_workstation_succeed)
-                                    .toString(),
+                                msg = CommonUtils.getStr("add_workstation_succeed"),
                                 countDownTime = 10,
                                 showConfirm = false,
                                 onCancelClick = {
@@ -103,11 +97,9 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
                             )
                         } else {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
-                                    .toString(),
+                                title = CommonUtils.getStr("action_failed"),
                                 dialogType = TipDialog.DialogType.ERROR,
-                                msg = CommonUtils.getStr(R.string.add_workstation_failed)
-                                    .toString(),
+                                msg = CommonUtils.getStr("add_workstation_failed"),
                                 countDownTime = 10,
                                 showConfirm = false,
                                 onCancelClick = {
@@ -124,27 +116,27 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
         }
         binding.moveUp.setDebouncedClickListener {
             if (viewModel.workstationManageData.none { it.isSelected }) {
-                PopTip.build().tip(R.string.please_select_workstation)
+                showToast(CommonUtils.getStr("please_select_workstation"))
                 return@setDebouncedClickListener
             }
             viewModel.moveUp().observe(this) {
                 if (it) {
                     getWorkstationManageData()
                 } else {
-                    PopTip.build().tip(R.string.workstation_is_in_top)
+                    showToast(CommonUtils.getStr("workstation_is_in_top"))
                 }
             }
         }
         binding.moveDown.setDebouncedClickListener {
             if (viewModel.workstationManageData.none { it.isSelected }) {
-                PopTip.build().tip(R.string.please_select_workstation)
+                showToast(CommonUtils.getStr("please_select_workstation"))
                 return@setDebouncedClickListener
             }
             viewModel.moveDown().observe(this) {
                 if (it) {
                     getWorkstationManageData()
                 } else {
-                    PopTip.build().tip(R.string.workstation_is_in_bottom)
+                    showToast(CommonUtils.getStr("workstation_is_in_bottom"))
                 }
             }
         }
@@ -208,16 +200,15 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
 
     private fun deleteSelectWorkstation() {
         if (viewModel.workstationManageData.none { it.isSelected }) {
-            PopTip.build().tip(R.string.please_select_workstation)
+            showToast(CommonUtils.getStr("please_select_workstation"))
             return
         }
         val deleteItem = viewModel.workstationManageData.first { it.isSelected }
         TipDialog.show(
             msg = CommonUtils.getStr(
-                R.string.check_delete_workstation,
-                args = listOf(deleteItem.workstationName.toString()).toTypedArray()
-            )
-                .toString(),
+                "check_delete_workstation",
+                args = listOf(deleteItem.workstationName).toTypedArray()
+            ),
             countDownTime = 10,
             onConfirmClick = {
                 viewModel.deleteWorkstation().observe(this) {
@@ -225,10 +216,9 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
                         TipDialog.show(
                             dialogType = TipDialog.DialogType.SUCCESS,
                             msg = CommonUtils.getStr(
-                                R.string.workstation_manage_delete_succeed,
-                                args = listOf(deleteItem.workstationName.toString()).toTypedArray()
-                            )
-                                .toString(),
+                                "workstation_manage_delete_succeed",
+                                args = listOf(deleteItem.workstationName).toTypedArray()
+                            ),
                             showConfirm = false,
                             countDownTime = 10
                         )
@@ -237,10 +227,9 @@ class WorkstationManageFragment : BaseFragment<FragmentWorkstationManageBinding>
                         TipDialog.show(
                             dialogType = TipDialog.DialogType.ERROR,
                             msg = CommonUtils.getStr(
-                                R.string.workstation_manage_delete_failed,
-                                args = listOf(deleteItem.workstationName.toString()).toTypedArray()
-                            )
-                                .toString(),
+                                "workstation_manage_delete_failed",
+                                args = listOf(deleteItem.workstationName).toTypedArray()
+                            ),
                             showConfirm = false,
                             countDownTime = 10
                         )

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

@@ -332,7 +332,7 @@ class ExceptionDetailFragment : BaseFragment<FragmentExceptionDetailBinding>() {
                     }
             } else {
                 TipDialog.showError(
-                    msg = CommonUtils.getStr(com.grkj.ui_base.R.string.ticket_lost).toString(),
+                    msg = CommonUtils.getStr("ticket_lost"),
                     onConfirmClick = {
                         navController.popBackStack()
                     },

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

@@ -283,13 +283,13 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
         binding.colockerLayout.isVisible = index == 2
         binding.dataTitleTv.text = when (index) {
             0 -> CommonUtils.getStr(
-                R.string.job_execute_step_description,
+                "job_execute_step_description",
                 viewModel.currentStepData?.stepTitle
                     ?: ""
-            ).toString()
+            )
 
-            1 -> CommonUtils.getStr(R.string.job_execute_lock_status_title).toString()
-            2 -> CommonUtils.getStr(R.string.job_execute_colocker_colock_status_title).toString()
+            1 -> CommonUtils.getStr("job_execute_lock_status_title")
+            2 -> CommonUtils.getStr("job_execute_colocker_colock_status_title")
             else -> ""
         }
     }
@@ -335,27 +335,27 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
         }
         return when {
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.recognize_work_content).toString()
+                CommonUtils.getStr("recognize_work_content")
             ) == true -> R.mipmap.icon_loto_step_1
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.power_isolation_way).toString()
+                CommonUtils.getStr("power_isolation_way")
             ) == true -> R.mipmap.icon_loto_step_2
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.shutdown).toString()
+                CommonUtils.getStr("shutdown")
             ) == true -> R.mipmap.icon_loto_step_4
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.ensure_power_isolation).toString()
+                CommonUtils.getStr("ensure_power_isolation")
             ) == true -> R.mipmap.icon_loto_step_6
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.check_before_unlocking).toString()
+                CommonUtils.getStr("check_before_unlocking")
             ) == true -> R.mipmap.icon_loto_step_7
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.unlock_and_restore_switch).toString()
+                CommonUtils.getStr("unlock_and_restore_switch")
             ) == true -> R.mipmap.icon_loto_step_8
 
             workflowStep.enableSetLocker || workflowStep.enableSetColocker -> R.mipmap.icon_step_select_member
@@ -444,7 +444,7 @@ class ExceptionJobFragment : BaseFragment<FragmentExceptionJobBinding>() {
                 }
             } else {
                 TipDialog.showError(
-                    msg = CommonUtils.getStr(com.grkj.ui_base.R.string.ticket_lost).toString(),
+                    msg = CommonUtils.getStr("ticket_lost"),
                     onConfirmClick = {
                         navController.popBackStack()
                     },

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

@@ -161,19 +161,19 @@ class ExceptionReportFragment : BaseFormFragment<FragmentExceptionReportBinding>
 
     private fun checkData(): Boolean{
         if (viewModel.selectedExceptionType==null){
-            showToast(CommonUtils.getStr(R.string.please_select_exception_type).toString())
+            showToast(CommonUtils.getStr("please_select_exception_type"))
             return false
         }
         if (viewModel.selectedExceptionDescription.isEmpty()){
-            showToast(CommonUtils.getStr(R.string.please_select_exception_description).toString())
+            showToast(CommonUtils.getStr("please_select_exception_description"))
             return false
         }
         if (viewModel.selectedSourceData.isEmpty()){
-            showToast(CommonUtils.getStr(R.string.please_select_exception_source).toString())
+            showToast(CommonUtils.getStr("please_select_exception_source"))
             return false
         }
         if (viewModel.selectedProcessApplication==null){
-            showToast(CommonUtils.getStr(R.string.please_select_process_application).toString())
+            showToast(CommonUtils.getStr("please_select_process_application"))
             return false
         }
         return true

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

@@ -41,10 +41,10 @@ class CardManageFragment : BaseFragment<FragmentCardManageBinding>() {
                 viewModel.validateCardData(vo.cardNfc).observe(this) {
                     viewModel.addCard(vo).observe(this) { ok ->
                         dialog.dismiss()
-                        @StringRes val titleRes =
-                            if (ok) com.grkj.ui_base.R.string.action_succeed else com.grkj.ui_base.R.string.action_failed
-                        @StringRes val msgRes =
-                            if (ok) R.string.add_card_succeed else R.string.add_card_failed
+                        val titleRes =
+                            if (ok) "action_succeed" else "action_failed"
+                        val msgRes =
+                            if (ok) "add_card_succeed" else "add_card_failed"
 
                         TipDialog.show(
                             title = CommonUtils.getStr(titleRes).toString(),
@@ -109,10 +109,10 @@ class CardManageFragment : BaseFragment<FragmentCardManageBinding>() {
             UpdateCardDialog.show(item, viewModel.dropDownData) { vo, dialog ->
                 viewModel.updateCard(vo).observe(this) { ok ->
                     dialog.dismiss()
-                    @StringRes val titleRes =
-                        if (ok) com.grkj.ui_base.R.string.action_succeed else com.grkj.ui_base.R.string.action_failed
-                    @StringRes val msgRes =
-                        if (ok) R.string.update_card_succeed else R.string.update_card_failed
+                    val titleRes =
+                        if (ok) "action_succeed" else "action_failed"
+                    val msgRes =
+                        if (ok) "update_card_succeed" else "update_card_failed"
 
                     TipDialog.show(
                         title = CommonUtils.getStr(titleRes).toString(),
@@ -163,14 +163,14 @@ class CardManageFragment : BaseFragment<FragmentCardManageBinding>() {
             PopTip.tip(R.string.please_select_card); return
         }
         TipDialog.show(
-            msg = CommonUtils.getStr(R.string.check_delete_card).toString(),
+            msg = CommonUtils.getStr("check_delete_card"),
             countDownTime = 10,
             onConfirmClick = {
                 val ids = viewModel.cardManageDataList.filter { it.isSelected }.map { it.cardId }
                 viewModel.deleteSelectedCard(ids).observe(this) { ok ->
                     TipDialog.show(
                         dialogType = if (ok) TipDialog.DialogType.SUCCESS else TipDialog.DialogType.ERROR,
-                        msg = CommonUtils.getStr(if (ok) R.string.card_manage_delete_succeed else R.string.card_manage_delete_failed)
+                        msg = CommonUtils.getStr(if (ok) "card_manage_delete_succeed" else "card_manage_delete_failed")
                             .toString(),
                         showConfirm = false,
                         countDownTime = 10

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

@@ -51,10 +51,9 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                         dialog.dismiss()
                         if (it) {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
-                                    .toString(),
+                                title = CommonUtils.getStr("action_succeed"),
                                 dialogType = TipDialog.DialogType.SUCCESS,
-                                msg = CommonUtils.getStr(R.string.add_key_succeed).toString(),
+                                msg = CommonUtils.getStr("add_key_succeed"),
                                 countDownTime = 10,
                                 showConfirm = false,
                                 onCancelClick = {
@@ -63,10 +62,10 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                             )
                         } else {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
+                                title = CommonUtils.getStr("action_failed")
                                     .toString(),
                                 dialogType = TipDialog.DialogType.ERROR,
-                                msg = CommonUtils.getStr(R.string.add_key_failed).toString(),
+                                msg = CommonUtils.getStr("add_key_failed"),
                                 countDownTime = 10,
                                 showConfirm = false,
                                 onCancelClick = {
@@ -132,11 +131,9 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                     dialog.dismiss()
                     if (it) {
                         TipDialog.show(
-                            title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
-                                .toString(),
+                            title = CommonUtils.getStr("action_succeed"),
                             dialogType = TipDialog.DialogType.SUCCESS,
-                            msg = CommonUtils.getStr(R.string.update_key_succeed)
-                                .toString(),
+                            msg = CommonUtils.getStr("update_key_succeed"),
                             countDownTime = 10,
                             showConfirm = false,
                             onCancelClick = {
@@ -145,10 +142,10 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                         )
                     } else {
                         TipDialog.show(
-                            title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
+                            title = CommonUtils.getStr("action_failed")
                                 .toString(),
                             dialogType = TipDialog.DialogType.ERROR,
-                            msg = CommonUtils.getStr(R.string.update_key_failed).toString(),
+                            msg = CommonUtils.getStr("update_key_failed").toString(),
                             countDownTime = 10,
                             showConfirm = false,
                             onCancelClick = {
@@ -198,7 +195,7 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
         viewModel.checkKeyInUse().observe(this){
             if (!it){
                 TipDialog.show(
-                    msg = CommonUtils.getStr(R.string.check_delete_key).toString(),
+                    msg = CommonUtils.getStr("check_delete_key").toString(),
                     countDownTime = 10,
                     onConfirmClick = {
                         viewModel.deleteSelectedKey(viewModel.keyManageDataList.filter { it.isSelected }
@@ -206,8 +203,7 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                             if (it) {
                                 TipDialog.show(
                                     dialogType = TipDialog.DialogType.SUCCESS,
-                                    msg = CommonUtils.getStr(R.string.key_manage_delete_succeed)
-                                        .toString(),
+                                    msg = CommonUtils.getStr("key_manage_delete_succeed"),
                                     showConfirm = false,
                                     countDownTime = 10
                                 )
@@ -215,8 +211,7 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                             } else {
                                 TipDialog.show(
                                     dialogType = TipDialog.DialogType.ERROR,
-                                    msg = CommonUtils.getStr(R.string.key_manage_delete_failed)
-                                        .toString(),
+                                    msg = CommonUtils.getStr("key_manage_delete_failed"),
                                     showConfirm = false,
                                     countDownTime = 10
                                 )
@@ -224,7 +219,7 @@ class KeyManageFragment : BaseFragment<FragmentKeyManageBinding>() {
                         }
                     })
             }else{
-                TipDialog.showError(CommonUtils.getStr(R.string.key_in_use).toString())
+                TipDialog.showError(CommonUtils.getStr("key_in_use"))
             }
         }
 

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

@@ -41,15 +41,15 @@ class LockManageFragment : BaseFragment<FragmentLockManageBinding>() {
                 viewModel.validateLockData(vo.lockNfc ?: "").observe(this) {
                     viewModel.addLock(vo).observe(this) { ok ->
                         dialog.dismiss()
-                        @StringRes val titleRes =
-                            if (ok) com.grkj.ui_base.R.string.action_succeed else com.grkj.ui_base.R.string.action_failed
-                        @StringRes val msgRes =
-                            if (ok) R.string.add_lock_succeed else R.string.add_lock_failed
+                        val titleRes =
+                            if (ok) "action_succeed" else "action_failed"
+                        val msgRes =
+                            if (ok) "add_lock_succeed" else "add_lock_failed"
 
                         TipDialog.show(
-                            title = CommonUtils.getStr(titleRes).toString(),
+                            title = CommonUtils.getStr(titleRes),
                             dialogType = if (ok) TipDialog.DialogType.SUCCESS else TipDialog.DialogType.ERROR,
-                            msg = CommonUtils.getStr(msgRes).toString(),
+                            msg = CommonUtils.getStr(msgRes),
                             countDownTime = 10,
                             showConfirm = false,
                             onCancelClick = { loadLocks(reset = true) }
@@ -111,15 +111,15 @@ class LockManageFragment : BaseFragment<FragmentLockManageBinding>() {
                 viewModel.validateLockData(vo.lockNfc ?: "").observe(this) {
                     viewModel.updateLock(vo).observe(this) { ok ->
                         dialog.dismiss()
-                        @StringRes val titleRes =
-                            if (ok) com.grkj.ui_base.R.string.action_succeed else com.grkj.ui_base.R.string.action_failed
-                        @StringRes val msgRes =
-                            if (ok) R.string.update_lock_succeed else R.string.update_lock_failed
+                        val titleRes =
+                            if (ok) "action_succeed" else "action_failed"
+                        val msgRes =
+                            if (ok) "update_lock_succeed" else "update_lock_failed"
 
                         TipDialog.show(
-                            title = CommonUtils.getStr(titleRes).toString(),
+                            title = CommonUtils.getStr(titleRes),
                             dialogType = if (ok) TipDialog.DialogType.SUCCESS else TipDialog.DialogType.ERROR,
-                            msg = CommonUtils.getStr(msgRes).toString(),
+                            msg = CommonUtils.getStr(msgRes),
                             countDownTime = 10,
                             showConfirm = false,
                             onCancelClick = { loadLocks(reset = true) }
@@ -162,14 +162,14 @@ class LockManageFragment : BaseFragment<FragmentLockManageBinding>() {
         viewModel.lockInUse().observe(this){
             if (!it){
                 TipDialog.show(
-                    msg = CommonUtils.getStr(R.string.check_delete_lock).toString(),
+                    msg = CommonUtils.getStr("check_delete_lock").toString(),
                     countDownTime = 10,
                     onConfirmClick = {
                         val ids = viewModel.lockManageDataList.filter { it.isSelected }.map { it.lockId }
                         viewModel.deleteSelectedLock(ids).observe(this) { ok ->
                             TipDialog.show(
                                 dialogType = if (ok) TipDialog.DialogType.SUCCESS else TipDialog.DialogType.ERROR,
-                                msg = CommonUtils.getStr(if (ok) R.string.lock_manage_delete_succeed else R.string.lock_manage_delete_failed)
+                                msg = CommonUtils.getStr(if (ok) "lock_manage_delete_succeed" else "lock_manage_delete_failed")
                                     .toString(),
                                 showConfirm = false, countDownTime = 10
                             )
@@ -178,7 +178,7 @@ class LockManageFragment : BaseFragment<FragmentLockManageBinding>() {
                     }
                 )
             }else{
-                TipDialog.showError(CommonUtils.getStr(R.string.lock_in_use).toString())
+                TipDialog.showError(CommonUtils.getStr("lock_in_use"))
             }
         }
 

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

@@ -38,15 +38,15 @@ class RfidTokenManageFragment : BaseFragment<FragmentRfidTokenManageBinding>() {
                 viewModel.validateRfidTokenData(vo.rfid).observe(this) {
                     viewModel.addRfidToken(vo).observe(this) { ok ->
                         dialog.dismiss()
-                        @StringRes val titleRes =
-                            if (ok) com.grkj.ui_base.R.string.action_succeed else com.grkj.ui_base.R.string.action_failed
-                        @StringRes val msgRes =
-                            if (ok) R.string.add_rfid_token_succeed else R.string.add_rfid_token_failed
+                        val titleRes =
+                            if (ok) "action_succeed" else "action_failed"
+                        val msgRes =
+                            if (ok) "add_rfid_token_succeed" else "add_rfid_token_failed"
 
                         TipDialog.show(
-                            title = CommonUtils.getStr(titleRes).toString(),
+                            title = CommonUtils.getStr(titleRes),
                             dialogType = if (ok) TipDialog.DialogType.SUCCESS else TipDialog.DialogType.ERROR,
-                            msg = CommonUtils.getStr(msgRes).toString(),
+                            msg = CommonUtils.getStr(msgRes),
                             countDownTime = 10,
                             showConfirm = false,
                             onCancelClick = {
@@ -108,21 +108,21 @@ class RfidTokenManageFragment : BaseFragment<FragmentRfidTokenManageBinding>() {
         }
         bind.root.setDebouncedClickListener {
             if (item.rfidId in viewModel.inUseRfidIds) {
-                showToast(CommonUtils.getStr(R.string.rfid_in_use).toString())
+                showToast(CommonUtils.getStr("rfid_in_use").toString())
                 return@setDebouncedClickListener
             }
             UpdateRfidTokenDialog.show(item) { vo, dialog ->
                 viewModel.updateRfidToken(vo).observe(this) { ok ->
                     dialog.dismiss()
-                    @StringRes val titleRes =
-                        if (ok) com.grkj.ui_base.R.string.action_succeed else com.grkj.ui_base.R.string.action_failed
-                    @StringRes val msgRes =
-                        if (ok) R.string.update_rfid_token_succeed else R.string.update_rfid_token_failed
+                    val titleRes =
+                        if (ok) "action_succeed" else "action_failed"
+                    val msgRes =
+                        if (ok) "update_rfid_token_succeed" else "update_rfid_token_failed"
 
                     TipDialog.show(
-                        title = CommonUtils.getStr(titleRes).toString(),
+                        title = CommonUtils.getStr(titleRes),
                         dialogType = if (ok) TipDialog.DialogType.SUCCESS else TipDialog.DialogType.ERROR,
-                        msg = CommonUtils.getStr(msgRes).toString(),
+                        msg = CommonUtils.getStr(msgRes),
                         countDownTime = 10,
                         showConfirm = false,
                         onCancelClick = { loadTokens(reset = true) }
@@ -164,11 +164,11 @@ class RfidTokenManageFragment : BaseFragment<FragmentRfidTokenManageBinding>() {
         }
         if (viewModel.rfidTokenManageDataList.map { it.rfidId }
                 .any { it in viewModel.inUseRfidIds }) {
-            showToast(CommonUtils.getStr(R.string.selected_rfid_in_use).toString())
+            showToast(CommonUtils.getStr("selected_rfid_in_use").toString())
             return
         }
         TipDialog.show(
-            msg = CommonUtils.getStr(R.string.check_delete_rfid_token).toString(),
+            msg = CommonUtils.getStr("check_delete_rfid_token").toString(),
             countDownTime = 10,
             onConfirmClick = {
                 val ids =
@@ -176,7 +176,7 @@ class RfidTokenManageFragment : BaseFragment<FragmentRfidTokenManageBinding>() {
                 viewModel.deleteSelectedRfidToken(ids).observe(this) { ok ->
                     TipDialog.show(
                         dialogType = if (ok) TipDialog.DialogType.SUCCESS else TipDialog.DialogType.ERROR,
-                        msg = CommonUtils.getStr(if (ok) R.string.rfid_token_manage_delete_succeed else R.string.rfid_token_manage_delete_failed)
+                        msg = CommonUtils.getStr(if (ok) "rfid_token_manage_delete_succeed" else "rfid_token_manage_delete_failed")
                             .toString(),
                         showConfirm = false,
                         countDownTime = 10

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

@@ -137,7 +137,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
         }
         binding.endTime.setDebouncedClickListener {
             if (binding.startTime.text.isEmpty()) {
-                PopTip.build().tip(R.string.please_select_start_time)
+                showToast(CommonUtils.getStr("please_select_start_time"))
                 return@setDebouncedClickListener
             }
             pickDateTime(false, binding.endTime)
@@ -158,9 +158,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
     private fun pickDateTime(startTime: Boolean = true, timeView: TextView) {
         AutoSize.autoConvertDensity(requireActivity(), 600f, false)
         CardDatePickerDialog.builder(requireContext()).setTitle(
-            if (startTime) CommonUtils.getStr(com.grkj.ui_base.R.string.start_time)
-                .toString() else CommonUtils.getStr(com.grkj.ui_base.R.string.end_time)
-                .toString()
+            if (startTime) CommonUtils.getStr("start_time") else CommonUtils.getStr("end_time")
         ).setOnChoose { millisecond ->
             val chooseTime = TimeUtils.formatDate(
                 Date(millisecond), TimeUtils.DEFAULT_DATE_HOUR_MIN_FORMAT
@@ -172,7 +170,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
                         TimeUtils.DEFAULT_DATE_HOUR_MIN_FORMAT
                     )
                 ) {
-                    PopTip.build().tip(R.string.end_time_must_large_then_start_time)
+                    showToast(CommonUtils.getStr("end_time_must_large_then_start_time"))
                     return@setOnChoose
                 }
             } else {
@@ -182,7 +180,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
                         TimeUtils.DEFAULT_DATE_HOUR_MIN_FORMAT
                     )
                 ) {
-                    PopTip.build().tip(R.string.end_time_must_large_then_start_time)
+                    showToast(CommonUtils.getStr("end_time_must_large_then_start_time"))
                     return@setOnChoose
                 }
             }

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

@@ -88,9 +88,9 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
         binding.save.setDebouncedClickListener {
             if (checkData()) {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_hint).toString(),
+                    title = CommonUtils.getStr("action_hint").toString(),
                     msg = CommonUtils.getStr(
-                        R.string.job_save_tip,
+                        "job_save_tip",
                         args = listOf<String>(binding.jobNameEt.text.toString()).toTypedArray()
                     ).toString(),
                     dialogType = TipDialog.DialogType.INFO,
@@ -112,9 +112,9 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
         binding.saveAndExecute.setDebouncedClickListener {
             if (checkData()) {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_confirm).toString(),
+                    title = CommonUtils.getStr("action_confirm").toString(),
                     msg = CommonUtils.getStr(
-                        R.string.job_save_and_execute_tip,
+                        "job_save_and_execute_tip",
                         args = listOf<String>(binding.jobNameEt.text.toString()).toTypedArray()
                     ).toString(),
                     dialogType = TipDialog.DialogType.INFO,
@@ -154,7 +154,7 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                    CommonUtils.getStr(R.string.create_job_title).toString()
+                    CommonUtils.getStr("create_job_title").toString()
                 )
             GlobalDataTempStore.getInstance()
                 .saveData(
@@ -204,7 +204,7 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                    CommonUtils.getStr(R.string.create_job_title).toString()
+                    CommonUtils.getStr("create_job_title").toString()
                 )
             GlobalDataTempStore.getInstance()
                 .saveData(
@@ -226,7 +226,7 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                    CommonUtils.getStr(R.string.create_job_title).toString()
+                    CommonUtils.getStr("create_job_title").toString()
                 )
             GlobalDataTempStore.getInstance()
                 .saveData(
@@ -250,7 +250,7 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                    CommonUtils.getStr(R.string.create_job_title).toString()
+                    CommonUtils.getStr("create_job_title").toString()
                 )
             GlobalDataTempStore.getInstance()
                 .saveData(
@@ -297,7 +297,7 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                    CommonUtils.getStr(R.string.create_job_title).toString()
+                    CommonUtils.getStr("create_job_title").toString()
                 )
             GlobalDataTempStore.getInstance()
                 .saveData(
@@ -393,10 +393,8 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
                     viewModel.startJob(it.second).observe(this) {
                         if (it) {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
-                                    .toString(),
-                                msg = CommonUtils.getStr(R.string.job_create_and_execute_succeed)
-                                    .toString(),
+                                title = CommonUtils.getStr("action_succeed"),
+                                msg = CommonUtils.getStr("job_create_and_execute_succeed"),
                                 dialogType = TipDialog.DialogType.SUCCESS,
                                 countDownTime = 10,
                                 onConfirmClick = {
@@ -408,10 +406,8 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
                             )
                         } else {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
-                                    .toString(),
-                                msg = CommonUtils.getStr(R.string.job_create_and_execute_failed)
-                                    .toString(),
+                                title = CommonUtils.getStr("action_failed"),
+                                msg = CommonUtils.getStr("job_create_and_execute_failed"),
                                 dialogType = TipDialog.DialogType.ERROR,
                                 showConfirm = false,
                                 countDownTime = 10
@@ -420,9 +416,8 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
                     }
                 } else {
                     TipDialog.show(
-                        title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
-                            .toString(),
-                        msg = CommonUtils.getStr(R.string.job_create_succeed).toString(),
+                        title = CommonUtils.getStr("action_succeed"),
+                        msg = CommonUtils.getStr("job_create_succeed"),
                         dialogType = TipDialog.DialogType.SUCCESS,
                         countDownTime = 10,
                         onConfirmClick = {
@@ -435,8 +430,8 @@ class CreateJobFragment : BaseFormFragment<FragmentCreateJobBinding>() {
                 }
             } else {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed).toString(),
-                    msg = CommonUtils.getStr(R.string.job_create_failed).toString(),
+                    title = CommonUtils.getStr("action_failed"),
+                    msg = CommonUtils.getStr("job_create_failed"),
                     dialogType = TipDialog.DialogType.ERROR,
                     showConfirm = false,
                     countDownTime = 10

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

@@ -84,9 +84,9 @@ class CreateSopFragment : BaseFormFragment<FragmentCreateSopBinding>() {
         binding.confirm.setDebouncedClickListener {
             if (checkData()) {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_confirm).toString(),
+                    title = CommonUtils.getStr("action_confirm").toString(),
                     msg = CommonUtils.getStr(
-                        R.string.sop_save_tip,
+                        "sop_save_tip",
                         args = listOf<String>(binding.sopNameEt.text.toString()).toTypedArray()
                     ).toString(),
                     dialogType = TipDialog.DialogType.INFO,
@@ -114,7 +114,7 @@ class CreateSopFragment : BaseFormFragment<FragmentCreateSopBinding>() {
                 .saveData(DataTransferConstants.KEY_SELECTED_POINT_DATA, selectedPointData)
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                CommonUtils.getStr(R.string.create_sop_title).toString()
+                CommonUtils.getStr("create_sop_title").toString()
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
@@ -152,7 +152,7 @@ class CreateSopFragment : BaseFormFragment<FragmentCreateSopBinding>() {
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                CommonUtils.getStr(R.string.create_sop_title).toString()
+                CommonUtils.getStr("create_sop_title").toString()
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
@@ -170,7 +170,7 @@ class CreateSopFragment : BaseFormFragment<FragmentCreateSopBinding>() {
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                CommonUtils.getStr(R.string.create_sop_title).toString()
+                CommonUtils.getStr("create_sop_title").toString()
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
@@ -190,7 +190,7 @@ class CreateSopFragment : BaseFormFragment<FragmentCreateSopBinding>() {
                 .saveData(DataTransferConstants.KEY_SELECTED_POINT_DATA, selectedPointData)
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                CommonUtils.getStr(R.string.create_sop_title).toString()
+                CommonUtils.getStr("create_sop_title").toString()
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
@@ -224,7 +224,7 @@ class CreateSopFragment : BaseFormFragment<FragmentCreateSopBinding>() {
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                CommonUtils.getStr(R.string.create_sop_title).toString()
+                CommonUtils.getStr("create_sop_title").toString()
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
@@ -294,8 +294,8 @@ class CreateSopFragment : BaseFormFragment<FragmentCreateSopBinding>() {
         ).observe(this) {
             if (it) {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed).toString(),
-                    msg = CommonUtils.getStr(R.string.sop_create_succeed).toString(),
+                    title = CommonUtils.getStr("action_succeed").toString(),
+                    msg = CommonUtils.getStr("sop_create_succeed").toString(),
                     dialogType = TipDialog.DialogType.SUCCESS,
                     countDownTime = 10,
                     onConfirmClick = {
@@ -306,8 +306,8 @@ class CreateSopFragment : BaseFormFragment<FragmentCreateSopBinding>() {
                     })
             } else {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed).toString(),
-                    msg = CommonUtils.getStr(R.string.sop_create_failed).toString(),
+                    title = CommonUtils.getStr("action_failed").toString(),
+                    msg = CommonUtils.getStr("sop_create_failed").toString(),
                     dialogType = TipDialog.DialogType.ERROR,
                     showConfirm = false,
                     countDownTime = 10

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

@@ -87,9 +87,9 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
         binding.save.setDebouncedClickListener {
             if (checkData()) {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_hint).toString(),
+                    title = CommonUtils.getStr("action_hint").toString(),
                     msg = CommonUtils.getStr(
-                        R.string.job_save_tip,
+                        "job_save_tip",
                         args = listOf<String>(binding.jobNameEt.text.toString()).toTypedArray()
                     ).toString(),
                     dialogType = TipDialog.DialogType.INFO,
@@ -102,9 +102,9 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
         binding.saveAndExecute.setDebouncedClickListener {
             if (checkData()) {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_confirm).toString(),
+                    title = CommonUtils.getStr("action_confirm").toString(),
                     msg = CommonUtils.getStr(
-                        R.string.create_sop_job_tip,
+                        "create_sop_job_tip",
                         args = listOf<String>(binding.jobNameEt.text.toString()).toTypedArray()
                     ).toString(),
                     dialogType = TipDialog.DialogType.INFO,
@@ -136,7 +136,7 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                    CommonUtils.getStr(R.string.create_sop_job_title).toString()
+                    CommonUtils.getStr("create_sop_job_title").toString()
                 )
             GlobalDataTempStore.getInstance()
                 .saveData(
@@ -179,7 +179,7 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                    CommonUtils.getStr(R.string.create_sop_job_title).toString()
+                    CommonUtils.getStr("create_sop_job_title").toString()
                 )
             GlobalDataTempStore.getInstance()
                 .saveData(
@@ -254,9 +254,9 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
                     viewModel.startJob(it.second).observe(this) {
                         if (it) {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
+                                title = CommonUtils.getStr("action_succeed")
                                     .toString(),
-                                msg = CommonUtils.getStr(R.string.sop_job_save_and_execute_succeed)
+                                msg = CommonUtils.getStr("sop_job_save_and_execute_succeed")
                                     .toString(),
                                 dialogType = TipDialog.DialogType.SUCCESS,
                                 countDownTime = 10,
@@ -269,9 +269,9 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
                             )
                         } else {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
+                                title = CommonUtils.getStr("action_succeed")
                                     .toString(),
-                                msg = CommonUtils.getStr(R.string.sop_job_save_and_execute_failed)
+                                msg = CommonUtils.getStr("sop_job_save_and_execute_failed")
                                     .toString(),
                                 dialogType = TipDialog.DialogType.SUCCESS,
                                 countDownTime = 10,
@@ -280,9 +280,9 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
                     }
                 } else {
                     TipDialog.show(
-                        title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
+                        title = CommonUtils.getStr("action_succeed")
                             .toString(),
-                        msg = CommonUtils.getStr(R.string.sop_job_save_succeed).toString(),
+                        msg = CommonUtils.getStr("sop_job_save_succeed").toString(),
                         dialogType = TipDialog.DialogType.SUCCESS,
                         countDownTime = 10,
                         onConfirmClick = {
@@ -295,8 +295,8 @@ class CreateSopJobFragment : BaseFormFragment<FragmentCreateSopJobBinding>() {
                 }
             } else {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed).toString(),
-                    msg = CommonUtils.getStr(R.string.sop_job_save_failed).toString(),
+                    title = CommonUtils.getStr("action_failed").toString(),
+                    msg = CommonUtils.getStr("sop_job_save_failed").toString(),
                     dialogType = TipDialog.DialogType.ERROR,
                     showConfirm = false,
                     countDownTime = 10

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

@@ -87,9 +87,9 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
         binding.save.setDebouncedClickListener {
             if (checkData()) {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_hint).toString(),
+                    title = CommonUtils.getStr("action_hint").toString(),
                     msg = CommonUtils.getStr(
-                        R.string.job_save_tip,
+                        "job_save_tip",
                         args = listOf<String>(binding.jobNameEt.text.toString()).toTypedArray()
                     ).toString(),
                     dialogType = TipDialog.DialogType.INFO,
@@ -102,9 +102,9 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
         binding.saveAndExecute.setDebouncedClickListener {
             if (checkData()) {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_confirm).toString(),
+                    title = CommonUtils.getStr("action_confirm").toString(),
                     msg = CommonUtils.getStr(
-                        R.string.job_save_and_execute_tip,
+                        "job_save_and_execute_tip",
                         args = listOf<String>(binding.jobNameEt.text.toString()).toTypedArray()
                     ).toString(),
                     dialogType = TipDialog.DialogType.INFO,
@@ -122,7 +122,7 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
         }
         binding.workflowModeSettingTv.setDebouncedClickListener {
             if (selectedModeId == null) {
-                PopTip.build().tip(R.string.please_select_workflow_mode)
+                showToast(CommonUtils.getStr("please_select_workflow_mode"))
                 return@setDebouncedClickListener
             }
             GlobalDataTempStore.getInstance()
@@ -138,7 +138,7 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                    CommonUtils.getStr(R.string.create_job_title).toString()
+                    CommonUtils.getStr("create_job_title").toString()
                 )
             GlobalDataTempStore.getInstance()
                 .saveData(
@@ -149,7 +149,7 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
         }
         binding.selectPointTv.setDebouncedClickListener {
             if (selectedWorkstationId == null) {
-                PopTip.build().tip(R.string.please_select_job_workstation)
+                showToast(CommonUtils.getStr("please_select_job_workstation"))
                 return@setDebouncedClickListener
             }
             GlobalDataTempStore.getInstance().saveData(
@@ -159,7 +159,7 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
                 .saveData(DataTransferConstants.KEY_SELECTED_POINT_DATA, selectedPointData)
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                CommonUtils.getStr(R.string.create_job_title).toString()
+                CommonUtils.getStr("create_job_title").toString()
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
@@ -174,11 +174,11 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
         }
         binding.selectMemberTv.setDebouncedClickListener {
             if (selectedWorkstationId == null) {
-                PopTip.build().tip(R.string.please_select_job_workstation)
+                showToast(CommonUtils.getStr("please_select_job_workstation"))
                 return@setDebouncedClickListener
             }
             if (selectedModeId == null) {
-                PopTip.build().tip(R.string.please_select_flow_mode)
+                showToast(CommonUtils.getStr("please_select_flow_mode"))
                 return@setDebouncedClickListener
             }
             GlobalDataTempStore.getInstance().saveData(
@@ -195,7 +195,7 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                CommonUtils.getStr(R.string.edit_job_title).toString()
+                CommonUtils.getStr("edit_job_title").toString()
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
@@ -265,9 +265,9 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
                     viewModel.startJob(it.second).observe(this) {
                         if (it) {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
+                                title = CommonUtils.getStr("action_succeed")
                                     .toString(),
-                                msg = CommonUtils.getStr(R.string.job_create_and_execute_succeed)
+                                msg = CommonUtils.getStr("job_create_and_execute_succeed")
                                     .toString(),
                                 dialogType = TipDialog.DialogType.SUCCESS,
                                 countDownTime = 10,
@@ -279,9 +279,9 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
                                 })
                         } else {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
+                                title = CommonUtils.getStr("action_failed")
                                     .toString(),
-                                msg = CommonUtils.getStr(R.string.job_create_and_execute_failed)
+                                msg = CommonUtils.getStr("job_create_and_execute_failed")
                                     .toString(),
                                 dialogType = TipDialog.DialogType.ERROR,
                                 showConfirm = false,
@@ -291,9 +291,9 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
                     }
                 } else {
                     TipDialog.show(
-                        title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
+                        title = CommonUtils.getStr("action_succeed")
                             .toString(),
-                        msg = CommonUtils.getStr(R.string.job_create_succeed).toString(),
+                        msg = CommonUtils.getStr("job_create_succeed").toString(),
                         dialogType = TipDialog.DialogType.SUCCESS,
                         countDownTime = 10,
                         onConfirmClick = {
@@ -305,8 +305,8 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
                 }
             } else {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed).toString(),
-                    msg = CommonUtils.getStr(R.string.job_create_failed).toString(),
+                    title = CommonUtils.getStr("action_failed").toString(),
+                    msg = CommonUtils.getStr("job_create_failed").toString(),
                     dialogType = TipDialog.DialogType.ERROR,
                     showConfirm = false,
                     countDownTime = 10
@@ -320,29 +320,29 @@ class EditJobFragment : BaseFormFragment<FragmentEditJobBinding>() {
      */
     private fun checkData(): Boolean {
         if (selectedWorkstationId == null) {
-            PopTip.build().tip(R.string.please_select_job_workstation)
+            showToast(CommonUtils.getStr("please_select_job_workstation"))
             return false
         }
         if (selectedModeId == null) {
-            PopTip.build().tip(R.string.please_select_flow_mode)
+            showToast(CommonUtils.getStr("please_select_flow_mode"))
             return false
         }
         if (binding.jobNameEt.text.isEmpty()) {
-            PopTip.build().tip(R.string.please_input_job_name)
+            showToast(CommonUtils.getStr("please_input_job_name"))
             return false
         }
         if (selectedPointData.isEmpty()) {
-            PopTip.build().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/EditSopFragment.kt

@@ -90,9 +90,9 @@ class EditSopFragment : BaseFormFragment<FragmentEditSopBinding>() {
         binding.confirm.setDebouncedClickListener {
             if (checkData()) {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_confirm).toString(),
+                    title = CommonUtils.getStr("action_confirm").toString(),
                     msg = CommonUtils.getStr(
-                        R.string.sop_save_tip,
+                        "sop_save_tip",
                         args = listOf<String>(binding.sopNameEt.text.toString()).toTypedArray()
                     ).toString(),
                     dialogType = TipDialog.DialogType.INFO,
@@ -110,7 +110,7 @@ class EditSopFragment : BaseFormFragment<FragmentEditSopBinding>() {
         }
         binding.workflowModeSettingTv.setDebouncedClickListener {
             if (selectedModeId == null) {
-                PopTip.build().tip(R.string.please_select_workflow_mode)
+                showToast(CommonUtils.getStr("please_select_workflow_mode"))
                 return@setDebouncedClickListener
             }
             GlobalDataTempStore.getInstance()
@@ -126,7 +126,7 @@ class EditSopFragment : BaseFormFragment<FragmentEditSopBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                    CommonUtils.getStr(R.string.create_sop_title).toString()
+                    CommonUtils.getStr("create_sop_title").toString()
                 )
             GlobalDataTempStore.getInstance()
                 .saveData(
@@ -137,7 +137,7 @@ class EditSopFragment : BaseFormFragment<FragmentEditSopBinding>() {
         }
         binding.selectPointTv.setDebouncedClickListener {
             if (selectedWorkstationId == null) {
-                PopTip.build().tip(R.string.please_select_sop_workstation)
+                showToast(CommonUtils.getStr("please_select_sop_workstation"))
                 return@setDebouncedClickListener
             }
             GlobalDataTempStore.getInstance()
@@ -150,7 +150,7 @@ class EditSopFragment : BaseFormFragment<FragmentEditSopBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                    CommonUtils.getStr(R.string.edit_sop_title).toString()
+                    CommonUtils.getStr("edit_sop_title").toString()
                 )
             GlobalDataTempStore.getInstance()
                 .saveData(
@@ -166,11 +166,11 @@ class EditSopFragment : BaseFormFragment<FragmentEditSopBinding>() {
         }
         binding.selectMemberTv.setDebouncedClickListener {
             if (selectedWorkstationId == null) {
-                PopTip.build().tip(R.string.please_select_sop_workstation)
+                showToast(CommonUtils.getStr("please_select_sop_workstation"))
                 return@setDebouncedClickListener
             }
             if (selectedModeId == null) {
-                PopTip.build().tip(R.string.please_select_flow_mode)
+                showToast(CommonUtils.getStr("please_select_flow_mode"))
                 return@setDebouncedClickListener
             }
             GlobalDataTempStore.getInstance().saveData(
@@ -192,7 +192,7 @@ class EditSopFragment : BaseFormFragment<FragmentEditSopBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                    CommonUtils.getStr(R.string.edit_sop_title).toString()
+                    CommonUtils.getStr("edit_sop_title").toString()
                 )
             GlobalDataTempStore.getInstance()
                 .saveData(
@@ -259,8 +259,8 @@ class EditSopFragment : BaseFormFragment<FragmentEditSopBinding>() {
         ).observe(this) {
             if (it) {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed).toString(),
-                    msg = CommonUtils.getStr(R.string.sop_save_succeed).toString(),
+                    title = CommonUtils.getStr("action_succeed").toString(),
+                    msg = CommonUtils.getStr("sop_save_succeed").toString(),
                     dialogType = TipDialog.DialogType.SUCCESS,
                     countDownTime = 10,
                     onConfirmClick = {
@@ -272,8 +272,8 @@ class EditSopFragment : BaseFormFragment<FragmentEditSopBinding>() {
                 )
             } else {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed).toString(),
-                    msg = CommonUtils.getStr(R.string.sop_save_failed).toString(),
+                    title = CommonUtils.getStr("action_failed").toString(),
+                    msg = CommonUtils.getStr("sop_save_failed").toString(),
                     dialogType = TipDialog.DialogType.ERROR,
                     showConfirm = false,
                     countDownTime = 10
@@ -287,28 +287,28 @@ class EditSopFragment : BaseFormFragment<FragmentEditSopBinding>() {
      */
     private fun checkData(): Boolean {
         if (selectedWorkstationId == null) {
-            PopTip.build().tip(R.string.please_select_sop_workstation)
+            showToast(CommonUtils.getStr("please_select_sop_workstation"))
             return false
         }
         if (selectedModeId == null) {
-            PopTip.build().tip(R.string.please_select_flow_mode)
+            showToast(CommonUtils.getStr("please_select_flow_mode"))
             return false
         }
         if (binding.sopNameEt.text.isEmpty()) {
-            PopTip.build().tip(R.string.please_input_sop_name)
+            showToast(CommonUtils.getStr("please_input_sop_name"))
             return false
         }
         if (selectedPointData.isEmpty()) {
-            PopTip.build().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/EditSopJobFragment.kt

@@ -91,9 +91,9 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
         binding.save.setDebouncedClickListener {
             if (checkData()) {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_hint).toString(),
+                    title = CommonUtils.getStr("action_hint").toString(),
                     msg = CommonUtils.getStr(
-                        R.string.job_save_tip,
+                        "job_save_tip",
                         args = listOf<String>(binding.jobNameEt.text.toString()).toTypedArray()
                     ).toString(),
                     dialogType = TipDialog.DialogType.INFO,
@@ -106,9 +106,9 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
         binding.saveAndExecute.setDebouncedClickListener {
             if (checkData()) {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_confirm).toString(),
+                    title = CommonUtils.getStr("action_confirm").toString(),
                     msg = CommonUtils.getStr(
-                        R.string.create_sop_job_tip,
+                        "create_sop_job_tip",
                         args = listOf<String>(binding.jobNameEt.text.toString()).toTypedArray()
                     ).toString(),
                     dialogType = TipDialog.DialogType.INFO,
@@ -129,7 +129,7 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
         }
         binding.sopTv.setDebouncedClickListener {
             if (selectedWorkstationId == null) {
-                PopTip.build().tip(R.string.please_select_sop_workstation)
+                showToast(CommonUtils.getStr("please_select_sop_workstation"))
                 return@setDebouncedClickListener
             } else {
                 viewModel.getSopByWorkstation(selectedWorkstationId!!).observe(this) {
@@ -139,7 +139,7 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
         }
         binding.workflowModeSettingTv.setDebouncedClickListener {
             if (selectedSop == null) {
-                PopTip.build().tip(R.string.please_select_sop)
+                showToast(CommonUtils.getStr("please_select_sop"))
                 return@setDebouncedClickListener
             }
             GlobalDataTempStore.getInstance()
@@ -155,7 +155,7 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                    CommonUtils.getStr(R.string.create_sop_job_title).toString()
+                    CommonUtils.getStr("create_sop_job_title").toString()
                 )
             GlobalDataTempStore.getInstance()
                 .saveData(
@@ -166,7 +166,7 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
         }
         binding.selectMemberTv.setDebouncedClickListener {
             if (selectedWorkstationId == null) {
-                PopTip.build().tip(R.string.please_select_sop_workstation)
+                showToast(CommonUtils.getStr("please_select_sop_workstation"))
                 return@setDebouncedClickListener
             }
             GlobalDataTempStore.getInstance().saveData(
@@ -183,7 +183,7 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                CommonUtils.getStr(R.string.create_sop_title).toString()
+                CommonUtils.getStr("create_sop_title").toString()
             )
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_PREVIEW_STEP_ICON_DATA,
@@ -253,9 +253,9 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
                     viewModel.startJob(it.second).observe(this) {
                         if (it) {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
+                                title = CommonUtils.getStr("action_succeed")
                                     .toString(),
-                                msg = CommonUtils.getStr(R.string.sop_job_save_and_execute_succeed)
+                                msg = CommonUtils.getStr("sop_job_save_and_execute_succeed")
                                     .toString(),
                                 dialogType = TipDialog.DialogType.SUCCESS,
                                 countDownTime = 10,
@@ -268,9 +268,9 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
                             )
                         } else {
                             TipDialog.show(
-                                title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
+                                title = CommonUtils.getStr("action_succeed")
                                     .toString(),
-                                msg = CommonUtils.getStr(R.string.sop_job_save_and_execute_failed)
+                                msg = CommonUtils.getStr("sop_job_save_and_execute_failed")
                                     .toString(),
                                 dialogType = TipDialog.DialogType.SUCCESS,
                                 countDownTime = 10,
@@ -279,9 +279,9 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
                     }
                 } else {
                     TipDialog.show(
-                        title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
+                        title = CommonUtils.getStr("action_succeed")
                             .toString(),
-                        msg = CommonUtils.getStr(R.string.sop_job_save_succeed).toString(),
+                        msg = CommonUtils.getStr("sop_job_save_succeed").toString(),
                         dialogType = TipDialog.DialogType.SUCCESS,
                         countDownTime = 10,
                         onConfirmClick = {
@@ -294,8 +294,8 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
                 }
             } else {
                 TipDialog.show(
-                    title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed).toString(),
-                    msg = CommonUtils.getStr(R.string.sop_job_save_failed).toString(),
+                    title = CommonUtils.getStr("action_failed").toString(),
+                    msg = CommonUtils.getStr("sop_job_save_failed").toString(),
                     dialogType = TipDialog.DialogType.ERROR,
                     showConfirm = false,
                     countDownTime = 10
@@ -309,24 +309,24 @@ class EditSopJobFragment : BaseFormFragment<FragmentEditSopJobBinding>() {
      */
     private fun checkData(): Boolean {
         if (selectedWorkstationId == null) {
-            PopTip.build().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/InProgressJobManageFragment.kt

@@ -61,7 +61,7 @@ class InProgressJobManageFragment : BaseFragment<FragmentInProgressJobManageBind
         val item = holder.getModel<JobTicketManageVo>()
         itemBinding.jobName.text = item.ticketName
         itemBinding.status.text =
-            if (item.exStatus != null) CommonUtils.getStr(R.string.abnormal) else JobTicketStatusEnum.getTicketStatusStr(
+            if (item.exStatus != null) CommonUtils.getStr("abnormal") else JobTicketStatusEnum.getTicketStatusStr(
                 item.ticketStatus
             )
         itemBinding.select.isVisible = false

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

@@ -98,11 +98,11 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
         }
         binding.toLock.setDebouncedClickListener {
             if (viewModel.groupInfo.isEmpty()) {
-                showToast(CommonUtils.getStr(R.string.not_group_can_lock).toString())
+                showToast(CommonUtils.getStr("not_group_can_lock").toString())
                 return@setDebouncedClickListener
             }
             BottomMenu.show(viewModel.groupInfo.map { it.groupName })
-                .setTitle(CommonUtils.getStr(R.string.please_select_group))
+                .setTitle(CommonUtils.getStr("please_select_group"))
                 .setOnMenuItemClickListener { popMenu, itemText, position ->
                     popMenu.dismiss()
                     toLock(viewModel.groupInfo[position].groupId)
@@ -111,11 +111,11 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
         }
         binding.toUnlock.setDebouncedClickListener {
             if (viewModel.groupInfo.isEmpty()) {
-                showToast(CommonUtils.getStr(R.string.not_group_can_unlock).toString())
+                showToast(CommonUtils.getStr("not_group_can_unlock").toString())
                 return@setDebouncedClickListener
             }
             BottomMenu.show(viewModel.groupInfo.map { it.groupName })
-                .setTitle(CommonUtils.getStr(R.string.please_select_group))
+                .setTitle(CommonUtils.getStr("please_select_group"))
                 .setOnMenuItemClickListener { popMenu, itemText, position ->
                     popMenu.dismiss()
                     toUnLock(viewModel.groupInfo[position].groupId)
@@ -217,11 +217,11 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
         binding.colockerLayout.isVisible = index == 2
         binding.dataTitleTv.text = when (index) {
             0 -> CommonUtils.getStr(
-                R.string.job_execute_step_description, viewModel.currentStepData?.stepTitle ?: ""
+                "job_execute_step_description", viewModel.currentStepData?.stepTitle ?: ""
             ).toString()
 
-            1 -> CommonUtils.getStr(R.string.job_execute_lock_status_title).toString()
-            2 -> CommonUtils.getStr(R.string.job_execute_colocker_colock_status_title).toString()
+            1 -> CommonUtils.getStr("job_execute_lock_status_title").toString()
+            2 -> CommonUtils.getStr("job_execute_colocker_colock_status_title").toString()
             else -> ""
         }
     }
@@ -292,13 +292,13 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
                             stepClickConfirm(adapter, item, workflowStep)
                         } else {
                             showToast(
-                                CommonUtils.getStr(com.grkj.ui_base.R.string.no_permission_to_handle)
+                                CommonUtils.getStr("no_permission_to_handle")
                                     .toString()
                             )
                         }
                     } else {
                         val errorTipData = viewModel.getStepErrorTip(workflowStep)
-                        PopTip.build().tip(errorTipData.first)
+                        showToast(errorTipData.first)
                         errorTipData.second?.let {
                             checkLayout(it)
                         }
@@ -318,7 +318,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
             if (viewModel.stepConditionsComplete(workflowStep)) {
                 TipDialog.showInfo(
                     msg = CommonUtils.getStr(
-                        com.grkj.ui_base.R.string.action_confirm_content,
+                        "action_confirm_content",
                         workflowStep?.stepTitleShort.toString()
                     ).toString(), onConfirmClick = {
                         item.stepStatus = "1"
@@ -326,7 +326,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
                             TimeUtils.nowString(TimeUtils.DEFAULT_DATE_HOUR_MIN_SEC_FORMAT)
                         viewModel.updateStepStatus(item).observe(this@JobExecuteFragment) {
                             if (it == false) {
-                                PopTip.build().tip(R.string.step_confirm_failed)
+                                showToast(CommonUtils.getStr("step_confirm_failed"))
                             } else {
                                 logger.info("点击更新步骤状态完成")
                                 checkLayout(0)
@@ -337,7 +337,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
                     })
             } else {
                 val errorTipData = viewModel.getStepErrorTip(workflowStep)
-                PopTip.build().tip(errorTipData.first)
+                showToast(errorTipData.first)
                 errorTipData.second?.let {
                     checkLayout(it)
                 }
@@ -394,27 +394,27 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
         }
         return when {
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.recognize_work_content).toString()
+                CommonUtils.getStr("recognize_work_content").toString()
             ) == true -> R.mipmap.icon_loto_step_1
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.power_isolation_way).toString()
+                CommonUtils.getStr("power_isolation_way").toString()
             ) == true -> R.mipmap.icon_loto_step_2
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.shutdown).toString()
+                CommonUtils.getStr("shutdown").toString()
             ) == true -> R.mipmap.icon_loto_step_4
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.ensure_power_isolation).toString()
+                CommonUtils.getStr("ensure_power_isolation").toString()
             ) == true -> R.mipmap.icon_loto_step_6
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.check_before_unlocking).toString()
+                CommonUtils.getStr("check_before_unlocking").toString()
             ) == true -> R.mipmap.icon_loto_step_7
 
             workflowStep.stepTitleShort?.contains(
-                CommonUtils.getStr(com.grkj.ui_base.R.string.unlock_and_restore_switch).toString()
+                CommonUtils.getStr("unlock_and_restore_switch").toString()
             ) == true -> R.mipmap.icon_loto_step_8
 
             workflowStep.enableSetLocker || workflowStep.enableSetColocker -> R.mipmap.icon_step_select_member
@@ -472,7 +472,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
             EventConstants.EVENT_RFID_CARD_READ -> {
                 if (MainDomainData.userInfo?.userName != viewModel.ticketData?.createBy) {
                     showToast(
-                        CommonUtils.getStr(com.grkj.ui_base.R.string.no_permission_to_handle)
+                        CommonUtils.getStr("no_permission_to_handle")
                             .toString()
                     )
                     return
@@ -494,7 +494,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
                                         logger.info("添加共锁")
                                         TipDialog.showInfo(
                                             msg = CommonUtils.getStr(
-                                                com.grkj.ui_base.R.string.confirm_to_colock,
+                                                "confirm_to_colock",
                                                 colocker.nickName ?: ""
                                             ).toString(), countDownTime = 10, onConfirmClick = {
                                                 colocker.jobStatus = "1"
@@ -515,7 +515,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
                                         logger.info("解除共锁")
                                         TipDialog.showInfo(
                                             msg = CommonUtils.getStr(
-                                                com.grkj.ui_base.R.string.confirm_to_uncolock,
+                                                "confirm_to_uncolock",
                                                 colocker.nickName ?: ""
                                             ).toString(), countDownTime = 10, onConfirmClick = {
                                                 colocker.jobStatus = "2"
@@ -536,11 +536,11 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
                                         PopTip.build()
                                             .tip(R.string.currently_unable_to_lock_together)
                                     }
-                                } ?: PopTip.build().tip(R.string.invalid_user)
-                            } ?: PopTip.build().tip(R.string.invalid_card)
+                                } ?: showToast(CommonUtils.getStr("invalid_user"))
+                            } ?: showToast(CommonUtils.getStr("invalid_card"))
                         }
                     } else {
-                        PopTip.build().tip(R.string.currently_unable_to_lock_together)
+                        showToast(CommonUtils.getStr("currently_unable_to_lock_together"))
                     }
                 }
             }
@@ -575,7 +575,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
                 it.stepStatus = "1"
                 viewModel.updateStepStatus(it).observe(this@JobExecuteFragment) {
                     if (it == false) {
-                        PopTip.build().tip(R.string.step_confirm_failed)
+                        showToast(CommonUtils.getStr("step_confirm_failed"))
                     } else {
                         logger.info("检查更新步骤状态完成")
                     }
@@ -643,7 +643,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
         super.initData()
         viewModel.checkMyTodoForHandleKey().observe(this) {}
         if (!GlobalDataTempStore.getInstance().hasData(DataTransferConstants.KEY_JOB_TICKET_ID)) {
-            PopTip.build().tip(R.string.job_lost)
+            showToast(CommonUtils.getStr("job_lost"))
             navController.popBackStack()
             return
         }
@@ -672,7 +672,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
                 }
             } else {
                 TipDialog.showError(
-                    msg = CommonUtils.getStr(com.grkj.ui_base.R.string.ticket_lost).toString(),
+                    msg = CommonUtils.getStr("ticket_lost").toString(),
                     onConfirmClick = {
                         navController.popBackStack()
                     },
@@ -732,7 +732,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
                     viewModel.currentStepData?.let {
                         viewModel.updateStepStatus(it).observe(this@JobExecuteFragment) {
                             if (it == false) {
-                                PopTip.build().tip(R.string.step_confirm_failed)
+                                showToast(CommonUtils.getStr("step_confirm_failed"))
                             } else {
                                 checkCurrentStep()
                             }
@@ -752,7 +752,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
                                 TimeUtils.nowString(TimeUtils.DEFAULT_DATE_HOUR_MIN_SEC_FORMAT)
                             viewModel.updateStepStatusBack(it).observe(this@JobExecuteFragment) {
                                 if (it == false) {
-                                    PopTip.build().tip(R.string.step_confirm_failed)
+                                    showToast(CommonUtils.getStr("step_confirm_failed"))
                                 } else {
                                     viewModel.currentStepData =
                                         viewModel.ticketStep.firstOrNull { it.stepStatus == "0" }

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

@@ -64,7 +64,7 @@ class JobManageFragment : BaseFragment<FragmentJobManageBinding>() {
 
     private fun deleteSelected() {
         if (viewModel.jobManageDataList.none { it.isSelected }) {
-            PopTip.build().tip(R.string.please_select_job)
+            showToast(CommonUtils.getStr("please_select_job"))
             return
         }
         if (viewModel.jobManageDataList.filter { it.isSelected }.any {
@@ -77,14 +77,14 @@ class JobManageFragment : BaseFragment<FragmentJobManageBinding>() {
             return
         }
         TipDialog.show(
-            msg = CommonUtils.getStr(R.string.check_delete_job).toString(),
+            msg = CommonUtils.getStr("check_delete_job").toString(),
             countDownTime = 10,
             onConfirmClick = {
                 viewModel.deleteSelectedJob().observe(this) {
                     if (it) {
                         TipDialog.show(
                             dialogType = TipDialog.DialogType.SUCCESS,
-                            msg = CommonUtils.getStr(R.string.job_manage_delete_succeed)
+                            msg = CommonUtils.getStr("job_manage_delete_succeed")
                                 .toString(),
                             showConfirm = false,
                             countDownTime = 10,
@@ -98,7 +98,7 @@ class JobManageFragment : BaseFragment<FragmentJobManageBinding>() {
                     } else {
                         TipDialog.show(
                             dialogType = TipDialog.DialogType.ERROR,
-                            msg = CommonUtils.getStr(R.string.job_manage_delete_failed)
+                            msg = CommonUtils.getStr("job_manage_delete_failed")
                                 .toString(),
                             showConfirm = false,
                             countDownTime = 10
@@ -138,9 +138,9 @@ class JobManageFragment : BaseFragment<FragmentJobManageBinding>() {
                     navController.navigate(R.id.action_jobManageFragment_to_editJobFragment)
                 }
             } else if (item.ticketStatus == JobTicketStatusEnum.CANCELED.status) {
-                PopTip.build().tip(R.string.job_canceled)
+                showToast(CommonUtils.getStr("job_canceled"))
             } else if (item.ticketStatus == JobTicketStatusEnum.FINISHED.status) {
-                PopTip.build().tip(R.string.job_finished)
+                showToast(CommonUtils.getStr("job_finished"))
             } else if (item.exStatus == viewModel.jobTicketStatus.find { it.dictLabel == "异常" }?.dictValue?.toInt()) {
                 viewModel.getExceptionIdByTicketId(item.ticketId).observe(this@JobManageFragment) {
                     GlobalDataTempStore.getInstance()

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

@@ -417,7 +417,7 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
             EventConstants.EVENT_RFID_CARD_READ -> {
                 if (MainDomainData.userInfo?.userName != jobExecuteViewModel.ticketData?.createBy) {
                     showToast(
-                        CommonUtils.getStr(com.grkj.ui_base.R.string.no_permission_to_handle)
+                        CommonUtils.getStr("no_permission_to_handle")
                             .toString()
                     )
                     return
@@ -441,7 +441,7 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
                                         logger.info("添加共锁")
                                         TipDialog.showInfo(
                                             msg = CommonUtils.getStr(
-                                                com.grkj.ui_base.R.string.confirm_to_colock,
+                                                "confirm_to_colock",
                                                 colocker.nickName ?: ""
                                             ).toString(), countDownTime = 10, onConfirmClick = {
                                                 colocker.jobStatus = "1"
@@ -462,7 +462,7 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
                                         logger.info("解除共锁")
                                         TipDialog.showInfo(
                                             msg = CommonUtils.getStr(
-                                                com.grkj.ui_base.R.string.confirm_to_uncolock,
+                                                "confirm_to_uncolock",
                                                 colocker.nickName ?: ""
                                             ).toString(), countDownTime = 10, onConfirmClick = {
                                                 colocker.jobStatus = "2"
@@ -483,11 +483,13 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
                                         PopTip.build()
                                             .tip(R.string.currently_unable_to_lock_together)
                                     }
-                                } ?: PopTip.build().tip(R.string.invalid_user)
-                            } ?: PopTip.build().tip(R.string.invalid_card)
+                                } ?:
+                                showToast(CommonUtils.getStr("invalid_user"))
+                            } ?:
+                            showToast(CommonUtils.getStr("invalid_card"))
                         }
                     } else {
-                        PopTip.build().tip(R.string.currently_unable_to_lock_together)
+                        showToast(CommonUtils.getStr("currently_unable_to_lock_together"))
                     }
                 }
             }
@@ -631,7 +633,7 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
                             }
                         } else {
                             showToast(
-                                CommonUtils.getStr(com.grkj.ui_base.R.string.no_permission_to_handle)
+                                CommonUtils.getStr("no_permission_to_handle")
                                     .toString()
                             )
                         }
@@ -649,7 +651,7 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
                                 jobExecuteViewModel.updateStepStatusBack(it)
                                     .observe(this@MyTodoListFragment) {
                                         if (it == false) {
-                                            PopTip.build().tip(R.string.step_confirm_failed)
+                                            showToast(CommonUtils.getStr("step_confirm_failed"))
                                         } else {
                                             jobExecuteViewModel.currentStepData =
                                                 jobExecuteViewModel.ticketStep.firstOrNull { it.stepStatus == "0" }
@@ -679,7 +681,7 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
                 it.updateTime = TimeUtils.nowString(TimeUtils.DEFAULT_DATE_HOUR_MIN_SEC_FORMAT)
                 jobExecuteViewModel.updateStepStatus(it).observe(this@MyTodoListFragment) {
                     if (it == false) {
-                        PopTip.build().tip(R.string.step_confirm_failed)
+                        showToast(CommonUtils.getStr("step_confirm_failed"))
                     } else {
                         logger.info("检查更新步骤状态完成")
                         getData()

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

@@ -73,14 +73,14 @@ class SopManageFragment : BaseFragment<FragmentSopManageBinding>() {
                 TipDialog.showError(getString(R.string.has_job_in_progress))
             } else {
                 TipDialog.show(
-                    msg = CommonUtils.getStr(R.string.check_delete_sop).toString(),
+                    msg = CommonUtils.getStr("check_delete_sop").toString(),
                     countDownTime = 10,
                     onConfirmClick = {
                         viewModel.deleteSelectedSop().observe(this) {
                             if (it) {
                                 TipDialog.show(
                                     dialogType = TipDialog.DialogType.SUCCESS,
-                                    msg = CommonUtils.getStr(R.string.sop_manage_delete_succeed)
+                                    msg = CommonUtils.getStr("sop_manage_delete_succeed")
                                         .toString(),
                                     showConfirm = false,
                                     countDownTime = 10,
@@ -94,7 +94,7 @@ class SopManageFragment : BaseFragment<FragmentSopManageBinding>() {
                             } else {
                                 TipDialog.show(
                                     dialogType = TipDialog.DialogType.ERROR,
-                                    msg = CommonUtils.getStr(R.string.sop_manage_delete_failed)
+                                    msg = CommonUtils.getStr("sop_manage_delete_failed")
                                         .toString(),
                                     showConfirm = false,
                                     countDownTime = 10

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

@@ -63,14 +63,14 @@ class WorkflowManageFragment : BaseFragment<FragmentWorkflowManageBinding>() {
             return
         }
         TipDialog.show(
-            msg = CommonUtils.getStr(R.string.check_delete_workflow_mode).toString(),
+            msg = CommonUtils.getStr("check_delete_workflow_mode").toString(),
             countDownTime = 10,
             onConfirmClick = {
                 viewModel.deleteSelectedWorkflowMode().observe(this) {
                     if (it) {
                         TipDialog.show(
                             dialogType = TipDialog.DialogType.SUCCESS,
-                            msg = CommonUtils.getStr(R.string.workflow_mode_manage_delete_succeed)
+                            msg = CommonUtils.getStr("workflow_mode_manage_delete_succeed")
                                 .toString(),
                             showConfirm = false,
                             countDownTime = 10,
@@ -84,7 +84,7 @@ class WorkflowManageFragment : BaseFragment<FragmentWorkflowManageBinding>() {
                     } else {
                         TipDialog.show(
                             dialogType = TipDialog.DialogType.ERROR,
-                            msg = CommonUtils.getStr(R.string.job_manage_delete_failed)
+                            msg = CommonUtils.getStr("job_manage_delete_failed")
                                 .toString(),
                             showConfirm = false,
                             countDownTime = 10
@@ -128,12 +128,12 @@ class WorkflowManageFragment : BaseFragment<FragmentWorkflowManageBinding>() {
         }
         itemBinding.delete.setDebouncedClickListener {
             if (item.isPreset) {
-                showToast(CommonUtils.getStr(R.string.preset_workflow_can_not_delete).toString())
+                showToast(CommonUtils.getStr("preset_workflow_can_not_delete").toString())
                 return@setDebouncedClickListener
             }
             viewModel.deleteWorkflowMode(item).observe(this@WorkflowManageFragment) {
                 TipDialog.showSuccess(
-                    CommonUtils.getStr(R.string.delete_success).toString(),
+                    CommonUtils.getStr("delete_success").toString(),
                     onConfirmClick = {
                         getData()
                     })
@@ -148,7 +148,7 @@ class WorkflowManageFragment : BaseFragment<FragmentWorkflowManageBinding>() {
             GlobalDataTempStore.getInstance()
                 .saveData(
                     DataTransferConstants.KEY_PREVIEW_STEP_TITLE_DATA,
-                    CommonUtils.getStr(R.string.workflow_manage_title).toString()
+                    CommonUtils.getStr("workflow_manage_title").toString()
                 )
             GlobalDataTempStore.getInstance()
                 .saveData(

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

@@ -41,7 +41,7 @@ class ResetPasswordFragment : BaseFragment<FragmentResetPasswordBinding>() {
                 ).observe(this) {
                     if (it) {
                         TipDialog.showSuccess(
-                            CommonUtils.getStr(R.string.reset_user_password_succeed).toString(),
+                            CommonUtils.getStr("reset_user_password_succeed").toString(),
                             onConfirmClick = {
                                 LogoutEvent.sendLogoutEvent()
                             }, onCancelClick = {
@@ -49,7 +49,7 @@ class ResetPasswordFragment : BaseFragment<FragmentResetPasswordBinding>() {
                             })
                     } else {
                         TipDialog.showError(
-                            CommonUtils.getStr(R.string.reset_user_password_failed).toString()
+                            CommonUtils.getStr("reset_user_password_failed").toString()
                         )
                     }
                 }

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

@@ -72,7 +72,7 @@ class SetFingerprintFragment : BaseFragment<FragmentSetFingerprintBinding>() {
         binding.delete.setDebouncedClickListener {
             TipDialog.showInfo(
                 CommonUtils.getStr(
-                    com.grkj.ui_base.R.string.fingerprint_delete_selected_confirm_tip
+                    "fingerprint_delete_selected_confirm_tip"
                 ).toString(),
                 countDownTime = 10,
                 onConfirmClick = {
@@ -106,7 +106,7 @@ class SetFingerprintFragment : BaseFragment<FragmentSetFingerprintBinding>() {
                 itemBinding.delete.setDebouncedClickListener {
                     TipDialog.showInfo(
                         CommonUtils.getStr(
-                            com.grkj.ui_base.R.string.fingerprint_delete_confirm_tip,
+                            "fingerprint_delete_confirm_tip",
                             getString(R.string.fingerprint_code_str, item.group?.take(6))
                         ).toString(),
                         countDownTime = 10,

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

@@ -120,11 +120,11 @@ class UserInfoFragment : BaseFragment<FragmentUserInfoBinding>() {
                 ).observe(this) {
                     if (it) {
                         TipDialog.showSuccess(
-                            CommonUtils.getStr(R.string.update_user_succeed).toString()
+                            CommonUtils.getStr("update_user_succeed").toString()
                         )
                     } else {
                         TipDialog.showError(
-                            CommonUtils.getStr(R.string.update_user_failed).toString()
+                            CommonUtils.getStr("update_user_failed").toString()
                         )
                     }
                 }

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

@@ -109,7 +109,7 @@ class MainViewModel @Inject constructor(
                                                     Executor.delayOnMain(300) {
                                                         bleBean?.let {
                                                             LoadingEvent.sendLoadingEvent(
-                                                                CommonUtils.getStr(com.grkj.ui_base.R.string.loading_msg_get_ticket_status_start),
+                                                                CommonUtils.getStr("loading_msg_get_ticket_status_start"),
                                                                 true
                                                             )
                                                             BleConnectionManager.getCurrentStatus(
@@ -120,7 +120,7 @@ class MainViewModel @Inject constructor(
                                                     }
                                                 }else{
                                                     ModBusController.controlKeyBuckle(true,mac){
-                                                        showTip(CommonUtils.getStr(R.string.ticket_get_failed).toString())
+                                                        showTip(CommonUtils.getStr("ticket_get_failed").toString())
                                                     }
                                                 }
                                             }

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

@@ -103,7 +103,7 @@ class WorkflowViewModel @Inject constructor(val workflowRepository: IWorkflowLog
                         override fun progress(progress: Float) {
                             LoadingEvent.sendLoadingEvent(
                                 CommonUtils.getStr(
-                                    R.string.unzip,
+                                    "unzip",
                                     progress
                                 )
                             )
@@ -115,7 +115,7 @@ class WorkflowViewModel @Inject constructor(val workflowRepository: IWorkflowLog
                             if (workflowModeSha == null) {
                                 LoadingEvent.sendLoadingEvent()
                                 TipDialog.showError(
-                                    CommonUtils.getStr(R.string.the_verification_file_not_exists)
+                                    CommonUtils.getStr("the_verification_file_not_exists")
                                         .toString()
                                 )
                                 return
@@ -123,7 +123,7 @@ class WorkflowViewModel @Inject constructor(val workflowRepository: IWorkflowLog
                             if (workflowModeData == null) {
                                 LoadingEvent.sendLoadingEvent()
                                 TipDialog.showError(
-                                    CommonUtils.getStr(R.string.data_file_not_exists).toString()
+                                    CommonUtils.getStr("data_file_not_exists").toString()
                                 )
                                 return
                             }
@@ -133,7 +133,7 @@ class WorkflowViewModel @Inject constructor(val workflowRepository: IWorkflowLog
                             ) {
                                 LoadingEvent.sendLoadingEvent()
                                 TipDialog.showError(
-                                    CommonUtils.getStr(R.string.data_file_is_corrupted).toString()
+                                    CommonUtils.getStr("data_file_is_corrupted").toString()
                                 )
                                 return
                             }
@@ -161,7 +161,7 @@ class WorkflowViewModel @Inject constructor(val workflowRepository: IWorkflowLog
                                         workflowImportData.filter { it.modeName !in existsWorkflowModes.map { it.modeName } }
                                     if (importData.isEmpty()) {
                                         showTip(
-                                            CommonUtils.getStr(R.string.workflow_already_exists)
+                                            CommonUtils.getStr("workflow_already_exists")
                                                 .toString()
                                         )
                                         return
@@ -185,20 +185,20 @@ class WorkflowViewModel @Inject constructor(val workflowRepository: IWorkflowLog
                                         }
                                         LoadingEvent.sendLoadingEvent()
                                         TipDialog.showSuccess(
-                                            CommonUtils.getStr(R.string.import_success)
+                                            CommonUtils.getStr("import_success")
                                                 .toString()
                                         )
                                     }
                                 } catch (e: Exception) {
                                     LoadingEvent.sendLoadingEvent()
                                     TipDialog.showError(
-                                        CommonUtils.getStr(R.string.data_content_error).toString()
+                                        CommonUtils.getStr("data_content_error").toString()
                                     )
                                 }
                             } catch (e: Exception) {
                                 LoadingEvent.sendLoadingEvent()
                                 TipDialog.showError(
-                                    CommonUtils.getStr(R.string.data_decrypt_failed).toString()
+                                    CommonUtils.getStr("data_decrypt_failed").toString()
                                 )
                             }
 
@@ -211,7 +211,7 @@ class WorkflowViewModel @Inject constructor(val workflowRepository: IWorkflowLog
                     })
                 }
             } catch (e: Exception) {
-                showTip(CommonUtils.getStr(R.string.file_not_exists).toString())
+                showTip(CommonUtils.getStr("file_not_exists").toString())
             }
             emit(true)
         }

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

@@ -67,24 +67,24 @@ class EditJobWorkflowSettingViewModel @Inject constructor(
     fun checkAndSetStepFunction(): List<String> {
         stepFunction.clear()
         if (currentStep?.enableCancelJob == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.cancel_job).toString())
+            stepFunction.add(CommonUtils.getStr("cancel_job").toString())
         }
         if (currentStep?.enableSetLocker == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.set_locker).toString())
+            stepFunction.add(CommonUtils.getStr("set_locker").toString())
         }
         if (currentStep?.enableSetColocker == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.set_colocker).toString())
+            stepFunction.add(CommonUtils.getStr("set_colocker").toString())
         }
         if (currentStep?.enableLock == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.lock).toString())
+            stepFunction.add(CommonUtils.getStr("lock").toString())
         }
         if (currentStep?.enableColock == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.colock).toString())
+            stepFunction.add(CommonUtils.getStr("colock").toString())
         }
         if (currentStep?.enableAddColocker == true) {
             val str = SIKCore.getApplication().getString(
                 R.string.add_colocker,
-                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr(R.string.no_goto_step) else SIKCore.getApplication()
+                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else SIKCore.getApplication()
                     .getString(R.string.navigate_to_step, currentStep?.gotoStepAfterAddingColocker)
             )
             stepFunction.add(str)
@@ -92,19 +92,19 @@ class EditJobWorkflowSettingViewModel @Inject constructor(
         if (currentStep?.enableReduceColocker == true) {
             val str = SIKCore.getApplication().getString(
                 R.string.reduce_colocker,
-                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr(R.string.no_goto_step) else SIKCore.getApplication()
+                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else SIKCore.getApplication()
                     .getString(R.string.navigate_to_step, currentStep?.gotoStepAfterAddingColocker)
             )
             stepFunction.add(str)
         }
         if (currentStep?.enableReleaseColock == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.release_colocker).toString())
+            stepFunction.add(CommonUtils.getStr("release_colocker").toString())
         }
         if (currentStep?.enableUnlock == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.unlock).toString())
+            stepFunction.add(CommonUtils.getStr("").toString())
         }
         if (currentStep?.enableEndJob == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.end_job).toString())
+            stepFunction.add(CommonUtils.getStr("end_job").toString())
         }
         return stepFunction
     }

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

@@ -67,24 +67,24 @@ class EditSopWorkflowSettingViewModel @Inject constructor(
     fun checkAndSetStepFunction(): List<String> {
         stepFunction.clear()
         if (currentStep?.enableCancelJob == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.cancel_job).toString())
+            stepFunction.add(CommonUtils.getStr("cancel_job").toString())
         }
         if (currentStep?.enableSetLocker == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.set_locker).toString())
+            stepFunction.add(CommonUtils.getStr("set_locker").toString())
         }
         if (currentStep?.enableSetColocker == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.set_colocker).toString())
+            stepFunction.add(CommonUtils.getStr("set_colocker").toString())
         }
         if (currentStep?.enableLock == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.lock).toString())
+            stepFunction.add(CommonUtils.getStr("R.string.").toString())
         }
         if (currentStep?.enableColock == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.colock).toString())
+            stepFunction.add(CommonUtils.getStr("colock").toString())
         }
         if (currentStep?.enableAddColocker == true) {
             val str = SIKCore.getApplication().getString(
                 R.string.add_colocker,
-                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr(R.string.no_goto_step) else SIKCore.getApplication()
+                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else SIKCore.getApplication()
                     .getString(R.string.navigate_to_step, currentStep?.gotoStepAfterAddingColocker)
             )
             stepFunction.add(str)
@@ -92,19 +92,19 @@ class EditSopWorkflowSettingViewModel @Inject constructor(
         if (currentStep?.enableReduceColocker == true) {
             val str = SIKCore.getApplication().getString(
                 R.string.reduce_colocker,
-                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr(R.string.no_goto_step) else SIKCore.getApplication()
+                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else SIKCore.getApplication()
                     .getString(R.string.navigate_to_step, currentStep?.gotoStepAfterAddingColocker)
             )
             stepFunction.add(str)
         }
         if (currentStep?.enableReleaseColock == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.release_colocker).toString())
+            stepFunction.add(CommonUtils.getStr("release_colocker").toString())
         }
         if (currentStep?.enableUnlock == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.unlock).toString())
+            stepFunction.add(CommonUtils.getStr("unlock").toString())
         }
         if (currentStep?.enableEndJob == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.end_job).toString())
+            stepFunction.add(CommonUtils.getStr("end_job").toString())
         }
         return stepFunction
     }

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

@@ -64,24 +64,24 @@ class WorkflowSettingViewModel @Inject constructor(
     fun checkAndSetStepFunction(): List<String> {
         stepFunction.clear()
         if (currentStep?.enableCancelJob == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.cancel_job).toString())
+            stepFunction.add(CommonUtils.getStr("cancel_job").toString())
         }
         if (currentStep?.enableSetLocker == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.set_locker).toString())
+            stepFunction.add(CommonUtils.getStr("set_locker").toString())
         }
         if (currentStep?.enableSetColocker == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.set_colocker).toString())
+            stepFunction.add(CommonUtils.getStr("set_colocker").toString())
         }
         if (currentStep?.enableLock == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.lock).toString())
+            stepFunction.add(CommonUtils.getStr("lock").toString())
         }
         if (currentStep?.enableColock == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.colock).toString())
+            stepFunction.add(CommonUtils.getStr("colock").toString())
         }
         if (currentStep?.enableAddColocker == true) {
             val str = SIKCore.getApplication().getString(
                 R.string.add_colocker,
-                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr(R.string.no_goto_step) else SIKCore.getApplication()
+                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else SIKCore.getApplication()
                     .getString(R.string.navigate_to_step, currentStep?.gotoStepAfterAddingColocker)
             )
             stepFunction.add(str)
@@ -89,19 +89,19 @@ class WorkflowSettingViewModel @Inject constructor(
         if (currentStep?.enableReduceColocker == true) {
             val str = SIKCore.getApplication().getString(
                 R.string.reduce_colocker,
-                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr(R.string.no_goto_step) else SIKCore.getApplication()
+                if (currentStep?.gotoStepAfterAddingColocker == null) CommonUtils.getStr("no_goto_step") else SIKCore.getApplication()
                     .getString(R.string.navigate_to_step, currentStep?.gotoStepAfterAddingColocker)
             )
             stepFunction.add(str)
         }
         if (currentStep?.enableReleaseColock == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.release_colocker).toString())
+            stepFunction.add(CommonUtils.getStr("release_colocker").toString())
         }
         if (currentStep?.enableUnlock == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.unlock).toString())
+            stepFunction.add(CommonUtils.getStr("unlock").toString())
         }
         if (currentStep?.enableEndJob == true) {
-            stepFunction.add(CommonUtils.getStr(R.string.end_job).toString())
+            stepFunction.add(CommonUtils.getStr("end_job").toString())
         }
         return stepFunction
     }

app/src/main/java/com/grkj/iscs/features/main/viewmodel/data_manage/PointManageViewModel.kt

@@ -109,7 +109,7 @@ class PointManageViewModel @Inject constructor(
             if (isolationPoint == null) {
                 emit(true)
             } else {
-                showTip(CommonUtils.getStr(R.string.rfid_already_bind).toString())
+                showTip(CommonUtils.getStr("rfid_already_bind").toString())
             }
         }
     }

app/src/main/java/com/grkj/iscs/features/main/viewmodel/data_manage/RoleManageViewModel.kt

@@ -129,7 +129,7 @@ class RoleManageViewModel @Inject constructor(
                 emit(true)
             } else {
                 showTip(
-                    CommonUtils.getStr(com.grkj.iscs.R.string.role_key_already_exists).toString()
+                    CommonUtils.getStr("role_key_already_exists").toString()
                 )
             }
         }

app/src/main/java/com/grkj/iscs/features/main/viewmodel/data_manage/UserManageViewModel.kt

@@ -121,7 +121,7 @@ class UserManageViewModel @Inject constructor(
         return liveData(Dispatchers.IO) {
             val user = userLogic.getUserByUserName(username)
             if (user != null) {
-                showTip(CommonUtils.getStr(R.string.user_already_exists).toString())
+                showTip(CommonUtils.getStr("user_already_exists").toString())
             } else {
                 emit(true)
             }

app/src/main/java/com/grkj/iscs/features/main/viewmodel/data_manage/WorkstationManageViewModel.kt

@@ -157,7 +157,7 @@ class WorkstationManageViewModel @Inject constructor(val workstationRepository:
             if (workstationData==null){
                 emit(true)
             }else{
-                showTip(CommonUtils.getStr(R.string.workstation_already_exists).toString())
+                showTip(CommonUtils.getStr("workstation_already_exists").toString())
             }
         }
     }

app/src/main/java/com/grkj/iscs/features/main/viewmodel/exception_manage/ExceptionJobViewModel.kt

@@ -143,7 +143,7 @@ class ExceptionJobViewModel @Inject constructor(
             exceptionData?.let {
                 exceptionRepository.handleException(listOf(it))
                 emit(true to "")
-            } ?: emit(false to CommonUtils.getStr(R.string.exception_data_not_exists).toString())
+            } ?: emit(false to CommonUtils.getStr("exception_data_not_exists").toString())
         }
     }
 

app/src/main/java/com/grkj/iscs/features/main/viewmodel/exception_manage/ExceptionViewModel.kt

@@ -184,7 +184,7 @@ class ExceptionViewModel @Inject constructor(
             exceptionData?.let {
                 exceptionRepository.handleException(listOf(it))
                 emit(true to "")
-            } ?: emit(false to CommonUtils.getStr(R.string.exception_data_not_exists).toString())
+            } ?: emit(false to CommonUtils.getStr("exception_data_not_exists").toString())
         }
     }
 

app/src/main/java/com/grkj/iscs/features/main/viewmodel/hardware_manage/CardManageViewModel.kt

@@ -127,7 +127,7 @@ class CardManageViewModel @Inject constructor(
             if (card == null) {
                 emit(true)
             } else {
-                showTip(CommonUtils.getStr(R.string.card_already_registration).toString())
+                showTip(CommonUtils.getStr("card_already_registration").toString())
             }
         }
     }

app/src/main/java/com/grkj/iscs/features/main/viewmodel/hardware_manage/KeyManageViewModel.kt

@@ -108,7 +108,7 @@ class KeyManageViewModel @Inject constructor(
             if (keyInfo == null || keyInfo.macAddress != keyMac) {
                 emit(true)
             } else {
-                showTip(CommonUtils.getStr(R.string.key_info_already_exists).toString())
+                showTip(CommonUtils.getStr("key_info_already_exists").toString())
             }
         }
     }

app/src/main/java/com/grkj/iscs/features/main/viewmodel/hardware_manage/LockManageViewModel.kt

@@ -105,7 +105,7 @@ class LockManageViewModel @Inject constructor(
             if (lockInfo == null) {
                 emit(true)
             }else{
-                showTip(CommonUtils.getStr(R.string.lock_already_exists).toString())
+                showTip(CommonUtils.getStr("lock_already_exists").toString())
             }
         }
     }

app/src/main/java/com/grkj/iscs/features/main/viewmodel/hardware_manage/RfidTokenManageViewModel.kt

@@ -115,7 +115,7 @@ class RfidTokenManageViewModel @Inject constructor(
             if (rfidTokenData == null) {
                 emit(true)
             } else {
-                showTip(CommonUtils.getStr(R.string.rfid_already_registration).toString())
+                showTip(CommonUtils.getStr("rfid_already_registration").toString())
             }
         }
     }

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/JobExecuteViewModel.kt

@@ -188,7 +188,7 @@ class JobExecuteViewModel @Inject constructor(
             if (ticketData?.createBy != MainDomainData.userInfo?.userName) {
                 ThreadUtils.runOnMain {
                     PopTip.build()
-                        .tip(CommonUtils.getStr(com.grkj.ui_base.R.string.no_permission_to_handle))
+                        .tip(CommonUtils.getStr("no_permission_to_handle"))
                 }
                 return@liveData
             }
@@ -205,7 +205,7 @@ class JobExecuteViewModel @Inject constructor(
             if (ticketData?.createBy != MainDomainData.userInfo?.userName) {
                 ThreadUtils.runOnMain {
                     PopTip.build()
-                        .tip(CommonUtils.getStr(com.grkj.ui_base.R.string.no_permission_to_handle))
+                        .tip(CommonUtils.getStr("no_permission_to_handle"))
                 }
                 return@liveData
             }
@@ -223,14 +223,14 @@ class JobExecuteViewModel @Inject constructor(
                     DeviceConst.DEVICE_TYPE_LOCK, ticketId
                 )
             ) {
-                showLoading(CommonUtils.getStr(com.grkj.ui_base.R.string.please_take_out_ready_device_first))
+                showLoading(CommonUtils.getStr("please_take_out_ready_device_first"))
                 return@liveData
             }
             if (ModbusBusinessManager.hasAnyDeviceWaitTakeByTicketId(
                     DeviceConst.DEVICE_TYPE_KEY, ticketId
                 )
             ) {
-                showLoading(CommonUtils.getStr(com.grkj.ui_base.R.string.check_key_and_lock))
+                showLoading(CommonUtils.getStr("check_key_and_lock"))
                 val rfid = ModbusBusinessManager.getWaitTakeDeviceByTicketId(
                     DeviceConst.DEVICE_TYPE_KEY, ticketId
                 )?.nfc
@@ -251,7 +251,7 @@ class JobExecuteViewModel @Inject constructor(
             if (role == null) {
                 ThreadUtils.runOnMain {
                     PopTip.build()
-                        .tip(CommonUtils.getStr(com.grkj.ui_base.R.string.no_permission_to_handle))
+                        .tip(CommonUtils.getStr("no_permission_to_handle"))
                 }
                 return@liveData
             }
@@ -271,8 +271,8 @@ class JobExecuteViewModel @Inject constructor(
             }, true) { keyMap, lockMap ->
                 if (lockMap.isEmpty()) {
                     TipDialog.show(
-                        CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed).toString(),
-                        CommonUtils.getStr(com.grkj.ui_base.R.string.lock_is_not_enough).toString(),
+                        CommonUtils.getStr("action_failed").toString(),
+                        CommonUtils.getStr("lock_is_not_enough").toString(),
                         TipDialog.DialogType.ERROR,
                         countDownTime = 10,
                         onConfirmClick = {
@@ -285,8 +285,8 @@ class JobExecuteViewModel @Inject constructor(
                 }
                 if (keyMap == null) {
                     TipDialog.show(
-                        CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed).toString(),
-                        CommonUtils.getStr(com.grkj.ui_base.R.string.no_available_key).toString(),
+                        CommonUtils.getStr("action_failed").toString(),
+                        CommonUtils.getStr("no_available_key").toString(),
                         TipDialog.DialogType.ERROR,
                         countDownTime = 10,
                         onConfirmClick = {
@@ -318,7 +318,7 @@ class JobExecuteViewModel @Inject constructor(
                             if (openedLockDockSize.get() >= waitOpenLockDockSize) {
                                 LoadingEvent.sendLoadingEvent(
                                     CommonUtils.getStr(
-                                        com.grkj.ui_base.R.string.take_out_lock_tip, args = listOf(
+                                        "take_out_lock_tip", args = listOf(
                                             lockMap.values.flatten().count().toInt()
                                         ).toTypedArray()
                                     ), true
@@ -341,14 +341,14 @@ class JobExecuteViewModel @Inject constructor(
                     DeviceConst.DEVICE_TYPE_LOCK, ticketId
                 )
             ) {
-                showLoading(CommonUtils.getStr(com.grkj.ui_base.R.string.please_take_out_ready_device_first))
+                showLoading(CommonUtils.getStr("please_take_out_ready_device_first"))
                 return@liveData
             }
             if (ModbusBusinessManager.hasAnyDeviceWaitTakeByTicketId(
                     DeviceConst.DEVICE_TYPE_KEY, ticketId
                 )
             ) {
-                showLoading(CommonUtils.getStr(com.grkj.ui_base.R.string.check_key_and_lock))
+                showLoading(CommonUtils.getStr("check_key_and_lock"))
                 val rfid = ModbusBusinessManager.getWaitTakeDeviceByTicketId(
                     DeviceConst.DEVICE_TYPE_KEY, ticketId
                 )?.nfc
@@ -369,7 +369,7 @@ class JobExecuteViewModel @Inject constructor(
             if (role == null) {
                 ThreadUtils.runOnMain {
                     PopTip.build()
-                        .tip(CommonUtils.getStr(com.grkj.ui_base.R.string.no_permission_to_handle))
+                        .tip(CommonUtils.getStr("no_permission_to_handle"))
                 }
                 return@liveData
             }
@@ -398,9 +398,9 @@ class JobExecuteViewModel @Inject constructor(
                         LoadingEvent.sendLoadingEvent()
                         if (keyMap == null) {
                             TipDialog.show(
-                                CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
+                                CommonUtils.getStr("action_failed")
                                     .toString(),
-                                CommonUtils.getStr(com.grkj.ui_base.R.string.no_available_key)
+                                CommonUtils.getStr("no_available_key")
                                     .toString(),
                                 TipDialog.DialogType.ERROR,
                                 countDownTime = 10
@@ -433,7 +433,7 @@ class JobExecuteViewModel @Inject constructor(
         tickets.firstOrNull()?.let {
             PopTip.build().tip(
                 CommonUtils.getStr(
-                    R.string.please_wait_ticket_name_lock_complete,
+                    "please_wait_ticket_name_lock_complete",
                     args = listOf<String>(it.ticketName).toTypedArray()
                 )
             )
@@ -667,7 +667,7 @@ class JobExecuteViewModel @Inject constructor(
         return when {
 
             ((ticketData?.createBy == MainDomainData.userInfo?.userName && workflowStep?.confirmUser == null) || workflowStep?.currentUserCanConfirm() == true) && (workflowStep?.enableSetLocker == true || workflowStep?.enableSetColocker == true) -> {
-                CommonUtils.getStr(R.string.please_select_member).toString() to null
+                CommonUtils.getStr("please_select_member").toString() to null
             }
 
             ((ticketData?.createBy == MainDomainData.userInfo?.userName && workflowStep?.confirmUser == null) || workflowStep?.currentUserCanConfirm() == true) && (workflowStep?.enableLock == true || workflowStep?.enableColock == true || workflowStep?.enableReleaseColock == true || workflowStep?.enableUnlock == true) -> {
@@ -675,38 +675,38 @@ class JobExecuteViewModel @Inject constructor(
                 var index: Int? = null
                 if (workflowStep.enableLock) {
                     if (ticketPoints.any { it.pointStatus != "1" } && ticketKey.isEmpty()) {
-                        tip = CommonUtils.getStr(com.grkj.ui_base.R.string.please_go_locking)
+                        tip = CommonUtils.getStr("please_go_locking")
                             .toString()
                         index = 1
                     } else if (ticketPoints.any { it.pointStatus != "1" } && ticketKey.filter { it.ticketType == 0 }
                             .any { it.collectTime.isNullOrEmpty() }) {
                         tip =
-                            CommonUtils.getStr(com.grkj.ui_base.R.string.please_return_key_after_locking)
+                            CommonUtils.getStr("please_return_key_after_locking")
                                 .toString()
                         index = 1
                     }
                 }
                 if (workflowStep.enableColock && ticketPoints.all { it.pointStatus == "1" } && ticketUser.filter { it.userRole == RoleEnum.JTCOLOCKER.roleKey }
                         .any { it.jobStatus == "0" }) {
-                    tip = CommonUtils.getStr(R.string.please_do_colock).toString()
+                    tip = CommonUtils.getStr("please_do_colock").toString()
                     index = 2
                 }
                 if (workflowStep.enableReleaseColock && ticketUser.filter { it.userRole == RoleEnum.JTCOLOCKER.roleKey }
                         .none { it.jobStatus == "0" }) {
                     tip =
-                        CommonUtils.getStr(com.grkj.ui_base.R.string.please_do_uncolock).toString()
+                        CommonUtils.getStr("please_do_uncolock").toString()
                     index = 2
                 }
                 if (workflowStep.enableUnlock && ticketUser.filter { it.userRole == RoleEnum.JTCOLOCKER.roleKey }
                         .all { it.jobStatus == "2" }) {
                     if (ticketPoints.any { it.pointStatus != "2" }) {
-                        tip = CommonUtils.getStr(com.grkj.ui_base.R.string.please_go_unlocking)
+                        tip = CommonUtils.getStr("please_go_unlocking")
                             .toString()
                         index = 1
                     } else if (ticketPoints.any { it.pointStatus != "2" } && ticketKey.filter { it.ticketType == 1 }
                             .any { it.collectTime.isNullOrEmpty() }) {
                         tip =
-                            CommonUtils.getStr(com.grkj.ui_base.R.string.please_return_key_after_unlocking)
+                            CommonUtils.getStr("please_return_key_after_unlocking")
                                 .toString()
                         index = 1
                     }
@@ -714,7 +714,7 @@ class JobExecuteViewModel @Inject constructor(
                 tip to index
             }
 
-            else -> CommonUtils.getStr(com.grkj.ui_base.R.string.no_permission_to_handle)
+            else -> CommonUtils.getStr("no_permission_to_handle")
                 .toString() to null
         }
     }
@@ -733,40 +733,40 @@ class JobExecuteViewModel @Inject constructor(
         val currentWorkflowStep = currentStepData
         return when {
             ((ticketData?.createBy == MainDomainData.userInfo?.userName && currentWorkflowStep?.confirmUser == null) || currentWorkflowStep?.currentUserCanConfirm() == true) && (currentWorkflowStep?.enableSetLocker == true || currentWorkflowStep?.enableSetColocker == true) -> {
-                CommonUtils.getStr(R.string.please_select_member).toString()
+                CommonUtils.getStr("please_select_member").toString()
             }
 
             ((ticketData?.createBy == MainDomainData.userInfo?.userName && currentWorkflowStep?.confirmUser == null) || currentWorkflowStep?.currentUserCanConfirm() == true) && (currentWorkflowStep?.enableLock == true || currentWorkflowStep?.enableColock == true || currentWorkflowStep?.enableReleaseColock == true || currentWorkflowStep?.enableUnlock == true) -> {
                 var tip = ""
                 if (currentWorkflowStep.enableLock) {
                     if (ticketPoints.any { it.pointStatus != "1" } && ticketKey.isEmpty()) {
-                        tip = CommonUtils.getStr(com.grkj.ui_base.R.string.please_go_locking)
+                        tip = CommonUtils.getStr("please_go_locking")
                             .toString()
                     } else if (ticketPoints.any { it.pointStatus != "1" } && ticketKey.filter { it.ticketType == 0 }
                             .any { it.collectTime.isNullOrEmpty() }) {
                         tip =
-                            CommonUtils.getStr(com.grkj.ui_base.R.string.please_return_key_after_locking)
+                            CommonUtils.getStr("please_return_key_after_locking")
                                 .toString()
                     }
                 }
                 if (currentWorkflowStep.enableColock && ticketPoints.all { it.pointStatus == "1" } && ticketUser.filter { it.userRole == RoleEnum.JTCOLOCKER.roleKey }
                         .any { it.jobStatus == "0" }) {
-                    tip = CommonUtils.getStr(R.string.please_do_colock).toString()
+                    tip = CommonUtils.getStr("please_do_colock").toString()
                 }
                 if (currentWorkflowStep.enableReleaseColock && ticketUser.filter { it.userRole == RoleEnum.JTCOLOCKER.roleKey }
                         .none { it.jobStatus == "0" }) {
                     tip =
-                        CommonUtils.getStr(com.grkj.ui_base.R.string.please_do_uncolock).toString()
+                        CommonUtils.getStr("please_do_uncolock").toString()
                 }
                 if (currentWorkflowStep.enableUnlock && ticketUser.filter { it.userRole == RoleEnum.JTCOLOCKER.roleKey }
                         .all { it.jobStatus == "2" }) {
                     if (ticketPoints.any { it.pointStatus != "2" }) {
-                        tip = CommonUtils.getStr(com.grkj.ui_base.R.string.please_go_unlocking)
+                        tip = CommonUtils.getStr("please_go_unlocking")
                             .toString()
                     } else if (ticketPoints.any { it.pointStatus != "2" } && ticketKey.filter { it.ticketType == 1 }
                             .any { it.collectTime.isNullOrEmpty() }) {
                         tip =
-                            CommonUtils.getStr(com.grkj.ui_base.R.string.please_return_key_after_unlocking)
+                            CommonUtils.getStr("please_return_key_after_unlocking")
                                 .toString()
                     }
                 }
@@ -787,7 +787,7 @@ class JobExecuteViewModel @Inject constructor(
             if (ticketData?.createBy != MainDomainData.userInfo?.userName && workflowStep?.currentUserCanConfirm() == false) {
                 ThreadUtils.runOnMain {
                     PopTip.build()
-                        .tip(CommonUtils.getStr(com.grkj.ui_base.R.string.no_permission_to_handle))
+                        .tip(CommonUtils.getStr("no_permission_to_handle"))
                 }
                 emit(false)
             } else {

app/src/main/java/com/grkj/iscs/features/main/viewmodel/job_manage/MyTodoViewModel.kt

@@ -183,23 +183,23 @@ class MyTodoViewModel @Inject constructor(
      */
     fun getHandleTip(item: TodoItemVo): String {
         return when (item.todoType) {
-            OperationTypeEnum.LOCK_TAKE_KEY -> CommonUtils.getStr(R.string.handle_lock_take_key)
+            OperationTypeEnum.LOCK_TAKE_KEY -> CommonUtils.getStr("handle_lock_take_key")
                 .toString()
 
-            OperationTypeEnum.UNLOCK_TAKE_KEY -> CommonUtils.getStr(R.string.handle_unlock_take_key)
+            OperationTypeEnum.UNLOCK_TAKE_KEY -> CommonUtils.getStr("handle_unlock_take_key")
                 .toString()
 
-            OperationTypeEnum.COLOCK -> CommonUtils.getStr(R.string.handle_colock)
+            OperationTypeEnum.COLOCK -> CommonUtils.getStr("handle_colock")
                 .toString()
 
-            OperationTypeEnum.RELEASE_COLOCK -> CommonUtils.getStr(R.string.handle_release_colock)
+            OperationTypeEnum.RELEASE_COLOCK -> CommonUtils.getStr("handle_release_colock")
                 .toString()
 
             OperationTypeEnum.CONFIRM -> CommonUtils.getStr(
-                R.string.handle_step_confirm, item.todoTitle.toString()
+               "handle_step_confirm", item.todoTitle.toString()
             ).toString()
 
-            OperationTypeEnum.END -> CommonUtils.getStr(R.string.finish_job_tip).toString()
+            OperationTypeEnum.END -> CommonUtils.getStr("finish_job_tip").toString()
             else -> ""
         }
     }

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

@@ -139,8 +139,8 @@ abstract class BaseFormFragment<V : ViewDataBinding> : BaseFragment<V>() {
         }
     ) {
         TipDialog.show(
-            title = CommonUtils.getStr(R.string.action_hint).toString(),
-            msg = CommonUtils.getStr(R.string.not_save_tip).toString(),
+            title = CommonUtils.getStr("action_hint").toString(),
+            msg = CommonUtils.getStr("not_save_tip").toString(),
             dialogType = TipDialog.DialogType.ERROR,
             countDownTime = 10,
             onConfirmClick = onConfirm

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

@@ -112,7 +112,7 @@ abstract class BaseFragment<V : ViewDataBinding> : Fragment(), CustomAdapt {
     }
 
     /** 显示加载框，子类实现 */
-    protected fun showLoading(msg: String? = CommonUtils.getStr(R.string.loading_data).toString()) {
+    protected fun showLoading(msg: String? = CommonUtils.getStr("loading_data").toString()) {
         LoadingEvent.sendLoadingEvent(msg)
     }
 

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

@@ -132,10 +132,10 @@ object BleBusinessManager {
                     val keyBean = ModBusController.getKeyByMac(bleBean.bleDevice.mac)
                     if (keyBean == null) {
                         LoadingEvent.sendLoadingEvent("未找到钥匙信息", true)
-                        PopTip.build().tip(R.string.key_not_exists)
+                        PopTip.build().tip(CommonUtils.getStr("key_not_exists"))
                     } else {
                         LoadingEvent.sendLoadingEvent(
-                            CommonUtils.getStr(R.string.take_out_key_tip), true
+                            CommonUtils.getStr("take_out_key_tip"), true
                         )
                         val dock = ModBusController.getDockByKeyMac(bleBean.bleDevice.mac)
                         keyBean.isReady = false
@@ -145,7 +145,7 @@ object BleBusinessManager {
                         ModBusController.updateKeyReadyStatus(
                             bleBean.bleDevice.mac, false, 1
                         )
-                        PopTip.build().tip(R.string.take_out_key)
+                        PopTip.build().tip(CommonUtils.getStr("take_out_key"))
                         ThreadUtils.runOnIO {
                             DataBusiness.checkMyTodoForHandleKey(bleBean.bleDevice.mac)
                         }
@@ -271,12 +271,12 @@ object BleBusinessManager {
                     Executor.delayOnMain(500) {
                         bleBean.retryCount++
                         LoadingEvent.sendLoadingEvent(
-                            CommonUtils.getStr(R.string.start_to_send_ticket), true
+                            CommonUtils.getStr("start_to_send_ticket"), true
                         )
                         sendTicketWithRetry(bleBean.ticketSend!!, bleBean.bleDevice, isNeedLoading)
                     }
                 } else {
-                    PopTip.build().tip(R.string.send_ticket_fail)
+                    PopTip.build().tip(CommonUtils.getStr("send_ticket_fail"))
                     logger.error("Send ticket fail")
                     ModBusController.getKeyByMac(bleBean.bleDevice.mac)?.let { itKey ->
                         ModbusBusinessManager.removeDeviceTake(
@@ -323,7 +323,7 @@ object BleBusinessManager {
         processCallback: ((Boolean) -> Unit)? = null
     ) {
         if (isNeedLoading) LoadingEvent.sendLoadingEvent(
-            CommonUtils.getStr(R.string.start_to_send_ticket), true
+            CommonUtils.getStr("start_to_send_ticket"), true
         )
         BleCmdManager.sendWorkTicket(
             jsonStr, bleDevice = bleDevice, callback = object : CustomBleWriteCallback() {
@@ -337,7 +337,7 @@ object BleBusinessManager {
                 ) {
                     logger.info("sendTicket success")
                     if (isNeedLoading) LoadingEvent.sendLoadingEvent(
-                        CommonUtils.getStr(R.string.sending_ticket), true
+                        CommonUtils.getStr("sending_ticket"), true
                     )
                 }
 
@@ -353,7 +353,7 @@ object BleBusinessManager {
                 ) {
                     logger.error("sendTicket fail : ${bleDevice.mac}")
                     if (isNeedLoading) LoadingEvent.sendLoadingEvent(
-                        CommonUtils.getStr(R.string.send_ticket_fail), true
+                        CommonUtils.getStr("send_ticket_fail"), true
                     )
                     processCallback?.invoke(false)
                 }
@@ -432,7 +432,7 @@ object BleBusinessManager {
             0x03.toByte() -> {
                 // TODO 上报？
                 PopTip.build().tip(
-                    "${currentModeEvent.bleBean.bleDevice.mac} : " + "${CommonUtils.getStr(R.string.key_is_in_failure_mode)}"
+                    "${currentModeEvent.bleBean.bleDevice.mac} : " + "${CommonUtils.getStr("key_is_in_failure_mode")}"
                 )
             }
         }
@@ -470,7 +470,7 @@ object BleBusinessManager {
                     if (role == null) {
                         ThreadUtils.runOnMain {
                             PopTip.build()
-                                .tip(CommonUtils.getStr(R.string.you_are_not_locker_tip))
+                                .tip(CommonUtils.getStr("you_are_not_locker_tip"))
                         }
                         return@getTicketDetail
                     }
@@ -511,6 +511,7 @@ object BleBusinessManager {
     ) {
         logger.info("检查钥匙连接情况")
         if (BleReturnDispatcher.isConnected(mac)) {
+            BleReturnDispatcher.busy(mac)
             BleConnectionManager.getBleDeviceByMac(mac)?.bleDevice?.let {
                 logger.info("开始读取作业票")
                 getTicketStatusWithRetry(it, isNeedLoading)
@@ -614,7 +615,7 @@ object BleBusinessManager {
             }
             logger.info("作业票信息:${workTicketGet}")
             if (workTicketGet == null) {
-                PopTip.build().tip(R.string.ticket_data_error)
+                PopTip.build().tip(CommonUtils.getStr("ticket_data_error"))
                 switchReadyMode(bleDevice)
                 return@handleTicketStatus
             }
@@ -632,7 +633,7 @@ object BleBusinessManager {
                     // 当前策略：作业票未完成禁止归还钥匙
                     LoadingEvent.sendLoadingEvent()
                     TipDialog.show(
-                        msg = CommonUtils.getStr(R.string.lock_key_return_tip)!!,
+                        msg = CommonUtils.getStr("lock_key_return_tip")!!,
                         onConfirmClick = {
                             ThreadUtils.runOnIO {
                                 handleKeyReturn(
@@ -644,7 +645,7 @@ object BleBusinessManager {
                             }
                         },
                         onCancelClick = {
-                            PopTip.build().tip(CommonUtils.getStr(R.string.continue_the_ticket))
+                            PopTip.build().tip(CommonUtils.getStr("continue_the_ticket"))
                             BleReturnDispatcher.scheduleDisconnect(bleDevice.mac)
                             logger.info("断开连接归还取消:${bleDevice.mac}")
                             // 打开卡扣，防止初始化的时候选择不处理钥匙导致无法使用
@@ -680,7 +681,7 @@ object BleBusinessManager {
                     LogicManager.jobTicketLogic.getTicketDataByTicketId(ticketId)
                 if (jobTicketData == null) {
                     TicketFinishedEvent.sendTicketFinishedEvent(ticketId)
-                    PopTip.build().tip(R.string.key_return_success)
+                    PopTip.build().tip(CommonUtils.getStr("key_return_success"))
                     return@updateKeyReturn
                 }
                 val ticketStepDataVo =
@@ -794,14 +795,14 @@ object BleBusinessManager {
                                     UpdateKeyReturn(data.taskCode?.toLong()!!, keyNfc!!)
                                 )
                                 if (msg.contains(
-                                        CommonUtils.getStr(R.string.ticket_lost).toString()
+                                        CommonUtils.getStr("ticket_lost").toString()
                                     )
                                 ) {
                                     data.taskCode?.let {
                                         TicketFinishedEvent.sendTicketFinishedEvent(it.toLong())
                                     }
                                 }
-                                PopTip.build().tip(R.string.key_return_success)
+                                PopTip.build().tip(CommonUtils.getStr("key_return_success"))
                             } else {
                                 //更新作业票的状态
                                 val jobTicketData =
@@ -810,7 +811,7 @@ object BleBusinessManager {
                                     data.taskCode?.let {
                                         TicketFinishedEvent.sendTicketFinishedEvent(it.toLong())
                                     }
-                                    PopTip.build().tip(R.string.key_return_success)
+                                    PopTip.build().tip(CommonUtils.getStr("key_return_success"))
                                     return@updateKeyReturn
                                 }
                                 val ticketStepDataVo =
@@ -859,7 +860,7 @@ object BleBusinessManager {
                                 )
                                 // 确认归还，切换为待机模式
                                 switchReadyMode(bleDevice)
-                                PopTip.build().tip(R.string.key_return_success)
+                                PopTip.build().tip(CommonUtils.getStr("key_return_success"))
                             }
                         }
                     } else {
@@ -867,7 +868,7 @@ object BleBusinessManager {
                             // 当前策略：作业票未完成禁止归还钥匙
                             fun keyReturnErrorConfirm() {
                                 LoadingEvent.sendLoadingEvent()
-                                PopTip.build().tip(R.string.continue_the_ticket)
+                                PopTip.build().tip(CommonUtils.getStr("continue_the_ticket"))
                                 // 打开卡扣，防止初始化的时候选择不处理钥匙导致无法使用
                                 if (workTicketGet.data?.all { it.dataList?.all { it.closed == 1 } == true } == true) {
                                     workTicketGet.data?.firstOrNull()?.taskCode?.toLong()?.let {
@@ -887,7 +888,7 @@ object BleBusinessManager {
                                 }
                             }
                             TipDialog.show(
-                                msg = CommonUtils.getStr(R.string.key_return_tip).toString(),
+                                msg = CommonUtils.getStr("key_return_tip").toString(),
                                 onCancelClick = {
                                     keyReturnErrorConfirm()
                                 },
@@ -923,7 +924,7 @@ object BleBusinessManager {
                             it.userId == MainDomainData.userInfo?.userId
                         }
                 if (role == null) {
-                    PopTip.build().tip(R.string.you_are_not_locker_tip)
+                    PopTip.build().tip(CommonUtils.getStr("you_are_not_locker_tip"))
                     return@getTicketDetail
                 }
                 if (step?.enableLock == true) {    // 上锁工作票
@@ -982,7 +983,7 @@ object BleBusinessManager {
                     ) { keyPair, lockMap ->
                         if (keyPair == null) {
                             TipDialog.show(
-                                msg = CommonUtils.getStr(R.string.key_take_error_tip).toString(),
+                                msg = CommonUtils.getStr("key_take_error_tip").toString(),
                                 onConfirmClick = {
                                     DeviceExceptionEvent.sendDeviceExceptionEvent(
                                         DeviceConst.DEVICE_TYPE_KEY, deviceTakeUpdateBO.nfc
@@ -1007,7 +1008,7 @@ object BleBusinessManager {
             } ?: run {
             logger.info("根据钥匙的rfid没找到钥匙")
             TipDialog.show(
-                msg = CommonUtils.getStr(R.string.key_take_error_tip).toString(), onConfirmClick = {
+                msg = CommonUtils.getStr("key_take_error_tip").toString(), onConfirmClick = {
                     DeviceExceptionEvent.sendDeviceExceptionEvent(
                         DeviceConst.DEVICE_TYPE_KEY, deviceTakeUpdateBO.nfc
                     )

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

@@ -169,7 +169,7 @@ object ModbusBusinessManager {
                                 if (isSuccess == false) {
                                     logger.error("Lock take report fail")
                                     PopTip.build()
-                                        .tip(CommonUtils.getStr(R.string.lock_take_report_fail))
+                                        .tip(CommonUtils.getStr("lock_take_report_fail"))
                                     SPUtils.saveTicketTakeLockException(info.ticketId)
                                     mDeviceTakeList.removeIf { it.deviceType == DeviceConst.DEVICE_TYPE_LOCK && it.nfc == info.nfc }
                                     mDeviceTakeList.removeIf { it.deviceType == DeviceConst.DEVICE_TYPE_KEY && it.ticketId == info.ticketId }
@@ -187,7 +187,7 @@ object ModbusBusinessManager {
                                             mDeviceTakeList.count { it.deviceType == DeviceConst.DEVICE_TYPE_LOCK && it.ticketId == info.ticketId }),
                                         true
                                     )
-                                    PopTip.build().tip(R.string.take_out_rest_locks)
+                                    PopTip.build().tip(CommonUtils.getStr("take_out_rest_locks"))
                                     return@runOnMain
                                 } else {
                                     logger.info("All locks are taken")
@@ -203,7 +203,7 @@ object ModbusBusinessManager {
                                 mDeviceTakeList.find { it.deviceType == DeviceConst.DEVICE_TYPE_KEY && it.ticketId == info.ticketId }
                                     ?.let { itKey ->
                                         LoadingEvent.sendLoadingEvent(
-                                            CommonUtils.getStr(R.string.ble_connecting), true
+                                            CommonUtils.getStr("ble_connecting"), true
                                         )
                                         BleBusinessManager.handleGiveKey(itKey)
                                     }
@@ -224,7 +224,7 @@ object ModbusBusinessManager {
     ) {
         // 你可以改成接收 CoroutineScope 或者直接在全局 Scope 启动
         ThreadUtils.runOnIO {
-            LoadingEvent.sendLoadingEvent(CommonUtils.getStr(R.string.check_key_and_lock))
+            LoadingEvent.sendLoadingEvent(CommonUtils.getStr("check_key_and_lock"))
             try {
                 // —— 串行请求1 & 2 ——
                 val slotsPage = DataBusiness.getSlotsPage()
@@ -266,7 +266,7 @@ object ModbusBusinessManager {
                 // 如果锁不够，提前清空并立刻返回
                 if (actualLockCount < needLockCount) {
                     PopTip.build().tip(
-                        R.string.lock_is_not_enough
+                        CommonUtils.getStr("lock_is_not_enough")
                     )
                     callBack(null, mutableMapOf())
                     return@runOnIO
@@ -290,7 +290,7 @@ object ModbusBusinessManager {
                         )
                     }
                     if (keyPair == null) {
-                        PopTip.build().tip(R.string.no_available_key)
+                        PopTip.build().tip(CommonUtils.getStr("no_available_key"))
                     }
                 }
                 // —— 全部计算完毕，在主线程一次性回调 ——
@@ -316,7 +316,7 @@ object ModbusBusinessManager {
     private fun deviceStatusHandle(res: Any) {
         logger.debug("硬件状态：${(res as List<ByteArray>).map { it.toHexStrings() }}")
         if (res.isEmpty() || res.any { it.isEmpty() }) {
-            var tipStr = CommonUtils.getStr(R.string.no_response_board_exists) + " : "
+            var tipStr = CommonUtils.getStr("no_response_board_exists") + " : "
             val addressList = mutableListOf<String>()
 
             ModBusController.modBusManager?.mSlaveAddressList?.forEach { itDock ->
@@ -429,12 +429,12 @@ object ModbusBusinessManager {
                                 ?.map { it.lockNfc }?.toMutableList()
                                 ?: mutableListOf())
                         ) {
-                            PopTip.build().tip(R.string.lock_exception_tag)
+                            PopTip.build().tip(CommonUtils.getStr("lock_exception_tag"))
                         } else if (slotsPage?.records?.filter {
                                 it.slotType == slotTypeList.find { d -> d.dictLabel == "锁" }?.dictValue && it.status == slotStatusList.find { d -> d.dictLabel == "异常" }?.dictValue
                             }
                                 ?.find { it.row?.toInt() == dockBean.row && (lockBean.idx + 1) == it.col?.toInt() } != null) {
-                            PopTip.build().tip(R.string.slot_exception_tag)
+                            PopTip.build().tip(CommonUtils.getStr("slot_exception_tag"))
                         } else {
                             logger.info("挂锁归还:${lockBean.rfid}")
                             LogicManager.hardwareLogic.getLockInfo(rfid) {
@@ -519,14 +519,14 @@ object ModbusBusinessManager {
                             ?: mutableListOf())
                     ) {
                         PopTip.build().tip(
-                            CommonUtils.getStr(R.string.key_exception_tag)
+                            CommonUtils.getStr("key_exception_tag")
                         )
                     } else if (slotsPage?.records?.filter {
                             it.slotType == slotTypeList.find { d -> d.dictLabel == "钥匙" }?.dictValue && it.status == slotStatusList.find { d -> d.dictLabel == "异常" }?.dictValue
                         }
                             ?.find { it.row?.toInt() == dockBean.row && it.col?.toInt() == (dockBean.col + (keyBean.idx) * 2 + 1) } != null) {
                         PopTip.build().tip(
-                            CommonUtils.getStr(R.string.slot_exception_tag)
+                            CommonUtils.getStr("slot_exception_tag")
                         )
                     } else {
                         // 放回钥匙,上锁
@@ -547,7 +547,7 @@ object ModbusBusinessManager {
                                 } else {
                                     logger.error("Get key info fail : $rfid")
                                     if (ISCSConfig.isInit) {
-                                        PopTip.build().tip(R.string.get_key_info_fail)
+                                        PopTip.build().tip(CommonUtils.getStr("get_key_info_fail"))
                                     }
                                     ModBusController.controlKeyBuckle(
                                         true, keyBean.idx, dockBean.addr
@@ -606,7 +606,7 @@ object ModbusBusinessManager {
      */
     fun getKeySlotPosition(keyNfc: String): String {
         val keyData = ModBusController.getKeyByRfid(keyNfc)
-        return if (keyData == null) CommonUtils.getStr(R.string.not_in_slot)
+        return if (keyData == null) CommonUtils.getStr("not_in_slot")
             .toString() else "${keyData.row}-${keyData.idx + 1}"
     }
 
@@ -615,7 +615,7 @@ object ModbusBusinessManager {
      */
     fun getLockSlotPosition(lockNfc: String): String {
         val lockData = ModBusController.getLockByRfid(lockNfc)
-        return if (lockData == null) CommonUtils.getStr(R.string.not_in_slot)
+        return if (lockData == null) CommonUtils.getStr("not_in_slot")
             .toString() else "${lockData.row}-${lockData.idx + 1}"
     }
 

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

@@ -78,14 +78,14 @@ class TipDialog : OnBindView<CustomDialog>(R.layout.dialog_tip) {
             if (countDownTime > 0) {
                 var timeLeft = countDownTime
                 binding.cancelBtn.text =
-                    CommonUtils.getStr(R.string.cancel_countdown, args = arrayOf(timeLeft))
+                    CommonUtils.getStr("cancel_countdown", args = arrayOf(timeLeft))
                 countDownJob = scope.launch {
                     while (timeLeft > 0) {
                         delay(1000)
                         timeLeft--
                         binding.cancelBtn.text =
                             CommonUtils.getStr(
-                                R.string.cancel_countdown,
+                                "cancel_countdown",
                                 args = arrayOf(timeLeft)
                             )
                     }
@@ -95,7 +95,7 @@ class TipDialog : OnBindView<CustomDialog>(R.layout.dialog_tip) {
                 }
             }
         } else {
-            binding.cancelBtn.text = CommonUtils.getStr(R.string.cancel)
+            binding.cancelBtn.text = CommonUtils.getStr("cancel")
         }
     }
 
@@ -163,7 +163,7 @@ class TipDialog : OnBindView<CustomDialog>(R.layout.dialog_tip) {
          */
         @JvmStatic
         fun show(
-            title: String = CommonUtils.getStr(R.string.action_confirm).toString(),
+            title: String = CommonUtils.getStr("action_confirm").toString(),
             msg: String,
             dialogType: DialogType = DialogType.INFO,
             showCancel: Boolean = true,
@@ -200,7 +200,7 @@ class TipDialog : OnBindView<CustomDialog>(R.layout.dialog_tip) {
         ) {
             ThreadUtils.runOnMain {
                 CustomDialog.show(TipDialog().apply {
-                    setTitle(CommonUtils.getStr(R.string.action_succeed).toString())
+                    setTitle(CommonUtils.getStr("action_succeed").toString())
                     setMessage(msg)
                     setDialogType(DialogType.SUCCESS)
                     showConfirm(showConfirm)
@@ -226,7 +226,7 @@ class TipDialog : OnBindView<CustomDialog>(R.layout.dialog_tip) {
         ) {
             ThreadUtils.runOnMain {
                 CustomDialog.show(TipDialog().apply {
-                    setTitle(CommonUtils.getStr(R.string.action_failed).toString())
+                    setTitle(CommonUtils.getStr("action_failed").toString())
                     setMessage(msg)
                     setDialogType(DialogType.ERROR)
                     showConfirm(showConfirm)
@@ -252,7 +252,7 @@ class TipDialog : OnBindView<CustomDialog>(R.layout.dialog_tip) {
         ) {
             ThreadUtils.runOnMain {
                 CustomDialog.show(TipDialog().apply {
-                    setTitle(CommonUtils.getStr(R.string.action_confirm).toString())
+                    setTitle(CommonUtils.getStr("action_confirm").toString())
                     setMessage(msg)
                     setDialogType(DialogType.INFO)
                     showConfirm(showConfirm)

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

@@ -68,14 +68,14 @@ class WheelDateRangePickerDialog(
 
         // 显示开始/结束时间文本
         binding.startDate.text = CommonUtils.getStr(
-            R.string.date,
+            "date",
             tempStartDate[0].toInt(),
             tempStartDate[1].toInt(),
             tempStartDate[2].toInt()
         )
 
         binding.endDate.text = CommonUtils.getStr(
-            R.string.date,
+            "date",
             tempEndDate[0].toInt(),
             tempEndDate[1].toInt(),
             tempEndDate[2].toInt()
@@ -86,7 +86,7 @@ class WheelDateRangePickerDialog(
 
         // 日期选择监听，更新当前选中项对应的日期文本和变量
         binding.datePicker.setOnDateSelectedListener { year, month, day ->
-            val text = CommonUtils.getStr(R.string.date, year, month, day)
+            val text = CommonUtils.getStr("date", year, month, day)
             val dateStr = "%04d-%02d-%02d".format(year, month, day)
             if (isStartDateSelected) {
                 binding.startDate.text = text
@@ -120,7 +120,7 @@ class WheelDateRangePickerDialog(
             val endCal = Calendar.getInstance().apply { time = sdf.parse(selectedEnd) }
 
             if (startCal.after(endCal)) {
-                PopTip.build().tip(R.string.error_date_range_invalid)
+                PopTip.build().tip(CommonUtils.getStr("error_date_range_invalid"))
                 return@setDebouncedClickListener
             }
 

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

@@ -1,20 +1,11 @@
 package com.grkj.ui_base.utils
 
-import android.Manifest.permission.ACCESS_COARSE_LOCATION
-import android.Manifest.permission.ACCESS_FINE_LOCATION
-import android.Manifest.permission.BLUETOOTH_ADVERTISE
-import android.Manifest.permission.BLUETOOTH_CONNECT
-import android.Manifest.permission.BLUETOOTH_SCAN
 import android.content.Context
-import android.os.Build
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import com.grkj.shared.utils.i18n.I18nManager
 import com.sik.sikcore.SIKCore
 import java.text.SimpleDateFormat
 import java.util.Locale
-import kotlin.let
-import kotlin.text.isNullOrEmpty
-import kotlin.text.toRegex
 
 object CommonUtils {
 
@@ -39,25 +30,16 @@ object CommonUtils {
     /**
      * 获取资源文本
      */
-    fun getStr(textId: Int, ctx: Context? = null): String? {
-        return ctx?.resources?.getString(textId) ?: let {
-            SIKCore.getApplication().applicationContext?.resources?.getString(textId)
-        }
+    fun getStr(textKey: String): String {
+        return I18nManager.t(textKey)
     }
-
+    
     /**
      * 获取资源文本
      */
-    fun getStr(textId: Int, vararg args: Any): String? {
-        // 优先用传入的 ctx，否则用全局 Application context
-        val realCtx =SIKCore.getApplication().applicationContext!!
-
-        return if (args.isNotEmpty()) {
-            // 注意这里的 *args
-            realCtx.resources.getString(textId, *args)
-        } else {
-            realCtx.resources.getString(textId)
-        }
+    fun getStr(textKey: String, vararg args: Any): String {
+        val argMap = args.withIndex().associate { it.index.toString() to it.value }
+        return I18nManager.t(textKey, argMap)
     }
 
     /**

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

@@ -361,7 +361,7 @@ object BleConnectionManager {
     ) {
         logger.info("蓝牙连接-doConnect : ${bleDevice.mac}")
         if (isNeedLoading) LoadingEvent.sendLoadingEvent(
-            CommonUtils.getStr(R.string.ble_connecting), true
+            CommonUtils.getStr("ble_connecting"), true
         )
         ThreadUtils.runOnIO {
             BleUtil.Companion.instance?.connectBySelect(
@@ -379,7 +379,7 @@ object BleConnectionManager {
 
                     override fun onConnectFail(bleDevice: BleDevice?, exception: BleException) {
                         if (isNeedLoading) LoadingEvent.sendLoadingEvent(
-                            CommonUtils.getStr(R.string.ble_connect_fail), false
+                            CommonUtils.getStr("ble_connect_fail"), false
                         )
                         logger.error("蓝牙连接-onConnectFail : ${bleDevice?.mac} - ${exception?.description}")
                         prepareDoneCallBack?.invoke(false, null)

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

@@ -9,7 +9,7 @@ object BleReturnDispatcher : BleQueueDispatcher() {
 
     override fun doConnect(mac: String, callback: (Boolean) -> Unit) {
         ThreadUtils.runOnMain {
-            LoadingEvent.sendLoadingEvent(CommonUtils.getStr(com.grkj.ui_base.R.string.loading_msg_return_key_start))
+            LoadingEvent.sendLoadingEvent(CommonUtils.getStr("loading_msg_return_key_start"))
         }
         ThreadUtils.runOnIO {
             val isConnected = BleConnectionManager.tryConnectWithOptionalCharge(mac, isSend = false)

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

@@ -389,7 +389,7 @@ class PortManager private constructor(
             if (newPort != null) {
                 // 3. 扫描到就保存，下次直接用
                 MMKVConstants.KEY_PORT_CONFIG.saveMMKVData(newPort)
-                PopTip.build().tip(CommonUtils.getStr(R.string.scan_complete_app_restarting))
+                PopTip.build().tip(CommonUtils.getStr("scan_complete_app_restarting"))
                 RestartAppEvent.sendRestartAppEvent()
                 logger.info("扫描到新主控板串口: $newPort")
                 return null