Эх сурвалжийг харах

refactor(更新)
- 多语言适配

周文健 2 сар өмнө
parent
commit
004a0adbcd
100 өөрчлөгдсөн 1033 нэмэгдсэн , 1027 устгасан
  1. 20 14
      app/src/main/assets/i18n/en-US.csv
  2. 21 15
      app/src/main/assets/i18n/zh-CN.csv
  3. 3 3
      app/src/main/res/layout-land/activity_login.xml
  4. 0 4
      app/src/main/res/layout-land/activity_main.xml
  5. 4 4
      app/src/main/res/layout-land/dialog_login.xml
  6. 4 4
      app/src/main/res/layout-land/dialog_slots_exception_report.xml
  7. 24 24
      app/src/main/res/layout-land/fragment_create_job.xml
  8. 22 22
      app/src/main/res/layout-land/fragment_create_sop.xml
  9. 22 22
      app/src/main/res/layout-land/fragment_create_sop_job.xml
  10. 20 20
      app/src/main/res/layout-land/fragment_edit_job.xml
  11. 19 19
      app/src/main/res/layout-land/fragment_edit_sop.xml
  12. 19 19
      app/src/main/res/layout-land/fragment_edit_sop_job.xml
  13. 13 13
      app/src/main/res/layout-land/fragment_home.xml
  14. 15 15
      app/src/main/res/layout-land/fragment_job_execute.xml
  15. 10 10
      app/src/main/res/layout-land/fragment_point_manage.xml
  16. 9 9
      app/src/main/res/layout-land/fragment_select_memeber.xml
  17. 8 8
      app/src/main/res/layout-land/fragment_select_point.xml
  18. 9 9
      app/src/main/res/layout-land/fragment_set_face.xml
  19. 16 16
      app/src/main/res/layout-land/fragment_user_info.xml
  20. 18 18
      app/src/main/res/layout-land/fragment_workflow_setting.xml
  21. 4 4
      app/src/main/res/layout-land/item_job_execute_point.xml
  22. 1 1
      app/src/main/res/layout-land/item_job_execute_step.xml
  23. 1 1
      app/src/main/res/layout-land/item_job_workflow_step.xml
  24. 1 1
      app/src/main/res/layout-land/item_locker_group.xml
  25. 3 3
      app/src/main/res/layout-land/item_point_group.xml
  26. 1 1
      app/src/main/res/layout-land/item_point_group_show.xml
  27. 3 3
      app/src/main/res/layout/activity_login.xml
  28. 0 4
      app/src/main/res/layout/activity_main.xml
  29. 2 2
      app/src/main/res/layout/activity_splash.xml
  30. 12 12
      app/src/main/res/layout/dialog_add_card.xml
  31. 2 2
      app/src/main/res/layout/dialog_add_fingerprint.xml
  32. 14 14
      app/src/main/res/layout/dialog_add_key.xml
  33. 12 12
      app/src/main/res/layout/dialog_add_lock.xml
  34. 13 13
      app/src/main/res/layout/dialog_add_point.xml
  35. 12 12
      app/src/main/res/layout/dialog_add_rfid_token.xml
  36. 13 13
      app/src/main/res/layout/dialog_add_role.xml
  37. 16 16
      app/src/main/res/layout/dialog_add_user.xml
  38. 5 5
      app/src/main/res/layout/dialog_add_workstation.xml
  39. 1 1
      app/src/main/res/layout/dialog_drop_down_list.xml
  40. 10 10
      app/src/main/res/layout/dialog_filter_card.xml
  41. 12 12
      app/src/main/res/layout/dialog_filter_key.xml
  42. 10 10
      app/src/main/res/layout/dialog_filter_lock.xml
  43. 13 13
      app/src/main/res/layout/dialog_filter_point.xml
  44. 10 10
      app/src/main/res/layout/dialog_filter_rfid_token.xml
  45. 10 10
      app/src/main/res/layout/dialog_filter_role.xml
  46. 12 12
      app/src/main/res/layout/dialog_filter_user.xml
  47. 4 4
      app/src/main/res/layout/dialog_login.xml
  48. 5 5
      app/src/main/res/layout/dialog_quick_entrance_config.xml
  49. 4 4
      app/src/main/res/layout/dialog_slots_exception_report.xml
  50. 6 6
      app/src/main/res/layout/dialog_todo_point_detail.xml
  51. 12 12
      app/src/main/res/layout/dialog_update_card.xml
  52. 14 14
      app/src/main/res/layout/dialog_update_key.xml
  53. 12 12
      app/src/main/res/layout/dialog_update_lock.xml
  54. 13 13
      app/src/main/res/layout/dialog_update_point.xml
  55. 12 12
      app/src/main/res/layout/dialog_update_rfid_token.xml
  56. 13 13
      app/src/main/res/layout/dialog_update_role.xml
  57. 16 16
      app/src/main/res/layout/dialog_update_user.xml
  58. 5 5
      app/src/main/res/layout/dialog_update_workstation.xml
  59. 10 10
      app/src/main/res/layout/fragment_card_manage.xml
  60. 26 25
      app/src/main/res/layout/fragment_create_job.xml
  61. 24 23
      app/src/main/res/layout/fragment_create_sop.xml
  62. 22 22
      app/src/main/res/layout/fragment_create_sop_job.xml
  63. 20 20
      app/src/main/res/layout/fragment_edit_job.xml
  64. 19 19
      app/src/main/res/layout/fragment_edit_sop.xml
  65. 19 19
      app/src/main/res/layout/fragment_edit_sop_job.xml
  66. 11 11
      app/src/main/res/layout/fragment_exception_detail.xml
  67. 15 15
      app/src/main/res/layout/fragment_exception_job.xml
  68. 6 6
      app/src/main/res/layout/fragment_exception_job_manage.xml
  69. 8 8
      app/src/main/res/layout/fragment_exception_manage.xml
  70. 13 13
      app/src/main/res/layout/fragment_exception_report.xml
  71. 13 13
      app/src/main/res/layout/fragment_home.xml
  72. 5 5
      app/src/main/res/layout/fragment_in_progress_job_manage.xml
  73. 8 8
      app/src/main/res/layout/fragment_init_card_registration.xml
  74. 7 7
      app/src/main/res/layout/fragment_init_device_registration_key_and_lock.xml
  75. 8 8
      app/src/main/res/layout/fragment_init_point_rfid_registration.xml
  76. 11 11
      app/src/main/res/layout/fragment_init_set_admin_account.xml
  77. 8 8
      app/src/main/res/layout/fragment_init_set_remote_server.xml
  78. 4 4
      app/src/main/res/layout/fragment_init_welcome.xml
  79. 15 15
      app/src/main/res/layout/fragment_job_execute.xml
  80. 6 6
      app/src/main/res/layout/fragment_job_manage.xml
  81. 10 10
      app/src/main/res/layout/fragment_key_manage.xml
  82. 10 10
      app/src/main/res/layout/fragment_lock_manage.xml
  83. 5 5
      app/src/main/res/layout/fragment_locked_point.xml
  84. 4 4
      app/src/main/res/layout/fragment_my_todo_list.xml
  85. 9 9
      app/src/main/res/layout/fragment_point_manage.xml
  86. 10 10
      app/src/main/res/layout/fragment_reset_password.xml
  87. 10 10
      app/src/main/res/layout/fragment_rfid_token_manage.xml
  88. 9 9
      app/src/main/res/layout/fragment_role_manage.xml
  89. 9 9
      app/src/main/res/layout/fragment_select_memeber.xml
  90. 8 8
      app/src/main/res/layout/fragment_select_point.xml
  91. 9 9
      app/src/main/res/layout/fragment_set_face.xml
  92. 6 6
      app/src/main/res/layout/fragment_set_fingerprint.xml
  93. 4 4
      app/src/main/res/layout/fragment_set_job_card.xml
  94. 3 3
      app/src/main/res/layout/fragment_slots_manage.xml
  95. 6 6
      app/src/main/res/layout/fragment_sop_manage.xml
  96. 16 16
      app/src/main/res/layout/fragment_user_info.xml
  97. 9 9
      app/src/main/res/layout/fragment_user_manage.xml
  98. 8 8
      app/src/main/res/layout/fragment_workflow_manage.xml
  99. 18 18
      app/src/main/res/layout/fragment_workflow_setting.xml
  100. 7 7
      app/src/main/res/layout/fragment_workstation_manage.xml

+ 20 - 14
app/src/main/assets/i18n/en-US.csv

@@ -27,9 +27,12 @@ add_workstation_succeed,text,添加区域成功的弹窗的内容,新增区域
 admin_role_can_not_edit,text,管理员信息修改的提示内容,管理员角色无法编辑
 admin_username,text,初始化超级管理员时的账号的标题,管理员账号:(数字、字母、6-20位)
 all,text,下拉框的全部文本,全部
-all_hardware_tv,text,首页的全部硬件文本,全部\n硬件
-all_job_tv,text,首页的全部作业文本,全部\n作业
-all_points_tv,text,首页的全部点位文本,全部\n点位
+all_hardware_tv,text,首页的全部硬件文本,全部
+硬件
+all_job_tv,text,首页的全部作业文本,全部
+作业
+all_points_tv,text,首页的全部点位文本,全部
+点位
 all_quick_entrance,text,快捷入口的配置弹窗的备选快捷入口的文本,所有快捷入口
 all_select_not_all_select,text,角色添加/修改弹窗中权限菜单选矿的文本,全选/全不选
 already_colock,text,作业执行界面的共锁人员界面的标题文本,已共锁({0})
@@ -47,13 +50,13 @@ cancel_exception_failed,text,取消异常完成之后提示弹窗文本,取消
 cancel_exception_success,text,取消异常完成之后提示弹窗文本,异常取消成功
 cancel_job,text,作业执行界面的按钮文本,取消作业
 cancel_job_tip,text,取消作业的二次确认弹窗文本,是否确认取消当前作业
-capture_tip_content,text,人脸录入时的提示文本,"1. 系统将自动拍摄照片,在拍摄过程中请确保:
-     \n · 脸部正对摄像头
-     \n · 保持适当距离,让整个脸部出现在左侧框中
-     \n · 光线充足
-     \n · 表情自然
-\n2. 拍摄完成后,您可以点击确认按钮进行提交,也可以点击重拍按钮重新进行拍摄。
-\n3. 取消录入,请点击取消按钮"
+capture_tip_content,text,人脸录入时的提示文本,1. 系统将自动拍摄照片,在拍摄过程中请确保:
+      · 脸部正对摄像头
+      · 保持适当距离,让整个脸部出现在左侧框中
+      · 光线充足
+      · 表情自然
+2. 拍摄完成后,您可以点击确认按钮进行提交,也可以点击重拍按钮重新进行拍摄。
+3. 取消录入,请点击取消按钮
 capture_tip_title,text,录入人脸时的标题文本,录入提示
 card_already_registration,text,卡片录入时已存在卡片保存是的错误文本,卡片已录入
 card_code,text,卡片管理表头文本,卡片名称
@@ -77,7 +80,7 @@ check_delete_sop,text,删除SOP时的二次确认弹窗文本,您确定要删除
 check_delete_user,text,删除用户时的二次确认弹窗文本,您确认要删除用户吗?
 check_delete_workflow_mode,text,删除流程模式时的二次确认弹窗文本,确定要删除选中的流程模式吗
 check_delete_workstation,text,删除区域时的二次确认弹窗文本,您确定要删除区域"{0}"吗
-check_device_info,text,初始化界面检测硬件完成之后的检测信息结果文本,"检测到未注册钥匙{0}把,未注册挂锁{1}把"
+check_device_info,text,初始化界面检测硬件完成之后的检测信息结果文本,检测到未注册钥匙{0}把,未注册挂锁{1}把
 check_key_and_lock,text,初始化界面检测硬件时的文本,正在检查钥匙和挂锁
 check_lock_is_new_device,text,仓位管理检查挂锁的加载弹窗的文本,检查挂锁是否为新硬件
 check_new_key_need_register,text,仓位管理检测到新钥匙是否注册的提示弹窗的文本,检测到新钥匙,是否注册
@@ -205,7 +208,8 @@ handle_time_last_30_days,text,我的待办的已处理的时间筛选的选择
 handle_time_last_7_days,text,我的待办的已处理的时间筛选的选择项文本,近7天
 handle_unknown,text,我的待办的处理项类型异常的提示文本,当前处理类型未知,无法处理
 handle_unlock_take_key,text,我的待办解锁取钥匙时的二次确认弹窗文本,确认获取钥匙进行解锁吗?
-hardware_in_use_tv,text,首页使用中的硬件文本,使用中\n的硬件
+hardware_in_use_tv,text,首页使用中的硬件文本,使用中
+的硬件
 hardware_info,text,仓位异常上报的信息展示,硬件信息: {0}
 hardware_key,text,仓位异常上报的硬件类型文本,钥匙
 hardware_lock,text,仓位异常上报的硬件类型文本,挂锁
@@ -301,7 +305,8 @@ lock_nfc,text,挂锁管理表头,挂锁 NFC
 lock_status,text,作业执行界面挂锁信息表头,上锁状态
 lock_take_report_fail,text,挂锁取出上报异常时提示信息,挂锁取出上报失败
 locked_points_title,text,锁定中的点位标题,锁定中的点位
-locked_points_tv,text,首页锁定中的点位文本,锁定中\n的点位
+locked_points_tv,text,首页锁定中的点位文本,锁定中
+的点位
 locker,text,通用上锁人文本,上锁人
 login,text,通用登录文本,登录
 login_tip,text,登录界面提示文本,请输入用户名和密码或者刷卡进行登录
@@ -336,7 +341,8 @@ old_password,text,重置密码旧密码文本,旧密码
 old_password_error,text,重置密码旧密码校验失败提示以文本,旧密码错误
 one_key_cancel,text,异常管理列表按钮文本,一键取消
 one_key_handle,text,异常管理列表按钮文本,一键处理
-ongoing_job_tv,text,首页进行中的作业文本,进行中\n的作业
+ongoing_job_tv,text,首页进行中的作业文本,进行中
+的作业
 only_one_person_allowed,text,人脸录入时提示文本,请保持单人入镜
 operation,text,列表表头,操作
 password_and_repeat_password_not_same,text,重置密码和初始化设置管理员账号时密码与重复密码不一致时提示文本,密码与重复密码不一致

+ 21 - 15
app/src/main/assets/i18n/zh-CN.csv

@@ -27,9 +27,12 @@ add_workstation_succeed,text,添加区域成功的弹窗的内容,新增区域
 admin_role_can_not_edit,text,管理员信息修改的提示内容,管理员角色无法编辑
 admin_username,text,初始化超级管理员时的账号的标题,管理员账号:(数字、字母、6-20位)
 all,text,下拉框的全部文本,全部
-all_hardware_tv,text,首页的全部硬件文本,全部\n硬件
-all_job_tv,text,首页的全部作业文本,全部\n作业
-all_points_tv,text,首页的全部点位文本,全部\n点位
+all_hardware_tv,text,首页的全部硬件文本,全部
+硬件
+all_job_tv,text,首页的全部作业文本,全部
+作业
+all_points_tv,text,首页的全部点位文本,全部
+点位
 all_quick_entrance,text,快捷入口的配置弹窗的备选快捷入口的文本,所有快捷入口
 all_select_not_all_select,text,角色添加/修改弹窗中权限菜单选矿的文本,全选/全不选
 already_colock,text,作业执行界面的共锁人员界面的标题文本,已共锁({0})
@@ -47,13 +50,13 @@ cancel_exception_failed,text,取消异常完成之后提示弹窗文本,取消
 cancel_exception_success,text,取消异常完成之后提示弹窗文本,异常取消成功
 cancel_job,text,作业执行界面的按钮文本,取消作业
 cancel_job_tip,text,取消作业的二次确认弹窗文本,是否确认取消当前作业
-capture_tip_content,text,人脸录入时的提示文本,"1. 系统将自动拍摄照片,在拍摄过程中请确保:
-     \n · 脸部正对摄像头
-     \n · 保持适当距离,让整个脸部出现在左侧框中
-     \n · 光线充足
-     \n · 表情自然
-\n2. 拍摄完成后,您可以点击确认按钮进行提交,也可以点击重拍按钮重新进行拍摄。
-\n3. 取消录入,请点击取消按钮"
+capture_tip_content,text,人脸录入时的提示文本,1. 系统将自动拍摄照片,在拍摄过程中请确保:
+      · 脸部正对摄像头
+      · 保持适当距离,让整个脸部出现在左侧框中
+      · 光线充足
+      · 表情自然
+2. 拍摄完成后,您可以点击确认按钮进行提交,也可以点击重拍按钮重新进行拍摄。
+3. 取消录入,请点击取消按钮
 capture_tip_title,text,录入人脸时的标题文本,录入提示
 card_already_registration,text,卡片录入时已存在卡片保存是的错误文本,卡片已录入
 card_code,text,卡片管理表头文本,卡片名称
@@ -77,7 +80,7 @@ check_delete_sop,text,删除SOP时的二次确认弹窗文本,您确定要删除
 check_delete_user,text,删除用户时的二次确认弹窗文本,您确认要删除用户吗?
 check_delete_workflow_mode,text,删除流程模式时的二次确认弹窗文本,确定要删除选中的流程模式吗
 check_delete_workstation,text,删除区域时的二次确认弹窗文本,您确定要删除区域"{0}"吗
-check_device_info,text,初始化界面检测硬件完成之后的检测信息结果文本,"检测到未注册钥匙{0}把,未注册挂锁{1}把"
+check_device_info,text,初始化界面检测硬件完成之后的检测信息结果文本,检测到未注册钥匙{0}把,未注册挂锁{1}把
 check_key_and_lock,text,初始化界面检测硬件时的文本,正在检查钥匙和挂锁
 check_lock_is_new_device,text,仓位管理检查挂锁的加载弹窗的文本,检查挂锁是否为新硬件
 check_new_key_need_register,text,仓位管理检测到新钥匙是否注册的提示弹窗的文本,检测到新钥匙,是否注册
@@ -205,7 +208,8 @@ handle_time_last_30_days,text,我的待办的已处理的时间筛选的选择
 handle_time_last_7_days,text,我的待办的已处理的时间筛选的选择项文本,近7天
 handle_unknown,text,我的待办的处理项类型异常的提示文本,当前处理类型未知,无法处理
 handle_unlock_take_key,text,我的待办解锁取钥匙时的二次确认弹窗文本,确认获取钥匙进行解锁吗?
-hardware_in_use_tv,text,首页使用中的硬件文本,使用中\n的硬件
+hardware_in_use_tv,text,首页使用中的硬件文本,使用中
+的硬件
 hardware_info,text,仓位异常上报的信息展示,硬件信息: {0}
 hardware_key,text,仓位异常上报的硬件类型文本,钥匙
 hardware_lock,text,仓位异常上报的硬件类型文本,挂锁
@@ -301,7 +305,8 @@ lock_nfc,text,挂锁管理表头,挂锁 NFC
 lock_status,text,作业执行界面挂锁信息表头,上锁状态
 lock_take_report_fail,text,挂锁取出上报异常时提示信息,挂锁取出上报失败
 locked_points_title,text,锁定中的点位标题,锁定中的点位
-locked_points_tv,text,首页锁定中的点位文本,锁定中\n的点位
+locked_points_tv,text,首页锁定中的点位文本,锁定中
+的点位
 locker,text,通用上锁人文本,上锁人
 login,text,通用登录文本,登录
 login_tip,text,登录界面提示文本,请输入用户名和密码或者刷卡进行登录
@@ -336,7 +341,8 @@ old_password,text,重置密码旧密码文本,旧密码
 old_password_error,text,重置密码旧密码校验失败提示以文本,旧密码错误
 one_key_cancel,text,异常管理列表按钮文本,一键取消
 one_key_handle,text,异常管理列表按钮文本,一键处理
-ongoing_job_tv,text,首页进行中的作业文本,进行中\n的作业
+ongoing_job_tv,text,首页进行中的作业文本,进行中
+的作业
 only_one_person_allowed,text,人脸录入时提示文本,请保持单人入镜
 operation,text,列表表头,操作
 password_and_repeat_password_not_same,text,重置密码和初始化设置管理员账号时密码与重复密码不一致时提示文本,密码与重复密码不一致
@@ -537,7 +543,7 @@ sop_manage_title,text,SOP管理标题,SOP管理
 sop_manage_workstation,text,SOP管理表头,所属岗位
 sop_save_failed,text,SOP保存失败时弹窗文本,SOP保存失败
 sop_save_succeed,text,SOP保存成功时弹窗文本,SOP保存成功
-sop_save_tip,text,SOP保存时二次确认弹窗文本,"确定要保存"{0}"吗?
+sop_save_tip,text,SOP保存时二次确认弹窗文本,确定要保存"{0}"吗?
 sop_workstation,text,创建修改SOP作业界面SOP区域选择文本,SOP区域
 start,text,初始化欢迎界面开始按钮文本,开始
 start_detect_key_slot,text,仓位管理检测钥匙仓位开始时加载弹窗文本,开始检测钥匙仓位

+ 3 - 3
app/src/main/res/layout-land/activity_login.xml

@@ -81,7 +81,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="@dimen/login_sub_title_margin_top"
-                android:text="@string/loto_en"
+                app:i18nKey='@{"loto_en"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/login_sub_title_text_size"
                 android:textStyle="bold" />
@@ -119,7 +119,7 @@
                         android:layout_height="wrap_content"
                         android:layout_alignParentBottom="true"
                         android:gravity="center_horizontal"
-                        android:text="@string/login_tip"
+                        app:i18nKey='@{"login_tip"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/login_tip_text_size" />
                 </LinearLayout>
@@ -134,7 +134,7 @@
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="@dimen/common_spacing"
             android:gravity="center_horizontal"
-            android:text="@string/tec_support"
+            app:i18nKey='@{"tec_support"}'
             android:textColor="@color/white"
             android:textSize="@dimen/login_tec_support_text_size" />
 

+ 0 - 4
app/src/main/res/layout-land/activity_main.xml

@@ -105,11 +105,7 @@
             android:layout_height="match_parent"
             android:layout_below="@+id/header_line"
             android:layout_margin="@dimen/common_spacing"
-            app:navBackgroundColor="@color/white80"
-            app:navBallDiameter="@dimen/home_bottom_nav_ball_size"
-            app:navCornerRadius="@dimen/home_bottom_nav_corner_radius"
             app:navIconSize="@dimen/home_bottom_nav_icon_size"
-            app:navNotchHeight="@dimen/home_bottom_nav_notch_height"
             app:navOrientation="vertical"
             app:navTextSize="@dimen/home_bottom_nav_text_size" />
     </RelativeLayout>

