refactor(更新)

- 多语言文本优化，删除无用文本，修改部分文本内容
- 优化 BleBusinessManager ticket_lost 判断逻辑

app/src/main/res/values-en/strings.xml

@@ -10,7 +10,6 @@
     <string name="home_overview_data_title">Overview data</string>
     <string name="zone">Zone</string>
     <string name="workflow_mode">Flow mode</string>
-    <string name="login_failed">login failed</string>
     <string name="ongoing_job_tv">ongoing\njob</string>
     <string name="hardware_in_use_tv">Hardware \nin use</string>
     <string name="locked_points_tv">Locked\npoints</string>
@@ -41,7 +40,6 @@
     <string name="user_manage_role">Role</string>
     <string name="please_select_status">please select status</string>
     <string name="add_user_succeed">New user succeed</string>
-    <string name="add_user_failed">New user failed</string>
     <string name="user_manage_view">View</string>
     <string name="role_manage_title">Role manage</string>
     <string name="user_manage_user_detail_title">User detail</string>
@@ -103,11 +101,6 @@
     <string name="sop_create_succeed">SOP create succeed</string>
     <string name="sop_create_failed">SOP create failed</string>
     <string name="not_save_tip">Data not save,Do you want to lost save and leave？</string>
-    <string name="lock_mode_1"><![CDATA[lock->colock->unlock]]></string>
-    <string name="lock_mode_2"><![CDATA[lock->unlock]]></string>
-    <string name="lock_mode_3"><![CDATA[unlock->lock]]></string>
-    <string name="lock_mode_4">lock</string>
-    <string name="lock_mode_5">unlock</string>
     <string name="sop_save_tip">Do you want to save \"%1$s\"？</string>
     <string name="create_sop_job_title">Create SOP job</string>
     <string name="create_sop_job_sop">SOP</string>
@@ -117,8 +110,6 @@
     <string name="show_points_when_selected_sop">Show SOP points when the sop has selected</string>
     <string name="show_member_when_selected_sop">Show SOP members when the sop has selected</string>
     <string name="create_sop_job_tip">Are you sure you want to execute the job \"%1$s\"？</string>
-    <string name="sop_job_create_succeed">Create SOP job succeed</string>
-    <string name="sop_job_create_failed">Create SOP job failed</string>
     <string name="create_job_title">Create job</string>
     <string name="job_workstation">Job workstation</string>
     <string name="create_job_name">Job name</string>
@@ -375,10 +366,6 @@
     <string name="job_execute_step_description">Operation Description(%1$s)</string>
     <string name="job_execute_lock_status_title">Point Lock Status</string>
     <string name="job_execute_colocker_colock_status_title">CoLocker CoLock status</string>
-    <string name="has_lock_not_locked">Your point %s are not locked</string>
-    <string name="please_complete_colock">Please let coLock complete</string>
-    <string name="please_complete_release_colock">Please release coLock</string>
-    <string name="has_lock_not_unlocked">Your point %s are not unlocked</string>
     <string name="please_do_colock">Please have co-locker perform co-lock</string>
     <string name="please_done_operation">Please done operation %s first</string>
     <string name="set_fingerprint_title">Set fingerprint</string>
@@ -406,7 +393,6 @@
     <string name="start_detect_key_slot">Start checking the key compartment</string>
     <string name="start_detect_lock_slot">Start detecting padlock compartments</string>
     <string name="check_lock_is_new_device">Check if the padlock is a new hardware</string>
-    <string name="check_key_is_new_device">Check if the key is new hardware</string>
     <string name="start_scan_key_mac">Start scanning key information</string>
     <string name="do_you_want_to_remove_exception">Are you sure to remove and modify the exception</string>
     <string name="check_device_info">Detected %1$d unregister keys and %2$d unregister padlocks</string>
@@ -447,11 +433,8 @@
     <string name="job_status">Job status</string>
     <string name="confirm_cancel_exception">Are you sure to cancel the exception</string>
     <string name="confirm_handle_exception">Are you sure to handle the exception</string>
-    <string name="handle_exception_failed">Handle exception failed</string>
     <string name="confirm_create_lock_job">Confirm whether to create a lock job</string>
     <string name="create_job_failed">Create job failed</string>
-    <string name="please_press_the_fingerprint_again">Please press the fingerprint again</string>
-    <string name="fingerprint_register_failed">Fingerprint input failed</string>
     <string name="detect_face_tip">Detected face, about to shoot</string>
     <string name="add_group">Add group</string>
     <string name="delete_group">Delete group</string>
@@ -468,7 +451,6 @@
     <string name="lock_already_exists">The padlock information already exists</string>
     <string name="new_group">New group %d</string>
     <string name="edit">Edit</string>
-    <string name="group_name_already_exists">Group name already exists</string>
     <string name="point_manage_point_group">Group name</string>
     <string name="please_select_group">Please select group</string>
     <string name="group_name_must_not_empty">Group name must not empty</string>
@@ -483,8 +465,6 @@
     <string name="admin_role_can_not_edit">Admin role can not edit</string>
     <string name="change_to_standard">Switch to Standard Version</string>
     <string name="restart_app_after_set">The app will restart after the settings are completed</string>
-    <string name="todo_title">To Do Steps:%s</string>
-    <string name="todo_content">To Do Content:%s</string>
     <string name="todo_header">Todo</string>
     <string name="done_header">Done</string>
     <string name="wait_header">Waiting</string>
@@ -554,7 +534,6 @@
     <string name="key_in_use">Key in use</string>
     <string name="password_regex_tip">The password does not meet the requirements</string>
     <string name="username_regex_tip">Account number does not meet the requirements</string>
-    <string name="workstation_manage_update_workstation">Edit workstation</string>
     <string name="update_workstation_succeed">Update workstation success</string>
     <string name="update_workstation_failed">Update workstation failed</string>
     <string name="current_slot_has_no_key">Current slot has no key</string>

app/src/main/res/values-zh/strings.xml

@@ -10,7 +10,6 @@
     <string name="home_overview_data_title">总览数据</string>
     <string name="zone">区域范围</string>
     <string name="workflow_mode">流程模式</string>
-    <string name="login_failed">登录失败</string>
     <string name="ongoing_job_tv">进行中\n的作业</string>
     <string name="hardware_in_use_tv">使用中\n的硬件</string>
     <string name="locked_points_tv">锁定中\n的点位</string>
@@ -41,7 +40,6 @@
     <string name="user_manage_role">角色</string>
     <string name="please_select_status">请选择状态</string>
     <string name="add_user_succeed">新增用户成功</string>
-    <string name="add_user_failed">新增用户失败</string>
     <string name="user_manage_view">查看</string>
     <string name="role_manage_title">角色管理</string>
     <string name="user_manage_user_detail_title">用户详情</string>
@@ -103,11 +101,6 @@
     <string name="sop_create_succeed">SOP创建成功</string>
     <string name="sop_create_failed">SOP创建失败</string>
     <string name="not_save_tip">数据还没有保存，您确定要放弃保存，离开当前页面吗？</string>
