diff --git a/star_lock/images/lan/lan_en.json b/star_lock/images/lan/lan_en.json index eed00e5f..90eb2734 100644 --- a/star_lock/images/lan/lan_en.json +++ b/star_lock/images/lan/lan_en.json @@ -832,5 +832,6 @@ "钥匙详情":"Key details", "姓名":"Name", "发送":"Send", - "请确认姓名全名和身份证号码是否正确":"Please confirm that the full name and ID number are correct" + "请确认姓名全名和身份证号码是否正确":"Please confirm that the full name and ID number are correct", + "传输期间请勿离开当前页面":"Do not leave the current page during transfer" } diff --git a/star_lock/images/lan/lan_keys.json b/star_lock/images/lan/lan_keys.json index b1e72ad1..7aaa9d43 100644 --- a/star_lock/images/lan/lan_keys.json +++ b/star_lock/images/lan/lan_keys.json @@ -860,5 +860,6 @@ "钥匙详情":"钥匙详情", "姓名":"姓名", "发送":"发送", - "请确认姓名全名和身份证号码是否正确":"请确认姓名全名和身份证号码是否正确" + "请确认姓名全名和身份证号码是否正确":"请确认姓名全名和身份证号码是否正确", + "传输期间请勿离开当前页面":"传输期间请勿离开当前页面" } diff --git a/star_lock/images/lan/lan_zh.json b/star_lock/images/lan/lan_zh.json index c159b3c3..42188044 100644 --- a/star_lock/images/lan/lan_zh.json +++ b/star_lock/images/lan/lan_zh.json @@ -863,5 +863,7 @@ "钥匙详情":"钥匙详情", "姓名":"姓名", "发送":"发送", - "请确认姓名全名和身份证号码是否正确":"请确认姓名全名和身份证号码是否正确" + "请确认姓名全名和身份证号码是否正确":"请确认姓名全名和身份证号码是否正确", + "传输期间请勿离开当前页面":"传输期间请勿离开当前页面" + } diff --git a/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart b/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart index a7fe8858..75c57c81 100644 --- a/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart +++ b/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart @@ -479,7 +479,6 @@ class NearbyLockLogic extends BaseGetXController { token: token, encrypt: false, ).packageData()); - showTitleEasyLoading("连接设备中..."); } else if (deviceConnectionState == BluetoothConnectionState.disconnected) {} },isAddEquipment: true); diff --git a/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_page.dart b/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_page.dart index 3740694b..cdf99f97 100644 --- a/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_page.dart +++ b/star_lock/lib/mine/addLock/nearbyLock/nearbyLock_page.dart @@ -279,20 +279,31 @@ class OTAProgressDialog extends StatelessWidget { title: Text( '固件升级中'.tr, ), - content: Row( + content: Column( children: [ - Text( - '传输中'.tr, - style: TextStyle(fontSize: 22.sp, color: AppColors.mainColor), + Padding( + padding: EdgeInsets.only(top: 20.h, bottom: 10.h), + child: Text( + '传输期间请勿离开当前页面'.tr, + style: TextStyle(fontSize: 20.sp, color: AppColors.blackColor), + ), ), - SizedBox( - width: 15.w, + Row( + children: [ + Text( + '传输中'.tr, + style: TextStyle(fontSize: 18.sp, color: AppColors.mainColor), + ), + SizedBox( + width: 15.w, + ), + Expanded( + child: LinearProgressIndicator( + value: logic.state.otaProgress.value, + color: AppColors.mainColor, + )), + ], ), - Expanded( - child: LinearProgressIndicator( - value: logic.state.otaProgress.value, - color: AppColors.mainColor, - )), ], ), actions: [