+ 4 - 4
app/src/main/res/layout-land/dialog_login.xml

@@ -56,7 +56,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/login_dialog_input_height"
                 android:layout_marginBottom="@dimen/common_spacing"
-                android:hint="@string/please_input_account"
+                app:i18nHint='@{"please_input_account"}'
                 android:textSize="@dimen/login_dialog_text_size" />
 
             <EditText
@@ -65,7 +65,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/login_dialog_input_height"
                 android:layout_marginBottom="@dimen/common_spacing"
-                android:hint="@string/please_input_password"
+                app:i18nHint='@{"please_input_password"}'
                 android:inputType="textPassword"
                 android:textSize="@dimen/login_dialog_text_size" />
 
@@ -75,7 +75,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/login_dialog_btn_height"
                 android:layout_marginBottom="@dimen/common_spacing"
-                android:text="@string/login"
+                app:i18nKey='@{"login"}'
                 android:textSize="@dimen/login_dialog_text_size" />
 
             <TextView
@@ -84,7 +84,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/login_dialog_btn_height"
                 android:background="@drawable/white_stroke_bg"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textSize="@dimen/login_dialog_text_size" />
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>

+ 4 - 4
app/src/main/res/layout-land/dialog_slots_exception_report.xml

@@ -15,7 +15,7 @@
             android:background="@color/common_tip_dialog_info"
             android:gravity="center_vertical"
             android:paddingHorizontal="@dimen/common_spacing"
-            android:text="@string/slots_exception_report"
+            app:i18nKey='@{"slots_exception_report"}'
             android:textColor="@color/white"
             android:textSize="@dimen/common_btn_text_size" />
 
@@ -50,7 +50,7 @@
                 android:layout_marginVertical="@dimen/common_spacing"
                 android:background="@drawable/selectable_input_text_bg"
                 android:gravity="left|top"
-                android:hint="@string/please_input_exception_reason"
+                app:i18nHint='@{"please_input_exception_reason"}'
                 android:padding="@dimen/selectable_input_edit_padding"
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
@@ -80,7 +80,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -95,7 +95,7 @@
                 android:minWidth="@dimen/tip_dialog_btn_width"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 24 - 24
app/src/main/res/layout-land/fragment_create_job.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/create_job_title"
+                app:i18nKey='@{"create_job_title"}'
                 android:textColor="@color/black"
                 android:textStyle="bold"
                 android:textSize="@dimen/normal_text_size_25" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -80,7 +80,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
-                        android:text="@string/base_info_title"
+                        app:i18nKey='@{"base_info_title"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -105,7 +105,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="@string/job_workstation"
+                                app:i18nKey='@{"job_workstation"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_text_size" />
 
@@ -116,7 +116,7 @@
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
                                 android:drawableRight="@mipmap/icon_drop_down"
-                                android:hint="@string/please_select_job_workstation"
+                                app:i18nHint='@{"please_select_job_workstation"}'
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
                                 android:paddingVertical="2dp"
@@ -136,7 +136,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="@string/workflow_mode"
+                                app:i18nKey='@{"workflow_mode"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_text_size" />
 
@@ -147,7 +147,7 @@
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
                                 android:drawableRight="@mipmap/icon_drop_down"
-                                android:hint="@string/please_select_flow_mode"
+                                app:i18nHint='@{"please_select_flow_mode"}'
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
                                 android:paddingVertical="2dp"
@@ -168,7 +168,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="@string/create_job_name"
+                                app:i18nKey='@{"create_job_name"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_text_size" />
 
@@ -178,7 +178,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
-                                android:hint="@string/please_input_job_name"
+                                app:i18nHint='@{"please_input_job_name"}'
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
                                 android:paddingVertical="2dp"
@@ -209,7 +209,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/workflow_mode"
+                            app:i18nKey='@{"workflow_mode"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -220,7 +220,7 @@
                             android:layout_margin="@dimen/common_spacing"
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:text="@string/settings"
+                            app:i18nKey='@{"settings"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -250,7 +250,7 @@
                             android:gravity="center"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
                             android:paddingVertical="@dimen/common_spacing"
-                            android:text="@string/please_select_workflow_mode"
+                            app:i18nKey='@{"please_select_workflow_mode"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
                     </FrameLayout>
@@ -284,7 +284,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/point_info_title"
+                            app:i18nKey='@{"point_info_title"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -295,7 +295,7 @@
                             android:layout_margin="@dimen/common_spacing"
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:text="@string/select"
+                            app:i18nKey='@{"select"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -334,7 +334,7 @@
                                 android:gravity="center"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/please_must_select_at_least_one_point"
+                                app:i18nKey='@{"please_must_select_at_least_one_point"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
                         </LinearLayout>
@@ -363,7 +363,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/member_info_title"
+                            app:i18nKey='@{"member_info_title"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -374,7 +374,7 @@
                             android:layout_margin="@dimen/common_spacing"
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:text="@string/select"
+                            app:i18nKey='@{"select"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -408,7 +408,7 @@
                                     android:layout_gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/locker"
+                                    app:i18nKey='@{"locker"}'
                                     android:textColor="@color/black"
                                     android:textSize="@dimen/normal_text_size_18" />
 
@@ -439,7 +439,7 @@
                                     android:gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/colocker"
+                                    app:i18nKey='@{"colocker"}'
                                     android:textColor="@color/black"
                                     android:layout_gravity="center"
                                     android:textSize="@dimen/normal_text_size_18" />
@@ -476,7 +476,7 @@
                                 android:gravity="center"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/please_select_member"
+                                app:i18nKey='@{"please_select_member"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
                         </LinearLayout>
@@ -496,7 +496,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/save_sop_check"
+                app:i18nKey='@{"save_sop_check"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -516,7 +516,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/save_and_execute"
+                app:i18nKey='@{"save_and_execute"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -530,7 +530,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/save"
+                app:i18nKey='@{"save"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -545,7 +545,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:layout_marginRight="@dimen/common_spacing"
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />

+ 22 - 22
app/src/main/res/layout-land/fragment_create_sop.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/create_sop_title"
+                app:i18nKey='@{"create_sop_title"}'
                 android:textColor="@color/black"
                 android:textStyle="bold"
                 android:textSize="@dimen/normal_text_size_25" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -80,7 +80,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
-                        android:text="@string/base_info_title"
+                        app:i18nKey='@{"base_info_title"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -105,7 +105,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="@string/sop_workstation"
+                                app:i18nKey='@{"sop_workstation"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_text_size" />
 
@@ -116,7 +116,7 @@
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
                                 android:drawableRight="@mipmap/icon_drop_down"
-                                android:hint="@string/please_select_sop_workstation"
+                                app:i18nHint='@{"please_select_sop_workstation"}'
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
                                 android:paddingVertical="2dp"
@@ -136,7 +136,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="@string/workflow_mode"
+                                app:i18nKey='@{"workflow_mode"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_text_size" />
 
@@ -147,7 +147,7 @@
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
                                 android:drawableRight="@mipmap/icon_drop_down"
-                                android:hint="@string/please_select_flow_mode"
+                                app:i18nHint='@{"please_select_flow_mode"}'
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
                                 android:paddingVertical="2dp"
@@ -168,7 +168,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="@string/create_sop_name"
+                                app:i18nKey='@{"create_sop_name"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_text_size" />
 
@@ -178,7 +178,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
-                                android:hint="@string/please_input_sop_name"
+                                app:i18nHint='@{"please_input_sop_name"}'
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
                                 android:paddingVertical="2dp"
@@ -208,7 +208,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/workflow_mode"
+                            app:i18nKey='@{"workflow_mode"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -219,7 +219,7 @@
                             android:layout_margin="@dimen/common_spacing"
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:text="@string/settings"
+                            app:i18nKey='@{"settings"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -249,7 +249,7 @@
                             android:gravity="center"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
                             android:paddingVertical="@dimen/common_spacing"
-                            android:text="@string/please_select_workflow_mode"
+                            app:i18nKey='@{"please_select_workflow_mode"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
                     </FrameLayout>
@@ -284,7 +284,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/point_info_title"
+                            app:i18nKey='@{"point_info_title"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -295,7 +295,7 @@
                             android:layout_margin="@dimen/common_spacing"
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:text="@string/select"
+                            app:i18nKey='@{"select"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -334,7 +334,7 @@
                                 android:gravity="center"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/please_must_select_at_least_one_point"
+                                app:i18nKey='@{"please_must_select_at_least_one_point"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
                         </LinearLayout>
@@ -363,7 +363,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/member_info_title"
+                            app:i18nKey='@{"member_info_title"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -374,7 +374,7 @@
                             android:layout_margin="@dimen/common_spacing"
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:text="@string/select"
+                            app:i18nKey='@{"select"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -407,7 +407,7 @@
                                     android:gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/locker"
+                                    app:i18nKey='@{"locker"}'
                                     android:layout_gravity="center"
                                     android:textColor="@color/black"
                                     android:textSize="@dimen/normal_text_size_18" />
@@ -439,7 +439,7 @@
                                     android:gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/colocker"
+                                    app:i18nKey='@{"colocker"}'
                                     android:layout_gravity="center"
                                     android:textColor="@color/black"
                                     android:textSize="@dimen/normal_text_size_18" />
@@ -476,7 +476,7 @@
                                 android:gravity="center"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/please_select_member"
+                                app:i18nKey='@{"please_select_member"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
                         </LinearLayout>
@@ -504,7 +504,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -519,7 +519,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 22 - 22
app/src/main/res/layout-land/fragment_create_sop_job.xml

@@ -27,7 +27,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/create_sop_job_title"
+                app:i18nKey='@{"create_sop_job_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -44,7 +44,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -81,7 +81,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
-                        android:text="@string/base_info_title"
+                        app:i18nKey='@{"base_info_title"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -102,7 +102,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/common_spacing"
-                            android:text="@string/sop_workstation"
+                            app:i18nKey='@{"sop_workstation"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size"
                             app:layout_constraintStart_toStartOf="parent"
@@ -115,7 +115,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_sop_workstation"
+                            app:i18nHint='@{"please_select_sop_workstation"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -132,7 +132,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/common_spacing"
-                            android:text="@string/create_sop_job_sop"
+                            app:i18nKey='@{"create_sop_job_sop"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size"
                             app:layout_constraintEnd_toEndOf="@+id/sop_workstation_tv"
@@ -145,7 +145,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_sop"
+                            app:i18nHint='@{"please_select_sop"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -162,7 +162,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/common_spacing"
-                            android:text="@string/job_name"
+                            app:i18nKey='@{"job_name"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size"
                             app:layout_constraintEnd_toEndOf="@+id/sop_title"
@@ -174,7 +174,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:hint="@string/please_input_job_name"
+                            app:i18nHint='@{"please_input_job_name"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -207,7 +207,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/workflow_mode"
+                            app:i18nKey='@{"workflow_mode"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -218,7 +218,7 @@
                             android:layout_margin="@dimen/common_spacing"
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:text="@string/settings"
+                            app:i18nKey='@{"settings"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -248,7 +248,7 @@
                             android:gravity="center"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
                             android:paddingVertical="@dimen/common_spacing"
-                            android:text="@string/please_select_workflow_mode"
+                            app:i18nKey='@{"please_select_workflow_mode"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
                     </FrameLayout>
@@ -282,7 +282,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/point_info_title"
+                            app:i18nKey='@{"point_info_title"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -317,7 +317,7 @@
                                 android:gravity="center"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/show_points_when_selected_sop"
+                                app:i18nKey='@{"show_points_when_selected_sop"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -346,7 +346,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/member_info_title"
+                            app:i18nKey='@{"member_info_title"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -357,7 +357,7 @@
                             android:layout_margin="@dimen/common_spacing"
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:text="@string/select"
+                            app:i18nKey='@{"select"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -391,7 +391,7 @@
                                     android:layout_gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/locker"
+                                    app:i18nKey='@{"locker"}'
                                     android:textColor="@color/black"
                                     android:textSize="@dimen/normal_text_size_18" />
 
@@ -422,7 +422,7 @@
                                     android:gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/colocker"
+                                    app:i18nKey='@{"colocker"}'
                                     android:textColor="@color/black"
                                     android:layout_gravity="center"
                                     android:textSize="@dimen/normal_text_size_18" />
@@ -454,7 +454,7 @@
                                 android:gravity="center"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/show_member_when_selected_sop"
+                                app:i18nKey='@{"show_member_when_selected_sop"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -482,7 +482,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/save_and_execute"
+                app:i18nKey='@{"save_and_execute"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -496,7 +496,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/save"
+                app:i18nKey='@{"save"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -511,7 +511,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:layout_marginRight="@dimen/common_spacing"
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />

+ 20 - 20
app/src/main/res/layout-land/fragment_edit_job.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/edit_job_title"
+                app:i18nKey='@{"edit_job_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -81,7 +81,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
-                        android:text="@string/base_info_title"
+                        app:i18nKey='@{"base_info_title"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -106,7 +106,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="@string/job_workstation"
+                                app:i18nKey='@{"job_workstation"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_text_size" />
 
@@ -117,7 +117,7 @@
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
                                 android:drawableRight="@mipmap/icon_drop_down"
-                                android:hint="@string/please_select_job_workstation"
+                                app:i18nHint='@{"please_select_job_workstation"}'
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
                                 android:paddingVertical="2dp"
@@ -137,7 +137,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="@string/workflow_mode"
+                                app:i18nKey='@{"workflow_mode"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_text_size" />
 
@@ -148,7 +148,7 @@
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
                                 android:drawableRight="@mipmap/icon_drop_down"
-                                android:hint="@string/please_select_flow_mode"
+                                app:i18nHint='@{"please_select_flow_mode"}'
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
                                 android:paddingVertical="2dp"
@@ -169,7 +169,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="@string/create_job_name"
+                                app:i18nKey='@{"create_job_name"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_text_size" />
 
@@ -179,7 +179,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:background="@drawable/bg_common_input"
-                                android:hint="@string/please_input_job_name"
+                                app:i18nHint='@{"please_input_job_name"}'
                                 android:maxLines="1"
                                 android:paddingHorizontal="@dimen/common_spacing"
                                 android:paddingVertical="2dp"
@@ -209,7 +209,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/workflow_mode"
+                            app:i18nKey='@{"workflow_mode"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -220,7 +220,7 @@
                             android:layout_margin="@dimen/common_spacing"
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:text="@string/settings"
+                            app:i18nKey='@{"settings"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -272,7 +272,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/point_info_title"
+                            app:i18nKey='@{"point_info_title"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -283,7 +283,7 @@
                             android:layout_margin="@dimen/common_spacing"
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:text="@string/select"
+                            app:i18nKey='@{"select"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -322,7 +322,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/member_info_title"
+                            app:i18nKey='@{"member_info_title"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -333,7 +333,7 @@
                             android:layout_margin="@dimen/common_spacing"
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:text="@string/select"
+                            app:i18nKey='@{"select"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -364,7 +364,7 @@
                                 android:layout_gravity="center"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/locker"
+                                app:i18nKey='@{"locker"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -395,7 +395,7 @@
                                 android:gravity="center"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/colocker"
+                                app:i18nKey='@{"colocker"}'
                                 android:textColor="@color/black"
                                 android:layout_gravity="center"
                                 android:textSize="@dimen/normal_text_size_18" />
@@ -439,7 +439,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/save_and_execute"
+                app:i18nKey='@{"save_and_execute"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -453,7 +453,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/save"
+                app:i18nKey='@{"save"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -468,7 +468,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:layout_marginRight="@dimen/common_spacing"
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />

+ 19 - 19
app/src/main/res/layout-land/fragment_edit_sop.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/edit_sop_title"
+                app:i18nKey='@{"edit_sop_title"}'
                 android:textColor="@color/black"
                 android:textStyle="bold"
                 android:textSize="@dimen/normal_text_size_25" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -80,7 +80,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
-                        android:text="@string/base_info_title"
+                        app:i18nKey='@{"base_info_title"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -101,7 +101,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/sop_workstation"
+                            app:i18nKey='@{"sop_workstation"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -112,7 +112,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_sop_workstation"
+                            app:i18nHint='@{"please_select_sop_workstation"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -132,7 +132,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/workflow_mode"
+                            app:i18nKey='@{"workflow_mode"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -143,7 +143,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_flow_mode"
+                            app:i18nHint='@{"please_select_flow_mode"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -164,7 +164,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/create_sop_name"
+                            app:i18nKey='@{"create_sop_name"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -174,7 +174,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:hint="@string/please_input_sop_name"
+                            app:i18nHint='@{"please_input_sop_name"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -203,7 +203,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/workflow_mode"
+                            app:i18nKey='@{"workflow_mode"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -214,7 +214,7 @@
                             android:layout_margin="@dimen/common_spacing"
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:text="@string/settings"
+                            app:i18nKey='@{"settings"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -266,7 +266,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/point_info_title"
+                            app:i18nKey='@{"point_info_title"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -277,7 +277,7 @@
                             android:layout_margin="@dimen/common_spacing"
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:text="@string/select"
+                            app:i18nKey='@{"select"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -317,7 +317,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/member_info_title"
+                            app:i18nKey='@{"member_info_title"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -328,7 +328,7 @@
                             android:layout_margin="@dimen/common_spacing"
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:text="@string/select"
+                            app:i18nKey='@{"select"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -357,7 +357,7 @@
                                 android:gravity="center"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/locker"
+                                app:i18nKey='@{"locker"}'
                                 android:layout_gravity="center"
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
@@ -389,7 +389,7 @@
                                 android:gravity="center"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/colocker"
+                                app:i18nKey='@{"colocker"}'
                                 android:textColor="@color/black"
                                 android:layout_gravity="center"
                                 android:textSize="@dimen/normal_text_size_18" />
@@ -429,7 +429,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -444,7 +444,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 19 - 19
app/src/main/res/layout-land/fragment_edit_sop_job.xml

@@ -27,7 +27,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/edit_sop_job_title"
+                app:i18nKey='@{"edit_sop_job_title"}'
                 android:textColor="@color/black"
                 android:textStyle="bold"
                 android:textSize="@dimen/normal_text_size_25" />
@@ -44,7 +44,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -81,7 +81,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
-                        android:text="@string/base_info_title"
+                        app:i18nKey='@{"base_info_title"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -103,7 +103,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/common_spacing"
-                            android:text="@string/sop_workstation"
+                            app:i18nKey='@{"sop_workstation"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size"
                             app:layout_constraintStart_toStartOf="parent"
@@ -116,7 +116,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_sop_workstation"
+                            app:i18nHint='@{"please_select_sop_workstation"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -133,7 +133,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/common_spacing"
-                            android:text="@string/create_sop_job_sop"
+                            app:i18nKey='@{"create_sop_job_sop"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size"
                             app:layout_constraintEnd_toEndOf="@+id/sop_workstation_tv"
@@ -146,7 +146,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_sop"
+                            app:i18nHint='@{"please_select_sop"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -163,7 +163,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/common_spacing"
-                            android:text="@string/job_name"
+                            app:i18nKey='@{"job_name"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size"
                             app:layout_constraintEnd_toEndOf="@+id/sop_title"
@@ -175,7 +175,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:hint="@string/please_input_job_name"
+                            app:i18nHint='@{"please_input_job_name"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -208,7 +208,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/workflow_mode"
+                            app:i18nKey='@{"workflow_mode"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -219,7 +219,7 @@
                             android:layout_margin="@dimen/common_spacing"
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:text="@string/settings"
+                            app:i18nKey='@{"settings"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -271,7 +271,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
-                            android:text="@string/point_info_title"
+                            app:i18nKey='@{"point_info_title"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -311,7 +311,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:layout_weight="1"
-                            android:text="@string/member_info_title"
+                            app:i18nKey='@{"member_info_title"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -322,7 +322,7 @@
                             android:layout_margin="@dimen/common_spacing"
                             android:background="@drawable/common_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
-                            android:text="@string/select"
+                            app:i18nKey='@{"select"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -351,7 +351,7 @@
                                 android:gravity="center"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/locker"
+                                app:i18nKey='@{"locker"}'
                                 android:layout_gravity="center"
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
@@ -383,7 +383,7 @@
                                 android:gravity="center"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/colocker"
+                                app:i18nKey='@{"colocker"}'
                                 android:textColor="@color/black"
                                 android:layout_gravity="center"
                                 android:textSize="@dimen/normal_text_size_18" />
@@ -422,7 +422,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/save_and_execute"
+                app:i18nKey='@{"save_and_execute"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -436,7 +436,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/save"
+                app:i18nKey='@{"save"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -451,7 +451,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:layout_marginRight="@dimen/common_spacing"
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />

+ 13 - 13
app/src/main/res/layout-land/fragment_home.xml

@@ -44,7 +44,7 @@
                 android:background="@drawable/common_btn_blue_bg"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:paddingVertical="@dimen/common_spacing"
-                android:text="@string/edit"
+                app:i18nKey='@{"edit"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -72,7 +72,7 @@
                     android:background="@color/home_card_title_bg"
                     android:paddingVertical="@dimen/common_spacing_small"
                     android:paddingLeft="@dimen/common_spacing"
-                    android:text="@string/home_realtime_data_title"
+                    app:i18nKey='@{"home_realtime_data_title"}'
                     android:textColor="@color/white"
                     android:textSize="@dimen/normal_text_size_18" />
 
@@ -92,7 +92,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/zone"
+                            app:i18nKey='@{"zone"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -119,7 +119,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/workflow_mode"
+                            app:i18nKey='@{"workflow_mode"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -161,7 +161,7 @@
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:text="@string/ongoing_job_tv"
+                            app:i18nKey='@{"ongoing_job_tv"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -193,7 +193,7 @@
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:text="@string/locked_points_tv"
+                            app:i18nKey='@{"locked_points_tv"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -225,7 +225,7 @@
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:text="@string/hardware_in_use_tv"
+                            app:i18nKey='@{"hardware_in_use_tv"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -259,7 +259,7 @@
                     android:background="@color/home_card_title_bg"
                     android:paddingVertical="@dimen/common_spacing_small"
                     android:paddingLeft="@dimen/common_spacing"
-                    android:text="@string/home_overview_data_title"
+                    app:i18nKey='@{"home_overview_data_title"}'
                     android:textColor="@color/white"
                     android:textSize="@dimen/normal_text_size_18" />
 
@@ -280,7 +280,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/time_frame_tv"
+                            app:i18nKey='@{"time_frame_tv"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -327,7 +327,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/zone"
+                            app:i18nKey='@{"zone"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -370,7 +370,7 @@
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:text="@string/all_job_tv"
+                            app:i18nKey='@{"all_job_tv"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -402,7 +402,7 @@
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:text="@string/all_points_tv"
+                            app:i18nKey='@{"all_points_tv"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -434,7 +434,7 @@
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:text="@string/all_hardware_tv"
+                            app:i18nKey='@{"all_hardware_tv"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 

