refactor(国际化)

- 移除`I18nManager.t()`包裹
- 为已有文本添加`I18nManager.t()`包裹

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

@@ -23,6 +23,7 @@ import com.grkj.shared.model.EventBean
 import com.grkj.ui_base.base.BaseActivity
 import com.grkj.shared.utils.extension.toByteArrays
 import com.grkj.shared.utils.extension.toHexStrings
+import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.utils.ble.BleSendDispatcher
 import com.grkj.ui_base.utils.event.FlashTipEvent
 import com.grkj.ui_base.utils.event.RFIDCardReadEvent
@@ -44,35 +45,35 @@ class MainActivity() : BaseActivity<ActivityMainBinding>() {
         TabConfig(
             View.generateViewId(),
             R.navigation.nav_home,
-            RoleFunctionalPermissionsEnum.HOME.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.HOME.description),
             "icon_bottom_menu_home.svg",
             RoleFunctionalPermissionsEnum.HOME.functionalPermission
         ),
         TabConfig(
             View.generateViewId(),
             R.navigation.nav_data_manage,
-            RoleFunctionalPermissionsEnum.DATA_HOME_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.DATA_HOME_MANAGE.description),
             "icon_bottom_menu_data_manage.svg",
             RoleFunctionalPermissionsEnum.DATA_HOME_MANAGE.functionalPermission
         ),
         TabConfig(
             View.generateViewId(),
             R.navigation.nav_job_manage,
-            RoleFunctionalPermissionsEnum.JOB_TICKET_HOME_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.JOB_TICKET_HOME_MANAGE.description),
             "icon_bottom_menu_job_manage.svg",
             RoleFunctionalPermissionsEnum.JOB_TICKET_HOME_MANAGE.functionalPermission
         ),
         TabConfig(
             View.generateViewId(),
             R.navigation.nav_hardware_manage,
-            RoleFunctionalPermissionsEnum.HARDWARE_HOME_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.HARDWARE_HOME_MANAGE.description),
             "icon_bottom_menu_hardware_manage.svg",
             RoleFunctionalPermissionsEnum.HARDWARE_HOME_MANAGE.functionalPermission
         ),
         TabConfig(
             View.generateViewId(),
             R.navigation.nav_exception_manage,
-            RoleFunctionalPermissionsEnum.EXCEPTION_HOME_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.EXCEPTION_HOME_MANAGE.description),
             "icon_bottom_menu_exception_manage.svg",
             RoleFunctionalPermissionsEnum.EXCEPTION_HOME_MANAGE.functionalPermission
         ),

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