-    <string name="lock_mode_1"><![CDATA[上锁->共锁->解锁]]></string>
-    <string name="lock_mode_2"><![CDATA[上锁->解锁]]></string>
-    <string name="lock_mode_3"><![CDATA[解锁->上锁]]></string>
-    <string name="lock_mode_4">上锁</string>
-    <string name="lock_mode_5">解锁</string>
     <string name="sop_save_tip">确定要保存\"%1$s\"吗？</string>
     <string name="create_sop_job_title">新建SOP作业</string>
     <string name="create_sop_job_sop">SOP</string>
@@ -117,8 +110,6 @@
     <string name="show_points_when_selected_sop">选择SOP后，将自动展示SOP的点位信息。</string>
     <string name="show_member_when_selected_sop">选择SOP后，将自动展示SOP的人员信息。</string>
     <string name="create_sop_job_tip">确定要执行作业\"%1$s\"吗？</string>
-    <string name="sop_job_create_succeed">SOP作业创建成功</string>
-    <string name="sop_job_create_failed">SOP作业创建失败</string>
     <string name="create_job_title">新建作业</string>
     <string name="job_workstation">作业区域</string>
     <string name="create_job_name">作业名称</string>
@@ -375,10 +366,6 @@
     <string name="job_execute_step_description">操作说明(%1$s)</string>
     <string name="job_execute_lock_status_title">隔离点锁定状态</string>
     <string name="job_execute_colocker_colock_status_title">共锁人员共锁状态</string>
-    <string name="has_lock_not_locked">您还有%s点位未上锁</string>
-    <string name="please_complete_colock">请完成共锁</string>
-    <string name="please_complete_release_colock">请先完成共锁解除</string>
-    <string name="has_lock_not_unlocked">您还有%s点位未解锁</string>
     <string name="please_do_colock">请共锁人完成共锁</string>
     <string name="please_done_operation">请先完成%s</string>
     <string name="set_fingerprint_title">设置指纹</string>
@@ -406,7 +393,6 @@
     <string name="start_detect_key_slot">开始检测钥匙仓位</string>
     <string name="start_detect_lock_slot">开始检测挂锁仓位</string>
     <string name="check_lock_is_new_device">检查挂锁是否为新硬件</string>
-    <string name="check_key_is_new_device">检查钥匙是否为新硬件</string>
     <string name="start_scan_key_mac">开始扫描钥匙信息</string>
     <string name="do_you_want_to_remove_exception">是否确认移除该异常</string>
     <string name="check_device_info">检测到未注册钥匙%1$d把,未注册挂锁%2$d把</string>
@@ -447,11 +433,8 @@
     <string name="job_status">作业状态</string>
     <string name="confirm_cancel_exception">是否确认取消异常</string>
     <string name="confirm_handle_exception">是否确认处理异常</string>
-    <string name="handle_exception_failed">处理异常失败</string>
     <string name="confirm_create_lock_job">确认是否创建上锁作业</string>
     <string name="create_job_failed">创建作业失败</string>
-    <string name="please_press_the_fingerprint_again">请再次按压指纹</string>
-    <string name="fingerprint_register_failed">指纹录入失败</string>
     <string name="detect_face_tip">检测到人脸，即将拍摄</string>
     <string name="has_job_in_progress">存在正在进行中的作业</string>
     <string name="loading_device">正在加载硬件......</string>
@@ -468,7 +451,6 @@
     <string name="delete_group">删除分组</string>
     <string name="new_group">新分组%d</string>
     <string name="edit">编辑</string>
-    <string name="group_name_already_exists">分组名称已存在</string>
     <string name="point_manage_point_group">分组名称</string>
     <string name="please_select_group">请选择分组</string>
     <string name="group_name_must_not_empty">分组名称不能为空</string>
@@ -483,8 +465,6 @@
     <string name="admin_role_can_not_edit">管理员角色无法编辑</string>
     <string name="change_to_standard">切换标准版</string>
     <string name="restart_app_after_set">App将在设置完成后重启</string>
-    <string name="todo_title">待办步骤:%s</string>
-    <string name="todo_content">待办内容:%s</string>
     <string name="todo_header">处理中</string>
     <string name="done_header">已处理</string>
     <string name="wait_header">等待中</string>
@@ -554,7 +534,6 @@
     <string name="key_in_use">钥匙正在使用</string>
     <string name="password_regex_tip">密码不符合要求</string>
     <string name="username_regex_tip">账号不符合要求</string>
-    <string name="workstation_manage_update_workstation">修改区域</string>
     <string name="update_workstation_succeed">更新区域成功</string>
     <string name="update_workstation_failed">更新区域失败</string>
     <string name="current_slot_has_no_key">当前仓位不存在钥匙</string>

data/src/main/java/com/grkj/data/data/CommonConstants.kt