+ 15 - 15
app/src/main/res/layout-land/fragment_job_execute.xml

@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/job_manage_title"
+                app:i18nKey='@{"job_manage_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -46,7 +46,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -112,7 +112,7 @@
                             android:layout_centerVertical="true"
                             android:layout_toLeftOf="@+id/lock_iv"
                             android:gravity="center"
-                            android:text="@string/job_execute_tab_title_lock"
+                            app:i18nKey='@{"job_execute_tab_title_lock"}'
                             android:textSize="@dimen/common_text_size" />
 
                         <ImageView
@@ -146,7 +146,7 @@
                             android:layout_centerVertical="true"
                             android:layout_toLeftOf="@+id/colock_iv"
                             android:gravity="center"
-                            android:text="@string/job_execute_tab_title_colock"
+                            app:i18nKey='@{"job_execute_tab_title_colock"}'
                             android:textSize="@dimen/common_text_size" />
 
                         <ImageView
@@ -230,7 +230,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/point_name_tv"
+                                    app:i18nKey='@{"point_name_tv"}'
                                     android:textSize="@dimen/common_text_size" />
 
                                 <TextView
@@ -239,7 +239,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/point_manage_point_group"
+                                    app:i18nKey='@{"point_manage_point_group"}'
                                     android:textSize="@dimen/common_text_size" />
 
                                 <TextView
@@ -248,7 +248,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/point_manage_point_function"
+                                    app:i18nKey='@{"point_manage_point_function"}'
                                     android:textSize="@dimen/common_text_size" />
 
                                 <TextView
@@ -257,7 +257,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/lock_status"
+                                    app:i18nKey='@{"lock_status"}'
                                     android:textSize="@dimen/common_text_size" />
                             </LinearLayout>
 
@@ -291,7 +291,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/wait_to_colock"
+                                    app:i18nKey='@{"wait_to_colock"}'
                                     android:textSize="@dimen/common_text_size" />
 
                                 <TextView
@@ -301,7 +301,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/already_colock"
+                                    app:i18nKey='@{"already_colock"}'
                                     android:textSize="@dimen/common_text_size" />
 
                                 <TextView
@@ -311,7 +311,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/already_uncolock"
+                                    app:i18nKey='@{"already_uncolock"}'
                                     android:textSize="@dimen/common_text_size" />
                             </LinearLayout>
 
@@ -383,7 +383,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/common_spacing"
-                        android:text="@string/go_locking"
+                        app:i18nKey='@{"go_locking"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         android:visibility="gone" />
@@ -400,7 +400,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/common_spacing"
-                        android:text="@string/go_unlocking"
+                        app:i18nKey='@{"go_unlocking"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         android:visibility="gone" />
@@ -417,7 +417,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/common_spacing"
-                        android:text="@string/cancel_job"
+                        app:i18nKey='@{"cancel_job"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         android:visibility="gone" />
@@ -434,7 +434,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/common_spacing"
-                        android:text="@string/finish_the_job"
+                        app:i18nKey='@{"finish_the_job"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         android:visibility="gone" />

+ 10 - 10
app/src/main/res/layout-land/fragment_point_manage.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/point_manage_title"
+                app:i18nKey='@{"point_manage_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -68,7 +68,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/insert"
+                app:i18nKey='@{"insert"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -79,7 +79,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/delete"
+                app:i18nKey='@{"delete"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -90,7 +90,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/reset"
+                app:i18nKey='@{"reset"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -106,7 +106,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/filter"
+                app:i18nKey='@{"filter"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -132,7 +132,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/point_manage_point_name"
+                app:i18nKey='@{"point_manage_point_name"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -140,7 +140,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/point_manage_point_function"
+                app:i18nKey='@{"point_manage_point_function"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -148,7 +148,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/point_manage_workstation"
+                app:i18nKey='@{"point_manage_workstation"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -156,7 +156,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/point_manage_rfid"
+                app:i18nKey='@{"point_manage_rfid"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 

+ 9 - 9
app/src/main/res/layout-land/fragment_select_memeber.xml

@@ -27,7 +27,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/create_sop_title"
+                app:i18nKey='@{"create_sop_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -48,7 +48,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/select_member_title"
+                app:i18nKey='@{"select_member_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_18"
                 android:textStyle="bold" />
@@ -70,7 +70,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -118,7 +118,7 @@
                             android:layout_marginVertical="@dimen/common_spacing"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
                             android:paddingVertical="@dimen/common_spacing"
-                            android:text="@string/locker"
+                            app:i18nKey='@{"locker"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -154,7 +154,7 @@
                             android:layout_marginVertical="@dimen/common_spacing"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
                             android:paddingVertical="@dimen/common_spacing"
-                            android:text="@string/colocker"
+                            app:i18nKey='@{"colocker"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -166,7 +166,7 @@
                             android:background="@drawable/bg_select_member_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
                             android:paddingVertical="@dimen/common_spacing_small"
-                            android:text="@string/select"
+                            app:i18nKey='@{"select"}'
                             android:textColor="@color/white"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -191,7 +191,7 @@
                     android:id="@+id/select_member_tip"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/select_colocker_tip"
+                    app:i18nKey='@{"select_colocker_tip"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/normal_text_size" />
 
@@ -225,7 +225,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -240,7 +240,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 8 - 8
app/src/main/res/layout-land/fragment_select_point.xml

@@ -27,7 +27,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/create_sop_title"
+                app:i18nKey='@{"create_sop_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -48,7 +48,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/select_point_title"
+                app:i18nKey='@{"select_point_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_18"
                 android:textStyle="bold" />
@@ -70,7 +70,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -102,7 +102,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/point_list_title"
+                    app:i18nKey='@{"point_list_title"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/normal_text_size_18" />
 
@@ -139,7 +139,7 @@
                         android:drawableLeft="@mipmap/tip"
                         android:drawablePadding="@dimen/common_spacing"
                         android:gravity="center_vertical"
-                        android:text="@string/select_group_tip"
+                        app:i18nKey='@{"select_group_tip"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/common_text_size" />
 
@@ -159,7 +159,7 @@
                         android:drawablePadding="@dimen/common_spacing"
                         android:gravity="center"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
-                        android:text="@string/add_group"
+                        app:i18nKey='@{"add_group"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/common_btn_text_size" />
                 </LinearLayout>
@@ -189,7 +189,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -204,7 +204,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 9 - 9
app/src/main/res/layout-land/fragment_set_face.xml

@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/set_face_title"
+                app:i18nKey='@{"set_face_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -46,7 +46,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -154,7 +154,7 @@
                                     android:layout_gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
                                     android:gravity="center"
-                                    android:text="@string/detect_face_tip"
+                                    app:i18nKey='@{"detect_face_tip"}'
                                     android:textColor="@color/dialogxColorBlue"
                                     android:textSize="@dimen/common_text_size_big"
                                     android:textStyle="bold"
@@ -168,7 +168,7 @@
                                     android:layout_gravity="center|bottom"
                                     android:paddingVertical="10dp"
                                     android:gravity="center"
-                                    android:text="@string/only_one_person_allowed"
+                                    app:i18nKey='@{"only_one_person_allowed"}'
                                     android:textColor="@color/common_status_red"
                                     android:textSize="@dimen/common_text_size_big"
                                     android:visibility="gone"
@@ -209,7 +209,7 @@
                             <TextView
                                 style="@style/CommonTextView"
                                 android:layout_marginLeft="@dimen/common_spacing_small"
-                                android:text="@string/capture_tip_title"
+                                app:i18nKey='@{"capture_tip_title"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_text_size_small" />
                         </LinearLayout>
@@ -218,7 +218,7 @@
                             style="@style/CommonTextView"
                             android:layout_marginTop="@dimen/common_spacing"
                             android:gravity="left"
-                            android:text="@string/capture_tip_content"
+                            app:i18nKey='@{"capture_tip_content"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size_small" />
 
@@ -240,7 +240,7 @@
                         android:drawableTint="@color/white"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:paddingVertical="@dimen/common_spacing"
-                        android:text="@string/confirm"
+                        app:i18nKey='@{"confirm"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         android:visibility="gone"
@@ -260,7 +260,7 @@
                         android:drawableTint="@color/white"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:paddingVertical="@dimen/common_spacing"
-                        android:text="@string/recapture"
+                        app:i18nKey='@{"recapture"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         android:visibility="gone"
@@ -279,7 +279,7 @@
                         android:drawableTint="@color/white"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:paddingVertical="@dimen/common_spacing"
-                        android:text="@string/cancel"
+                        app:i18nKey='@{"cancel"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         app:layout_constraintEnd_toEndOf="parent"

+ 16 - 16
app/src/main/res/layout-land/fragment_user_info.xml

@@ -28,7 +28,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/user_info_title"
+                app:i18nKey='@{"user_info_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -45,7 +45,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -91,7 +91,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/common_spacing"
-                        android:text="@string/user_name"
+                        app:i18nKey='@{"user_name"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/common_text_size"
                         app:layout_constraintStart_toStartOf="parent"
@@ -119,7 +119,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/common_spacing"
-                        android:text="@string/nickname"
+                        app:i18nKey='@{"nickname"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/common_text_size"
                         app:layout_constraintEnd_toEndOf="@+id/username_tv"
@@ -131,7 +131,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:background="@drawable/bg_common_input"
-                        android:hint="@string/please_input_nickname"
+                        app:i18nHint='@{"please_input_nickname"}'
                         android:maxLines="1"
                         android:paddingHorizontal="@dimen/common_spacing"
                         android:paddingVertical="2dp"
@@ -148,7 +148,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/common_spacing"
-                        android:text="@string/phone"
+                        app:i18nKey='@{"phone"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/common_text_size"
                         app:layout_constraintEnd_toEndOf="@+id/nickname_tv"
@@ -160,7 +160,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:background="@drawable/bg_common_input"
-                        android:hint="@string/please_input_phone"
+                        app:i18nHint='@{"please_input_phone"}'
                         android:maxLines="1"
                         android:paddingHorizontal="@dimen/common_spacing"
                         android:paddingVertical="2dp"
@@ -200,7 +200,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
-                        android:text="@string/confirm"
+                        app:i18nKey='@{"confirm"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size" />
 
@@ -215,7 +215,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
-                        android:text="@string/cancel"
+                        app:i18nKey='@{"cancel"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size" />
                 </LinearLayout>
@@ -272,7 +272,7 @@
                                     android:layout_gravity="center"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/detect_face_tip"
+                                    app:i18nKey='@{"detect_face_tip"}'
                                     android:textColor="@color/dialogxColorBlue"
                                     android:textSize="@dimen/common_text_size_big"
                                     android:textStyle="bold"
@@ -286,7 +286,7 @@
                                     android:layout_gravity="center|bottom"
                                     android:gravity="center"
                                     android:paddingVertical="10dp"
-                                    android:text="@string/only_one_person_allowed"
+                                    app:i18nKey='@{"only_one_person_allowed"}'
                                     android:textColor="@color/common_status_red"
                                     android:textSize="@dimen/common_text_size_big"
                                     android:visibility="gone"
@@ -327,7 +327,7 @@
                             <TextView
                                 style="@style/CommonTextView"
                                 android:layout_marginLeft="@dimen/common_spacing_small"
-                                android:text="@string/capture_tip_title"
+                                app:i18nKey='@{"capture_tip_title"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_text_size_small" />
                         </LinearLayout>
@@ -336,7 +336,7 @@
                             style="@style/CommonTextView"
                             android:layout_marginTop="@dimen/common_spacing"
                             android:gravity="left"
-                            android:text="@string/capture_tip_content"
+                            app:i18nKey='@{"capture_tip_content"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size_small" />
 
@@ -358,7 +358,7 @@
                         android:drawableTint="@color/white"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:paddingVertical="@dimen/common_spacing"
-                        android:text="@string/confirm"
+                        app:i18nKey='@{"confirm"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         android:visibility="gone"
@@ -378,7 +378,7 @@
                         android:drawableTint="@color/white"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:paddingVertical="@dimen/common_spacing"
-                        android:text="@string/recapture"
+                        app:i18nKey='@{"recapture"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         android:visibility="gone"
@@ -397,7 +397,7 @@
                         android:drawableTint="@color/white"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:paddingVertical="@dimen/common_spacing"
-                        android:text="@string/cancel"
+                        app:i18nKey='@{"cancel"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         app:layout_constraintEnd_toEndOf="parent"

+ 18 - 18
app/src/main/res/layout-land/fragment_workflow_setting.xml

@@ -29,7 +29,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/create_sop_title"
+                app:i18nKey='@{"create_sop_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -50,7 +50,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/workflow_setting"
+                app:i18nKey='@{"workflow_setting"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -72,7 +72,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -123,7 +123,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginVertical="@dimen/common_spacing_2x"
-                            android:text="@string/workflow_step_title"
+                            app:i18nKey='@{"workflow_step_title"}'
                             android:textSize="@dimen/normal_text_size_18"
                             android:textStyle="bold"
                             app:layout_constraintEnd_toEndOf="@+id/barrier_title_end_land"
@@ -137,7 +137,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginHorizontal="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:hint="@string/please_input_step_title"
+                            app:i18nHint='@{"please_input_step_title"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="5dp"
@@ -154,7 +154,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginVertical="@dimen/common_spacing_2x"
-                            android:text="@string/workflow_step_title_short"
+                            app:i18nKey='@{"workflow_step_title_short"}'
                             android:textSize="@dimen/normal_text_size_18"
                             android:textStyle="bold"
                             app:layout_constraintEnd_toEndOf="@+id/barrier_title_end_land"
@@ -169,7 +169,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginHorizontal="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:hint="@string/please_input_step_title_short"
+                            app:i18nHint='@{"please_input_step_title_short"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="5dp"
@@ -186,7 +186,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginVertical="@dimen/common_spacing_2x"
-                            android:text="@string/workflow_step_confirm_type"
+                            app:i18nKey='@{"workflow_step_confirm_type"}'
                             android:textSize="@dimen/normal_text_size_18"
                             android:textStyle="bold"
                             app:layout_constraintEnd_toEndOf="@+id/barrier_title_end_land"
@@ -202,7 +202,7 @@
                             android:layout_marginHorizontal="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_step_confirm_type"
+                            app:i18nHint='@{"please_select_step_confirm_type"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="5dp"
@@ -219,7 +219,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginVertical="@dimen/common_spacing_2x"
-                            android:text="@string/workflow_step_confirm_role"
+                            app:i18nKey='@{"workflow_step_confirm_role"}'
                             android:textSize="@dimen/normal_text_size_18"
                             android:textStyle="bold"
                             android:visibility="gone"
@@ -236,7 +236,7 @@
                             android:layout_marginHorizontal="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_step_confirm_role"
+                            app:i18nHint='@{"please_select_step_confirm_role"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="5dp"
@@ -253,7 +253,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginVertical="@dimen/common_spacing_2x"
-                            android:text="@string/workflow_step_confirm_member"
+                            app:i18nKey='@{"workflow_step_confirm_member"}'
                             android:textSize="@dimen/normal_text_size_18"
                             android:textStyle="bold"
                             android:visibility="gone"
@@ -270,7 +270,7 @@
                             android:layout_marginHorizontal="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_step_confirm_member"
+                            app:i18nHint='@{"please_select_step_confirm_member"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="5dp"
@@ -287,7 +287,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginVertical="@dimen/common_spacing_2x"
-                            android:text="@string/workflow_step_function"
+                            app:i18nKey='@{"workflow_step_function"}'
                             android:textSize="@dimen/normal_text_size_18"
                             android:textStyle="bold"
                             app:layout_constraintEnd_toEndOf="@+id/barrier_title_end_land"
@@ -318,7 +318,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginVertical="@dimen/common_spacing_2x"
-                        android:text="@string/workflow_step_description"
+                        app:i18nKey='@{"workflow_step_description"}'
                         android:textSize="@dimen/normal_text_size_18"
                         android:textStyle="bold"
                         app:layout_constraintStart_toStartOf="parent"
@@ -333,7 +333,7 @@
                         android:layout_marginHorizontal="@dimen/common_spacing"
                         android:background="@drawable/bg_common_input"
                         android:gravity="top"
-                        android:hint="@string/please_input_step_description"
+                        app:i18nHint='@{"please_input_step_description"}'
                         android:paddingHorizontal="@dimen/common_spacing"
                         android:paddingVertical="5dp"
                         android:scrollbars="vertical"
@@ -365,7 +365,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -380,7 +380,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 4 - 4
app/src/main/res/layout-land/item_job_execute_point.xml

@@ -15,7 +15,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:paddingVertical="@dimen/common_spacing"
-            android:text="@string/point_name_tv"
+            app:i18nKey='@{"point_name_tv"}'
             android:textSize="@dimen/common_text_size" />
 
         <TextView
@@ -25,7 +25,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:paddingVertical="@dimen/common_spacing"
-            android:text="@string/point_manage_point_function"
+            app:i18nKey='@{"point_manage_point_function"}'
             android:textSize="@dimen/common_text_size" />
 
         <TextView
@@ -35,7 +35,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:paddingVertical="@dimen/common_spacing"
-            android:text="@string/point_manage_point_function"
+            app:i18nKey='@{"point_manage_point_function"}'
             android:textSize="@dimen/common_text_size" />
 
         <FrameLayout
@@ -66,7 +66,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing_small"
-                    android:text="@string/has_locked"
+                    app:i18nKey='@{"has_locked"}'
                     android:textColor="@color/white"
                     android:textSize="@dimen/common_text_size" />
             </LinearLayout>

+ 1 - 1
app/src/main/res/layout-land/item_job_execute_step.xml

@@ -27,7 +27,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing"
                 android:gravity="center"
-                android:text="@string/point_name_tv"
+                app:i18nKey='@{"point_name_tv"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView

+ 1 - 1
app/src/main/res/layout-land/item_job_workflow_step.xml

@@ -24,7 +24,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing"
                 android:gravity="center"
-                android:text="@string/point_name_tv"
+                app:i18nKey='@{"point_name_tv"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView

+ 1 - 1
app/src/main/res/layout-land/item_locker_group.xml

@@ -36,7 +36,7 @@
                     android:focusableInTouchMode="false"
                     android:gravity="center"
                     android:paddingHorizontal="@dimen/common_spacing"
-                    android:text="@string/selected_point_info_title"
+                    app:i18nKey='@{"selected_point_info_title"}'
                     android:textColor="@color/text_color_item_group_title_text"
                     android:textSize="@dimen/normal_text_size_18" />
 

+ 3 - 3
app/src/main/res/layout-land/item_point_group.xml

@@ -29,7 +29,7 @@
                 android:focusable="false"
                 android:focusableInTouchMode="false"
                 android:paddingHorizontal="@dimen/common_spacing"
-                android:text="@string/selected_point_info_title"
+                app:i18nKey='@{"selected_point_info_title"}'
                 android:textColor="@color/text_color_item_group_title_text"
                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -48,7 +48,7 @@
                 android:drawablePadding="@dimen/common_spacing"
                 android:gravity="center"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/edit"
+                app:i18nKey='@{"edit"}'
                 android:textColor="@color/text_color_item_group_title_text"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -62,7 +62,7 @@
                 android:drawablePadding="@dimen/common_spacing"
                 android:gravity="center"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/delete_group"
+                app:i18nKey='@{"delete_group"}'
                 android:textColor="@color/text_color_item_group_title_text"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 1 - 1
app/src/main/res/layout-land/item_point_group_show.xml

@@ -28,7 +28,7 @@
                 android:focusable="false"
                 android:focusableInTouchMode="false"
                 android:paddingLeft="@dimen/common_spacing"
-                android:text="@string/selected_point_info_title"
+                app:i18nKey='@{"selected_point_info_title"}'
                 android:textColor="@color/text_color_item_group_title_text"
                 android:textSize="@dimen/normal_text_size_18" />
 

+ 3 - 3
app/src/main/res/layout/activity_login.xml

@@ -80,7 +80,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="@dimen/login_sub_title_margin_top"
-                android:text="@string/loto_en"
+                app:i18nKey='@{"loto_en"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/login_sub_title_text_size"
                 android:textStyle="bold" />
@@ -112,7 +112,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentBottom="true"
                     android:gravity="center_horizontal"
-                    android:text="@string/login_tip"
+                    app:i18nKey='@{"login_tip"}'
                     android:textColor="@color/white"
                     android:textSize="@dimen/login_tip_text_size" />
             </LinearLayout>
@@ -130,7 +130,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
                 android:gravity="center_horizontal"
-                android:text="@string/tec_support"
+                app:i18nKey='@{"tec_support"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/login_tec_support_text_size" />
 

+ 0 - 4
app/src/main/res/layout/activity_main.xml

@@ -107,11 +107,7 @@
             android:layout_height="@dimen/home_bottom_nav_size"
             android:layout_alignParentBottom="true"
             android:layout_margin="@dimen/common_spacing"
-            app:navBackgroundColor="@color/white80"
-            app:navBallDiameter="@dimen/home_bottom_nav_ball_size"
-            app:navCornerRadius="@dimen/home_bottom_nav_corner_radius"
             app:navIconSize="@dimen/home_bottom_nav_icon_size"
-            app:navNotchHeight="@dimen/home_bottom_nav_notch_height"
             app:navOrientation="horizontal"
             app:navTextSize="@dimen/home_bottom_nav_text_size" />
     </RelativeLayout>

+ 2 - 2
app/src/main/res/layout/activity_splash.xml

@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="@dimen/login_sub_title_margin_top"
-                android:text="@string/loto_en"
+                app:i18nKey='@{"loto_en"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/login_sub_title_text_size"
                 android:textStyle="bold" />
@@ -49,7 +49,7 @@
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="@dimen/login_tec_support_margin_bottom"
             android:gravity="center_horizontal"
-            android:text="@string/tec_support"
+            app:i18nKey='@{"tec_support"}'
             android:textColor="@color/white"
             android:textSize="@dimen/login_tec_support_text_size" />
     </RelativeLayout>

+ 12 - 12
app/src/main/res/layout/dialog_add_card.xml

