Merge branch 'master_hyx'

star_lock/images/lan/lan_en.json

@@ -685,5 +685,8 @@
   "去设置": "Go set it up",
 
   "虹膜":"iris",
-  "手掌":"palm"
+  "手掌":"palm",
+
+  "商城":"mall",
+  "我的":"my"
 }

star_lock/images/lan/lan_keys.json

@@ -684,5 +684,8 @@
   "去设置": "去设置",
 
   "虹膜":"虹膜",
-  "手掌":"手掌"
+  "手掌":"手掌",
+
+  "商城":"mall",
+  "我的":"my"
 }

star_lock/images/lan/lan_zh.json

@@ -50,7 +50,7 @@
   "periodValidity":"有效期",
   "sendGroupKey":"群发钥匙",
   "lock":"锁",
-  "pleaseAdd":"请添加",
+  "pleaseAdd":"请添加",Ï
   "pleaseSelect":"请选择",
   "remoteUnlockingAllowed":"允许远程开锁",
   "pleaseEnter":"请输入",
@@ -686,5 +686,7 @@
   "去设置": "去设置",
 
   "虹膜":"虹膜",
-  "手掌":"手掌"
+  "手掌":"手掌",
+  "商城":"商城",
+  "我的":"我的"
 }

star_lock/lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart

@@ -13,6 +13,7 @@ import 'package:star_lock/mine/message/messageList/messageList_page.dart';
 import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart';
 import 'package:star_lock/tools/noData.dart';
 import 'package:star_lock/tools/submitBtn.dart';
+import 'package:star_lock/translations/trans_lib.dart';
 
 class StarLockMainXHJPage extends StatefulWidget {
   const StarLockMainXHJPage({Key? key}) : super(key: key);
@@ -93,16 +94,20 @@ class _StarLockMainXHJPageState extends State<StarLockMainXHJPage>
                   // navigationBarItem(Icons.start, '场景', false, () {
                   //   logic.setIndex(0);
                   // }),
-                  navigationBarItem(Icons.devices, '设备', logic, 0, () {
+
+                  navigationBarItem(Icons.devices,
+                      TranslationLoader.lanKeys!.device!.tr, logic, 0, () {
                     logic.setIndex(0);
                   }),
-                  navigationBarItem(Icons.message, '消息', logic, 1, () {
+                  navigationBarItem(Icons.message,
+                      TranslationLoader.lanKeys!.message!.tr, logic, 1, () {
                     logic.setIndex(1);
                   }),
-                  navigationBarItem(Icons.shopping_cart, '商城', logic, 2, () {
+                  navigationBarItem(Icons.shopping_cart, '商城'.tr, logic, 2, () {
                     logic.setIndex(2);
                   }),
-                  navigationBarItem(Icons.account_circle, '我的', logic, 3, () {
+                  navigationBarItem(Icons.account_circle, '我的'.tr, logic, 3,
+                      () {
                     logic.setIndex(3);
                   }),
                 ],