@@ -4,10 +4,6 @@ package com.grkj.data.data
  * 通用常量
  */
 object CommonConstants {
-    /**
-     * 作业票数据丢失
-     */
-    const val TICKET_LOST = "{\"msg\":\"作业票数据丢失啦!\",\"code\":500}"
 
     /**
      * http前缀

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

@@ -792,7 +792,10 @@ object BleBusinessManager {
                                     SIKCore.getApplication(),
                                     UpdateKeyReturn(data.taskCode?.toLong()!!, keyNfc!!)
                                 )
-                                if (msg == CommonUtils.getStr(R.string.ticket_lost) || msg == "作业票不存在") {
+                                if (msg.contains(
+                                        CommonUtils.getStr(R.string.ticket_lost).toString()
+                                    )
+                                ) {
                                     data.taskCode?.let {
                                         TicketFinishedEvent.sendTicketFinishedEvent(it.toLong())
                                     }

ui-base/src/main/res/values-en/strings.xml

@@ -1,241 +1,72 @@
 <resources>
     <string name="app_name">ISCS</string>
 
-    <string name="common_net_dis">Please check your network connection and try again!</string>
-    <string name="common_net_download">Please check your network connection and download URL, then try again!</string>
-    <string name="common_download_erro_notag">Download failed! Please check the file storage location and try again</string>
-    <string name="common_token_expired">Token expired, please login again!</string>
-    <string name="common_net_timeout">Network request timeout, please check your network connection and try again!</string>
-
-    <string name="title_bar_current_work_ticket_num">Current permits: %d</string>
-    <string name="home_page">Home</string>
-
-    <string name="enter_system">Enter System</string>
-
-    <string name="swipe_card_on_machine">Please swipe your card on the device</string>
-    <string name="auth_success">Authentication successful!</string>
-    <string name="auth_fail">Authentication failed, please try again!</string>
-
-    <string name="selectable_input_prefix">*</string>
-
-    <string name="sop_number">Permit Number</string>
-    <string name="sop_name">Permit Name</string>
-    <string name="sop_type">Permit Type</string>
     <string name="start_time">Start Time</string>
     <string name="end_time">End Time</string>
-    <string name="current_time">Current Time</string>
-    <string name="current_sop_number">Current Permits Count</string>
 
-    <string name="ble_no_device_found">No devices found</string>
     <string name="ble_connecting">Connecting, please wait...</string>
     <string name="ble_connect_fail">Connection failed, please try again!</string>
-    <string name="ble_disconnect">Connection disconnected, please try again!</string>
-
-    <string name="ticket_code_is_null">Please enter permit number</string>
-    <string name="ticket_name_is_null">Please enter permit name</string>
-    <string name="work_shop_is_null">Please select workshop</string>
-    <string name="work_area_is_null">Please select work area</string>
-    <string name="sop_is_null">Please select SOP</string>
-    <string name="ticket_type_is_null">Please select permit type</string>
 
     <string name="login_tip">Please enter username/password or swipe card to login</string>
     <string name="please_input_account">Please enter username</string>
     <string name="please_input_password">Please enter password</string>
-    <string name="account_or_password_error">Incorrect username or password</string>
-    <string name="device_is_initializing">Initializing device...</string>
-    <string name="create_ticket">Create Permit</string>
-    <string name="current_tickets">Current Permits</string>
-    <string name="history_tickets">Permit History</string>
-    <string name="please_login">Please login</string>
-
-    <string name="exit">Exit</string>
 
-    <string name="not_started">Not Started</string>
-    <string name="ready_to_lock">Ready to Lock</string>
-    <string name="on_process">In Progress</string>
-    <string name="ready_to_unlock">Ready to Unlock</string>
-    <string name="finished">Finished</string>
-    <string name="key_return_confirm_tip">Permit not completed, confirm to return key?</string>
-    <string name="ticket_id_is_null">Permit ID cannot be empty</string>
     <string name="lock_is_not_enough">Insufficient locks</string>
-    <string name="key_is_not_enough">Insufficient keys</string>
     <string name="no_available_key">No available keys</string>
     <string name="get_key_info_fail">Failed to get key information</string>
 
-    <string name="ticket_is_finished">Permit completed</string>
-    <string name="ticket_is_locker_part_finished">Locker part completed</string>
-    <string name="ticket_is_colocker_part_finished">Co-locker part completed</string>
-
     <string name="key_not_exists">Key does not exist</string>
 
-    <string name="make_sure_to_colock">Confirm to co-lock?</string>
-    <string name="make_sure_to_unlock">Confirm to unlock?</string>
     <string name="key_return_tip">Permit not completed, key return prohibited</string>
     <string name="lock_key_return_tip">The work order has not been completed. Do you want to force data upload</string>
 
     <!--  Presentation Page  -->
-    <string name="presentation_select_sop">Select SOP</string>
-    <string name="presentation_select_workshop">Select Workshop</string>
-    <string name="presentation_select_line">Select Production Line</string>
-    <string name="presentation_ticket_name">Permit Name</string>
-    <string name="presentation_ticket_number">Permit Number</string>
-    <string name="presentation_ticket_type">Permit Type</string>
-    <string name="presentation_segregation_point">Isolation Point</string>
-    <string name="presentation_person_lock">Locker</string>
-    <string name="presentation_person_lock_together">Co-locker</string>
-    <string name="presentation_person_safety">Safety Officer</string>
-    <string name="presentation_ticket_content">Work Content</string>
-
-    <string name="presentation_hint_workshop">Please select workshop</string>
-    <string name="presentation_hint_line">Please select production line</string>
-    <string name="presentation_hint_sop">Please select...</string>
-    <string name="presentation_hint_name">Please select</string>
-    <string name="presentation_hint_number">Please enter permit number</string>
-    <string name="presentation_hint_type">Please select permit type</string>
-    <string name="presentation_hint_point">Please enter isolation point</string>
-    <string name="presentation_hint_locker">Please select locker</string>
-    <string name="presentation_hint_together">Please enter co-locker</string>
-    <string name="presentation_hint_safety">Please select safety officer</string>
-    <string name="presentation_hint_content">Please enter work content</string>
-
-    <string name="presentation_login_tip">Please swipe card to login</string>
 
 
     <!--  Design  -->
     <string name="loto">智能锁控系统</string>
-    <string name="app_title">Intelligent LOTO</string>
-    <string name="job_management">Job Management</string>
     <string name="settings">Settings</string>
-    <string name="workshop">Workstation</string>
-    <string name="technology_sop">Technical SOP</string>
-    <string name="job_execution">Job Execution</string>
-    <string name="repair">Maintenance</string>
-    <string name="pre_maintenance">PM</string>
-    <string name="change_shifts">Shift Change</string>
-    <string name="switch_product">Changeover</string>
-    <string name="clean">Cleaning</string>
     <string name="back">Back</string>
-    <string name="start_the_job">Start</string>
     <string name="finish_the_job">Finish</string>
     <string name="cancel_the_job">Cancel</string>
     <string name="action_confirm">Action Confirmation</string>
-    <string name="executed">Executed</string>
-    <string name="not_executed">Pending Execution</string>
-    <string name="allocated">Allocated</string>
-    <string name="not_allocated">Pending Allocation</string>
     <string name="recognize_work_content">Identify Work Content</string>
     <string name="power_isolation_way">Energy Isolation Method</string>
-    <string name="notice_worker">Notify Personnel</string>
     <string name="shutdown">Shutdown Operation</string>
-    <string name="lock_and_hang_a_sign">Lockout Tagout</string>
     <string name="ensure_power_isolation">Energy Isolation Verification</string>
     <string name="check_before_unlocking">Pre-Unlock Check</string>
     <string name="unlock_and_restore_switch">Unlock and Restore Switch</string>
-    <string name="login_face">Face Login</string>
-    <string name="login_fingerprint">Fingerprint Login</string>
-    <string name="login_card">Card Login</string>
-    <string name="login_account">Username Login</string>
     <string name="please_swipe_card">Please swipe card</string>
     <string name="please_scan_face">Please scan face</string>
     <string name="please_scan_fingerprint">Please scan fingerprint</string>
     <string name="login">Login</string>
-    <string name="current_sop">Current SOP: %s</string>
-    <string name="machinery_pic">Technology Diagram</string>
-    <string name="lock_station">LOTO Station</string>
     <string name="locker">Locker</string>
     <string name="colocker">Co-locker</string>
     <string name="select">Select</string>
     <string name="select_locker">Select Locker</string>
-    <string name="select_coloker_mars">Select Co-locker (Internal)</string>
-    <string name="select_coloker_outside">Select Co-locker (External)</string>
-    <string name="isolation_point">Isolation Point</string>
-    <string name="effect">Effect</string>
-    <string name="switch_status">Switch Status</string>
     <string name="lock_status">Lock Status</string>
-    <string name="ready_to_colock">Ready to Co-lock</string>
-    <string name="colocked">Co-locked</string>
-    <string name="unlocked">Unlocked</string>
-    <string name="locked">Locked</string>
     <string name="go_locking">Go to Lock</string>
     <string name="go_unlocking">Unlock</string>
-    <string name="please_select_machinery">Please select process</string>
-    <string name="please_select_sop_type">Please select SOP type</string>
     <string name="confirm">Confirm</string>
     <string name="please_select_locker">Please select locker</string>
     <string name="has_locked">Locked</string>
-    <string name="action_confirm_shut_down">Confirm to perform shutdown operation?</string>
     <string name="action_confirm_content">Confirm to perform %1$s operation？</string>
-    <string name="action_confirm_lock">Confirm to perform lockout tagout?</string>
-    <string name="action_confirm_power_isolation">Confirm to verify energy isolation?</string>
-    <string name="action_confirm_check_before_unlocking">Confirm to perform pre-unlock check?</string>
-    <string name="action_confirm_restore">Confirm to unlock and restore switch?</string>
-    <string name="action_confirm_finish_ticket">Other permits still lock isolation points, confirm to finish?</string>
-    <string name="logout">Logout</string>
     <string name="cancel">Cancel</string>
     <string name="cancel_countdown">Cancel (%d seconds)</string>
     <string name="confirm_to_colock">Confirm %s to co-lock?</string>
     <string name="confirm_to_uncolock">Confirm %s to remove co-lock?</string>
-    <string name="not_involved_in_ticket">You are not involved in this permit</string>
     <string name="you_are_not_locker_tip">You are not the locker, cannot perform this operation</string>
-    <string name="open_all_docks">Open All Docks</string>
-    <string name="close_all_docks">Close All Docks</string>
-    <string name="key_dock">Key Dock</string>
-    <string name="lock_dock">Lock Dock</string>
-    <string name="address">Address</string>
-    <string name="device_index">Dock %d</string>
-    <string name="test">Test</string>
-    <string name="system_setting">System Settings</string>
     <string name="turn_on">On</string>
     <string name="turn_off">Off</string>
-    <string name="dock_config">Dock Configuration</string>
-    <string name="port_address_config">Serial Port Address Settings</string>
-    <string name="type">Type</string>
-    <string name="add">Add</string>
-    <string name="board_type_key">Key Board</string>
-    <string name="board_type_lock">Padlock Board</string>
-    <string name="board_type_portal">All-in-one Board</string>
-    <string name="board_type_collect">Collection Board</string>
-    <string name="board_type_elec_lock">Electromagnetic Lock Control Board</string>
-    <string name="action">Action</string>
     <string name="delete">Delete</string>
-    <string name="please_select_board_type">Please select board type</string>
-    <string name="please_input_address">Please enter address</string>
-    <string name="please_input_valid_address">Please enter valid address</string>
-    <string name="port_address">Serial Port Address</string>
-    <string name="please_select_port">Please select serial port</string>
     <string name="save_success">Saved successfully!</string>
-    <string name="save_config">Save Configuration</string>
-    <string name="system_setting_tip">App will restart after saving, changes will take effect after restart</string>
-    <string name="no_board_responses">No board responses</string>
     <string name="no_response_board_exists">There are unresponsive boards</string>
     <string name="please_take_out_ready_device_first">Please take out the ready devices first</string>
-    <string name="can_not_do_colock_action">Co-lock operations are currently unavailable</string>
     <string name="key_is_in_failure_mode">Key is in failure mode</string>
-    <string name="uncaught_exception_tip">Sorry, an exception occurred, the app will exit</string>
-    <string name="submit">Submit</string>
     <string name="exception_report">Exception Report</string>
-    <string name="exception_report_type">Exception Type:</string>
-    <string name="exception_report_type_hint">Please select exception type</string>
-    <string name="exception_report_level">Severity Level:</string>
-    <string name="exception_report_level_hint">Please select severity level</string>
-    <string name="exception_report_hardware_key">Key number：</string>
-    <string name="exception_report_hardware_lock">Lock number：</string>
-    <string name="exception_report_hardware_job_card">Job card number：</string>
-    <string name="exception_report_hardware_rfid_point">Rfid number：</string>
-    <string name="exception_report_description">Exception Description:</string>
-    <string name="fingerprint_config">Fingerprint Settings</string>
-    <string name="face_config">Face Settings</string>
-    <string name="add_fingerprint">Add Fingerprint</string>
-    <string name="fingerprint_config_tip">Up to 3 fingerprints can be added</string>
-    <string name="fingerprint">Fingerprint</string>
     <string name="fingerprint_delete_confirm_tip">Confirm to delete %s?</string>
     <string name="fingerprint_scan_tip">Please press the fingerprint recognition area %d times in succession</string>
     <string name="fingerprint_add_success_tip">Fingerprint added successfully</string>
-    <string name="exception_type_tip">Please select exception type</string>
-    <string name="exception_level_tip">Please select severity level</string>
-    <string name="exception_submit_success_tip">Exception submitted successfully</string>
-    <string name="add_face">Add face record</string>
-    <string name="face_config_tip">Up to 1 face can be registered</string>
     <string name="recapture">Retake</string>
     <string name="capture_tip_title">Registration Tips</string>
     <string name="capture_tip_content">1. The system will automatically take photos. Please ensure:
@@ -245,101 +76,31 @@
      \n · Natural expression
 \n2. After shooting, you can submit or retake photo.
 \n3. Click cancel to abort collation</string>
-    <string name="face_add_success_tip">Face registered successfully</string>
-    <string name="face_delete_confirm_tip">Confirm to delete face data?</string>
-    <string name="my_face">My Face</string>
     <string name="loading_msg_return_key_start">Connecting to key, please wait...</string>
     <string name="loading_msg_get_ticket_status_start">Reading permit from key</string>
     <string name="key_return_success">Key returned successfully</string>
     <string name="continue_the_ticket">Please continue to complete the permit</string>
-    <string name="can_not_lock_in_current_step">Locking not allowed at current step</string>
     <string name="take_out_rest_locks">Please take out remaining unlocked padlocks</string>
     <string name="take_out_key">Please take out the key</string>
-    <string name="ticket_is_starting">Starting permit...</string>
-    <string name="system_is_processing">System processing...</string>
     <string name="take_out_lock_tip">Please take locks from open dock, %d remaining</string>
     <string name="take_out_key_tip">Please take the key from open key dock</string>
-    <string name="data_is_uploading">Uploading data...</string>
-    <string name="waiting_for_allocating_worker">Waiting to assign workers</string>
-    <string name="waiting_for_shutting_down">Waiting to perform shutdown</string>
-    <string name="waiting_for_hanging_a_sign">Waiting to perform lockout tagout</string>
-    <string name="waiting_for_power_isolation">Waiting to verify energy isolation</string>
-    <string name="waiting_for_checking_before_unlocking">Waiting to perform pre-unlock check</string>
-    <string name="waiting_for_restoring_switch_before_unlocking">Waiting to restore switch before unlocking</string>
-    <string name="waiting_for_finishing">Waiting to finish current job</string>
-    <string name="allocating_worker_tip">Please assign locker and co-locker</string>
     <string name="please_go_locking">Please have locker perform locking operation</string>
     <string name="please_return_key_after_locking">Please have locker return the key after locking</string>
-    <string name="please_do_colock_and_uncolock">Please have co-locker perform co-lock and remove co-lock after work</string>
     <string name="please_go_unlocking">Please have locker perform unlocking operation</string>
     <string name="please_return_key_after_unlocking">Please have locker return the key after unlocking</string>
-    <string name="face_active_fail">Face recognition activation failed</string>
     <string name="face_can_not_process">Face engine activation failed, recognition unavailable</string>
     <string name="face_detected_do_login">Face detected, logging in...</string>
-    <string name="current_step_can_not_be_process">Current step cannot be processed temporarily</string>
     <string name="no_permission_to_handle">You do not have permission for this permit</string>
-    <string name="can_not_change_locker">Cannot change locker currently</string>
-    <string name="please_add_at_least_colockers">Please add at least %1$d colockers</string>
-    <string name="can_not_change_colocker">Cannot change co-locker currently</string>
-    <string name="is_processing_please_wait">Processing, please wait...</string>
     <string name="doing_login">Logging in...</string>
     <string name="start_to_send_ticket">Starting to issue permit...</string>
     <string name="sending_ticket">Issuing permit...</string>
     <string name="send_ticket_fail">Failed to issue permit</string>
-    <string name="login_method_tip">● You can login directly via fingerprint or card</string>
-    <string name="use_default_cabinet_id">Will use default CabinetId</string>
-    <string name="please_set_url">Please enter URL, empty will use default</string>
-    <string name="url_format_error">Please start with http:// or https://</string>
-    <string name="no_key_available_dialog_tip">No available keys, confirm to continue permit?</string>
     <string name="lock_take_report_fail">Failed to report padlock removal</string>
-    <string name="board_address_exists">Board address already exists</string>
-    <string name="row">Row</string>
-    <string name="column">Column</string>
-    <string name="please_input_row">Please enter row number</string>
-    <string name="please_input_column">Please enter key column number</string>
-    <string name="row_and_column_conflict">Duplicate row/column for same board type, please re-enter</string>
-    <string name="column_must_be_1_or_2">Key column must be 1 or 2</string>
-    <string name="row_conflict">Row conflics</string>
-    <string name="device_status">Device Status</string>
-    <string name="key_does_not_exists">Key does not exist</string>
-    <string name="key_no_rfid">Key RFID missing</string>
-    <string name="key_no_mac">Key MAC missing</string>
-    <string name="key_no_connected">Key not connected</string>
-    <string name="key_not_in_ready_mode">Key not in ready mode</string>
-    <string name="key_has_exception">Key has exception</string>
-    <string name="key_is_available">Normal</string>
-    <string name="key_unknown">Unknown</string>
-    <string name="repair_key">Repair</string>
-    <string name="no_key_to_repair">Key does not exist, cannot repair</string>
     <string name="key_take_error_tip">Key assignment failed, please check device status</string>
 
-    <string name="index_number">number</string>
-    <string name="icon">icons</string>
-    <string name="ticket_name">Ticket Name</string>
-    <string name="check">view</string>
-    <string name="ticket_processing">operation in progress</string>
-    <string name="has_no_point_can_unlock">has no point can unlock</string>
-    <string name="all_point_already_locked">all point already locked</string>
-    <string name="please_done_lock_action_and_colock_action">please done lock action and colock action</string>
-    <string name="please_done_all_unlock_action">please done all unlock action</string>
-    <string name="step_mode_select">select step mode</string>
-    <string name="mode_one">mode 1</string>
-    <string name="mode_two">mode 2</string>
-    <string name="step_mode_change_success">step mode change success</string>
-    <string name="user_already_unlock">user already unlock</string>
-    <string name="please_wait_all_colocker_unlocked">please wait all colocker unlocked</string>
-    <string name="current_colocker_already_locked">current colocker already locked</string>
-    <string name="current_colocker_already_unlocked">current colocker already unlocked</string>
     <string name="can_not_remove_current_colocker">can not remove current co-locker</string>
-    <string name="current_step_not_allowed_to_add_colocker">current step not allowed to add colocker</string>
-    <string name="keep_at_least_colocker">keep at least %1$d colocker</string>
     <string name="action_hint">action hint</string>
-    <string name="take_one_more_key_hint">I have already taken out the key, would you like to take out another one</string>
-    <string name="current_user_does_not_have_the_authority_to_colock">The current user does not have the authority to colock</string>
-    <string name="current_user_does_not_have_the_authority_to_unlock_colock">The current user does not have the authority to unlock colock</string>
-    <string name="all_point_have_other_job_not_finish">all point have other job not finish，do you want to continue？</string>
-    <string name="lock_is_not_enough_stop_issue_ticket">lock is not enough, stop issue ticket</string>
-    <string name="ticket_lost">{"msg":"作业票数据丢失啦!","code":500}</string>
+    <string name="ticket_lost">作业票不存在</string>
     <string name="current_ticket_report_lock_take_exception_tip">current ticket report lock take exception, please return lock</string>
     <string name="please_input_exception_reason">please input exception reason</string>
     <string name="hardware_info">Hardware Info: %s</string>
@@ -347,16 +108,8 @@
     <string name="hardware_key">Key</string>
     <string name="hardware_lock">Lock</string>
     <string name="number">Number: </string>
-    <string name="report_success">exception report success</string>
-    <string name="report_failed">exception report failed</string>
-    <string name="is_device_recovery_check">Is device recovery check(%1$s,%2$s)?</string>
-    <string name="recovery_success">recovery success</string>
-    <string name="recovery_failed">recovery failed</string>
-    <string name="no_permission">no permission</string>
-    <string name="exception_select_hardware_tip">Please select hardware</string>
     <string name="check_key_and_lock">check key and lock</string>
     <string name="turn_read">read</string>
-    <string name="lock_nfc_lost">{\"msg\":\"挂锁nfc缺失!\",\"code\":500}</string>
     <string name="key_exception_tag">Key is tag for exception</string>
     <string name="slot_exception_tag">Slot is tag for exception</string>
     <string name="lock_exception_tag">Lock is tag for exception</string>
@@ -366,7 +119,6 @@
     <string name="ticket_data_error">Ticket data error</string>
     <string name="job_already_finished">job already finished</string>
     <string name="not_save_tip">Data not save,Do you want to lost save and leave？</string>
-    <string name="please_reopen_ble">Please reopen ble</string>
     <string name="scan_complete_app_restarting">scan complete app restarting</string>
     <string name="please_do_uncolock">Please have co-locker remove co-lock</string>
     <string name="can_not_remove_current_locker">can not remove current locker</string>

ui-base/src/main/res/values-zh/strings.xml

@@ -1,233 +1,65 @@
 <resources>
     <string name="app_name">ISCS</string>
 
-    <string name="common_net_dis">请确认网络状态正常后重试！</string>
-    <string name="common_net_download">请确认网络状态正常且下载地址无误后重试！</string>
-    <string name="common_download_erro_notag">下载失败！请确认文件存储位置后重试</string>
-    <string name="common_token_expired">token 已过期，请重新登录！</string>
-    <string name="common_net_timeout">网络请求超时，请确认网络状态正常后重试！</string>
-
-    <string name="title_bar_current_work_ticket_num">当前作业数：%d</string>
-    <string name="home_page">主页</string>
-
-    <string name="enter_system">进入系统</string>
-
-    <string name="swipe_card_on_machine">请在机器上刷卡</string>
-    <string name="auth_success">认证通过！</string>
-    <string name="auth_fail">认证失败，请重试！</string>
-
-    <string name="selectable_input_prefix">*</string>
-
-    <string name="sop_number">作业编号</string>
-    <string name="sop_name">作业名称</string>
-    <string name="sop_type">作业类型</string>
     <string name="start_time">开始时间</string>
     <string name="end_time">结束时间</string>
-    <string name="current_time">当前时间</string>
-    <string name="current_sop_number">当前作业票数量</string>
 
-    <string name="ble_no_device_found">没有扫描到设备</string>
     <string name="ble_connecting">连接中，请稍后...</string>
     <string name="ble_connect_fail">连接失败，请重试！</string>
-    <string name="ble_disconnect">连接断开了，请重试！</string>
-
-    <string name="ticket_code_is_null">请填写作业票编号</string>
-    <string name="ticket_name_is_null">请填写作业票名称</string>
-    <string name="work_shop_is_null">请选择所属车间</string>
-    <string name="work_area_is_null">请选择所属区域</string>
-    <string name="sop_is_null">请选择SOP</string>
-    <string name="ticket_type_is_null">请选择作业票类型</string>
 
     <string name="login_tip">请输入用户名和密码或者刷卡进行登录</string>
     <string name="please_input_account">请输入用户名</string>
     <string name="please_input_password">请输入密码</string>
-    <string name="account_or_password_error">账号或密码错误</string>
-    <string name="device_is_initializing">正在初始化设备……</string>
-    <string name="create_ticket">开作业票</string>
-    <string name="current_tickets">当前作业票</string>
-    <string name="history_tickets">历史作业票</string>
-    <string name="please_login">请登录</string>
-
-    <string name="exit">退出</string>
 
-    <string name="not_started">未开始</string>
-    <string name="ready_to_lock">待上锁</string>
-    <string name="on_process">进行中</string>
-    <string name="ready_to_unlock">待解锁</string>
-    <string name="finished">已结束</string>
-    <string name="key_return_confirm_tip">工作票尚未完成，是否确认归还钥匙？</string>
-    <string name="ticket_id_is_null">作业票编号不能为空</string>
     <string name="lock_is_not_enough">锁具数量不足</string>
-    <string name="key_is_not_enough">钥匙数量不足</string>
     <string name="no_available_key">暂无可用钥匙</string>
     <string name="get_key_info_fail">获取钥匙信息失败</string>
-
-    <string name="ticket_is_finished">工作票已完成</string>
-    <string name="ticket_is_locker_part_finished">工作票上锁人部分已完成</string>
-    <string name="ticket_is_colocker_part_finished">工作票共锁人部分已完成</string>
-
     <string name="key_not_exists">钥匙不存在</string>
 
-    <string name="make_sure_to_colock">确定要共锁吗？</string>
-    <string name="make_sure_to_unlock">确定要解锁吗？</string>
     <string name="key_return_tip">作业票尚未完成，禁止归还钥匙</string>
     <string name="lock_key_return_tip">作业票尚未完成，是否强制上传数据</string>
 
-    <!--  演示页  -->
-    <string name="presentation_select_sop">选择SOP</string>
-    <string name="presentation_select_workshop">选择车间</string>
-    <string name="presentation_select_line">选择产线</string>
-    <string name="presentation_ticket_name">作业票名称</string>
-    <string name="presentation_ticket_number">作业票编号</string>
-    <string name="presentation_ticket_type">作业票类型</string>
-    <string name="presentation_segregation_point">隔离点</string>
-    <string name="presentation_person_lock">上锁人</string>
-    <string name="presentation_person_lock_together">共锁人</string>
-    <string name="presentation_person_safety">安全员</string>
-    <string name="presentation_ticket_content">作业内容</string>
-
-    <string name="presentation_hint_workshop">请选择车间</string>
-    <string name="presentation_hint_line">请选择产线</string>
-    <string name="presentation_hint_sop">请选择...</string>
-    <string name="presentation_hint_name">请选择</string>
-    <string name="presentation_hint_number">请输入作业编号</string>
-    <string name="presentation_hint_type">请选择作业类型</string>
-    <string name="presentation_hint_point">请输入隔离点</string>
-    <string name="presentation_hint_locker">请选择上锁人</string>
-    <string name="presentation_hint_together">请输入共锁人</string>
-    <string name="presentation_hint_safety">请选择安全员</string>
-    <string name="presentation_hint_content">请输入作业内容</string>
-
-    <string name="presentation_login_tip">请刷卡登录</string>
-
-
     <!--  设计图  -->
     <string name="loto">智能锁控系统</string>
-    <string name="app_title">智能锁控</string>
-    <string name="job_management">作业管理</string>
     <string name="settings">设置</string>
-    <string name="workshop">车间岗位</string>
-    <string name="technology_sop">工艺SOP</string>
-    <string name="job_execution">作业执行</string>
-    <string name="repair">维修</string>
-    <string name="pre_maintenance">PM</string>
-    <string name="change_shifts">开收班</string>
-    <string name="switch_product">换产</string>
-    <string name="clean">清洁</string>
     <string name="back">返回</string>
-    <string name="start_the_job">开始作业</string>
     <string name="finish_the_job">结束作业</string>
     <string name="cancel_the_job">取消作业</string>
     <string name="action_confirm">操作确认</string>
-    <string name="executed">已执行</string>
-    <string name="not_executed">待执行</string>
-    <string name="allocated">已分配</string>
-    <string name="not_allocated">待分配</string>
     <string name="recognize_work_content">识别工作内容</string>
     <string name="power_isolation_way">确认隔离方式</string>
-    <string name="notice_worker">通知人员</string>
     <string name="shutdown">操作停机</string>
-    <string name="lock_and_hang_a_sign">上锁并挂牌</string>
     <string name="ensure_power_isolation">能量隔离证实</string>
     <string name="check_before_unlocking">取锁前检查</string>
     <string name="unlock_and_restore_switch">拆锁恢复开关</string>
-    <string name="login_face">人脸登录</string>
-    <string name="login_fingerprint">指纹登录</string>
-    <string name="login_card">工卡登录</string>
-    <string name="login_account">用户名登录</string>
     <string name="please_swipe_card">请刷卡</string>
     <string name="please_scan_face">请刷脸</string>
     <string name="please_scan_fingerprint">请刷指纹</string>
     <string name="login">登录</string>
-    <string name="current_sop">当前SOP：%s</string>
-    <string name="machinery_pic">工艺图</string>
-    <string name="lock_station">锁定站</string>
     <string name="locker">上锁人</string>
     <string name="colocker">共锁人</string>
     <string name="select">选择</string>
     <string name="select_locker">选择上锁人</string>
-    <string name="select_coloker_mars">选择共锁人（内部）</string>
-    <string name="select_coloker_outside">选择共锁人（外部）</string>
-    <string name="isolation_point">隔离点</string>
-    <string name="effect">作用</string>
-    <string name="switch_status">开关状态</string>
     <string name="lock_status">上锁状态</string>
-    <string name="ready_to_colock">待共锁</string>
-    <string name="colocked">已共锁</string>
-    <string name="unlocked">已解锁</string>
-    <string name="locked">未解锁</string>
     <string name="go_locking">去上锁</string>
     <string name="go_unlocking">去解锁</string>
-    <string name="please_select_machinery">请选择工艺</string>
-    <string name="please_select_sop_type">请选择SOP类型</string>
     <string name="confirm">确定</string>
     <string name="please_select_locker">请选择上锁人</string>
     <string name="has_locked">已上锁</string>
-    <string name="action_confirm_shut_down">确定要执行停机操作吗？</string>
     <string name="action_confirm_content">确定要执行%1$s吗？</string>
-    <string name="action_confirm_lock">确定要执行上锁挂牌吗？</string>
-    <string name="action_confirm_power_isolation">确定要执行能量隔离证实吗？</string>
-    <string name="action_confirm_check_before_unlocking">确定要执行取锁前检查吗？</string>
-    <string name="action_confirm_restore">确定要执行拆锁恢复开关吗？</string>
-    <string name="action_confirm_finish_ticket">还有隔离开关被其他作业票锁定，确定要结束作业吗？</string>
-    <string name="logout">退出登录</string>
     <string name="cancel">取消</string>
     <string name="cancel_countdown">取消（%d秒）</string>
     <string name="confirm_to_colock">%s是否确认共锁？</string>
     <string name="confirm_to_uncolock">%s是否确认解除共锁？</string>
-    <string name="not_involved_in_ticket">您不参与该工票</string>
     <string name="you_are_not_locker_tip">您不是上锁人，无法执行此操作</string>
-    <string name="open_all_docks">全仓开</string>
-    <string name="close_all_docks">全仓关</string>
-    <string name="key_dock">钥匙仓</string>
-    <string name="lock_dock">锁仓</string>
-    <string name="address">地址</string>
-    <string name="device_index">%d号仓</string>
-    <string name="test">测试</string>
-    <string name="system_setting">系统设置</string>
     <string name="turn_on">开</string>
     <string name="turn_off">关</string>
-    <string name="dock_config">主板设置</string>
-    <string name="port_address_config">串口地址设置</string>
-    <string name="type">类型</string>
-    <string name="add">添加</string>
-    <string name="board_type_key">钥匙主板</string>
-    <string name="board_type_lock">挂锁主板</string>
-    <string name="board_type_portal">一体机主板</string>
-    <string name="board_type_collect">采集主板</string>
-    <string name="board_type_elec_lock">电磁锁控制主板</string>
-    <string name="action">操作</string>
     <string name="delete">删除</string>
-    <string name="please_select_board_type">请选择主板类型</string>
-    <string name="please_input_address">请输入地址</string>
-    <string name="please_input_valid_address">请输入合法地址</string>
-    <string name="port_address">串口地址</string>
-    <string name="please_select_port">请选择串口</string>
     <string name="save_success">保存成功！</string>
-    <string name="save_config">保存配置</string>
-    <string name="system_setting_tip">保存配置后App将自动重启，配置将在重启后生效</string>
-    <string name="no_board_responses">没有主板响应</string>
     <string name="no_response_board_exists">存在未响应的主板</string>
     <string name="please_take_out_ready_device_first">请先取出已开卡扣的设备</string>
-    <string name="can_not_do_colock_action">当前无法进行共锁相关操作</string>
     <string name="key_is_in_failure_mode">钥匙处于故障模式</string>
-    <string name="uncaught_exception_tip">很抱歉,程序出现异常,即将退出</string>
-    <string name="submit">提交</string>
     <string name="exception_report">异常上报</string>
-    <string name="exception_report_type">异常类型：</string>
-    <string name="exception_report_type_hint">请选择异常类型</string>
-    <string name="exception_report_level">严重等级：</string>
-    <string name="exception_report_level_hint">请选择严重等级</string>
-    <string name="exception_report_description">异常描述：</string>
-    <string name="exception_report_hardware_key">钥匙编号：</string>
-    <string name="exception_report_hardware_lock">挂锁编号：</string>
-    <string name="exception_report_hardware_job_card">工卡编号：</string>
-    <string name="exception_report_hardware_rfid_point">Rfid标记：</string>
-    <string name="fingerprint_config">指纹设置</string>
-    <string name="face_config">人脸设置</string>
-    <string name="add_fingerprint">添加指纹</string>
-    <string name="fingerprint_config_tip">最多可以添加3个指纹数据</string>
-    <string name="fingerprint">指纹</string>
     <string name="fingerprint_delete_confirm_tip">确定要删除%s吗？</string>
     <string name="fingerprint_scan_tip">请连续按压%d次指纹识别区</string>
     <string name="fingerprint_add_success_tip">已成功添加指纹数据</string>
@@ -245,101 +77,31 @@
      \n · 表情⾃然
 \n2. 拍摄完成后，您可以点击确认按钮进行提交，也可以点击重拍按钮重新进行拍摄。
 \n3. 取消录入，请点击取消按钮</string>
-    <string name="face_add_success_tip">已成功录入您的人脸数据</string>
-    <string name="face_delete_confirm_tip">确定要删除人脸数据吗？</string>
-    <string name="my_face">我的人脸</string>
     <string name="loading_msg_return_key_start">开始连接钥匙，请稍候······</string>
     <string name="loading_msg_get_ticket_status_start">正在读取钥匙作业票</string>
     <string name="key_return_success">钥匙归还成功</string>
     <string name="continue_the_ticket">请继续完成作业票</string>
-    <string name="can_not_lock_in_current_step">当前进度不允许执行上锁</string>
     <string name="take_out_rest_locks">请取出剩余开启卡扣的挂锁</string>
     <string name="take_out_key">请取出钥匙</string>
-    <string name="ticket_is_starting">作业启动中······</string>
-    <string name="system_is_processing">系统处理中······</string>
     <string name="take_out_lock_tip">请从打开的锁仓取出锁，还有%d把待取出</string>
     <string name="take_out_key_tip">请从打开的钥匙仓取出钥匙</string>
-    <string name="data_is_uploading">数据上传······</string>
-    <string name="waiting_for_allocating_worker">等待分配作业人员</string>
-    <string name="waiting_for_shutting_down">等待执行操作停机</string>
-    <string name="waiting_for_hanging_a_sign">等待执行上锁挂牌</string>
-    <string name="waiting_for_power_isolation">等待执行能量隔离证实</string>
-    <string name="waiting_for_checking_before_unlocking">等待执行取锁前检查</string>
-    <string name="waiting_for_restoring_switch_before_unlocking">等待执行拆锁前恢复开关</string>
-    <string name="waiting_for_finishing">等待结束本次作业</string>
-    <string name="allocating_worker_tip">请设置上锁人和共锁人</string>
     <string name="please_go_locking">请上锁员执行去上锁操作</string>
     <string name="please_return_key_after_locking">请上锁员完成上锁后，归还钥匙</string>
-    <string name="please_do_colock_and_uncolock">请共锁人进行共锁，并在工作完成后解除共锁</string>
     <string name="please_go_unlocking">请上锁员执行去解锁操作</string>
     <string name="please_return_key_after_unlocking">请上锁员完成解锁后，归还钥匙</string>
-    <string name="face_active_fail">人脸识别激活失败</string>
     <string name="face_can_not_process">人脸引擎激活失败，识别暂不可用</string>
     <string name="face_detected_do_login">检测到人脸，正在登录······</string>
-    <string name="current_step_can_not_be_process">当前步骤暂时无法处理</string>
     <string name="no_permission_to_handle">您暂无权限操作当前作业票</string>
-    <string name="can_not_change_locker">当前无法更换上锁人</string>
-    <string name="can_not_change_colocker">当前无法更换共锁人</string>
-    <string name="please_add_at_least_colockers">请添加至少%1$d共锁人</string>
-    <string name="is_processing_please_wait">正在处理中，请稍后······</string>
     <string name="doing_login">正在登录······</string>
     <string name="start_to_send_ticket">开始下发工作票······</string>
     <string name="sending_ticket">工作票下发中······</string>
     <string name="send_ticket_fail">作业票下发失败</string>
-    <string name="login_method_tip">● 您可以通过指纹或刷卡直接进行登录</string>
-    <string name="use_default_cabinet_id">将使用默认锁柜id</string>
-    <string name="please_set_url">请输入地址，清空保存将使用默认地址</string>
-    <string name="url_format_error">请以http://或https://开头</string>
-    <string name="no_key_available_dialog_tip">暂无可用钥匙，确认继续执行作业票吗？</string>
     <string name="lock_take_report_fail">挂锁取出上报失败</string>
-    <string name="board_address_exists">存在相同地址的主板</string>
-    <string name="row">行</string>
-    <string name="column">列</string>
-    <string name="please_input_row">请输入行号</string>
-    <string name="please_input_column">请输入钥匙列号</string>
-    <string name="row_and_column_conflict">存在相同的行列号的同类型主板，请重新输入</string>
-    <string name="column_must_be_1_or_2">钥匙列号只能输入1或者2</string>
-    <string name="row_conflict">行号冲突</string>
-    <string name="device_status">硬件状态</string>
-    <string name="key_does_not_exists">钥匙不存在</string>
-    <string name="key_no_rfid">钥匙RFID缺失</string>
-    <string name="key_no_mac">钥匙Mac缺失</string>
-    <string name="key_no_connected">钥匙未连接</string>
-    <string name="key_not_in_ready_mode">钥匙未处于待机模式</string>
-    <string name="key_has_exception">钥匙发生异常</string>
-    <string name="key_is_available">正常</string>
-    <string name="key_unknown">未知</string>
-    <string name="repair_key">修复</string>
-    <string name="no_key_to_repair">钥匙不存在，无法修复</string>
     <string name="key_take_error_tip">钥匙分配失败，请检查硬件状态</string>
 
-    <string name="index_number">编号</string>
-    <string name="icon">图标</string>
-    <string name="ticket_name">作业票名称</string>
-    <string name="check">查看</string>
-    <string name="ticket_processing">进行中的作业</string>
-    <string name="has_no_point_can_unlock">暂无隔离点可以解锁</string>
-    <string name="all_point_already_locked">所有隔离点已上锁</string>
-    <string name="please_done_lock_action_and_colock_action">请完成上锁和共锁操作</string>
-    <string name="please_done_all_unlock_action">请完成所有解锁操作</string>
-    <string name="step_mode_select">选择流程模式</string>
-    <string name="mode_one">模式1</string>
-    <string name="mode_two">模式2</string>
-    <string name="step_mode_change_success">流程模式切换成功</string>
-    <string name="user_already_unlock">用户已解锁</string>
-    <string name="please_wait_all_colocker_unlocked">请等待所有共锁人完成解锁</string>
-    <string name="current_colocker_already_locked">当前共锁人已上锁</string>
-    <string name="current_colocker_already_unlocked">当前共锁人已解锁</string>
     <string name="can_not_remove_current_colocker">无法移除当前共锁人</string>
-    <string name="current_step_not_allowed_to_add_colocker">当前步骤不允许添加共锁人</string>
-    <string name="keep_at_least_colocker">至少保留%1$d位共锁人</string>
     <string name="action_hint">操作提醒</string>
-    <string name="take_one_more_key_hint">已有钥匙取出，是否再取一个</string>
-    <string name="current_user_does_not_have_the_authority_to_colock">当前用户无权共锁</string>
-    <string name="current_user_does_not_have_the_authority_to_unlock_colock">当前用户无权解除共锁</string>
-    <string name="all_point_have_other_job_not_finish">所有隔离点存在其他作业未完成，是否继续拆锁恢复？</string>
-    <string name="lock_is_not_enough_stop_issue_ticket">锁具数量不足，停止下发作业票</string>
-    <string name="ticket_lost">{"msg":"作业票数据丢失啦!","code":500}</string>
+    <string name="ticket_lost">作业票不存在</string>
     <string name="current_ticket_report_lock_take_exception_tip">当前作业挂锁上报异常，请归还挂锁</string>
     <string name="please_input_exception_reason">请输入异常原因</string>
     <string name="hardware_info">硬件信息: %s</string>
@@ -347,16 +109,8 @@
     <string name="hardware_key">钥匙</string>
     <string name="hardware_lock">挂锁</string>
     <string name="number">编号: </string>
-    <string name="report_success">异常上报成功</string>
-    <string name="report_failed">异常上报失败</string>
-    <string name="is_device_recovery_check">是否确认恢复设备(%1$s,%2$s)</string>
-    <string name="recovery_success">恢复成功</string>
-    <string name="recovery_failed">恢复失败</string>
-    <string name="no_permission">权限不足</string>
-    <string name="exception_select_hardware_tip">请选择硬件</string>
     <string name="check_key_and_lock">正在检查钥匙和挂锁</string>
     <string name="turn_read">读</string>
-    <string name="lock_nfc_lost">{\"msg\":\"挂锁nfc缺失!\",\"code\":500}</string>
     <string name="key_exception_tag">该钥匙已被标记异常</string>
     <string name="slot_exception_tag">该锁仓已被标记异常</string>
     <string name="lock_exception_tag">该挂锁已被标记异常</string>
@@ -366,7 +120,6 @@
     <string name="ticket_data_error">工作票数据损坏</string>
     <string name="job_already_finished">该作业已被结束</string>
     <string name="not_save_tip">数据还没有保存，您确定要放弃保存，离开当前页面吗？</string>
-    <string name="please_reopen_ble">请重新打开蓝牙</string>
     <string name="scan_complete_app_restarting">扫描完成，APP将自动重启</string>
     <string name="please_do_uncolock">请共锁人解除共锁</string>
     <string name="can_not_remove_current_locker">无法移除当前上锁人</string>

ui-base/src/main/res/values/strings.xml

@@ -100,7 +100,7 @@
 
     <string name="can_not_remove_current_colocker">无法移除当前共锁人</string>
     <string name="action_hint">操作提醒</string>
-    <string name="ticket_lost">{"msg":"作业票数据丢失啦!","code":500}</string>
+    <string name="ticket_lost">作业票不存在</string>
     <string name="current_ticket_report_lock_take_exception_tip">当前作业挂锁上报异常，请归还挂锁</string>
     <string name="please_input_exception_reason">请输入异常原因</string>
     <string name="hardware_info">硬件信息: %s</string>