@@ -22,7 +22,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/card_manage_new_card_title"
+                app:i18nKey='@{"card_manage_new_card_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -52,7 +52,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/card_nfc"
+                app:i18nKey='@{"card_nfc"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="parent"
@@ -64,7 +64,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_card_nfc"
+                app:i18nHint='@{"please_input_card_nfc"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -81,7 +81,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/username"
+                app:i18nKey='@{"username"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/card_nfc_tv"
@@ -93,7 +93,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_select_card_username"
+                app:i18nHint='@{"please_select_card_username"}'
                 android:drawableRight="@mipmap/icon_drop_down"
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
@@ -111,7 +111,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_filter_status"
+                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/username_title_tv"
@@ -131,7 +131,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/common_spacing"
-                    android:text="@string/normal"
+                    app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <RadioButton
@@ -139,7 +139,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/common_spacing"
-                    android:text="@string/abnormal"
+                    app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/common_text_size" />
             </RadioGroup>
 
@@ -149,7 +149,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/remark"
+                app:i18nKey='@{"remark"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="@+id/status_tv"
@@ -161,7 +161,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_remark"
+                app:i18nHint='@{"please_input_remark"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -192,7 +192,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -207,7 +207,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 2 - 2
app/src/main/res/layout/dialog_add_fingerprint.xml

@@ -21,7 +21,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_spacing"
-            android:text="@string/fingerprint_scan_tip"
+            app:i18nKey='@{"fingerprint_scan_tip"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_text_size" />
 
@@ -36,7 +36,7 @@
             android:drawableTint="@color/white"
             android:paddingHorizontal="@dimen/common_spacing_2x"
             android:paddingVertical="@dimen/common_spacing"
-            android:text="@string/cancel"
+            app:i18nKey='@{"cancel"}'
             android:textColor="@color/white"
             android:textSize="@dimen/common_btn_text_size" />
     </LinearLayout>

+ 14 - 14
app/src/main/res/layout/dialog_add_key.xml

@@ -21,7 +21,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/key_manage_new_key_title"
+                app:i18nKey='@{"key_manage_new_key_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -50,7 +50,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/key_name"
+                app:i18nKey='@{"key_name"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="parent"
@@ -62,7 +62,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_key_name"
+                app:i18nHint='@{"please_input_key_name"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -80,7 +80,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/key_nfc"
+                app:i18nKey='@{"key_nfc"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/key_code_tv"
@@ -92,7 +92,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_key_nfc"
+                app:i18nHint='@{"please_input_key_nfc"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -110,7 +110,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/key_mac"
+                app:i18nKey='@{"key_mac"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/key_nfc_tv"
@@ -122,7 +122,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_key_mac"
+                app:i18nHint='@{"please_input_key_mac"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:textColor="@color/black"
@@ -138,7 +138,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_filter_status"
+                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/key_mac_tv"
@@ -159,7 +159,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/normal"
+                    app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <RadioButton
@@ -167,7 +167,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/abnormal"
+                    app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/common_text_size" />
             </RadioGroup>
 
@@ -177,7 +177,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/remark"
+                app:i18nKey='@{"remark"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/status_tv"
@@ -189,7 +189,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_remark"
+                app:i18nHint='@{"please_input_remark"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:textColor="@color/black"
@@ -218,7 +218,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -233,7 +233,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 12 - 12
app/src/main/res/layout/dialog_add_lock.xml

@@ -22,7 +22,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/lock_manage_new_lock_title"
+                app:i18nKey='@{"lock_manage_new_lock_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -52,7 +52,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/lock_code"
+                app:i18nKey='@{"lock_code"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="parent"
@@ -64,7 +64,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_key_nfc"
+                app:i18nHint='@{"please_input_key_nfc"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -81,7 +81,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/lock_nfc"
+                app:i18nKey='@{"lock_nfc"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/lock_code_tv"
@@ -93,7 +93,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_key_nfc"
+                app:i18nHint='@{"please_input_key_nfc"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -110,7 +110,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_filter_status"
+                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/lock_nfc_tv"
@@ -130,7 +130,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/common_spacing"
-                    android:text="@string/normal"
+                    app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <RadioButton
@@ -138,7 +138,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/common_spacing"
-                    android:text="@string/abnormal"
+                    app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/common_text_size" />
             </RadioGroup>
 
@@ -148,7 +148,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/remark"
+                app:i18nKey='@{"remark"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="@+id/status_tv"
@@ -160,7 +160,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_remark"
+                app:i18nHint='@{"please_input_remark"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -191,7 +191,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -206,7 +206,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 13 - 13
app/src/main/res/layout/dialog_add_point.xml

@@ -21,7 +21,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/point_manage_add_title"
+                app:i18nKey='@{"point_manage_add_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -50,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dialog_content_normal_padding_horizontal"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/point_manage_point_name"
+                app:i18nKey='@{"point_manage_point_name"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintLeft_toLeftOf="parent"
@@ -65,7 +65,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
-                android:hint="@string/please_input_point_name"
+                app:i18nHint='@{"please_input_point_name"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -82,7 +82,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/point_manage_point_function"
+                app:i18nKey='@{"point_manage_point_function"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/point_name_tv_title"
@@ -97,7 +97,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
-                android:hint="@string/please_input_point_function"
+                app:i18nHint='@{"please_input_point_function"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -114,7 +114,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/point_manage_point_power_type"
+                app:i18nKey='@{"point_manage_point_power_type"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/function_tv"
@@ -130,7 +130,7 @@
                 android:background="@drawable/bg_common_input"
                 android:drawableRight="@mipmap/icon_drop_down"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
-                android:hint="@string/please_select_power_type"
+                app:i18nHint='@{"please_select_power_type"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -147,7 +147,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/point_manage_workstation"
+                app:i18nKey='@{"point_manage_workstation"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/power_type_tv_title"
@@ -163,7 +163,7 @@
                 android:background="@drawable/bg_common_input"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
                 android:drawableRight="@mipmap/icon_drop_down"
-                android:hint="@string/please_select_workstation"
+                app:i18nHint='@{"please_select_workstation"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -180,7 +180,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/point_manage_rfid_tag"
+                app:i18nKey='@{"point_manage_rfid_tag"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/workstation_tv_title"
@@ -195,7 +195,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
                 android:drawableRight="@mipmap/icon_drop_down"
-                android:hint="@string/please_select_rfid_token"
+                app:i18nHint='@{"please_select_rfid_token"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -229,7 +229,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -244,7 +244,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 12 - 12
app/src/main/res/layout/dialog_add_rfid_token.xml

@@ -22,7 +22,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/rfid_token_manage_new_rfid_token_title"
+                app:i18nKey='@{"rfid_token_manage_new_rfid_token_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -52,7 +52,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/rfid_code"
+                app:i18nKey='@{"rfid_code"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="parent"
@@ -64,7 +64,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_rfid_code"
+                app:i18nHint='@{"please_input_rfid_code"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -81,7 +81,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/rfid"
+                app:i18nKey='@{"rfid"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/rfid_code_tv"
@@ -93,7 +93,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_rfid"
+                app:i18nHint='@{"please_input_rfid"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -110,7 +110,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_filter_status"
+                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/rfid_tv"
@@ -130,7 +130,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/common_spacing"
-                    android:text="@string/normal"
+                    app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <RadioButton
@@ -138,7 +138,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/common_spacing"
-                    android:text="@string/abnormal"
+                    app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/common_text_size" />
             </RadioGroup>
 
@@ -148,7 +148,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/remark"
+                app:i18nKey='@{"remark"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="@+id/status_tv"
@@ -160,7 +160,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_remark"
+                app:i18nHint='@{"please_input_remark"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -191,7 +191,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -206,7 +206,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 13 - 13
app/src/main/res/layout/dialog_add_role.xml

@@ -21,7 +21,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/role_manage_add_title"
+                app:i18nKey='@{"role_manage_add_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -50,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dialog_content_normal_padding_horizontal"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/role_manage_role_name"
+                app:i18nKey='@{"role_manage_role_name"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintLeft_toLeftOf="parent"
@@ -65,7 +65,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_role_name"
+                app:i18nHint='@{"please_input_role_name"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/normal_input_padding_horizontal"
                 android:paddingVertical="@dimen/normal_input_padding_vertical"
@@ -82,7 +82,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/role_manage_permission_string"
+                app:i18nKey='@{"role_manage_permission_string"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/role_name_tv"
@@ -97,7 +97,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_permission_characters"
+                app:i18nHint='@{"please_input_permission_characters"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/normal_input_padding_horizontal"
                 android:paddingVertical="@dimen/normal_input_padding_vertical"
@@ -114,7 +114,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_filter_status"
+                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/role_key_tv"
@@ -137,7 +137,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/normal_margin_left"
-                    android:text="@string/user_manage_filter_activate"
+                    app:i18nKey='@{"user_manage_filter_activate"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <RadioButton
@@ -145,7 +145,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/normal_margin_left"
-                    android:text="@string/user_manage_filter_deactivate"
+                    app:i18nKey='@{"user_manage_filter_deactivate"}'
                     android:textSize="@dimen/common_text_size" />
             </RadioGroup>
 
@@ -154,7 +154,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_role_function_permission"
+                app:i18nKey='@{"manage_role_function_permission"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/status_tv"
@@ -175,7 +175,7 @@
                     android:id="@+id/expand_collapse"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/expand_collapse"
+                    app:i18nKey='@{"expand_collapse"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size" />
 
@@ -184,7 +184,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/all_select_not_all_select"
+                    app:i18nKey='@{"all_select_not_all_select"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size" />
             </LinearLayout>
@@ -222,7 +222,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -237,7 +237,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 16 - 16
app/src/main/res/layout/dialog_add_user.xml

@@ -22,7 +22,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/user_manage_new_user_title"
+                app:i18nKey='@{"user_manage_new_user_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -51,7 +51,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/user_name"
+                app:i18nKey='@{"user_name"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="parent"
@@ -65,7 +65,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_username"
+                app:i18nHint='@{"please_input_username"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -81,7 +81,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/nickname"
+                app:i18nKey='@{"nickname"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/username_tv"
@@ -95,7 +95,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_nickname"
+                app:i18nHint='@{"please_input_nickname"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -112,7 +112,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/user_manage_card_code"
+                app:i18nKey='@{"user_manage_card_code"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/nickname_tv"
@@ -124,7 +124,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_card_code"
+                app:i18nHint='@{"please_input_card_code"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -141,7 +141,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/user_manage_role"
+                app:i18nKey='@{"user_manage_role"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/card_code_tv"
@@ -156,7 +156,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
                 android:drawableRight="@mipmap/icon_drop_down"
-                android:hint="@string/please_select_role"
+                app:i18nHint='@{"please_select_role"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:textColor="@color/black"
@@ -173,7 +173,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/user_manage_area"
+                app:i18nKey='@{"user_manage_area"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/role_title_tv"
@@ -188,7 +188,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
                 android:drawableRight="@mipmap/icon_drop_down"
-                android:hint="@string/please_select_area"
+                app:i18nHint='@{"please_select_area"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:textColor="@color/black"
@@ -203,7 +203,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_filter_status"
+                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/workstation_tv"
@@ -226,7 +226,7 @@
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/user_manage_filter_activate"
+                    app:i18nKey='@{"user_manage_filter_activate"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <RadioButton
@@ -234,7 +234,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/user_manage_filter_deactivate"
+                    app:i18nKey='@{"user_manage_filter_deactivate"}'
                     android:textSize="@dimen/common_text_size" />
             </RadioGroup>
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -257,7 +257,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -272,7 +272,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 5 - 5
app/src/main/res/layout/dialog_add_workstation.xml

@@ -21,7 +21,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/workstation_manage_new_workstation"
+                app:i18nKey='@{"workstation_manage_new_workstation"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -55,7 +55,7 @@
                 <com.grkj.ui_base.widget.RequiredTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/workstation_manage_workstation_name"
+                    app:i18nKey='@{"workstation_manage_workstation_name"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size"
                     app:markPosition="end"
@@ -67,7 +67,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:hint="@string/please_input_workstation_name"
+                    app:i18nHint='@{"please_input_workstation_name"}'
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
                     android:paddingVertical="2dp"
@@ -95,7 +95,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -110,7 +110,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 1 - 1
app/src/main/res/layout/dialog_drop_down_list.xml

@@ -14,7 +14,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/common_spacing"
             android:background="@drawable/bg_common_input"
-            android:hint="@string/please_input_key_word"
+            app:i18nHint='@{"please_input_key_word"}'
             android:maxLines="1"
             android:paddingHorizontal="@dimen/common_spacing"
             android:singleLine="true"

+ 10 - 10
app/src/main/res/layout/dialog_filter_card.xml

@@ -21,7 +21,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/user_manage_filter_title"
+                app:i18nKey='@{"user_manage_filter_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -51,7 +51,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/card_nfc"
+                app:i18nKey='@{"card_nfc"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="parent"
@@ -63,7 +63,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_card_nfc"
+                app:i18nHint='@{"please_input_card_nfc"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -81,7 +81,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/username"
+                app:i18nKey='@{"username"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/card_nfc_tv"
@@ -93,7 +93,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_select_card_username"
+                app:i18nHint='@{"please_select_card_username"}'
                 android:drawableRight="@mipmap/icon_drop_down"
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
@@ -112,7 +112,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_filter_status"
+                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/username_title_tv"
@@ -133,7 +133,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/normal"
+                    app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <RadioButton
@@ -141,7 +141,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/abnormal"
+                    app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/common_text_size" />
             </RadioGroup>
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -164,7 +164,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -179,7 +179,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 12 - 12
app/src/main/res/layout/dialog_filter_key.xml

@@ -21,7 +21,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/user_manage_filter_title"
+                app:i18nKey='@{"user_manage_filter_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -50,7 +50,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/key_name"
+                app:i18nKey='@{"key_name"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="parent"
@@ -62,7 +62,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_key_name"
+                app:i18nHint='@{"please_input_key_name"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -80,7 +80,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/key_nfc"
+                app:i18nKey='@{"key_nfc"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/key_code_tv"
@@ -92,7 +92,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_key_nfc"
+                app:i18nHint='@{"please_input_key_nfc"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -110,7 +110,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/key_mac"
+                app:i18nKey='@{"key_mac"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/key_nfc_tv"
@@ -122,7 +122,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_key_mac"
+                app:i18nHint='@{"please_input_key_mac"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:textColor="@color/black"
@@ -138,7 +138,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_filter_status"
+                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/key_mac_tv"
@@ -159,7 +159,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/normal"
+                    app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <RadioButton
@@ -167,7 +167,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/abnormal"
+                    app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/common_text_size" />
             </RadioGroup>
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -190,7 +190,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -205,7 +205,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 10 - 10
app/src/main/res/layout/dialog_filter_lock.xml

@@ -21,7 +21,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/user_manage_filter_title"
+                app:i18nKey='@{"user_manage_filter_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -51,7 +51,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/lock_code"
+                app:i18nKey='@{"lock_code"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="parent"
@@ -63,7 +63,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_lock_code"
+                app:i18nHint='@{"please_input_lock_code"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -81,7 +81,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/lock_nfc"
+                app:i18nKey='@{"lock_nfc"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/lock_code_tv"
@@ -93,7 +93,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_lock_nfc"
+                app:i18nHint='@{"please_input_lock_nfc"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -111,7 +111,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_filter_status"
+                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/lock_nfc_tv"
@@ -132,7 +132,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/normal"
+                    app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <RadioButton
@@ -140,7 +140,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/abnormal"
+                    app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/common_text_size" />
             </RadioGroup>
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -163,7 +163,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -178,7 +178,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 13 - 13
app/src/main/res/layout/dialog_filter_point.xml

@@ -20,7 +20,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/filter"
+                app:i18nKey='@{"filter"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -49,7 +49,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dialog_content_normal_padding_horizontal"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/point_manage_point_name"
+                app:i18nKey='@{"point_manage_point_name"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintLeft_toLeftOf="parent"
@@ -64,7 +64,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_point_name"
+                app:i18nHint='@{"please_input_point_name"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -81,7 +81,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/point_manage_point_function"
+                app:i18nKey='@{"point_manage_point_function"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/point_name_tv_title"
@@ -96,7 +96,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_point_function"
+                app:i18nHint='@{"please_input_point_function"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -113,7 +113,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/point_manage_point_power_type"
+                app:i18nKey='@{"point_manage_point_power_type"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/function_tv"
@@ -129,7 +129,7 @@
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
                 android:background="@drawable/bg_common_input"
                 android:drawableRight="@mipmap/icon_drop_down"
-                android:hint="@string/please_select_power_type"
+                app:i18nHint='@{"please_select_power_type"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -146,7 +146,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/point_manage_workstation"
+                app:i18nKey='@{"point_manage_workstation"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/power_type_tv_title"
@@ -162,7 +162,7 @@
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
                 android:background="@drawable/bg_common_input"
                 android:drawableRight="@mipmap/icon_drop_down"
-                android:hint="@string/please_select_workstation"
+                app:i18nHint='@{"please_select_workstation"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -179,7 +179,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/point_manage_rfid_tag"
+                app:i18nKey='@{"point_manage_rfid_tag"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/workstation_tv_title"
@@ -194,7 +194,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_rfid_tag"
+                app:i18nHint='@{"please_input_rfid_tag"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -227,7 +227,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -242,7 +242,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 10 - 10
app/src/main/res/layout/dialog_filter_rfid_token.xml

@@ -21,7 +21,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/user_manage_filter_title"
+                app:i18nKey='@{"user_manage_filter_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -51,7 +51,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/rfid_code"
+                app:i18nKey='@{"rfid_code"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="parent"
@@ -63,7 +63,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_rfid_code"
+                app:i18nHint='@{"please_input_rfid_code"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -81,7 +81,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/rfid"
+                app:i18nKey='@{"rfid"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/rfid_code_tv"
@@ -93,7 +93,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_rfid"
+                app:i18nHint='@{"please_input_rfid"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -111,7 +111,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_filter_status"
+                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/rfid_tv"
@@ -132,7 +132,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/normal"
+                    app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <RadioButton
@@ -140,7 +140,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/abnormal"
+                    app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/common_text_size" />
             </RadioGroup>
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -163,7 +163,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -178,7 +178,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 10 - 10
app/src/main/res/layout/dialog_filter_role.xml

@@ -20,7 +20,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/user_manage_filter_title"
+                app:i18nKey='@{"user_manage_filter_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -54,7 +54,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/role_manage_role_name"
+                    app:i18nKey='@{"role_manage_role_name"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size" />
 
@@ -64,7 +64,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:hint="@string/please_input_role_name"
+                    app:i18nHint='@{"please_input_role_name"}'
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
                     android:paddingVertical="2dp"
@@ -84,7 +84,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/role_manage_permission_string"
+                    app:i18nKey='@{"role_manage_permission_string"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size" />
 
@@ -94,7 +94,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:hint="@string/please_input_permission_characters"
+                    app:i18nHint='@{"please_input_permission_characters"}'
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
                     android:paddingVertical="2dp"
@@ -114,7 +114,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/manage_filter_status"
+                    app:i18nKey='@{"manage_filter_status"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size" />
 
@@ -130,7 +130,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:textSize="@dimen/common_text_size"
-                        android:text="@string/user_manage_filter_activate" />
+                        app:i18nKey='@{"user_manage_filter_activate"}' />
 
                     <RadioButton
                         android:id="@+id/deactivate_rb"
@@ -138,7 +138,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:textSize="@dimen/common_text_size"
-                        android:text="@string/user_manage_filter_deactivate" />
+                        app:i18nKey='@{"user_manage_filter_deactivate"}' />
                 </RadioGroup>
             </LinearLayout>
         </LinearLayout>
@@ -161,7 +161,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -176,7 +176,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 12 - 12
app/src/main/res/layout/dialog_filter_user.xml

@@ -20,7 +20,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/user_manage_filter_title"
+                app:i18nKey='@{"user_manage_filter_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -54,7 +54,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/nickname"
+                    app:i18nKey='@{"nickname"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size" />
 
@@ -64,7 +64,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:hint="@string/please_input_nickname"
+                    app:i18nHint='@{"please_input_nickname"}'
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
                     android:paddingVertical="2dp"
@@ -84,7 +84,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/user_manage_card_code"
+                    app:i18nKey='@{"user_manage_card_code"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size" />
 
@@ -94,7 +94,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:hint="@string/please_input_card_code"
+                    app:i18nHint='@{"please_input_card_code"}'
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
                     android:paddingVertical="2dp"
@@ -115,7 +115,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/user_manage_area"
+                    app:i18nKey='@{"user_manage_area"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size" />
 
@@ -125,7 +125,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:hint="@string/please_input_area"
+                    app:i18nHint='@{"please_input_area"}'
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
                     android:paddingVertical="2dp"
@@ -145,7 +145,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/manage_filter_status"
+                    app:i18nKey='@{"manage_filter_status"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size" />
 
@@ -161,7 +161,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:textSize="@dimen/common_text_size"
-                        android:text="@string/user_manage_filter_activate" />
+                        app:i18nKey='@{"user_manage_filter_activate"}' />
 
                     <RadioButton
                         android:id="@+id/deactivate_rb"
@@ -169,7 +169,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:textSize="@dimen/common_text_size"
-                        android:text="@string/user_manage_filter_deactivate" />
+                        app:i18nKey='@{"user_manage_filter_deactivate"}' />
                 </RadioGroup>
             </LinearLayout>
         </LinearLayout>
@@ -192,7 +192,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -207,7 +207,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 4 - 4
app/src/main/res/layout/dialog_login.xml

@@ -56,7 +56,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/login_dialog_input_height"
                 android:layout_marginBottom="@dimen/common_spacing"
-                android:hint="@string/please_input_account"
+                app:i18nHint='@{"please_input_account"}'
                 android:textSize="@dimen/login_dialog_text_size" />
 
             <EditText
@@ -65,7 +65,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/login_dialog_input_height"
                 android:layout_marginBottom="@dimen/common_spacing"
-                android:hint="@string/please_input_password"
+                app:i18nHint='@{"please_input_password"}'
                 android:inputType="textPassword"
                 android:textSize="@dimen/login_dialog_text_size" />
 
@@ -75,7 +75,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/login_dialog_btn_height"
                 android:layout_marginBottom="@dimen/common_spacing"
-                android:text="@string/login"
+                app:i18nKey='@{"login"}'
                 android:textSize="@dimen/login_dialog_text_size" />
 
             <TextView
@@ -84,7 +84,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/login_dialog_btn_height"
                 android:background="@drawable/white_stroke_bg"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textSize="@dimen/login_dialog_text_size" />
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>

+ 5 - 5
app/src/main/res/layout/dialog_quick_entrance_config.xml

@@ -19,7 +19,7 @@
                 android:layout_height="wrap_content"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:paddingVertical="@dimen/common_spacing"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/main_color"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:paddingVertical="@dimen/common_spacing"