@@ -19,6 +19,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.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.extension.tip
@@ -39,7 +40,7 @@ class QuickEntranceConfigDialog(private val save: (String) -> Unit) :
             QuickEntranceMenuItemEntity(
                 index,
                 QuickEntranceMenuItemEntity.getMenuIcon(value),
-                value.description,
+                I18nManager.t(value.description),
                 value,
                 QuickEntranceMenuItemEntity.getNavGraphId(value),
                 QuickEntranceMenuItemEntity.getDestId(value)
@@ -57,7 +58,7 @@ class QuickEntranceConfigDialog(private val save: (String) -> Unit) :
                     QuickEntranceMenuItemEntity(
                         0,
                         "document.svg",
-                        RoleFunctionalPermissionsEnum.CREATE_JOB.description,
+                        I18nManager.t(RoleFunctionalPermissionsEnum.CREATE_JOB.description),
                         RoleFunctionalPermissionsEnum.CREATE_JOB,
                         QuickEntranceMenuItemEntity.getNavGraphId(RoleFunctionalPermissionsEnum.CREATE_JOB),
                         QuickEntranceMenuItemEntity.getDestId(RoleFunctionalPermissionsEnum.CREATE_JOB)
@@ -68,7 +69,7 @@ class QuickEntranceConfigDialog(private val save: (String) -> Unit) :
                     QuickEntranceMenuItemEntity(
                         index,
                         QuickEntranceMenuItemEntity.getMenuIcon(value),
-                        value.description,
+                        I18nManager.t(value.description),
                         value,
                         QuickEntranceMenuItemEntity.getNavGraphId(value),
                         QuickEntranceMenuItemEntity.getDestId(value)

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

@@ -6,6 +6,7 @@ import com.grkj.data.model.vo.AddPointManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogAddPointBinding
 import com.grkj.iscs.features.main.dialog.TextDropDownDialog
+import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.extension.tip
@@ -39,7 +40,7 @@ class AddPointDialog(
                     dataId = 0L,
                     dataObject = null,
                     dataTag = it.name,
-                    dataText = it.description
+                    dataText = I18nManager.t(it.description)
                 )
             }
             TextDropDownDialog.showSingle(list, binding.powerTypeTv) { item ->

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

@@ -7,6 +7,7 @@ import com.grkj.data.model.vo.PointManageFilterVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogFilterPointBinding
 import com.grkj.iscs.features.main.dialog.TextDropDownDialog
+import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.utils.CommonUtils
 import com.kongzue.dialogx.dialogs.CustomDialog
 import com.kongzue.dialogx.dialogs.PopTip
@@ -39,7 +40,7 @@ class FilterPointDialog(
                     dataId = 0L,
                     dataObject = null,
                     dataTag = it.name,
-                    dataText = it.description
+                    dataText = I18nManager.t(it.description)
                 )
             }
             TextDropDownDialog.showSingle(list,binding.powerTypeTv) { item ->

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

@@ -7,6 +7,7 @@ import com.grkj.data.model.vo.UpdatePointManageVo
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.DialogUpdatePointBinding
 import com.grkj.iscs.features.main.dialog.TextDropDownDialog
+import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.extension.tip
@@ -36,7 +37,7 @@ class UpdatePointDialog(
                 dataId = 0L,
                 dataObject = null,
                 dataTag = it.name,
-                dataText = it.description
+                dataText = I18nManager.t(it.description)
             )
         }
     }

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

@@ -2,6 +2,7 @@ package com.grkj.iscs.features.main.entity
 
 import com.drake.brv.item.ItemExpand
 import com.grkj.data.enums.RoleFunctionalPermissionsEnum
+import com.grkj.shared.utils.i18n.I18nManager
 
 /**
  *  角色功能权限实体
@@ -56,7 +57,7 @@ class RoleManageFunctionalPermissionsEntity(
                             RoleManageFunctionalPermissionsEntity(false, index)
                         roleManageFunctionalPermissionsEntity.functionalPermission =
                             item.functionalPermission
-                        roleManageFunctionalPermissionsEntity.description = item.description
+                        roleManageFunctionalPermissionsEntity.description = I18nManager.t(item.description)
                         roleManageFunctionalPermissionsEntity.level = item.level
                         item.children.forEachIndexed { index, child ->
                             roleManageFunctionalPermissionsEntity.children.add(
@@ -82,7 +83,7 @@ class RoleManageFunctionalPermissionsEntity(
                 RoleManageFunctionalPermissionsEntity(false, index)
             roleManageFunctionalPermissionsEntity.functionalPermission =
                 item.functionalPermission
-            roleManageFunctionalPermissionsEntity.description = item.description
+            roleManageFunctionalPermissionsEntity.description = I18nManager.t(item.description)
             roleManageFunctionalPermissionsEntity.level = item.level
             item.children.forEachIndexed { index, child ->
                 roleManageFunctionalPermissionsEntity.children.add(

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

@@ -17,6 +17,7 @@ import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentDataManageHomeBinding
 import com.grkj.iscs.databinding.ItemHomeMenuBinding
 import com.grkj.iscs.features.main.entity.MenuItemEntity
+import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.config.ISCSConfig
 import com.grkj.ui_base.skin.loadSkinIcon
@@ -34,37 +35,37 @@ class DataManageHomeFragment : BaseFragment<FragmentDataManageHomeBinding>() {
         MenuItemEntity(
             0,
             "user.svg",
-            RoleFunctionalPermissionsEnum.USER_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.USER_MANAGE.description),
             RoleFunctionalPermissionsEnum.USER_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             1,
             "users-alt.svg",
-            RoleFunctionalPermissionsEnum.ROLE_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.ROLE_MANAGE.description),
             RoleFunctionalPermissionsEnum.ROLE_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             2,
             "land-location.png",
-            RoleFunctionalPermissionsEnum.WORKSTATION_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.WORKSTATION_MANAGE.description),
             RoleFunctionalPermissionsEnum.WORKSTATION_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             3,
             "location-crosshairs.svg",
-            RoleFunctionalPermissionsEnum.POINT_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.POINT_MANAGE.description),
             RoleFunctionalPermissionsEnum.POINT_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             4,
             "back-up.svg",
-            RoleFunctionalPermissionsEnum.BACKUP_AND_RESTORE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.BACKUP_AND_RESTORE.description),
             RoleFunctionalPermissionsEnum.BACKUP_AND_RESTORE.functionalPermission
         ),
         MenuItemEntity(
             5,
             "icon_data_manage_switch_layout.svg",
-            RoleFunctionalPermissionsEnum.SWITCH_LAYOUT.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.SWITCH_LAYOUT.description),
             RoleFunctionalPermissionsEnum.SWITCH_LAYOUT.functionalPermission
         ),
     )

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

@@ -15,6 +15,7 @@ import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentExceptionManageHomeBinding
 import com.grkj.iscs.databinding.ItemHomeMenuBinding
 import com.grkj.iscs.features.main.entity.MenuItemEntity
+import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.changeBgTint
@@ -31,19 +32,19 @@ class ExceptionManageHomeFragment : BaseFragment<FragmentExceptionManageHomeBind
         MenuItemEntity(
             0,
             "limit-hand.svg",
-            RoleFunctionalPermissionsEnum.EXCEPTION_REPORT.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.EXCEPTION_REPORT.description),
             RoleFunctionalPermissionsEnum.EXCEPTION_REPORT.functionalPermission
         ),
         MenuItemEntity(
             1,
             "icon_bottom_menu_exception_manage.svg",
-            RoleFunctionalPermissionsEnum.EXCEPTION_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.EXCEPTION_MANAGE.description),
             RoleFunctionalPermissionsEnum.EXCEPTION_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             2,
             "message-alert.svg",
-            RoleFunctionalPermissionsEnum.EXCEPTION_JOB.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.EXCEPTION_JOB.description),
             RoleFunctionalPermissionsEnum.EXCEPTION_JOB.functionalPermission
         ),
     )

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

@@ -15,6 +15,7 @@ import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentHardwareManageHomeBinding
 import com.grkj.iscs.databinding.ItemHomeMenuBinding
 import com.grkj.iscs.features.main.entity.MenuItemEntity
+import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.changeBgTint
@@ -31,31 +32,31 @@ class HardwareManageHomeFragment : BaseFragment<FragmentHardwareManageHomeBindin
         MenuItemEntity(
             0,
             "slot.svg",
-            RoleFunctionalPermissionsEnum.SLOT_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.SLOT_MANAGE.description),
             RoleFunctionalPermissionsEnum.SLOT_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             1,
             "key.svg",
-            RoleFunctionalPermissionsEnum.KEY_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.KEY_MANAGE.description),
             RoleFunctionalPermissionsEnum.KEY_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             2,
             "lock.svg",
-            RoleFunctionalPermissionsEnum.LOCK_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.LOCK_MANAGE.description),
             RoleFunctionalPermissionsEnum.LOCK_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             3,
             "cards-blank.png",
-            RoleFunctionalPermissionsEnum.CARD_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.CARD_MANAGE.description),
             RoleFunctionalPermissionsEnum.CARD_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             4,
             "rfid.svg",
-            RoleFunctionalPermissionsEnum.RFID_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.RFID_MANAGE.description),
             RoleFunctionalPermissionsEnum.RFID_MANAGE.functionalPermission
         ),
     )

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

@@ -16,6 +16,7 @@ import com.grkj.iscs.features.main.dialog.QuickEntranceConfigDialog
 import com.grkj.iscs.features.main.dialog.TextDropDownDialog
 import com.grkj.iscs.features.main.entity.QuickEntranceMenuItemEntity
 import com.grkj.iscs.features.main.viewmodel.home.HomeViewModel
+import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
@@ -45,7 +46,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
                     QuickEntranceMenuItemEntity(
                         0,
                         "document.svg",
-                        RoleFunctionalPermissionsEnum.CREATE_JOB.description,
+                        I18nManager.t(RoleFunctionalPermissionsEnum.CREATE_JOB.description),
                         RoleFunctionalPermissionsEnum.CREATE_JOB,
                         QuickEntranceMenuItemEntity.getNavGraphId(RoleFunctionalPermissionsEnum.CREATE_JOB),
                         QuickEntranceMenuItemEntity.getDestId(RoleFunctionalPermissionsEnum.CREATE_JOB)
@@ -56,7 +57,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
                     QuickEntranceMenuItemEntity(
                         index,
                         QuickEntranceMenuItemEntity.getMenuIcon(value),
-                        value.description,
+                        I18nManager.t(value.description),
                         value,
                         QuickEntranceMenuItemEntity.getNavGraphId(value),
                         QuickEntranceMenuItemEntity.getDestId(value)

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

@@ -18,6 +18,7 @@ import com.grkj.iscs.databinding.FragmentJobManageHomeBinding
 import com.grkj.iscs.databinding.ItemHomeMenuBinding
 import com.grkj.iscs.features.main.entity.MenuItemEntity
 import com.grkj.iscs.features.main.viewmodel.job_manage.JobManageHomeViewModel
+import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.CommonUtils
@@ -36,61 +37,61 @@ class JobManageHomeFragment : BaseFragment<FragmentJobManageHomeBinding>() {
         MenuItemEntity(
             0,
             "to-do.svg",
-            RoleFunctionalPermissionsEnum.TODO_LIST.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.TODO_LIST.description),
             RoleFunctionalPermissionsEnum.TODO_LIST.functionalPermission
         ),
         MenuItemEntity(
             1,
             "ballot-check.svg",
-            RoleFunctionalPermissionsEnum.IN_PROGRESS_JOB.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.IN_PROGRESS_JOB.description),
             RoleFunctionalPermissionsEnum.IN_PROGRESS_JOB.functionalPermission,
         ),
         MenuItemEntity(
             2,
             "new_sop.svg",
-            RoleFunctionalPermissionsEnum.CREATE_SOP.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.CREATE_SOP.description),
             RoleFunctionalPermissionsEnum.CREATE_SOP.functionalPermission
         ),
         MenuItemEntity(
             3,
             "ballot.svg",
-            RoleFunctionalPermissionsEnum.SOP_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.SOP_MANAGE.description),
             RoleFunctionalPermissionsEnum.SOP_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             4,
             "message-alert.svg",
-            RoleFunctionalPermissionsEnum.EXCEPTION_JOB.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.EXCEPTION_JOB.description),
             RoleFunctionalPermissionsEnum.EXCEPTION_JOB.functionalPermission,
         ),
         MenuItemEntity(
             5,
             "document.svg",
-            RoleFunctionalPermissionsEnum.CREATE_JOB.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.CREATE_JOB.description),
             RoleFunctionalPermissionsEnum.CREATE_JOB.functionalPermission
         ),
         MenuItemEntity(
             6,
             "icon_bottom_menu_job_manage.svg",
-            RoleFunctionalPermissionsEnum.JOB_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.JOB_MANAGE.description),
             RoleFunctionalPermissionsEnum.JOB_MANAGE.functionalPermission
         ),
         MenuItemEntity(
             7,
             "sop.svg",
-            RoleFunctionalPermissionsEnum.CREATE_SOP_JOB.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.CREATE_SOP_JOB.description),
             RoleFunctionalPermissionsEnum.CREATE_SOP_JOB.functionalPermission
         ),
         MenuItemEntity(
             8,
             "target.svg",
-            RoleFunctionalPermissionsEnum.LOCKED_POINT.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.LOCKED_POINT.description),
             RoleFunctionalPermissionsEnum.LOCKED_POINT.functionalPermission
         ),
         MenuItemEntity(
             9,
             "workflow-alt.svg",
-            RoleFunctionalPermissionsEnum.WORKFLOW_MANAGE.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.WORKFLOW_MANAGE.description),
             RoleFunctionalPermissionsEnum.WORKFLOW_MANAGE.functionalPermission
         ),
     )

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

@@ -30,6 +30,7 @@ import com.grkj.iscs.features.main.dialog.job_manage.TodoPointDetailDialog
 import com.grkj.iscs.features.main.viewmodel.job_manage.JobExecuteViewModel
 import com.grkj.iscs.features.main.viewmodel.job_manage.MyTodoViewModel
 import com.grkj.shared.model.EventBean
+import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.dialog.TipDialog
 import com.grkj.ui_base.dialog.WheelDateRangePickerDialog
@@ -258,7 +259,7 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
         val itemBinding = holder.getBinding<ItemMyTodoBinding>()
         val item = holder.getModel<TodoItemVo>()
         itemBinding.todoTitle.text =
-            "${getTodoTitlePrefix(item)}${item.todoType.todoTitle}${item.groupName?.let { if (it.isEmpty()) "(${item.todoTitle})" else "(${it})" }}"
+            "${getTodoTitlePrefix(item)}${I18nManager.t(item.todoType.todoTitle)}${item.groupName?.let { if (it.isEmpty()) "(${item.todoTitle})" else "(${it})" }}"
         if (item.todoStatus == TodoStatusEnum.TODO) {
             itemBinding.todoTitle.setTextColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorStatusRed))
         } else {
@@ -274,7 +275,7 @@ class MyTodoListFragment : BaseFragment<FragmentMyTodoListBinding>() {
         itemBinding.currentOperationTv.isVisible = item.todoStatus == TodoStatusEnum.WAIT
         itemBinding.currentOperation.isVisible = item.todoStatus == TodoStatusEnum.WAIT
         itemBinding.currentOperation.text =
-            item.previousTodoItem?.joinToString(",") { itemData -> "${itemData.todoType.todoTitle}${itemData.groupName?.let { if (it.isEmpty()) "(${itemData.todoContent})" else "(${it})" }}" }
+            item.previousTodoItem?.joinToString(",") { itemData -> "${I18nManager.t(itemData.todoType.todoTitle)}${itemData.groupName?.let { if (it.isEmpty()) "(${itemData.todoContent})" else "(${it})" }}" }
         itemBinding.btnPointDetail.isVisible =
             item.todoType == OperationTypeEnum.LOCK_TAKE_KEY || item.todoType == OperationTypeEnum.UNLOCK_TAKE_KEY || item.todoType == OperationTypeEnum.LOCK_RETURN_KEY || item.todoType == OperationTypeEnum.UNLOCK_RETURN_KEY
 

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

@@ -15,6 +15,7 @@ import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentUserInfoHomeBinding
 import com.grkj.iscs.databinding.ItemHomeMenuBinding
 import com.grkj.iscs.features.main.entity.MenuItemEntity
+import com.grkj.shared.utils.i18n.I18nManager
 import com.grkj.ui_base.base.BaseFragment
 import com.grkj.ui_base.skin.loadSkinIcon
 import com.grkj.ui_base.utils.changeBgTint
@@ -31,37 +32,37 @@ class UserInfoHomeFragment : BaseFragment<FragmentUserInfoHomeBinding>() {
         MenuItemEntity(
             0,
             "chalkboard-user.svg",
-            RoleFunctionalPermissionsEnum.USER_INFO.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.USER_INFO.description),
             RoleFunctionalPermissionsEnum.USER_INFO.functionalPermission
         ),
         MenuItemEntity(
             1,
             "password-lock.svg",
-            RoleFunctionalPermissionsEnum.RESET_PASSWORD.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.RESET_PASSWORD.description),
             RoleFunctionalPermissionsEnum.RESET_PASSWORD.functionalPermission
         ),
         MenuItemEntity(
             2,
             "fingerprint.svg",
-            RoleFunctionalPermissionsEnum.FINGERPRINT_SETTING.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.FINGERPRINT_SETTING.description),
             RoleFunctionalPermissionsEnum.FINGERPRINT_SETTING.functionalPermission
         ),
         MenuItemEntity(
             3,
             "face-id-svgrepo-com.svg",
-            RoleFunctionalPermissionsEnum.FACE_SETTING.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.FACE_SETTING.description),
             RoleFunctionalPermissionsEnum.FACE_SETTING.functionalPermission
         ),
         MenuItemEntity(
             4,
             "cards-blank.png",
-            RoleFunctionalPermissionsEnum.CARD_SETTING.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.CARD_SETTING.description),
             RoleFunctionalPermissionsEnum.CARD_SETTING.functionalPermission
         ),
         MenuItemEntity(
             6,
             "leave.svg",
-            RoleFunctionalPermissionsEnum.LOGOUT.description,
+            I18nManager.t(RoleFunctionalPermissionsEnum.LOGOUT.description),
             RoleFunctionalPermissionsEnum.LOGOUT.functionalPermission
         ),
     )

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

@@ -6,11 +6,11 @@ import com.grkj.shared.utils.i18n.I18nManager
  * 能量源
  */
 enum class IsolationPointPowerTypeEnum(val description: String, val icon: String) {
-    HYDRAULIC_PRESSURE(I18nManager.t("hydraulic_pressure"), "arrow-down-strenght.svg"),
-    ELECTRIC_ENERGY(I18nManager.t("electric_energy"), "bolt.svg"),
-    POTENTIAL_ENERGY(I18nManager.t("potential_energy"), "external-world.png"),
-    HEAT_ENERGY(I18nManager.t("heat_energy"), "heat.svg"),
-    GAS(I18nManager.t("gas"), "gas-pump.svg"),
-    MECHANICAL_ENERGY(I18nManager.t("mechanical_energy"), "robotic-arm.svg"),
-    AIR_ENERGY(I18nManager.t("air_energy"), "wind.svg"),
+    HYDRAULIC_PRESSURE("hydraulic_pressure", "arrow-down-strenght.svg"),
+    ELECTRIC_ENERGY("electric_energy", "bolt.svg"),
+    POTENTIAL_ENERGY("potential_energy", "external-world.png"),
+    HEAT_ENERGY("heat_energy", "heat.svg"),
+    GAS("gas", "gas-pump.svg"),
+    MECHANICAL_ENERGY("mechanical_energy", "robotic-arm.svg"),
+    AIR_ENERGY("air_energy", "wind.svg"),
 }

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

@@ -7,14 +7,14 @@ import com.grkj.shared.utils.i18n.I18nManager
  * (0未开始 1待上锁 2进行中 3待解锁 4已解锁 5已结束6已取消)
  */
 enum class JobTicketStatusEnum(val status: String, val description: String) {
-    NOT_START("0", I18nManager.t("not_start")),
-    SELECT_MEMBER("1", I18nManager.t("select_member")),
-    LOCKING("2", I18nManager.t("locking")),
-    COLOCKING("3", I18nManager.t("colocking")),
-    UNLOCKING("4", I18nManager.t("unlocking")),
-    FINISHED("5", I18nManager.t("finished")),
-    CANCELED("6", I18nManager.t("canceled")),
-    PROGRESSING("7",I18nManager.t("progressing"));
+    NOT_START("0", "not_start"),
+    SELECT_MEMBER("1", "select_member"),
+    LOCKING("2", "locking"),
+    COLOCKING("3", "colocking"),
+    UNLOCKING("4", "unlocking"),
+    FINISHED("5", "finished"),
+    CANCELED("6", "canceled"),
+    PROGRESSING("7", "progressing");
 
     companion object {
         /**
@@ -22,7 +22,7 @@ enum class JobTicketStatusEnum(val status: String, val description: String) {
          */
         @JvmStatic
         fun getTicketStatusStr(status: String): String {
-            return values().find { it.status == status }?.description ?: "未知"
+            return I18nManager.t(values().find { it.status == status }?.description ?: "")
         }
     }
 }

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

@@ -1,6 +1,5 @@
 package com.grkj.data.enums
 
-import com.grkj.data.check_data.ICheckDataMode
 import com.grkj.shared.utils.i18n.I18nManager
 
 /**
@@ -10,7 +9,7 @@ enum class LockPointModeEnum(
     val type: Int,
     val description: String,
 ) {
-    FORCE_SHARED_LOCK(0, I18nManager.t("force_shared_lock")),
-    FORCE_MULTI_LOCK(1, I18nManager.t("force_multi_lock")),
-    MIXED_MODE(2, I18nManager.t("mixed_mode")), ;
+    FORCE_SHARED_LOCK(0, "force_shared_lock"),
+    FORCE_MULTI_LOCK(1, "force_multi_lock"),
+    MIXED_MODE(2, "mixed_mode"), ;
 }

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

@@ -10,15 +10,15 @@ import org.slf4j.LoggerFactory
  * 操作类型枚举（用于标记作业票当前步骤所需的用户行为）
  */
 enum class OperationTypeEnum(val code: String, val desc: String, val todoTitle: String) {
-    LOCK_TAKE_KEY("lock_take_key", "取钥匙上锁", I18nManager.t("lock_take_key")),
-    LOCK_RETURN_KEY("lock_return_key", "上锁还钥匙", I18nManager.t("lock_return_key")),
-    UNLOCK_TAKE_KEY("unlock_take_key", "取钥匙解锁", I18nManager.t("unlock_take_key")),
-    UNLOCK_RETURN_KEY("unlock_return_key", "解锁还钥匙", I18nManager.t("unlock_return_key")),
-    COLOCK("colock", "待添加共锁", I18nManager.t("colock")),
-    RELEASE_COLOCK("release_colock", "待解除共锁", I18nManager.t("release_colock")),
-    CONFIRM("confirm", "步骤待确认", I18nManager.t("confirm_exec")),
-    END("end", "作业结束待确认", I18nManager.t("end")),
-    UNKNOWN("unknown", "未知", I18nManager.t("unknown"));
+    LOCK_TAKE_KEY("lock_take_key", "取钥匙上锁", "lock_take_key"),
+    LOCK_RETURN_KEY("lock_return_key", "上锁还钥匙", "lock_return_key"),
+    UNLOCK_TAKE_KEY("unlock_take_key", "取钥匙解锁", "unlock_take_key"),
+    UNLOCK_RETURN_KEY("unlock_return_key", "解锁还钥匙", "unlock_return_key"),
+    COLOCK("colock", "待添加共锁", "colock"),
+    RELEASE_COLOCK("release_colock", "待解除共锁", "release_colock"),
+    CONFIRM("confirm", "步骤待确认", "confirm_exec"),
+    END("end", "作业结束待确认", "end"),
+    UNKNOWN("unknown", "未知", "unknown");
 
     companion object {
         /**

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

@@ -6,10 +6,10 @@ import com.grkj.shared.utils.i18n.I18nManager
  * 角色枚举
  */
 enum class RoleEnum(val roleKey: String, val description: String) {
-    ADMIN("admin", I18nManager.t("admin")),
-    JTDRAWER("jtdrawer", I18nManager.t("jtdrawer")),
-    JTLOCKER("jtlocker", I18nManager.t("jtlocker")),
-    JTCOLOCKER("jtcolocker", I18nManager.t("jtcolocker")),
-    JTGUARD("jtguard", I18nManager.t("jtguard")),
-    SYSCONFIG("sysconfig", I18nManager.t("sysconfig"));
+    ADMIN("admin", "admin"),
+    JTDRAWER("jtdrawer", "jtdrawer"),
+    JTLOCKER("jtlocker", "jtlocker"),
+    JTCOLOCKER("jtcolocker", "jtcolocker"),
+    JTGUARD("jtguard", "jtguard"),
+    SYSCONFIG("sysconfig", "sysconfig");
 }

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

@@ -11,80 +11,80 @@ enum class RoleFunctionalPermissionsEnum(
     val level: Int,
     val children: List<RoleFunctionalPermissionsEnum>
 ) {
-    USER_MANAGE("data_manage:user_manage", I18nManager.t("user_manage"), 1, listOf()),
-    ROLE_MANAGE("data_manage:role_manage", I18nManager.t("role_manage"), 1, listOf()),
+    USER_MANAGE("data_manage:user_manage", "user_manage", 1, listOf()),
+    ROLE_MANAGE("data_manage:role_manage", "role_manage", 1, listOf()),
     WORKSTATION_MANAGE(
         "data_manage:workstation_manage",
-        I18nManager.t("workstation_manage"),
+        "workstation_manage",
         1,
         listOf()
     ),
-    POINT_MANAGE("data_manage:point_manage", I18nManager.t("point_manage"), 1, listOf()),
+    POINT_MANAGE("data_manage:point_manage", "point_manage", 1, listOf()),
     BACKUP_AND_RESTORE(
         "data_manage:backup_and_restore",
-        I18nManager.t("backup_and_restore"),
+        "backup_and_restore",
         1,
         listOf()
     ),
-    SWITCH_LAYOUT("data_manage:switch_layout", I18nManager.t("switch_layout"), 1, listOf()),
+    SWITCH_LAYOUT("data_manage:switch_layout", "switch_layout", 1, listOf()),
     IN_PROGRESS_JOB(
         "job_ticket_manage:in_progress_job",
-        I18nManager.t("in_progress_job"),
+        "in_progress_job",
         1,
         listOf()
     ),
-    CREATE_SOP("job_ticket_manage:create_sop", I18nManager.t("create_sop"), 1, listOf()),
-    SOP_MANAGE("job_ticket_manage:sop_manage", I18nManager.t("sop_manage"), 1, listOf()),
-    EXCEPTION_JOB("exception_job", I18nManager.t("exception_job"), 1, listOf()),
-    CREATE_JOB("job_ticket_manage:create_job", I18nManager.t("create_job"), 1, listOf()),
-    JOB_MANAGE("job_ticket_manage:job_manage", I18nManager.t("job_manage"), 1, listOf()),
+    CREATE_SOP("job_ticket_manage:create_sop", "create_sop", 1, listOf()),
+    SOP_MANAGE("job_ticket_manage:sop_manage", "sop_manage", 1, listOf()),
+    EXCEPTION_JOB("exception_job", "exception_job", 1, listOf()),
+    CREATE_JOB("job_ticket_manage:create_job", "create_job", 1, listOf()),
+    JOB_MANAGE("job_ticket_manage:job_manage", "job_manage", 1, listOf()),
     WORKFLOW_MANAGE(
         "job_ticket_manage:workflow_manage",
-        I18nManager.t("workflow_manage"),
+        "workflow_manage",
         1,
         listOf()
     ),
     CREATE_SOP_JOB(
         "job_ticket_manage:create_sop_job",
-        I18nManager.t("create_sop_job"),
+        "create_sop_job",
         1,
         listOf()
     ),
-    LOCKED_POINT("job_ticket_manage:locked_point", I18nManager.t("locked_point"), 1, listOf()),
-    SLOT_MANAGE("hardware_manage:slot_manage", I18nManager.t("slot_manage"), 1, listOf()),
-    KEY_MANAGE("hardware_manage:key_manage", I18nManager.t("key_manage"), 1, listOf()),
-    LOCK_MANAGE("hardware_manage:lock_manage", I18nManager.t("lock_manage"), 1, listOf()),
-    CARD_MANAGE("hardware_manage:card_manage", I18nManager.t("card_manage"), 1, listOf()),
-    RFID_MANAGE("hardware_manage:rfid_manage", I18nManager.t("rfid_manage"), 1, listOf()),
+    LOCKED_POINT("job_ticket_manage:locked_point", "locked_point", 1, listOf()),
+    SLOT_MANAGE("hardware_manage:slot_manage", "slot_manage", 1, listOf()),
+    KEY_MANAGE("hardware_manage:key_manage", "key_manage", 1, listOf()),
+    LOCK_MANAGE("hardware_manage:lock_manage", "lock_manage", 1, listOf()),
+    CARD_MANAGE("hardware_manage:card_manage", "card_manage", 1, listOf()),
+    RFID_MANAGE("hardware_manage:rfid_manage", "rfid_manage", 1, listOf()),
     EXCEPTION_REPORT(
         "exception_manage:exception_report",
-        I18nManager.t("exception_report"),
+        "exception_report",
         1,
         listOf()
     ),
     EXCEPTION_MANAGE(
         "exception_manage:exception_manage",
-        I18nManager.t("exception_manage"),
+        "exception_manage",
         1,
         listOf()
     ),
-    USER_INFO("user_info:user_info", I18nManager.t("user_info"), 1, listOf()),
-    RESET_PASSWORD("user_info:reset_password", I18nManager.t("reset_password"), 1, listOf()),
+    USER_INFO("user_info:user_info", "user_info", 1, listOf()),
+    RESET_PASSWORD("user_info:reset_password","reset_password", 1, listOf()),
     FINGERPRINT_SETTING(
         "user_info:fingerprint_setting",
-        I18nManager.t("fingerprint_setting"),
+        "fingerprint_setting",
         1,
         listOf()
     ),
-    FACE_SETTING("user_info:face_setting", I18nManager.t("face_setting"), 1, listOf()),
-    CARD_SETTING("user_info:card_setting", I18nManager.t("card_setting"), 1, listOf()),
-    LOGOUT("user_info:logout", I18nManager.t("logout"), 1, listOf()),
+    FACE_SETTING("user_info:face_setting", "face_setting", 1, listOf()),
+    CARD_SETTING("user_info:card_setting", "card_setting", 1, listOf()),
+    LOGOUT("user_info:logout", "logout", 1, listOf()),
 
-    TODO_LIST("home:todo_list", I18nManager.t("todo_list"), 1, listOf()),
+    TODO_LIST("home:todo_list", "todo_list", 1, listOf()),
 
     USER_INFO_HOME(
         "user_info",
-        I18nManager.t("user_info"),
+        "user_info",
         0,
         listOf(
             USER_INFO,
@@ -97,17 +97,17 @@ enum class RoleFunctionalPermissionsEnum(
     ),
     EXCEPTION_HOME_MANAGE(
         "exception_manage",
-        I18nManager.t("exception_manage"), 0,
+        "exception_manage", 0,
         listOf(EXCEPTION_REPORT, EXCEPTION_JOB, EXCEPTION_MANAGE)
     ),
     HARDWARE_HOME_MANAGE(
         "hardware_manage",
-        I18nManager.t("hardware_manage"), 0,
+        "hardware_manage", 0,
         listOf(SLOT_MANAGE, KEY_MANAGE, LOCK_MANAGE, CARD_MANAGE, RFID_MANAGE)
     ),
     JOB_TICKET_HOME_MANAGE(
         "job_ticket_manage",
-        I18nManager.t("job_ticket_manage"), 0,
+        "job_ticket_manage", 0,
         listOf(
             TODO_LIST,
             IN_PROGRESS_JOB,
@@ -123,7 +123,7 @@ enum class RoleFunctionalPermissionsEnum(
     ),
     DATA_HOME_MANAGE(
         "data_manage",
-        I18nManager.t("data_manage"), 0,
+        "data_manage", 0,
         listOf(
             USER_MANAGE,
             ROLE_MANAGE,
@@ -133,7 +133,7 @@ enum class RoleFunctionalPermissionsEnum(
             SWITCH_LAYOUT
         )
     ),
-    HOME("Home", I18nManager.t("home"), 0, listOf()),
+    HOME("Home", "home", 0, listOf()),
     ;
 
     companion object {

data/src/main/java/com/grkj/data/logic/impl/standard/JobTicketLogic.kt

@@ -716,8 +716,11 @@ class JobTicketLogic @Inject constructor(
                     ticketPointData.lotoId = it.lotoId
                     ticketPointData.lotoName = it.lotoName
                     ticketPointData.powerType = it.powerType
-                    ticketPointData.powerTypeName = IsolationPointPowerTypeEnum.values()
-                        .find { enum -> enum.name == it.powerType }?.description
+                    ticketPointData.powerTypeName =
+                        I18nManager.t(
+                            IsolationPointPowerTypeEnum.values()
+                                .find { enum -> enum.name == it.powerType }?.description ?: ""
+                        )
                     ticketPointData.isolationMethod = it.isolationMethod
                     ticketPointData.pointIcon = it.pointIcon
                     ticketPointData.pointPicture = it.pointPicture
@@ -931,7 +934,7 @@ class JobTicketLogic @Inject constructor(
         // 普通用户要排除 "异常" 状态
         val exStatusList =
             CommonDictDataEnum.JOB_TICKET_STATUS.commonDictRes.filter {
-                I18nManager.t(it.dictLabel)== I18nManager.t(
+                I18nManager.t(it.dictLabel) == I18nManager.t(
                     "abnormal"
                 )
             }

data/src/main/java/com/grkj/data/logic/impl/standard/SysMenuLogic.kt

@@ -8,6 +8,7 @@ import com.grkj.data.model.dos.SysMenu
 import com.grkj.data.model.dos.SysRoleMenu
 import com.grkj.data.logic.BaseLogic
 import com.grkj.data.logic.ISysMenuLogic
+import com.grkj.shared.utils.i18n.I18nManager
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -170,7 +171,7 @@ class SysMenuLogic @Inject constructor(val sysMenuDao: SysMenuDao, val roleDao:
         val currentMenu: SysMenu = if (existing == null) {
             // 不存在，构造一个新的实体并插入
             val newMenu = SysMenu().apply {
-                menuName = menuEnum.description
+                menuName = I18nManager.t(menuEnum.description)
                 perms = menuEnum.functionalPermission
                 // 这里用 level 做 orderNum（仅示意），可根据业务自由调整
                 orderNum = menuEnum.level