修复单词拼写错误；修复共锁进度和人名显示

app/src/main/java/com/grkj/iscs/presentation/simple/SimpleProcessActivity.kt

@@ -164,9 +164,9 @@ class SimpleProcessActivity : BaseActivity<ActivitySimpleProcessBinding>() {
             samStatus = 0
         }
         val samText = when (samStatus) {
-            1 -> getString(R.string.simple_colocker_sam, getString(R.string.simple_lock_shared))
-            2 -> getString(R.string.simple_colocker_sam, getString(R.string.simple_lock_unlocked))
-            else -> getString(R.string.simple_colocker_sam, " ")
+            1 ->  "${getString(R.string.simple_colocker_sam)}(${getString(R.string.simple_lock_shared)})"
+            2 ->  "${getString(R.string.simple_colocker_sam)}(${getString(R.string.simple_lock_unlocked)})"
+            else -> getString(R.string.simple_colocker_sam)
         }
 
         val robinName = getString(R.string.simple_colocker_robin)
@@ -175,9 +175,9 @@ class SimpleProcessActivity : BaseActivity<ActivitySimpleProcessBinding>() {
             robinStatus = 0
         }
         val robinText = when (robinStatus) {
-            1 -> getString(R.string.simple_colocker_robin, getString(R.string.simple_lock_shared))
-            2 -> getString(R.string.simple_colocker_robin, getString(R.string.simple_lock_unlocked))
-            else -> getString(R.string.simple_colocker_robin, " ")
+            1 -> "${getString(R.string.simple_colocker_robin)}(${getString(R.string.simple_lock_shared)})"
+            2 -> "${getString(R.string.simple_colocker_robin)}(${getString(R.string.simple_lock_unlocked)})"
+            else -> getString(R.string.simple_colocker_robin)
         }
 
         val text = "${getString(R.string.simple_wati_for_lock_share)}\n1. $samText\n2. $robinText"

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

@@ -170,8 +170,8 @@
     <string name="simple_tip_complete">作业票流程已技术，请返回首页</string>
     <string name="simple_please_wait_for_colocker_to_finish">请等待维修人员完成操作</string>
     <string name="simple_key_is_not_connected">钥匙未连接</string>
-    <string name="simple_colocker_sam">山姆（%s）</string>
-    <string name="simple_colocker_robin">罗宾（%s）</string>
+    <string name="simple_colocker_sam">山姆</string>
+    <string name="simple_colocker_robin">罗宾</string>
     <string name="simple_lock_shared">已共锁</string>
     <string name="simple_lock_unlocked">已解锁</string>
     <string name="start_scanning_for_devices">正在扫描设备...</string>

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

@@ -154,24 +154,24 @@
     <string name="simple_execute">Execute</string>
     <string name="simpe_tip_execute">After login, you can:\n1. Execute work permit to demonstrate the workflow.\n2.Access settings to demonstrate other features.\n3. Return to the homepage to log out.</string>
     <string name="simple_tip_content">Work Permit Content\nTake 2 locks (Green Light)\nTake 1 key (Green Light)\nLock 2 isolation points\n2 maintenance workers share lock</string>
-    <string name="simple_tip_process">Process Instructions\nThe primary lock owner takes the key and locks, confrms the isolationpoints, and locks them.\nThe primary lock owner returns the key, and the locks status are updated\nThe maintenance workers confrm the on-site lock and energy isolation.then clock in to share lock.\nThe maintenance workers perform their work. After work fnished, the maintenance workers remove the shared lock.\nThe primary lock owner unlocks and returns the key and locks.</string>
-    <string name="simple_tip_process2">Process Instructions:\nThe primary lock owner uses the key to confrm theisolation points and locks them.\nOnce all points are locked, the key should bereturned.</string>
+    <string name="simple_tip_process">Process Instructions\nThe primary lock owner takes the key and locks, confirms the isolation points, and locks them.\nThe primary lock owner returns the key, and the locks status are updated\nThe maintenance workers confrm the on-site lock and energy isolation.then clock in to share lock.\nThe maintenance workers perform their work. After work finished, the maintenance workers remove the shared lock.\nThe primary lock owner unlocks and returns the key and locks.</string>
+    <string name="simple_tip_process2">Process Instructions:\nThe primary lock owner uses the key to confirm the isolation points and locks them.\nOnce all points are locked, the key should be returned.</string>
     <string name="simple_waiting">Waiting</string>
     <string name="simple_wati_for_lock_share">Waiting for lock-share:</string>
-    <string name="simple_tip_process3">Process Instructions:\nThe work permit has been started. Please have themaintenance workers confrm whether the site islocked and the energy sources are isolated. Onceconfrmed, please clock in to share lock.</string>
+    <string name="simple_tip_process3">Process Instructions:\nThe work permit has been started. Please have the maintenance workers confirm whether the site is locked and the energy sources are isolated. Once confrmed, please clock in to share lock.</string>
     <string name="simple_shared">Shared</string>
     <string name="simple_maintenance_workers">Maintenance Workers:</string>
-    <string name="simple_tip_process4">Process Instructions:\nAfter the maintenance work, please have themaintenance personnel clock out to unshare lock</string>
+    <string name="simple_tip_process4">Process Instructions:\nAfter the maintenance work, please have the maintenance personnel clock out to unshare lock</string>
     <string name="simple_locker_get_key">Primary lock owner retrieves the key.</string>
-    <string name="simple_tip_process5">Process Instructions:\nAfter the maintenance is completed, the primary lockowner retrieves the key to unlock.</string>
+    <string name="simple_tip_process5">Process Instructions:\nAfter the maintenance is completed, the primary lock owner retrieves the key to unlock.</string>
     <string name="simple_unlock_in_progress">Unlocking in progress</string>
-    <string name="simple_wait_for_device_return">Waiting for the return ofthe key and lock</string>
-    <string name="simple_tip_process6">Process Instructions:\nWait for the primary lock owner to unlock and returnthe key and lock to complete the work permit.</string>
+    <string name="simple_wait_for_device_return">Waiting for the return of the key and lock</string>
+    <string name="simple_tip_process6">Process Instructions:\nWait for the primary lock owner to unlock and return the key and lock to complete the work permit.</string>
     <string name="simple_tip_complete">The work permit process has been completed.\nPlease return to the homepage.</string>
     <string name="simple_please_wait_for_colocker_to_finish">Waiting for maintenance workers to finish</string>
     <string name="simple_key_is_not_connected">Key is not connected</string>
-    <string name="simple_colocker_sam">Sam(%s)</string>
-    <string name="simple_colocker_robin">Robin(%s)</string>
+    <string name="simple_colocker_sam">Sam</string>
+    <string name="simple_colocker_robin">Robin</string>
     <string name="simple_lock_shared">Lock shared</string>
     <string name="simple_lock_unlocked">Unlocked</string>
     <string name="start_scanning_for_devices">Scanning for devices...</string>