-                android:text="@string/quick_entrance_title"
+                app:i18nKey='@{"quick_entrance_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -41,7 +41,7 @@
                 android:background="@drawable/common_btn_blue_bg"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:paddingVertical="@dimen/common_spacing"
-                android:text="@string/save"
+                app:i18nKey='@{"save"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </RelativeLayout>
@@ -60,7 +60,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:paddingVertical="@dimen/common_spacing"
-                android:text="@string/selected_quick_entrance"
+                app:i18nKey='@{"selected_quick_entrance"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -75,7 +75,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:paddingVertical="@dimen/common_spacing"
-                android:text="@string/all_quick_entrance"
+                app:i18nKey='@{"all_quick_entrance"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 

+ 4 - 4
app/src/main/res/layout/dialog_slots_exception_report.xml

@@ -15,7 +15,7 @@
             android:background="@color/common_tip_dialog_info"
             android:gravity="center_vertical"
             android:paddingHorizontal="@dimen/common_spacing"
-            android:text="@string/slots_exception_report"
+            app:i18nKey='@{"slots_exception_report"}'
             android:textColor="@color/white"
             android:textSize="@dimen/common_btn_text_size" />
 
@@ -50,7 +50,7 @@
                 android:layout_marginVertical="@dimen/common_spacing"
                 android:background="@drawable/selectable_input_text_bg"
                 android:gravity="left|top"
-                android:hint="@string/please_input_exception_reason"
+                app:i18nHint='@{"please_input_exception_reason"}'
                 android:padding="@dimen/selectable_input_edit_padding"
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
@@ -80,7 +80,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -95,7 +95,7 @@
                 android:minWidth="@dimen/tip_dialog_btn_width"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 6 - 6
app/src/main/res/layout/dialog_todo_point_detail.xml

@@ -12,7 +12,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="@dimen/common_spacing_2x"
-            android:text="@string/close"
+            app:i18nKey='@{"close"}'
             android:textColor="@color/tag_lock"
             android:textSize="@dimen/common_text_size"
             app:layout_constraintEnd_toEndOf="parent"
@@ -22,7 +22,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="@dimen/common_spacing_2x"
-            android:text="@string/point_detail"
+            app:i18nKey='@{"point_detail"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_text_size"
             android:textStyle="bold"
@@ -52,7 +52,7 @@
                     android:layout_weight="1"
                     android:gravity="center"
                     android:paddingVertical="@dimen/common_spacing"
-                    android:text="@string/point_name_tv"
+                    app:i18nKey='@{"point_name_tv"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <TextView
@@ -61,7 +61,7 @@
                     android:layout_weight="1"
                     android:gravity="center"
                     android:paddingVertical="@dimen/common_spacing"
-                    android:text="@string/point_manage_point_group"
+                    app:i18nKey='@{"point_manage_point_group"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <TextView
@@ -70,7 +70,7 @@
                     android:layout_weight="1"
                     android:gravity="center"
                     android:paddingVertical="@dimen/common_spacing"
-                    android:text="@string/point_manage_point_function"
+                    app:i18nKey='@{"point_manage_point_function"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <TextView
@@ -79,7 +79,7 @@
                     android:layout_weight="1"
                     android:gravity="center"
                     android:paddingVertical="@dimen/common_spacing"
-                    android:text="@string/lock_status"
+                    app:i18nKey='@{"lock_status"}'
                     android:textSize="@dimen/common_text_size" />
             </LinearLayout>
 

+ 12 - 12
app/src/main/res/layout/dialog_update_card.xml

@@ -22,7 +22,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/card_manage_card_detail_title"
+                app:i18nKey='@{"card_manage_card_detail_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -52,7 +52,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/card_nfc"
+                app:i18nKey='@{"card_nfc"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="parent"
@@ -64,7 +64,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_card_nfc"
+                app:i18nHint='@{"please_input_card_nfc"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
@@ -80,7 +80,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/username"
+                app:i18nKey='@{"username"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/card_nfc_tv"
@@ -93,7 +93,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
                 android:drawableRight="@mipmap/icon_drop_down"
-                android:hint="@string/please_select_card_username"
+                app:i18nHint='@{"please_select_card_username"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
@@ -109,7 +109,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_filter_status"
+                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/username_title_tv"
@@ -130,7 +130,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/normal"
+                    app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <RadioButton
@@ -138,7 +138,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/abnormal"
+                    app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/common_text_size" />
             </RadioGroup>
 
@@ -148,7 +148,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/remark"
+                app:i18nKey='@{"remark"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/status_tv"
@@ -160,7 +160,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_remark"
+                app:i18nHint='@{"please_input_remark"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
@@ -189,7 +189,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -204,7 +204,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 14 - 14
app/src/main/res/layout/dialog_update_key.xml

@@ -21,7 +21,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/key_manage_key_detail_title"
+                app:i18nKey='@{"key_manage_key_detail_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -50,7 +50,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/key_name"
+                app:i18nKey='@{"key_name"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="parent"
@@ -62,7 +62,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_key_name"
+                app:i18nHint='@{"please_input_key_name"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -80,7 +80,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/key_nfc"
+                app:i18nKey='@{"key_nfc"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/key_code_tv"
@@ -92,7 +92,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_key_nfc"
+                app:i18nHint='@{"please_input_key_nfc"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -110,7 +110,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/key_mac"
+                app:i18nKey='@{"key_mac"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/key_nfc_tv"
@@ -122,7 +122,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_key_mac"
+                app:i18nHint='@{"please_input_key_mac"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:textColor="@color/black"
@@ -138,7 +138,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_filter_status"
+                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/key_mac_tv"
@@ -159,7 +159,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/normal"
+                    app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <RadioButton
@@ -167,7 +167,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/abnormal"
+                    app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/common_text_size" />
             </RadioGroup>
 
@@ -177,7 +177,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/remark"
+                app:i18nKey='@{"remark"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/status_tv"
@@ -189,7 +189,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_remark"
+                app:i18nHint='@{"please_input_remark"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:textColor="@color/black"
@@ -218,7 +218,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -233,7 +233,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 12 - 12
app/src/main/res/layout/dialog_update_lock.xml

@@ -22,7 +22,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/lock_manage_lock_detail_title"
+                app:i18nKey='@{"lock_manage_lock_detail_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -52,7 +52,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/lock_code"
+                app:i18nKey='@{"lock_code"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="parent"
@@ -64,7 +64,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_lock_code"
+                app:i18nHint='@{"please_input_lock_code"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
@@ -80,7 +80,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/lock_nfc"
+                app:i18nKey='@{"lock_nfc"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/lock_code_tv"
@@ -92,7 +92,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_lock_nfc"
+                app:i18nHint='@{"please_input_lock_nfc"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
@@ -108,7 +108,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_filter_status"
+                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/lock_nfc_tv"
@@ -129,7 +129,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/normal"
+                    app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <RadioButton
@@ -137,7 +137,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/abnormal"
+                    app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/common_text_size" />
             </RadioGroup>
 
@@ -147,7 +147,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/remark"
+                app:i18nKey='@{"remark"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/status_tv"
@@ -159,7 +159,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_remark"
+                app:i18nHint='@{"please_input_remark"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
@@ -188,7 +188,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -203,7 +203,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 13 - 13
app/src/main/res/layout/dialog_update_point.xml

@@ -21,7 +21,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/point_manage_update_title"
+                app:i18nKey='@{"point_manage_update_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -50,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dialog_content_normal_padding_horizontal"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/point_manage_point_name"
+                app:i18nKey='@{"point_manage_point_name"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintLeft_toLeftOf="parent"
@@ -65,7 +65,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
-                android:hint="@string/please_input_point_name"
+                app:i18nHint='@{"please_input_point_name"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -82,7 +82,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/point_manage_point_function"
+                app:i18nKey='@{"point_manage_point_function"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/point_name_tv_title"
@@ -97,7 +97,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
-                android:hint="@string/please_input_point_function"
+                app:i18nHint='@{"please_input_point_function"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -114,7 +114,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/point_manage_point_power_type"
+                app:i18nKey='@{"point_manage_point_power_type"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/function_tv"
@@ -130,7 +130,7 @@
                 android:background="@drawable/bg_common_input"
                 android:drawableRight="@mipmap/icon_drop_down"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
-                android:hint="@string/please_select_power_type"
+                app:i18nHint='@{"please_select_power_type"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -147,7 +147,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/point_manage_workstation"
+                app:i18nKey='@{"point_manage_workstation"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/power_type_tv_title"
@@ -163,7 +163,7 @@
                 android:background="@drawable/bg_common_input"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
                 android:drawableRight="@mipmap/icon_drop_down"
-                android:hint="@string/please_select_workstation"
+                app:i18nHint='@{"please_select_workstation"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -180,7 +180,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/point_manage_rfid_tag"
+                app:i18nKey='@{"point_manage_rfid_tag"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/workstation_tv_title"
@@ -195,7 +195,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
                 android:drawableRight="@mipmap/icon_drop_down"
-                android:hint="@string/please_select_rfid_token"
+                app:i18nHint='@{"please_select_rfid_token"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -229,7 +229,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -244,7 +244,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 12 - 12
app/src/main/res/layout/dialog_update_rfid_token.xml

@@ -22,7 +22,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/rfid_token_manage_rfid_token_detail_title"
+                app:i18nKey='@{"rfid_token_manage_rfid_token_detail_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -52,7 +52,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/rfid_code"
+                app:i18nKey='@{"rfid_code"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="parent"
@@ -64,7 +64,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_rfid_code"
+                app:i18nHint='@{"please_input_rfid_code"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
@@ -80,7 +80,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/rfid"
+                app:i18nKey='@{"rfid"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/rfid_code_tv"
@@ -92,7 +92,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_rfid"
+                app:i18nHint='@{"please_input_rfid"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
@@ -108,7 +108,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_filter_status"
+                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/rfid_tv"
@@ -129,7 +129,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/normal"
+                    app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <RadioButton
@@ -137,7 +137,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/abnormal"
+                    app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/common_text_size" />
             </RadioGroup>
 
@@ -147,7 +147,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/remark"
+                app:i18nKey='@{"remark"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/status_tv"
@@ -159,7 +159,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_remark"
+                app:i18nHint='@{"please_input_remark"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
@@ -188,7 +188,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -203,7 +203,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 13 - 13
app/src/main/res/layout/dialog_update_role.xml

@@ -21,7 +21,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/user_manage_filter_title"
+                app:i18nKey='@{"user_manage_filter_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -51,7 +51,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dialog_content_normal_padding_horizontal"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/role_manage_role_name"
+                app:i18nKey='@{"role_manage_role_name"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintLeft_toLeftOf="parent"
@@ -66,7 +66,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_role_name"
+                app:i18nHint='@{"please_input_role_name"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/normal_input_padding_horizontal"
                 android:paddingVertical="@dimen/normal_input_padding_vertical"
@@ -83,7 +83,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/role_manage_permission_string"
+                app:i18nKey='@{"role_manage_permission_string"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/role_name_tv"
@@ -98,7 +98,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_permission_characters"
+                app:i18nHint='@{"please_input_permission_characters"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/normal_input_padding_horizontal"
                 android:paddingVertical="@dimen/normal_input_padding_vertical"
@@ -115,7 +115,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_filter_status"
+                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/role_key_tv"
@@ -138,7 +138,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/normal_margin_left"
-                    android:text="@string/user_manage_filter_activate"
+                    app:i18nKey='@{"user_manage_filter_activate"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <RadioButton
@@ -146,7 +146,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/normal_margin_left"
-                    android:text="@string/user_manage_filter_deactivate"
+                    app:i18nKey='@{"user_manage_filter_deactivate"}'
                     android:textSize="@dimen/common_text_size" />
             </RadioGroup>
 
@@ -155,7 +155,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_role_function_permission"
+                app:i18nKey='@{"manage_role_function_permission"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/status_tv"
@@ -176,7 +176,7 @@
                     android:id="@+id/expand_collapse"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/expand_collapse"
+                    app:i18nKey='@{"expand_collapse"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size" />
 
@@ -185,7 +185,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/all_select_not_all_select"
+                    app:i18nKey='@{"all_select_not_all_select"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size" />
             </LinearLayout>
@@ -223,7 +223,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -238,7 +238,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 16 - 16
app/src/main/res/layout/dialog_update_user.xml

@@ -21,7 +21,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/user_manage_user_detail_title"
+                app:i18nKey='@{"user_manage_user_detail_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -50,7 +50,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/user_name"
+                app:i18nKey='@{"user_name"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintStart_toStartOf="parent"
@@ -62,7 +62,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_username"
+                app:i18nHint='@{"please_input_username"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -78,7 +78,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/nickname"
+                app:i18nKey='@{"nickname"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/username_tv"
@@ -90,7 +90,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_nickname"
+                app:i18nHint='@{"please_input_nickname"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -107,7 +107,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/user_manage_card_code"
+                app:i18nKey='@{"user_manage_card_code"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/nickname_tv"
@@ -119,7 +119,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_card_code"
+                app:i18nHint='@{"please_input_card_code"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
@@ -136,7 +136,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/user_manage_role"
+                app:i18nKey='@{"user_manage_role"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/card_code_tv"
@@ -149,7 +149,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
                 android:drawableRight="@mipmap/icon_drop_down"
-                android:hint="@string/please_select_role"
+                app:i18nHint='@{"please_select_role"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:textColor="@color/black"
@@ -166,7 +166,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/user_manage_area"
+                app:i18nKey='@{"user_manage_area"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/role_title_tv"
@@ -179,7 +179,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
                 android:drawableRight="@mipmap/icon_drop_down"
-                android:hint="@string/please_select_area"
+                app:i18nHint='@{"please_select_area"}'
                 android:paddingHorizontal="@dimen/common_spacing"
                 android:paddingVertical="2dp"
                 android:textColor="@color/black"
@@ -194,7 +194,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/manage_filter_status"
+                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/workstation_tv"
@@ -215,7 +215,7 @@
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/user_manage_filter_activate"
+                    app:i18nKey='@{"user_manage_filter_activate"}'
                     android:textSize="@dimen/common_text_size" />
 
                 <RadioButton
@@ -223,7 +223,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/user_manage_filter_deactivate"
+                    app:i18nKey='@{"user_manage_filter_deactivate"}'
                     android:textSize="@dimen/common_text_size" />
             </RadioGroup>
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -246,7 +246,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -261,7 +261,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 5 - 5
app/src/main/res/layout/dialog_update_workstation.xml

@@ -21,7 +21,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/workstation_manage_workstation_name"
+                app:i18nKey='@{"workstation_manage_workstation_name"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -55,7 +55,7 @@
                 <com.grkj.ui_base.widget.RequiredTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/workstation_manage_workstation_name"
+                    app:i18nKey='@{"workstation_manage_workstation_name"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size"
                     app:markPosition="end"
@@ -67,7 +67,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
-                    android:hint="@string/please_input_workstation_name"
+                    app:i18nHint='@{"please_input_workstation_name"}'
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
                     android:paddingVertical="2dp"
@@ -95,7 +95,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -110,7 +110,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 10 - 10
app/src/main/res/layout/fragment_card_manage.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/card_manage_title"
+                app:i18nKey='@{"card_manage_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -68,7 +68,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/insert"
+                app:i18nKey='@{"insert"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -80,7 +80,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/delete"
+                app:i18nKey='@{"delete"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -91,7 +91,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/reset"
+                app:i18nKey='@{"reset"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -107,7 +107,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/filter"
+                app:i18nKey='@{"filter"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -133,7 +133,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/card_code"
+                app:i18nKey='@{"card_code"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -141,7 +141,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/card_nfc"
+                app:i18nKey='@{"card_nfc"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -149,14 +149,14 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/username"
+                app:i18nKey='@{"username"}'
                 android:textSize="@dimen/common_text_size" />
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/detail"
+                app:i18nKey='@{"detail"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 

+ 26 - 25
app/src/main/res/layout/fragment_create_job.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -26,7 +27,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/create_job_title"
+                app:i18nKey='@{"create_job_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +44,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -80,7 +81,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_weight="1"
-                        android:text="@string/base_info_title"
+                        app:i18nKey='@{"base_info_title"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -101,7 +102,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/job_workstation"
+                            app:i18nKey='@{"job_workstation"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -112,7 +113,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_job_workstation"
+                            app:i18nHint='@{"please_select_job_workstation"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -132,7 +133,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/workflow_mode"
+                            app:i18nKey='@{"workflow_mode"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -143,7 +144,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_flow_mode"
+                            app:i18nHint='@{"please_select_flow_mode"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -164,7 +165,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/create_job_name"
+                            app:i18nKey='@{"create_job_name"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -174,7 +175,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:hint="@string/please_input_job_name"
+                            app:i18nHint='@{"please_input_job_name"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -212,7 +213,7 @@
                                 android:layout_gravity="center_vertical"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/workflow_mode"
+                                app:i18nKey='@{"workflow_mode"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -223,7 +224,7 @@
                                 android:layout_margin="@dimen/common_spacing"
                                 android:background="@drawable/common_btn"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                                android:text="@string/settings"
+                                app:i18nKey='@{"settings"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -253,7 +254,7 @@
                                 android:gravity="center"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/please_select_workflow_mode"
+                                app:i18nKey='@{"please_select_workflow_mode"}'
                                 android:textColor="@color/color_black50"
                                 android:textSize="@dimen/normal_text_size_18" />
                         </FrameLayout>
@@ -281,7 +282,7 @@
                                 android:layout_gravity="center_vertical"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/point_info_title"
+                                app:i18nKey='@{"point_info_title"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -292,7 +293,7 @@
                                 android:layout_margin="@dimen/common_spacing"
                                 android:background="@drawable/common_btn"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                                android:text="@string/select"
+                                app:i18nKey='@{"select"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -331,7 +332,7 @@
                                     android:gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/please_must_select_at_least_one_point"
+                                    app:i18nKey='@{"please_must_select_at_least_one_point"}'
                                     android:textColor="@color/color_black50"
                                     android:textSize="@dimen/normal_text_size_18" />
                             </LinearLayout>
@@ -360,7 +361,7 @@
                                 android:layout_gravity="center_vertical"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/member_info_title"
+                                app:i18nKey='@{"member_info_title"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -371,7 +372,7 @@
                                 android:layout_margin="@dimen/common_spacing"
                                 android:background="@drawable/common_btn"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                                android:text="@string/select"
+                                app:i18nKey='@{"select"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -405,7 +406,7 @@
                                         android:gravity="center"
                                         android:paddingHorizontal="@dimen/common_spacing_2x"
                                         android:paddingVertical="@dimen/common_spacing"
-                                        android:text="@string/locker"
+                                        app:i18nKey='@{"locker"}'
                                         android:textColor="@color/black"
                                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -437,7 +438,7 @@
                                         android:gravity="center"
                                         android:paddingHorizontal="@dimen/common_spacing_2x"
                                         android:paddingVertical="@dimen/common_spacing"
-                                        android:text="@string/colocker"
+                                        app:i18nKey='@{"colocker"}'
                                         android:textColor="@color/black"
                                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -473,7 +474,7 @@
                                     android:gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/please_select_member"
+                                    app:i18nKey='@{"please_select_member"}'
                                     android:textColor="@color/color_black50"
                                     android:textSize="@dimen/normal_text_size_18" />
                             </LinearLayout>
@@ -494,7 +495,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/save_sop_check"
+                app:i18nKey='@{"save_sop_check"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -514,7 +515,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/save_and_execute"
+                app:i18nKey='@{"save_and_execute"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -528,7 +529,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/save"
+                app:i18nKey='@{"save"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -543,7 +544,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:layout_marginRight="@dimen/common_spacing_2x"
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />

+ 24 - 23
app/src/main/res/layout/fragment_create_sop.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -26,7 +27,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/create_sop_title"
+                app:i18nKey='@{"create_sop_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +44,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -80,7 +81,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_weight="1"
-                        android:text="@string/base_info_title"
+                        app:i18nKey='@{"base_info_title"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -101,7 +102,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/sop_workstation"
+                            app:i18nKey='@{"sop_workstation"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -112,7 +113,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_sop_workstation"
+                            app:i18nHint='@{"please_select_sop_workstation"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -132,7 +133,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/workflow_mode"
+                            app:i18nKey='@{"workflow_mode"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -143,7 +144,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_flow_mode"
+                            app:i18nHint='@{"please_select_flow_mode"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -164,7 +165,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/create_sop_name"
+                            app:i18nKey='@{"create_sop_name"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -174,7 +175,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:hint="@string/please_input_sop_name"
+                            app:i18nHint='@{"please_input_sop_name"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -212,7 +213,7 @@
                                 android:layout_gravity="center_vertical"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/workflow_mode"
+                                app:i18nKey='@{"workflow_mode"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -225,7 +226,7 @@
                                 android:layout_marginRight="@dimen/common_spacing"
                                 android:background="@drawable/common_btn"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                                android:text="@string/settings"
+                                app:i18nKey='@{"settings"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -255,7 +256,7 @@
                                 android:gravity="center"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/please_select_workflow_mode"
+                                app:i18nKey='@{"please_select_workflow_mode"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
                         </FrameLayout>
@@ -283,7 +284,7 @@
                                 android:layout_gravity="center_vertical"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/point_info_title"
+                                app:i18nKey='@{"point_info_title"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -296,7 +297,7 @@
                                 android:layout_marginRight="@dimen/common_spacing"
                                 android:background="@drawable/common_btn"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                                android:text="@string/select"
+                                app:i18nKey='@{"select"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -335,7 +336,7 @@
                                     android:gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/please_must_select_at_least_one_point"
+                                    app:i18nKey='@{"please_must_select_at_least_one_point"}'
                                     android:textColor="@color/black50"
                                     android:textSize="@dimen/normal_text_size_18" />
                             </LinearLayout>
@@ -366,7 +367,7 @@
                                 android:layout_gravity="center_vertical"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/member_info_title"
+                                app:i18nKey='@{"member_info_title"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -379,7 +380,7 @@
                                 android:layout_marginRight="@dimen/common_spacing"
                                 android:background="@drawable/common_btn"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                                android:text="@string/select"
+                                app:i18nKey='@{"select"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -413,7 +414,7 @@
                                         android:gravity="center"
                                         android:paddingHorizontal="@dimen/common_spacing_2x"
                                         android:paddingVertical="@dimen/common_spacing"
-                                        android:text="@string/locker"
+                                        app:i18nKey='@{"locker"}'
                                         android:textColor="@color/black"
                                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -445,7 +446,7 @@
                                         android:gravity="center"
                                         android:paddingHorizontal="@dimen/common_spacing_2x"
                                         android:paddingVertical="@dimen/common_spacing"
-                                        android:text="@string/colocker"
+                                        app:i18nKey='@{"colocker"}'
                                         android:textColor="@color/black"
                                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -481,7 +482,7 @@
                                     android:gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/please_select_member"
+                                    app:i18nKey='@{"please_select_member"}'
                                     android:textColor="@color/black50"
                                     android:textSize="@dimen/normal_text_size_18" />
                             </LinearLayout>
@@ -511,7 +512,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -526,7 +527,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 22 - 22
app/src/main/res/layout/fragment_create_sop_job.xml

@@ -27,7 +27,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/create_sop_job_title"
+                app:i18nKey='@{"create_sop_job_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -44,7 +44,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -80,7 +80,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
-                        android:text="@string/base_info_title"
+                        app:i18nKey='@{"base_info_title"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -100,7 +100,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/common_spacing_2x"
-                            android:text="@string/sop_workstation"
+                            app:i18nKey='@{"sop_workstation"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size"
                             app:layout_constraintStart_toStartOf="parent"
@@ -113,7 +113,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_sop_workstation"
+                            app:i18nHint='@{"please_select_sop_workstation"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -130,7 +130,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/common_spacing_2x"
-                            android:text="@string/create_sop_job_sop"
+                            app:i18nKey='@{"create_sop_job_sop"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size"
                             app:layout_constraintEnd_toEndOf="@+id/sop_workstation_tv"
@@ -143,7 +143,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_sop"
+                            app:i18nHint='@{"please_select_sop"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -160,7 +160,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/common_spacing_2x"
-                            android:text="@string/job_name"
+                            app:i18nKey='@{"job_name"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size"
                             app:layout_constraintEnd_toEndOf="@+id/sop_title"
@@ -172,7 +172,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:hint="@string/please_input_job_name"
+                            app:i18nHint='@{"please_input_job_name"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -214,7 +214,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/workflow_mode"
+                                app:i18nKey='@{"workflow_mode"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -226,7 +226,7 @@
                                 android:layout_marginRight="@dimen/common_spacing"
                                 android:background="@drawable/common_btn"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                                android:text="@string/settings"
+                                app:i18nKey='@{"settings"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -256,7 +256,7 @@
                                 android:gravity="center"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/please_select_workflow_mode"
+                                app:i18nKey='@{"please_select_workflow_mode"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
                         </FrameLayout>
@@ -283,7 +283,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/point_info_title"
+                                app:i18nKey='@{"point_info_title"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -318,7 +318,7 @@
                                     android:gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/show_points_when_selected_sop"
+                                    app:i18nKey='@{"show_points_when_selected_sop"}'
                                     android:textColor="@color/black"
                                     android:textSize="@dimen/common_btn_text_size" />
                             </LinearLayout>
@@ -347,7 +347,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/member_info_title"
+                                app:i18nKey='@{"member_info_title"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -359,7 +359,7 @@
                                 android:layout_marginRight="@dimen/common_spacing"
                                 android:background="@drawable/common_btn"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                                android:text="@string/select"
+                                app:i18nKey='@{"select"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -393,7 +393,7 @@
                                         android:gravity="center"
                                         android:paddingHorizontal="@dimen/common_spacing_2x"
                                         android:paddingVertical="@dimen/common_spacing"
-                                        android:text="@string/locker"
+                                        app:i18nKey='@{"locker"}'
                                         android:textColor="@color/black"
                                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -425,7 +425,7 @@
                                         android:gravity="center"
                                         android:paddingHorizontal="@dimen/common_spacing_2x"
                                         android:paddingVertical="@dimen/common_spacing"
-                                        android:text="@string/colocker"
+                                        app:i18nKey='@{"colocker"}'
                                         android:textColor="@color/black"
                                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -456,7 +456,7 @@
                                     android:gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/show_member_when_selected_sop"
+                                    app:i18nKey='@{"show_member_when_selected_sop"}'
                                     android:textColor="@color/black"
                                     android:textSize="@dimen/common_btn_text_size" />
                             </LinearLayout>
@@ -485,7 +485,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/save_and_execute"
+                app:i18nKey='@{"save_and_execute"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -499,7 +499,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/save"
+                app:i18nKey='@{"save"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -514,7 +514,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:layout_marginRight="@dimen/common_spacing"
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />

+ 20 - 20
app/src/main/res/layout/fragment_edit_job.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/edit_job_title"
+                app:i18nKey='@{"edit_job_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -80,7 +80,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_weight="1"
-                        android:text="@string/base_info_title"
+                        app:i18nKey='@{"base_info_title"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -101,7 +101,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/job_workstation"
+                            app:i18nKey='@{"job_workstation"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -112,7 +112,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_job_workstation"
+                            app:i18nHint='@{"please_select_job_workstation"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -132,7 +132,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/workflow_mode"
+                            app:i18nKey='@{"workflow_mode"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -143,7 +143,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_flow_mode"
+                            app:i18nHint='@{"please_select_flow_mode"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -164,7 +164,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/create_job_name"
+                            app:i18nKey='@{"create_job_name"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -174,7 +174,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:hint="@string/please_input_job_name"
+                            app:i18nHint='@{"please_input_job_name"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -211,7 +211,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/workflow_mode"
+                                app:i18nKey='@{"workflow_mode"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -223,7 +223,7 @@
                                 android:layout_marginRight="@dimen/common_spacing"
                                 android:background="@drawable/common_btn"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                                android:text="@string/settings"
+                                app:i18nKey='@{"settings"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -268,7 +268,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/point_info_title"
+                                app:i18nKey='@{"point_info_title"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -280,7 +280,7 @@
                                 android:layout_marginRight="@dimen/common_spacing"
                                 android:background="@drawable/common_btn"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                                android:text="@string/select"
+                                app:i18nKey='@{"select"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -319,7 +319,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/member_info_title"
+                                app:i18nKey='@{"member_info_title"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -331,7 +331,7 @@
                                 android:layout_marginRight="@dimen/common_spacing"
                                 android:background="@drawable/common_btn"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                                android:text="@string/select"
+                                app:i18nKey='@{"select"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -362,7 +362,7 @@
                                     android:gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/locker"
+                                    app:i18nKey='@{"locker"}'
                                     android:textColor="@color/black"
                                     android:textSize="@dimen/normal_text_size_18" />
 
@@ -394,7 +394,7 @@
                                     android:gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/colocker"
+                                    app:i18nKey='@{"colocker"}'
                                     android:textColor="@color/black"
                                     android:textSize="@dimen/normal_text_size_18" />
 
@@ -438,7 +438,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/save_and_execute"
+                app:i18nKey='@{"save_and_execute"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -452,7 +452,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/save"
+                app:i18nKey='@{"save"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -467,7 +467,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:layout_marginRight="@dimen/common_spacing"
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />

+ 19 - 19
app/src/main/res/layout/fragment_edit_sop.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/edit_sop_title"
+                app:i18nKey='@{"edit_sop_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -80,7 +80,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_weight="1"
-                        android:text="@string/base_info_title"
+                        app:i18nKey='@{"base_info_title"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -101,7 +101,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/sop_workstation"
+                            app:i18nKey='@{"sop_workstation"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -112,7 +112,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_sop_workstation"
+                            app:i18nHint='@{"please_select_sop_workstation"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -132,7 +132,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/workflow_mode"
+                            app:i18nKey='@{"workflow_mode"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -143,7 +143,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_flow_mode"
+                            app:i18nHint='@{"please_select_flow_mode"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -164,7 +164,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/create_sop_name"
+                            app:i18nKey='@{"create_sop_name"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -174,7 +174,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:hint="@string/please_input_sop_name"
+                            app:i18nHint='@{"please_input_sop_name"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -211,7 +211,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/workflow_mode"
+                                app:i18nKey='@{"workflow_mode"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -223,7 +223,7 @@
                                 android:layout_marginRight="@dimen/common_spacing"
                                 android:background="@drawable/common_btn"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                                android:text="@string/settings"
+                                app:i18nKey='@{"settings"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -268,7 +268,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/point_info_title"
+                                app:i18nKey='@{"point_info_title"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -280,7 +280,7 @@
                                 android:layout_marginRight="@dimen/common_spacing"
                                 android:background="@drawable/common_btn"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                                android:text="@string/select"
+                                app:i18nKey='@{"select"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -320,7 +320,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/member_info_title"
+                                app:i18nKey='@{"member_info_title"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -332,7 +332,7 @@
                                 android:layout_marginRight="@dimen/common_spacing"
                                 android:background="@drawable/common_btn"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                                android:text="@string/select"
+                                app:i18nKey='@{"select"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -362,7 +362,7 @@
                                     android:gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/locker"
+                                    app:i18nKey='@{"locker"}'
                                     android:textColor="@color/black"
                                     android:textSize="@dimen/normal_text_size_18" />
 
@@ -394,7 +394,7 @@
                                     android:gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/colocker"
+                                    app:i18nKey='@{"colocker"}'
                                     android:textColor="@color/black"
                                     android:textSize="@dimen/normal_text_size_18" />
 
@@ -434,7 +434,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -449,7 +449,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 19 - 19
app/src/main/res/layout/fragment_edit_sop_job.xml

@@ -27,7 +27,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/edit_sop_job_title"
+                app:i18nKey='@{"edit_sop_job_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -44,7 +44,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -81,7 +81,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:layout_weight="1"
-                        android:text="@string/base_info_title"
+                        app:i18nKey='@{"base_info_title"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/normal_text_size_18" />
 
@@ -102,7 +102,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/common_spacing_2x"
-                            android:text="@string/sop_workstation"
+                            app:i18nKey='@{"sop_workstation"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size"
                             app:layout_constraintStart_toStartOf="parent"
@@ -115,7 +115,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_sop_workstation"
+                            app:i18nHint='@{"please_select_sop_workstation"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -132,7 +132,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/common_spacing_2x"
-                            android:text="@string/create_sop_job_sop"
+                            app:i18nKey='@{"create_sop_job_sop"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size"
                             app:layout_constraintEnd_toEndOf="@+id/sop_workstation_tv"
@@ -145,7 +145,7 @@
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
                             android:drawableRight="@mipmap/icon_drop_down"
-                            android:hint="@string/please_select_sop"
+                            app:i18nHint='@{"please_select_sop"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -162,7 +162,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/common_spacing_2x"
-                            android:text="@string/job_name"
+                            app:i18nKey='@{"job_name"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size"
                             app:layout_constraintEnd_toEndOf="@+id/sop_title"
@@ -174,7 +174,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/common_spacing"
                             android:background="@drawable/bg_common_input"
-                            android:hint="@string/please_input_job_name"
+                            app:i18nHint='@{"please_input_job_name"}'
                             android:maxLines="1"
                             android:paddingHorizontal="@dimen/common_spacing"
                             android:paddingVertical="2dp"
@@ -215,7 +215,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/workflow_mode"
+                                app:i18nKey='@{"workflow_mode"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -227,7 +227,7 @@
                                 android:layout_marginRight="@dimen/common_spacing"
                                 android:background="@drawable/common_btn"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                                android:text="@string/settings"
+                                app:i18nKey='@{"settings"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -272,7 +272,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/point_info_title"
+                                app:i18nKey='@{"point_info_title"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -312,7 +312,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginLeft="@dimen/common_spacing"
                                 android:layout_weight="1"
-                                android:text="@string/member_info_title"
+                                app:i18nKey='@{"member_info_title"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -324,7 +324,7 @@
                                 android:layout_marginRight="@dimen/common_spacing"
                                 android:background="@drawable/common_btn"
                                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                                android:text="@string/select"
+                                app:i18nKey='@{"select"}'
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/common_btn_text_size" />
                         </LinearLayout>
@@ -354,7 +354,7 @@
                                     android:gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/locker"
+                                    app:i18nKey='@{"locker"}'
                                     android:textColor="@color/black"
                                     android:textSize="@dimen/normal_text_size_18" />
 
@@ -386,7 +386,7 @@
                                     android:gravity="center"
                                     android:paddingHorizontal="@dimen/common_spacing_2x"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/colocker"
+                                    app:i18nKey='@{"colocker"}'
                                     android:textColor="@color/black"
                                     android:textSize="@dimen/normal_text_size_18" />
 
@@ -425,7 +425,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/save_and_execute"
+                app:i18nKey='@{"save_and_execute"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -439,7 +439,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/save"
+                app:i18nKey='@{"save"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -454,7 +454,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:layout_marginRight="@dimen/common_spacing"
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />

+ 11 - 11
app/src/main/res/layout/fragment_exception_detail.xml

@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/exception_detail_title"
+                app:i18nKey='@{"exception_detail_title"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -47,7 +47,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -74,7 +74,7 @@
 
                     <TextView
                         style="@style/TableCellKey"
-                        android:text="@string/exception_type" />
+                        app:i18nKey='@{"exception_type"}' />
 
                     <TextView
                         android:id="@+id/exception_type"
@@ -86,7 +86,7 @@
 
                     <TextView
                         style="@style/TableCellKey"
-                        android:text="@string/exception_source" />
+                        app:i18nKey='@{"exception_source"}' />
 
                     <TextView
                         android:id="@+id/exception_source"
@@ -98,7 +98,7 @@
 
                     <TextView
                         style="@style/TableCellKey"
-                        android:text="@string/exception_status" />
+                        app:i18nKey='@{"exception_status"}' />
 
                     <TextView
                         android:id="@+id/exception_status"
@@ -110,7 +110,7 @@
 
                     <TextView
                         style="@style/TableCellKey"
-                        android:text="@string/exception_reporter" />
+                        app:i18nKey='@{"exception_reporter"}' />
 
                     <TextView
                         android:id="@+id/exception_reporter"
@@ -122,7 +122,7 @@
 
                     <TextView
                         style="@style/TableCellKey"
-                        android:text="@string/exception_occurrence_time" />
+                        app:i18nKey='@{"exception_occurrence_time"}' />
 
                     <TextView
                         android:id="@+id/exception_occurrence_time"
@@ -134,7 +134,7 @@
 
                     <TextView
                         style="@style/TableCellKey"
-                        android:text="@string/exception_release_time" />
+                        app:i18nKey='@{"exception_release_time"}' />
 
                     <TextView
                         android:id="@+id/exception_release_time"
@@ -146,7 +146,7 @@
 
                     <TextView
                         style="@style/TableCellKey"
-                        android:text="@string/exception_description" />
+                        app:i18nKey='@{"exception_description"}' />
 
                     <TextView
                         android:id="@+id/exception_description"
@@ -174,7 +174,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel_exception"
+                app:i18nKey='@{"cancel_exception"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size"
                 android:visibility="gone" />
@@ -189,7 +189,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/handle_exception"
+                app:i18nKey='@{"handle_exception"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size"
                 android:visibility="gone" />

+ 15 - 15
app/src/main/res/layout/fragment_exception_job.xml

@@ -30,7 +30,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/exception_job_title"
+                app:i18nKey='@{"exception_job_title"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -48,7 +48,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -81,7 +81,7 @@
 
                         <TextView
                             style="@style/TableCellKey"
-                            android:text="@string/exception_job" />
+                            app:i18nKey='@{"exception_job"}' />
 
                         <TextView
                             android:id="@+id/exception_job"
@@ -93,7 +93,7 @@
 
                         <TextView
                             style="@style/TableCellKey"
-                            android:text="@string/exception_description" />
+                            app:i18nKey='@{"exception_description"}' />
 
                         <TextView
                             android:id="@+id/exception_description"
@@ -148,7 +148,7 @@
                             android:layout_centerVertical="true"
                             android:layout_toLeftOf="@+id/lock_iv"
                             android:gravity="center"
-                            android:text="@string/job_execute_tab_title_lock"
+                            app:i18nKey='@{"job_execute_tab_title_lock"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -185,7 +185,7 @@
                             android:layout_centerVertical="true"
                             android:layout_toLeftOf="@+id/colock_iv"
                             android:gravity="center"
-                            android:text="@string/job_execute_tab_title_colock"
+                            app:i18nKey='@{"job_execute_tab_title_colock"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -284,7 +284,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/point_name_tv"
+                                    app:i18nKey='@{"point_name_tv"}'
                                     android:textSize="@dimen/common_text_size" />
 
                                 <TextView
@@ -293,7 +293,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/point_manage_point_group"
+                                    app:i18nKey='@{"point_manage_point_group"}'
                                     android:textSize="@dimen/common_text_size" />
 
                                 <TextView
@@ -302,7 +302,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/point_manage_point_function"
+                                    app:i18nKey='@{"point_manage_point_function"}'
                                     android:textSize="@dimen/common_text_size" />
 
                                 <TextView
@@ -311,7 +311,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/lock_status"
+                                    app:i18nKey='@{"lock_status"}'
                                     android:textSize="@dimen/common_text_size" />
                             </LinearLayout>
 
@@ -345,7 +345,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/wait_to_colock"
+                                    app:i18nKey='@{"wait_to_colock"}'
                                     android:textSize="@dimen/common_text_size" />
 
                                 <TextView
@@ -355,7 +355,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/already_colock"
+                                    app:i18nKey='@{"already_colock"}'
                                     android:textSize="@dimen/common_text_size" />
 
                                 <TextView
@@ -365,7 +365,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/already_uncolock"
+                                    app:i18nKey='@{"already_uncolock"}'
                                     android:textSize="@dimen/common_text_size" />
                             </LinearLayout>
 
@@ -437,7 +437,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/common_spacing"
-                        android:text="@string/cancel_exception"
+                        app:i18nKey='@{"cancel_exception"}'
                         android:visibility="gone"
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size" />
@@ -453,7 +453,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/common_spacing"
-                        android:text="@string/handle_exception"
+                        app:i18nKey='@{"handle_exception"}'
                         android:visibility="gone"
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size" />

+ 6 - 6
app/src/main/res/layout/fragment_exception_job_manage.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/exception_job_title"
+                app:i18nKey='@{"exception_job_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -68,7 +68,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:paddingVertical="@dimen/common_spacing"
-                android:text="@string/job_name"
+                app:i18nKey='@{"job_name"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -77,7 +77,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:paddingVertical="@dimen/common_spacing"
-                android:text="@string/exception_reason"
+                app:i18nKey='@{"exception_reason"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -86,7 +86,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:paddingVertical="@dimen/common_spacing"
-                android:text="@string/status"
+                app:i18nKey='@{"status"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -95,7 +95,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:paddingVertical="@dimen/common_spacing"
-                android:text="@string/detail"
+                app:i18nKey='@{"detail"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
         <com.drake.statelayout.StateLayout

+ 8 - 8
app/src/main/res/layout/fragment_exception_manage.xml

@@ -27,7 +27,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/exception_manage_title"
+                app:i18nKey='@{"exception_manage_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -44,7 +44,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -69,7 +69,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/one_key_handle"
+                app:i18nKey='@{"one_key_handle"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -81,7 +81,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/one_key_cancel"
+                app:i18nKey='@{"one_key_cancel"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -107,7 +107,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/exception_type_header"
+                app:i18nKey='@{"exception_type_header"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -115,7 +115,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/exception_status_header"
+                app:i18nKey='@{"exception_status_header"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -123,14 +123,14 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/exception_occurrence_time_header"
+                app:i18nKey='@{"exception_occurrence_time_header"}'
                 android:textSize="@dimen/common_text_size" />
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/detail"
+                app:i18nKey='@{"detail"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 

+ 13 - 13
app/src/main/res/layout/fragment_exception_report.xml

@@ -28,7 +28,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/exception_report"
+                app:i18nKey='@{"exception_report"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -45,7 +45,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -71,7 +71,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:paddingVertical="@dimen/common_spacing_small"
-                android:text="@string/exception_info"
+                app:i18nKey='@{"exception_info"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_18" />
 
@@ -92,7 +92,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/common_spacing_2x"
-                    android:text="@string/exception_type_tv"
+                    app:i18nKey='@{"exception_type_tv"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size"
                     app:layout_constraintStart_toStartOf="parent"
@@ -107,7 +107,7 @@
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
                     android:drawableRight="@mipmap/icon_drop_down"
-                    android:hint="@string/please_select_exception_type"
+                    app:i18nHint='@{"please_select_exception_type"}'
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
                     android:paddingVertical="@dimen/common_spacing_small"
@@ -125,7 +125,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/common_spacing_2x"
-                    android:text="@string/exception_source_tv"
+                    app:i18nKey='@{"exception_source_tv"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size"
                     app:layout_constraintEnd_toEndOf="@+id/exception_type_tv"
@@ -140,7 +140,7 @@
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
                     android:drawableRight="@mipmap/icon_drop_down"
-                    android:hint="@string/please_select_exception_source"
+                    app:i18nHint='@{"please_select_exception_source"}'
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
                     android:paddingVertical="@dimen/common_spacing_small"
@@ -158,7 +158,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/common_spacing_2x"
-                    android:text="@string/exception_description_tv"
+                    app:i18nKey='@{"exception_description_tv"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size"
                     app:layout_constraintEnd_toEndOf="@+id/exception_source_tv"
@@ -173,7 +173,7 @@
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
                     android:drawableRight="@mipmap/icon_drop_down"
-                    android:hint="@string/please_select_exception_description"
+                    app:i18nHint='@{"please_select_exception_description"}'
                     android:paddingHorizontal="@dimen/common_spacing"
                     android:paddingVertical="@dimen/common_spacing_small"
                     android:textColor="@color/black"
@@ -189,7 +189,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/common_spacing_2x"
-                    android:text="@string/process_application_tv"
+                    app:i18nKey='@{"process_application_tv"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size"
                     app:layout_constraintEnd_toEndOf="@+id/exception_description_tv"
@@ -204,7 +204,7 @@
                     android:layout_marginLeft="@dimen/common_spacing"
                     android:background="@drawable/bg_common_input"
                     android:drawableRight="@mipmap/icon_drop_down"
-                    android:hint="@string/please_select_process_application"
+                    app:i18nHint='@{"please_select_process_application"}'
                     android:paddingHorizontal="@dimen/common_spacing"
                     android:paddingVertical="@dimen/common_spacing_small"
                     android:textColor="@color/black"
@@ -235,7 +235,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -250,7 +250,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 13 - 13
app/src/main/res/layout/fragment_home.xml

@@ -44,7 +44,7 @@
                 android:background="@drawable/common_btn_blue_bg"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
                 android:paddingVertical="@dimen/common_spacing"
-                android:text="@string/edit"
+                app:i18nKey='@{"edit"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -72,7 +72,7 @@
                     android:background="@color/home_card_title_bg"
                     android:paddingVertical="@dimen/common_spacing_small"
                     android:paddingLeft="@dimen/common_spacing"
-                    android:text="@string/home_realtime_data_title"
+                    app:i18nKey='@{"home_realtime_data_title"}'
                     android:textColor="@color/white"
                     android:textSize="@dimen/normal_text_size_18" />
 
@@ -92,7 +92,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/zone"
+                            app:i18nKey='@{"zone"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -119,7 +119,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/workflow_mode"
+                            app:i18nKey='@{"workflow_mode"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -161,7 +161,7 @@
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:text="@string/ongoing_job_tv"
+                            app:i18nKey='@{"ongoing_job_tv"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -193,7 +193,7 @@
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:text="@string/locked_points_tv"
+                            app:i18nKey='@{"locked_points_tv"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -225,7 +225,7 @@
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:text="@string/hardware_in_use_tv"
+                            app:i18nKey='@{"hardware_in_use_tv"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -259,7 +259,7 @@
                     android:background="@color/home_card_title_bg"
                     android:paddingVertical="@dimen/common_spacing_small"
                     android:paddingLeft="@dimen/common_spacing"
-                    android:text="@string/home_overview_data_title"
+                    app:i18nKey='@{"home_overview_data_title"}'
                     android:textColor="@color/white"
                     android:textSize="@dimen/normal_text_size_18" />
 
@@ -280,7 +280,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/time_frame_tv"
+                            app:i18nKey='@{"time_frame_tv"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -327,7 +327,7 @@
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/zone"
+                            app:i18nKey='@{"zone"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -370,7 +370,7 @@
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:text="@string/all_job_tv"
+                            app:i18nKey='@{"all_job_tv"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -402,7 +402,7 @@
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:text="@string/all_points_tv"
+                            app:i18nKey='@{"all_points_tv"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 
@@ -434,7 +434,7 @@
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:gravity="center"
-                            android:text="@string/all_hardware_tv"
+                            app:i18nKey='@{"all_hardware_tv"}'
                             android:textColor="@color/black"
                             android:textSize="22sp" />
 

+ 5 - 5
app/src/main/res/layout/fragment_in_progress_job_manage.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/in_progress_job_manage_title"
+                app:i18nKey='@{"in_progress_job_manage_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -68,7 +68,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:paddingVertical="@dimen/common_spacing"
-                android:text="@string/job_name"
+                app:i18nKey='@{"job_name"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -76,7 +76,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/status"
+                app:i18nKey='@{"status"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -84,7 +84,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/detail"
+                app:i18nKey='@{"detail"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 

+ 8 - 8
app/src/main/res/layout/fragment_init_card_registration.xml

@@ -32,7 +32,7 @@
                 android:layout_height="40dp"
                 android:background="@drawable/init_step_circle"
                 android:gravity="center"
-                android:text="@string/init_card_registration_step"
+                app:i18nKey='@{"init_card_registration_step"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/normal_text_size" />
 
@@ -41,7 +41,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/init_card_registration_step_tip"
+                app:i18nKey='@{"init_card_registration_step_tip"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size_big" />
         </LinearLayout>
@@ -52,7 +52,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/common_spacing"
             android:layout_marginTop="@dimen/common_spacing_2x"
-            android:text="@string/init_card_registration_step_hint"
+            app:i18nKey='@{"init_card_registration_step_hint"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_text_size"
             app:layout_constraintStart_toStartOf="@+id/step_title_layout"
@@ -75,7 +75,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="2"
                 android:gravity="center"
-                android:text="@string/recognized_card_rfid"
+                app:i18nKey='@{"recognized_card_rfid"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -83,7 +83,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/operation"
+                app:i18nKey='@{"operation"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 
@@ -107,7 +107,7 @@
             android:layout_marginBottom="100dp"
             android:background="@drawable/common_btn"
             android:paddingHorizontal="@dimen/common_spacing_2x"
-            android:text="@string/previous"
+            app:i18nKey='@{"previous"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_btn_text_size"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -130,7 +130,7 @@
             android:layout_marginBottom="100dp"
             android:background="@drawable/common_btn"
             android:paddingHorizontal="@dimen/common_spacing_2x"
-            android:text="@string/next"
+            app:i18nKey='@{"next"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_btn_text_size"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -145,7 +145,7 @@
             android:layout_marginTop="@dimen/common_spacing"
             android:layout_marginBottom="100dp"
             android:paddingHorizontal="@dimen/common_spacing_2x"
-            android:text="@string/ski_step"
+            app:i18nKey='@{"ski_step"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_btn_text_size"
             app:layout_constraintEnd_toEndOf="@+id/next_btn"

+ 7 - 7
app/src/main/res/layout/fragment_init_device_registration_key_and_lock.xml

@@ -25,7 +25,7 @@
                 android:layout_height="40dp"
                 android:background="@drawable/init_step_circle"
                 android:gravity="center"
-                android:text="@string/init_device_registration_key_and_lock_step"
+                app:i18nKey='@{"init_device_registration_key_and_lock_step"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/normal_text_size" />
 
@@ -34,7 +34,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/init_device_registration_key_and_lock_step_tip"
+                app:i18nKey='@{"init_device_registration_key_and_lock_step_tip"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size_big" />
         </LinearLayout>
@@ -45,7 +45,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/common_spacing"
             android:layout_marginTop="@dimen/common_spacing_2x"
-            android:text="@string/init_device_registration_key_and_lock_step_hint"
+            app:i18nKey='@{"init_device_registration_key_and_lock_step_hint"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_text_size"
             app:layout_constraintStart_toStartOf="@+id/step_title_layout"
@@ -57,7 +57,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/common_spacing"
             android:layout_marginTop="@dimen/common_spacing"
-            android:text="@string/init_device_registration_key_and_lock_step_hint"
+            app:i18nKey='@{"init_device_registration_key_and_lock_step_hint"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_text_size"
             android:visibility="gone"
@@ -90,7 +90,7 @@
             android:layout_marginBottom="100dp"
             android:background="@drawable/common_btn"
             android:paddingHorizontal="@dimen/common_spacing_2x"
-            android:text="@string/previous"
+            app:i18nKey='@{"previous"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_btn_text_size"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -113,7 +113,7 @@
             android:layout_marginBottom="100dp"
             android:background="@drawable/common_btn"
             android:paddingHorizontal="@dimen/common_spacing_2x"
-            android:text="@string/next"
+            app:i18nKey='@{"next"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_btn_text_size"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -128,7 +128,7 @@
             android:layout_marginTop="@dimen/common_spacing"
             android:layout_marginBottom="100dp"
             android:paddingHorizontal="@dimen/common_spacing_2x"
-            android:text="@string/re_recognize"
+            app:i18nKey='@{"re_recognize"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_btn_text_size"
             android:visibility="gone"

+ 8 - 8
app/src/main/res/layout/fragment_init_point_rfid_registration.xml

@@ -32,7 +32,7 @@
                 android:layout_height="40dp"
                 android:background="@drawable/init_step_circle"
                 android:gravity="center"
-                android:text="@string/init_point_rfid_registration_step"
+                app:i18nKey='@{"init_point_rfid_registration_step"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/normal_text_size" />
 
@@ -41,7 +41,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/init_point_rfid_registration_step_tip"
+                app:i18nKey='@{"init_point_rfid_registration_step_tip"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size_big" />
         </LinearLayout>
@@ -52,7 +52,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/common_spacing"
             android:layout_marginTop="@dimen/common_spacing_2x"
-            android:text="@string/init_point_rfid_registration_step_hint"
+            app:i18nKey='@{"init_point_rfid_registration_step_hint"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_text_size"
             app:layout_constraintStart_toStartOf="@+id/step_title_layout"
@@ -75,7 +75,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="2"
                 android:gravity="center"
-                android:text="@string/recognized_point_rfid"
+                app:i18nKey='@{"recognized_point_rfid"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -83,7 +83,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/operation"
+                app:i18nKey='@{"operation"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 
@@ -107,7 +107,7 @@
             android:layout_marginBottom="100dp"
             android:background="@drawable/common_btn"
             android:paddingHorizontal="@dimen/common_spacing_2x"
-            android:text="@string/previous"
+            app:i18nKey='@{"previous"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_btn_text_size"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -130,7 +130,7 @@
             android:layout_marginBottom="100dp"
             android:background="@drawable/common_btn"
             android:paddingHorizontal="@dimen/common_spacing_2x"
-            android:text="@string/next"
+            app:i18nKey='@{"next"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_btn_text_size"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -145,7 +145,7 @@
             android:layout_marginTop="@dimen/common_spacing"
             android:layout_marginBottom="100dp"
             android:paddingHorizontal="@dimen/common_spacing_2x"
-            android:text="@string/skip_and_complete"
+            app:i18nKey='@{"skip_and_complete"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_btn_text_size"
             app:layout_constraintEnd_toEndOf="@+id/next_btn"

+ 11 - 11
app/src/main/res/layout/fragment_init_set_admin_account.xml

@@ -26,7 +26,7 @@
                 android:layout_height="40dp"
                 android:background="@drawable/init_step_circle"
                 android:gravity="center"
-                android:text="@string/init_set_admin_account_step"
+                app:i18nKey='@{"init_set_admin_account_step"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/normal_text_size" />
 
@@ -35,7 +35,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/init_set_admin_account_step_tip"
+                app:i18nKey='@{"init_set_admin_account_step_tip"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size_big" />
         </LinearLayout>
@@ -46,7 +46,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/common_spacing"
             android:layout_marginTop="@dimen/common_spacing_2x"
-            android:text="@string/init_set_admin_account_step_hint"
+            app:i18nKey='@{"init_set_admin_account_step_hint"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_text_size"
             app:layout_constraintStart_toStartOf="@+id/step_title_layout"
@@ -57,7 +57,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_spacing_2x"
-            android:text="@string/admin_username"
+            app:i18nKey='@{"admin_username"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_text_size"
             app:layout_constraintStart_toStartOf="@+id/step_hint"
@@ -71,7 +71,7 @@
             android:layout_marginTop="@dimen/common_spacing"
             android:layout_marginRight="@dimen/common_spacing_7x"
             android:background="@drawable/bg_common_input"
-            android:hint="@string/please_input_admin_username"
+            app:i18nHint='@{"please_input_admin_username"}'
             android:maxLength="20"
             android:maxLines="1"
             android:paddingHorizontal="@dimen/common_spacing_1_5x"
@@ -88,7 +88,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_spacing"
-            android:text="@string/set_password"
+            app:i18nKey='@{"set_password"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_text_size"
             app:layout_constraintStart_toStartOf="@+id/admin_username_tv"
@@ -113,7 +113,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_password"
+                app:i18nHint='@{"please_input_password"}'
                 android:inputType="textPassword"
                 android:maxLength="20"
                 android:maxLines="1"
@@ -130,7 +130,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_spacing"
-            android:text="@string/repeat_password"
+            app:i18nKey='@{"repeat_password"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_text_size"
             app:layout_constraintStart_toStartOf="@+id/password_tv"
@@ -154,7 +154,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_repeat_password"
+                app:i18nHint='@{"please_input_repeat_password"}'
                 android:inputType="textPassword"
                 android:maxLength="20"
                 android:maxLines="1"
@@ -175,7 +175,7 @@
             android:layout_marginBottom="100dp"
             android:background="@drawable/common_btn"
             android:paddingHorizontal="@dimen/common_spacing_2x"
-            android:text="@string/previous"
+            app:i18nKey='@{"previous"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_btn_text_size"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -198,7 +198,7 @@
             android:layout_marginBottom="100dp"
             android:background="@drawable/common_btn"
             android:paddingHorizontal="@dimen/common_spacing_2x"
-            android:text="@string/next"
+            app:i18nKey='@{"next"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_btn_text_size"
             app:layout_constraintBottom_toBottomOf="parent"

+ 8 - 8
app/src/main/res/layout/fragment_init_set_remote_server.xml

@@ -25,7 +25,7 @@
                 android:layout_height="40dp"
                 android:background="@drawable/init_step_circle"
                 android:gravity="center"
-                android:text="@string/init_set_remote_server_step"
+                app:i18nKey='@{"init_set_remote_server_step"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/normal_text_size" />
 
@@ -34,7 +34,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/init_set_remote_server_step_tip"
+                app:i18nKey='@{"init_set_remote_server_step_tip"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size_big" />
         </LinearLayout>
@@ -45,7 +45,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/common_spacing"
             android:layout_marginTop="@dimen/common_spacing_2x"
-            android:text="@string/init_set_remote_server_step_hint"
+            app:i18nKey='@{"init_set_remote_server_step_hint"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_text_size"
             app:layout_constraintStart_toStartOf="@+id/step_title_layout"
@@ -56,7 +56,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_spacing_2x"
-            android:text="@string/server_address"
+            app:i18nKey='@{"server_address"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_text_size"
             app:layout_constraintStart_toStartOf="@+id/step_hint"
@@ -69,7 +69,7 @@
             android:layout_marginLeft="@dimen/common_spacing"
             android:layout_marginRight="@dimen/common_spacing_7x"
             android:background="@drawable/bg_common_input"
-            android:hint="@string/please_input_remote_server_address"
+            app:i18nHint='@{"please_input_remote_server_address"}'
             android:maxLines="1"
             android:paddingHorizontal="@dimen/common_spacing_1_5x"
             android:paddingVertical="2dp"
@@ -86,7 +86,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/common_spacing"
-            android:text="@string/restart_app_after_set"
+            app:i18nKey='@{"restart_app_after_set"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_text_size"
             app:layout_constraintBottom_toTopOf="@+id/confirm"
@@ -102,7 +102,7 @@
             android:layout_marginBottom="100dp"
             android:background="@drawable/common_btn"
             android:paddingHorizontal="@dimen/common_spacing_2x"
-            android:text="@string/confirm"
+            app:i18nKey='@{"confirm"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_btn_text_size"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -126,7 +126,7 @@
             android:layout_marginBottom="100dp"
             android:background="@drawable/common_btn"
             android:paddingHorizontal="@dimen/common_spacing_2x"
-            android:text="@string/change_to_standard"
+            app:i18nKey='@{"change_to_standard"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_btn_text_size"
             app:layout_constraintBottom_toBottomOf="parent"

+ 4 - 4
app/src/main/res/layout/fragment_init_welcome.xml

@@ -13,7 +13,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginLeft="@dimen/init_margin_space"
             android:layout_marginTop="@dimen/init_margin_space"
-            android:text="@string/welcome_tip"
+            app:i18nKey='@{"welcome_tip"}'
             android:textColor="@color/black"
             android:textSize="@dimen/login_sub_title_text_size"
             android:textStyle="bold" />
@@ -39,7 +39,7 @@
             android:layout_alignLeft="@+id/title_cn"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="@dimen/login_sub_title_margin_top"
-            android:text="@string/loto_en"
+            app:i18nKey='@{"loto_en"}'
             android:textColor="@color/black"
             android:textSize="@dimen/login_sub_title_text_size"
             android:textStyle="bold" />
@@ -53,7 +53,7 @@
             android:layout_centerHorizontal="true"
             android:layout_marginBottom="@dimen/common_spacing_2x"
             android:textSize="@dimen/common_btn_text_size"
-            android:text="@string/start_tip" />
+            app:i18nKey='@{"start_tip"}' />
 
         <TextView
             android:id="@+id/start_btn"
@@ -64,7 +64,7 @@
             android:layout_marginBottom="100dp"
             android:background="@drawable/common_btn"
             android:paddingHorizontal="@dimen/common_spacing_2x"
-            android:text="@string/start"
+            app:i18nKey='@{"start"}'
             android:textColor="@color/black"
             android:textSize="@dimen/common_btn_text_size" />
     </RelativeLayout>

+ 15 - 15
app/src/main/res/layout/fragment_job_execute.xml

@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/job_execute_title"
+                app:i18nKey='@{"job_execute_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -46,7 +46,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -112,7 +112,7 @@
                             android:layout_centerVertical="true"
                             android:layout_toLeftOf="@+id/lock_iv"
                             android:gravity="center"
-                            android:text="@string/job_execute_tab_title_lock"
+                            app:i18nKey='@{"job_execute_tab_title_lock"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -149,7 +149,7 @@
                             android:layout_centerVertical="true"
                             android:layout_toLeftOf="@+id/colock_iv"
                             android:gravity="center"
-                            android:text="@string/job_execute_tab_title_colock"
+                            app:i18nKey='@{"job_execute_tab_title_colock"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size" />
 
@@ -235,7 +235,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/point_name_tv"
+                                    app:i18nKey='@{"point_name_tv"}'
                                     android:textSize="@dimen/common_text_size" />
 
                                 <TextView
@@ -244,7 +244,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/point_manage_point_group"
+                                    app:i18nKey='@{"point_manage_point_group"}'
                                     android:textSize="@dimen/common_text_size" />
 
                                 <TextView
@@ -253,7 +253,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/point_manage_point_function"
+                                    app:i18nKey='@{"point_manage_point_function"}'
                                     android:textSize="@dimen/common_text_size" />
 
                                 <TextView
@@ -262,7 +262,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/lock_status"
+                                    app:i18nKey='@{"lock_status"}'
                                     android:textSize="@dimen/common_text_size" />
                             </LinearLayout>
 
@@ -296,7 +296,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/wait_to_colock"
+                                    app:i18nKey='@{"wait_to_colock"}'
                                     android:textSize="@dimen/common_text_size" />
 
                                 <TextView
@@ -306,7 +306,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/already_colock"
+                                    app:i18nKey='@{"already_colock"}'
                                     android:textSize="@dimen/common_text_size" />
 
                                 <TextView
@@ -316,7 +316,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:paddingVertical="@dimen/common_spacing"
-                                    android:text="@string/already_uncolock"
+                                    app:i18nKey='@{"already_uncolock"}'
                                     android:textSize="@dimen/common_text_size" />
                             </LinearLayout>
 
@@ -389,7 +389,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/common_spacing"
-                        android:text="@string/go_locking"
+                        app:i18nKey='@{"go_locking"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         android:visibility="gone" />
@@ -406,7 +406,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/common_spacing"
-                        android:text="@string/go_unlocking"
+                        app:i18nKey='@{"go_unlocking"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         android:visibility="gone" />
@@ -423,7 +423,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/common_spacing"
-                        android:text="@string/cancel_job"
+                        app:i18nKey='@{"cancel_job"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         android:visibility="gone" />
@@ -440,7 +440,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/common_spacing"
-                        android:text="@string/finish_the_job"
+                        app:i18nKey='@{"finish_the_job"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         android:visibility="gone" />

+ 6 - 6
app/src/main/res/layout/fragment_job_manage.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/job_manage_title"
+                app:i18nKey='@{"job_manage_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -67,7 +67,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/delete"
+                app:i18nKey='@{"delete"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -93,7 +93,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/job_name"
+                app:i18nKey='@{"job_name"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -101,7 +101,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/status"
+                app:i18nKey='@{"status"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -109,7 +109,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/detail"
+                app:i18nKey='@{"detail"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 

+ 10 - 10
app/src/main/res/layout/fragment_key_manage.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/key_manage_title"
+                app:i18nKey='@{"key_manage_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -68,7 +68,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/insert"
+                app:i18nKey='@{"insert"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -80,7 +80,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/delete"
+                app:i18nKey='@{"delete"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -91,7 +91,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/reset"
+                app:i18nKey='@{"reset"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -107,7 +107,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/filter"
+                app:i18nKey='@{"filter"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -133,7 +133,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/key_name"
+                app:i18nKey='@{"key_name"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -141,7 +141,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/key_nfc"
+                app:i18nKey='@{"key_nfc"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -149,14 +149,14 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/key_mac"
+                app:i18nKey='@{"key_mac"}'
                 android:textSize="@dimen/common_text_size" />
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/detail"
+                app:i18nKey='@{"detail"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 

+ 10 - 10
app/src/main/res/layout/fragment_lock_manage.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/lock_manage_title"
+                app:i18nKey='@{"lock_manage_title"}'
                 android:textStyle="bold"
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -68,7 +68,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/insert"
+                app:i18nKey='@{"insert"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -80,7 +80,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/delete"
+                app:i18nKey='@{"delete"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -91,7 +91,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/reset"
+                app:i18nKey='@{"reset"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -107,7 +107,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/filter"
+                app:i18nKey='@{"filter"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -133,7 +133,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/lock_name"
+                app:i18nKey='@{"lock_name"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -141,7 +141,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/lock_nfc"
+                app:i18nKey='@{"lock_nfc"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -149,14 +149,14 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/status"
+                app:i18nKey='@{"status"}'
                 android:textSize="@dimen/common_text_size" />
             <TextView
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/detail"
+                app:i18nKey='@{"detail"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 

+ 5 - 5
app/src/main/res/layout/fragment_locked_point.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/locked_points_title"
+                app:i18nKey='@{"locked_points_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -67,7 +67,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/point_manage_point_name"
+                app:i18nKey='@{"point_manage_point_name"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -75,7 +75,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/job_name"
+                app:i18nKey='@{"job_name"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -83,7 +83,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/job_status"
+                app:i18nKey='@{"job_status"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 

+ 4 - 4
app/src/main/res/layout/fragment_my_todo_list.xml

@@ -27,7 +27,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/my_todo_title"
+                app:i18nKey='@{"my_todo_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -44,7 +44,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -82,7 +82,7 @@
                     android:id="@+id/handle_time_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/handle_time"
+                    app:i18nKey='@{"handle_time"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size"
                     android:layout_marginTop="@dimen/common_spacing"
@@ -99,7 +99,7 @@
                     android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
                     android:background="@drawable/bg_common_input"
                     android:drawableRight="@mipmap/icon_drop_down"
-                    android:hint="@string/please_select_handle_time"
+                    app:i18nHint='@{"please_select_handle_time"}'
                     android:maxLines="1"
                     android:paddingHorizontal="@dimen/common_spacing"
                     android:paddingVertical="2dp"

+ 9 - 9
app/src/main/res/layout/fragment_point_manage.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/point_manage_title"
+                app:i18nKey='@{"point_manage_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -68,7 +68,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/insert"
+                app:i18nKey='@{"insert"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -80,7 +80,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/delete"
+                app:i18nKey='@{"delete"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -91,7 +91,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/reset"
+                app:i18nKey='@{"reset"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -107,7 +107,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/filter"
+                app:i18nKey='@{"filter"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -133,7 +133,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/point_manage_point_name"
+                app:i18nKey='@{"point_manage_point_name"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -141,7 +141,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/point_manage_point_function"
+                app:i18nKey='@{"point_manage_point_function"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -149,7 +149,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/point_manage_workstation"
+                app:i18nKey='@{"point_manage_workstation"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 

+ 10 - 10
app/src/main/res/layout/fragment_reset_password.xml

@@ -28,7 +28,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/reset_password_title"
+                app:i18nKey='@{"reset_password_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -45,7 +45,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -67,7 +67,7 @@
                 android:id="@+id/old_password_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/old_password"
+                app:i18nKey='@{"old_password"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/end_line"
@@ -79,7 +79,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_old_password"
+                app:i18nHint='@{"please_input_old_password"}'
                 android:inputType="textPassword"
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
@@ -96,7 +96,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing"
-                android:text="@string/new_password"
+                app:i18nKey='@{"new_password"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/end_line"
@@ -108,7 +108,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_new_password"
+                app:i18nHint='@{"please_input_new_password"}'
                 android:inputType="textPassword"
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
@@ -126,7 +126,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing"
-                android:text="@string/repeat_new_password"
+                app:i18nKey='@{"repeat_new_password"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size"
                 app:layout_constraintEnd_toEndOf="@+id/end_line"
@@ -139,7 +139,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/common_spacing"
                 android:background="@drawable/bg_common_input"
-                android:hint="@string/please_input_repeat_new_password"
+                app:i18nHint='@{"please_input_repeat_new_password"}'
                 android:inputType="textPassword"
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/common_spacing"
@@ -180,7 +180,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -195,7 +195,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 10 - 10
app/src/main/res/layout/fragment_rfid_token_manage.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/rfid_token_manage_title"
+                app:i18nKey='@{"rfid_token_manage_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -68,7 +68,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/insert"
+                app:i18nKey='@{"insert"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -80,7 +80,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/delete"
+                app:i18nKey='@{"delete"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -91,7 +91,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/reset"
+                app:i18nKey='@{"reset"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -107,7 +107,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/filter"
+                app:i18nKey='@{"filter"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -133,7 +133,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/rfid_name"
+                app:i18nKey='@{"rfid_name"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -141,7 +141,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/rfid"
+                app:i18nKey='@{"rfid"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -149,7 +149,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/status"
+                app:i18nKey='@{"status"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -157,7 +157,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/detail"
+                app:i18nKey='@{"detail"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 

+ 9 - 9
app/src/main/res/layout/fragment_role_manage.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/role_manage_title"
+                app:i18nKey='@{"role_manage_title"}'
                 android:textColor="@color/black"
                 android:textStyle="bold"
                 android:textSize="@dimen/normal_text_size_25" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -68,7 +68,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/insert"
+                app:i18nKey='@{"insert"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -80,7 +80,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/delete"
+                app:i18nKey='@{"delete"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -91,7 +91,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/reset"
+                app:i18nKey='@{"reset"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -107,7 +107,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/filter"
+                app:i18nKey='@{"filter"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -133,7 +133,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/role_manage_role_num"
+                app:i18nKey='@{"role_manage_role_num"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -141,7 +141,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/role_manage_role_name"
+                app:i18nKey='@{"role_manage_role_name"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -149,7 +149,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/role_manage_permission_string"
+                app:i18nKey='@{"role_manage_permission_string"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 

+ 9 - 9
app/src/main/res/layout/fragment_select_memeber.xml

@@ -27,7 +27,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/create_sop_title"
+                app:i18nKey='@{"create_sop_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -48,7 +48,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/select_member_title"
+                app:i18nKey='@{"select_member_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -70,7 +70,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -118,7 +118,7 @@
                             android:gravity="center"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
                             android:paddingVertical="@dimen/common_spacing"
-                            android:text="@string/locker"
+                            app:i18nKey='@{"locker"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -155,7 +155,7 @@
                             android:gravity="center"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
                             android:paddingVertical="@dimen/common_spacing"
-                            android:text="@string/colocker"
+                            app:i18nKey='@{"colocker"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/normal_text_size_18" />
 
@@ -167,7 +167,7 @@
                             android:background="@drawable/bg_select_member_btn"
                             android:paddingHorizontal="@dimen/common_spacing_2x"
                             android:paddingVertical="@dimen/common_spacing_small"
-                            android:text="@string/select"
+                            app:i18nKey='@{"select"}'
                             android:textColor="@color/white"
                             android:textSize="@dimen/common_btn_text_size" />
                     </LinearLayout>
@@ -186,7 +186,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/common_spacing_2x"
                 android:layout_marginTop="@dimen/common_spacing_2x"
-                android:text="@string/select_colocker_tip"
+                app:i18nKey='@{"select_colocker_tip"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_text_size" />
 
@@ -218,7 +218,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -233,7 +233,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 8 - 8
app/src/main/res/layout/fragment_select_point.xml

@@ -27,7 +27,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/create_sop_title"
+                app:i18nKey='@{"create_sop_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -48,7 +48,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/select_point_title"
+                app:i18nKey='@{"select_point_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -70,7 +70,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -107,7 +107,7 @@
                         android:drawablePadding="@dimen/common_spacing"
                         android:gravity="center_vertical"
                         android:textColor="@color/black"
-                        android:text="@string/select_group_tip"
+                        app:i18nKey='@{"select_group_tip"}'
                         android:textSize="@dimen/common_text_size" />
 
                     <View
@@ -126,7 +126,7 @@
                         android:drawablePadding="@dimen/common_spacing"
                         android:gravity="center"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
-                        android:text="@string/add_group"
+                        app:i18nKey='@{"add_group"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/common_btn_text_size" />
                 </LinearLayout>
@@ -152,7 +152,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/common_spacing"
-                    android:text="@string/point_list_title"
+                    app:i18nKey='@{"point_list_title"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/normal_text_size_18" />
 
@@ -188,7 +188,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -203,7 +203,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 9 - 9
app/src/main/res/layout/fragment_set_face.xml

@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/set_face_title"
+                app:i18nKey='@{"set_face_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -46,7 +46,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -146,7 +146,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/detect_face_tip"
+                                app:i18nKey='@{"detect_face_tip"}'
                                 android:gravity="center"
                                 android:textColor="@color/dialogxColorBlue"
                                 android:textSize="@dimen/common_text_size_big"
@@ -163,7 +163,7 @@
                                 android:layout_marginBottom="@dimen/common_spacing"
                                 android:gravity="center"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/only_one_person_allowed"
+                                app:i18nKey='@{"only_one_person_allowed"}'
                                 android:textColor="@color/common_status_red"
                                 android:textSize="@dimen/common_text_size_big"
                                 android:visibility="gone"
@@ -203,7 +203,7 @@
                         <TextView
                             style="@style/CommonTextView"
                             android:layout_marginLeft="@dimen/common_spacing_small"
-                            android:text="@string/capture_tip_title"
+                            app:i18nKey='@{"capture_tip_title"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size_small" />
                     </LinearLayout>
@@ -212,7 +212,7 @@
                         style="@style/CommonTextView"
                         android:layout_marginTop="@dimen/common_spacing"
                         android:gravity="left"
-                        android:text="@string/capture_tip_content"
+                        app:i18nKey='@{"capture_tip_content"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/common_text_size_small" />
                 </LinearLayout>
@@ -232,7 +232,7 @@
                         android:drawableTint="@color/white"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:paddingVertical="@dimen/common_spacing"
-                        android:text="@string/confirm"
+                        app:i18nKey='@{"confirm"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         android:visibility="gone"
@@ -252,7 +252,7 @@
                         android:drawableTint="@color/white"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:paddingVertical="@dimen/common_spacing"
-                        android:text="@string/recapture"
+                        app:i18nKey='@{"recapture"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         android:visibility="gone"
@@ -271,7 +271,7 @@
                         android:drawableTint="@color/white"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:paddingVertical="@dimen/common_spacing"
-                        android:text="@string/cancel"
+                        app:i18nKey='@{"cancel"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         app:layout_constraintEnd_toEndOf="parent"

+ 6 - 6
app/src/main/res/layout/fragment_set_fingerprint.xml

@@ -27,7 +27,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/set_fingerprint_title"
+                app:i18nKey='@{"set_fingerprint_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -44,7 +44,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -69,7 +69,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/insert"
+                app:i18nKey='@{"insert"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -81,7 +81,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/delete"
+                app:i18nKey='@{"delete"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -108,7 +108,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/fingerprint_code"
+                app:i18nKey='@{"fingerprint_code"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -116,7 +116,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/operation"
+                app:i18nKey='@{"operation"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 

+ 4 - 4
app/src/main/res/layout/fragment_set_job_card.xml

@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/set_job_card_title"
+                app:i18nKey='@{"set_job_card_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -46,7 +46,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -128,7 +128,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/common_spacing"
-                    android:text="@string/job_card_scan_tip"
+                    app:i18nKey='@{"job_card_scan_tip"}'
                     android:textColor="@color/black"
                     android:textSize="@dimen/common_text_size" />
 
@@ -143,7 +143,7 @@
                     android:drawableTint="@color/white"
                     android:paddingHorizontal="@dimen/common_spacing_2x"
                     android:paddingVertical="@dimen/common_spacing"
-                    android:text="@string/cancel"
+                    app:i18nKey='@{"cancel"}'
                     android:textColor="@color/white"
                     android:textSize="@dimen/common_btn_text_size" />
             </LinearLayout>

+ 3 - 3
app/src/main/res/layout/fragment_slots_manage.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/slots_manage_title"
+                app:i18nKey='@{"slots_manage_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -68,7 +68,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@color/white"
-                android:text="@string/loading_device"
+                app:i18nKey='@{"loading_device"}'
                 android:textSize="@dimen/common_text_size_big"
                 android:textStyle="bold"
                 android:gravity="center"/>

+ 6 - 6
app/src/main/res/layout/fragment_sop_manage.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/sop_manage_title"
+                app:i18nKey='@{"sop_manage_title"}'
                 android:textColor="@color/black"
                 android:textStyle="bold"
                 android:textSize="@dimen/normal_text_size_25" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -67,7 +67,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/delete"
+                app:i18nKey='@{"delete"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -93,7 +93,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/sop_manage_sop_name"
+                app:i18nKey='@{"sop_manage_sop_name"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -101,7 +101,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/sop_manage_workstation"
+                app:i18nKey='@{"sop_manage_workstation"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -109,7 +109,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/detail"
+                app:i18nKey='@{"detail"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 

+ 16 - 16
app/src/main/res/layout/fragment_user_info.xml

@@ -28,7 +28,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/user_info_title"
+                app:i18nKey='@{"user_info_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -45,7 +45,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -91,7 +91,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/common_spacing"
-                        android:text="@string/user_name"
+                        app:i18nKey='@{"user_name"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/common_text_size"
                         app:layout_constraintStart_toStartOf="parent"
@@ -119,7 +119,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/common_spacing"
-                        android:text="@string/nickname"
+                        app:i18nKey='@{"nickname"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/common_text_size"
                         app:layout_constraintEnd_toEndOf="@+id/username_tv"
@@ -131,7 +131,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:background="@drawable/bg_common_input"
-                        android:hint="@string/please_input_nickname"
+                        app:i18nHint='@{"please_input_nickname"}'
                         android:maxLines="1"
                         android:paddingHorizontal="@dimen/common_spacing"
                         android:paddingVertical="2dp"
@@ -148,7 +148,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/common_spacing"
-                        android:text="@string/phone"
+                        app:i18nKey='@{"phone"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/common_text_size"
                         app:layout_constraintEnd_toEndOf="@+id/nickname_tv"
@@ -160,7 +160,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/common_spacing"
                         android:background="@drawable/bg_common_input"
-                        android:hint="@string/please_input_phone"
+                        app:i18nHint='@{"please_input_phone"}'
                         android:maxLines="1"
                         android:paddingHorizontal="@dimen/common_spacing"
                         android:paddingVertical="2dp"
@@ -200,7 +200,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
-                        android:text="@string/confirm"
+                        app:i18nKey='@{"confirm"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size" />
 
@@ -215,7 +215,7 @@
                         android:gravity="center"
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
-                        android:text="@string/cancel"
+                        app:i18nKey='@{"cancel"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size" />
                 </LinearLayout>
@@ -264,7 +264,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/detect_face_tip"
+                                app:i18nKey='@{"detect_face_tip"}'
                                 android:gravity="center"
                                 android:textColor="@color/dialogxColorBlue"
                                 android:textSize="@dimen/common_text_size_big"
@@ -281,7 +281,7 @@
                                 android:layout_marginBottom="@dimen/common_spacing"
                                 android:gravity="center"
                                 android:paddingVertical="@dimen/common_spacing"
-                                android:text="@string/only_one_person_allowed"
+                                app:i18nKey='@{"only_one_person_allowed"}'
                                 android:textColor="@color/common_status_red"
                                 android:textSize="@dimen/common_text_size_big"
                                 android:visibility="gone"
@@ -321,7 +321,7 @@
                         <TextView
                             style="@style/CommonTextView"
                             android:layout_marginLeft="@dimen/common_spacing_small"
-                            android:text="@string/capture_tip_title"
+                            app:i18nKey='@{"capture_tip_title"}'
                             android:textColor="@color/black"
                             android:textSize="@dimen/common_text_size_small" />
                     </LinearLayout>
@@ -330,7 +330,7 @@
                         style="@style/CommonTextView"
                         android:layout_marginTop="@dimen/common_spacing"
                         android:gravity="left"
-                        android:text="@string/capture_tip_content"
+                        app:i18nKey='@{"capture_tip_content"}'
                         android:textColor="@color/black"
                         android:textSize="@dimen/common_text_size_small" />
                 </LinearLayout>
@@ -350,7 +350,7 @@
                         android:drawableTint="@color/white"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:paddingVertical="@dimen/common_spacing"
-                        android:text="@string/confirm"
+                        app:i18nKey='@{"confirm"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         android:visibility="gone"
@@ -370,7 +370,7 @@
                         android:drawableTint="@color/white"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:paddingVertical="@dimen/common_spacing"
-                        android:text="@string/recapture"
+                        app:i18nKey='@{"recapture"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         android:visibility="gone"
@@ -389,7 +389,7 @@
                         android:drawableTint="@color/white"
                         android:paddingHorizontal="@dimen/common_spacing_2x"
                         android:paddingVertical="@dimen/common_spacing"
-                        android:text="@string/cancel"
+                        app:i18nKey='@{"cancel"}'
                         android:textColor="@color/white"
                         android:textSize="@dimen/common_btn_text_size"
                         app:layout_constraintEnd_toEndOf="parent"

+ 9 - 9
app/src/main/res/layout/fragment_user_manage.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/user_manage_title"
+                app:i18nKey='@{"user_manage_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -68,7 +68,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/insert"
+                app:i18nKey='@{"insert"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -80,7 +80,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/delete"
+                app:i18nKey='@{"delete"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -92,7 +92,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/reset"
+                app:i18nKey='@{"reset"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -108,7 +108,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/filter"
+                app:i18nKey='@{"filter"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -134,7 +134,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/nickname"
+                app:i18nKey='@{"nickname"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -142,7 +142,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/user_manage_card_code"
+                app:i18nKey='@{"user_manage_card_code"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -150,7 +150,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="@string/user_manage_role"
+                app:i18nKey='@{"user_manage_role"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 

+ 8 - 8
app/src/main/res/layout/fragment_workflow_manage.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/workflow_manage_title"
+                app:i18nKey='@{"workflow_manage_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -67,7 +67,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/delete"
+                app:i18nKey='@{"delete"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size"
                 android:visibility="gone" />
@@ -79,7 +79,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/import_str"
+                app:i18nKey='@{"import_str"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -107,7 +107,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:paddingVertical="@dimen/common_spacing"
-                android:text="@string/workflow_name"
+                app:i18nKey='@{"workflow_name"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -116,7 +116,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:paddingVertical="@dimen/common_spacing"
-                android:text="@string/status"
+                app:i18nKey='@{"status"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -125,7 +125,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:paddingVertical="@dimen/common_spacing"
-                android:text="@string/detail"
+                app:i18nKey='@{"detail"}'
                 android:textSize="@dimen/common_text_size" />
 
             <TextView
@@ -134,7 +134,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:paddingVertical="@dimen/common_spacing"
-                android:text="@string/operation"
+                app:i18nKey='@{"operation"}'
                 android:textSize="@dimen/common_text_size" />
         </LinearLayout>
 

+ 18 - 18
app/src/main/res/layout/fragment_workflow_setting.xml

@@ -29,7 +29,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/create_sop_title"
+                app:i18nKey='@{"create_sop_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -50,7 +50,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
-                android:text="@string/workflow_setting"
+                app:i18nKey='@{"workflow_setting"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -72,7 +72,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -118,7 +118,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginVertical="@dimen/common_spacing_2x"
-                        android:text="@string/workflow_step_title"
+                        app:i18nKey='@{"workflow_step_title"}'
                         android:textSize="@dimen/normal_text_size_18"
                         android:textStyle="bold"
                         app:layout_constraintEnd_toEndOf="@+id/barrier_title_end"
@@ -132,7 +132,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginHorizontal="@dimen/common_spacing"
                         android:background="@drawable/bg_common_input"
-                        android:hint="@string/please_input_step_title"
+                        app:i18nHint='@{"please_input_step_title"}'
                         android:maxLines="1"
                         android:paddingHorizontal="@dimen/common_spacing"
                         android:paddingVertical="5dp"
@@ -149,7 +149,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginVertical="@dimen/common_spacing_2x"
-                        android:text="@string/workflow_step_title_short"
+                        app:i18nKey='@{"workflow_step_title_short"}'
                         android:textSize="@dimen/normal_text_size_18"
                         android:textStyle="bold"
                         app:layout_constraintEnd_toEndOf="@+id/barrier_title_end"
@@ -165,7 +165,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginHorizontal="@dimen/common_spacing"
                         android:background="@drawable/bg_common_input"
-                        android:hint="@string/please_input_step_title_short"
+                        app:i18nHint='@{"please_input_step_title_short"}'
                         android:maxLines="1"
                         android:paddingHorizontal="@dimen/common_spacing"
                         android:paddingVertical="5dp"
@@ -182,7 +182,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginVertical="@dimen/common_spacing_2x"
-                        android:text="@string/workflow_step_confirm_type"
+                        app:i18nKey='@{"workflow_step_confirm_type"}'
                         android:textSize="@dimen/normal_text_size_18"
                         android:textStyle="bold"
                         app:layout_constraintEnd_toEndOf="@+id/barrier_title_end"
@@ -198,7 +198,7 @@
                         android:layout_marginHorizontal="@dimen/common_spacing"
                         android:background="@drawable/bg_common_input"
                         android:drawableRight="@mipmap/icon_drop_down"
-                        android:hint="@string/please_select_step_confirm_type"
+                        app:i18nHint='@{"please_select_step_confirm_type"}'
                         android:maxLines="1"
                         android:paddingHorizontal="@dimen/common_spacing"
                         android:paddingVertical="5dp"
@@ -215,7 +215,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginVertical="@dimen/common_spacing_2x"
-                        android:text="@string/workflow_step_confirm_role"
+                        app:i18nKey='@{"workflow_step_confirm_role"}'
                         android:textSize="@dimen/normal_text_size_18"
                         android:textStyle="bold"
                         android:visibility="gone"
@@ -232,7 +232,7 @@
                         android:layout_marginHorizontal="@dimen/common_spacing"
                         android:background="@drawable/bg_common_input"
                         android:drawableRight="@mipmap/icon_drop_down"
-                        android:hint="@string/please_select_step_confirm_role"
+                        app:i18nHint='@{"please_select_step_confirm_role"}'
                         android:maxLines="1"
                         android:paddingHorizontal="@dimen/common_spacing"
                         android:paddingVertical="5dp"
@@ -250,7 +250,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginVertical="@dimen/common_spacing_2x"
-                        android:text="@string/workflow_step_confirm_member"
+                        app:i18nKey='@{"workflow_step_confirm_member"}'
                         android:textSize="@dimen/normal_text_size_18"
                         android:textStyle="bold"
                         android:visibility="gone"
@@ -267,7 +267,7 @@
                         android:layout_marginHorizontal="@dimen/common_spacing"
                         android:background="@drawable/bg_common_input"
                         android:drawableRight="@mipmap/icon_drop_down"
-                        android:hint="@string/please_select_step_confirm_member"
+                        app:i18nHint='@{"please_select_step_confirm_member"}'
                         android:maxLines="1"
                         android:paddingHorizontal="@dimen/common_spacing"
                         android:paddingVertical="5dp"
@@ -285,7 +285,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginVertical="@dimen/common_spacing_2x"
-                        android:text="@string/workflow_step_function"
+                        app:i18nKey='@{"workflow_step_function"}'
                         android:textSize="@dimen/normal_text_size_18"
                         android:textStyle="bold"
                         app:layout_constraintEnd_toEndOf="@+id/barrier_title_end"
@@ -316,7 +316,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginVertical="@dimen/common_spacing_2x"
-                        android:text="@string/workflow_step_description"
+                        app:i18nKey='@{"workflow_step_description"}'
                         android:textSize="@dimen/normal_text_size_18"
                         android:textStyle="bold"
                         app:layout_constraintEnd_toEndOf="@+id/barrier_title_end"
@@ -332,7 +332,7 @@
                         android:layout_marginHorizontal="@dimen/common_spacing"
                         android:background="@drawable/bg_common_input"
                         android:gravity="top"
-                        android:hint="@string/please_input_step_description"
+                        app:i18nHint='@{"please_input_step_description"}'
                         android:paddingHorizontal="@dimen/common_spacing"
                         android:paddingVertical="5dp"
                         android:scrollbars="vertical"
@@ -365,7 +365,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/confirm"
+                app:i18nKey='@{"confirm"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -380,7 +380,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/cancel"
+                app:i18nKey='@{"cancel"}'
                 android:textColor="@color/white"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

+ 7 - 7
app/src/main/res/layout/fragment_workstation_manage.xml

@@ -26,7 +26,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:layout_weight="1"
-                android:text="@string/workstation_manage_title"
+                app:i18nKey='@{"workstation_manage_title"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/normal_text_size_25"
                 android:textStyle="bold" />
@@ -43,7 +43,7 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/back"
+                app:i18nKey='@{"back"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>
@@ -68,7 +68,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/insert"
+                app:i18nKey='@{"insert"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -79,7 +79,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/edit"
+                app:i18nKey='@{"edit"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -90,7 +90,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/delete"
+                app:i18nKey='@{"delete"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -102,7 +102,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/move_up"
+                app:i18nKey='@{"move_up"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
 
@@ -113,7 +113,7 @@
                 android:layout_marginLeft="@dimen/common_spacing"
                 android:background="@drawable/common_btn"
                 android:paddingHorizontal="@dimen/common_spacing_2x"
-                android:text="@string/move_down"
+                app:i18nKey='@{"move_down"}'
                 android:textColor="@color/black"
                 android:textSize="@dimen/common_btn_text_size" />
         </LinearLayout>

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно