diff --git a/assets/langs/en_US.json b/assets/langs/en_US.json index a630526..8b6dcf8 100644 --- a/assets/langs/en_US.json +++ b/assets/langs/en_US.json @@ -557,5 +557,11 @@ "正常心率窦性图": "Normal Sinus Rhythm Chart", "窦性心律不齐图": "Sinus Arrhythmia Chart", "持续性房颤图": " Continuous Ventricular Flutter Chart", - "阵法性房颤图": " Arrhythmia Chart" + "阵法性房颤图": " Arrhythmia Chart", + "设备连接超时，请重试": "Device connection timed out, please try again", + "s后超时": "s timeout", + "未选择图片": "No Image Selected", + "无效的手机号码": "Invalid Phone", + "联系人不能为空": "Contact cannot be empty", + "联系电话不能为空": "Contact number cannot be empty" } \ No newline at end of file diff --git a/assets/langs/zh_CN.json b/assets/langs/zh_CN.json index 91a7158..4384925 100644 --- a/assets/langs/zh_CN.json +++ b/assets/langs/zh_CN.json @@ -429,7 +429,7 @@ "检测到": "检测到", "绑定流程未走完是否继续": "绑定流程未走完是否继续?", "暂无": "暂无", - "设备连接超时，请重试": "设备连接超时，请点击刷新重试", + "设备连接超时，请重试": "设备连接超时，请重试", "设备连接失败": "设备连接失败，请点击刷新重试", "失败": "服务器内部错误，请联系管理员", "关于我们": "关于我们", @@ -555,9 +555,14 @@ "MAC号": "MAC号", "微信用户": "微信用户", "其他设备正在绑定中，是否终止其他设备绑定？": "其他设备正在绑定中，是否终止其他设备绑定？", - "图形参考":"图像参考", - "正常心率窦性图":"正常心率窦性图", - "窦性心律不齐图":"窦性心律不齐图", - "持续性房颤图":"持续性房颤图", - "阵法性房颤图":"阵法性房颤图" + "图形参考": "图像参考", + "正常心率窦性图": "正常心率窦性图", + "窦性心律不齐图": "窦性心律不齐图", + "持续性房颤图": "持续性房颤图", + "阵法性房颤图": "阵法性房颤图", + "s后超时": "s后超时", + "无效的手机号码": "无效的手机号码", + "联系人不能为空": "联系人不能为空", + "联系电话不能为空": "联系电话不能为空" + } \ No newline at end of file diff --git a/assets/langs/zh_TW.json b/assets/langs/zh_TW.json index 5cf42aa..bf30016 100644 --- a/assets/langs/zh_TW.json +++ b/assets/langs/zh_TW.json @@ -554,5 +554,10 @@ "正常心率窦性图": "正常心率竇性圖", "窦性心律不齐图": "竇性心律不齊圖", "持续性房颤图": "持續性房顫圖", - "阵法性房颤图": "陣法性房顫圖" + "阵法性房颤图": "陣法性房顫圖", + "设备连接超时，请重试": "設備連接超時，請重試", + "s后超时": "s後超時", + "无效的手机号码": "無效的手機號碼", + "联系人不能为空": " 聯繫人不能為空", + "联系电话不能为空": "聯繫電話不能為空" } \ No newline at end of file diff --git a/lib/pages/device/component/DeviceDataComponentWidget.dart b/lib/pages/device/component/DeviceDataComponentWidget.dart index 9e4c20b..f9064e5 100644 --- a/lib/pages/device/component/DeviceDataComponentWidget.dart +++ b/lib/pages/device/component/DeviceDataComponentWidget.dart @@ -725,10 +725,10 @@ class _DeviceDataComponentWidgetState extends State { padding: EdgeInsetsDirectional.fromSTEB( 0, 0.rpx, 0.rpx, 0), // 外部 padding 移到内部 width: 28.rpx, - height: 28.rpx, + height: 24.rpx, child: SvgPicture.asset( 'assets/img/icon/group.svg', - fit: BoxFit.cover, + fit: BoxFit.fill, color: Colors.white, ), ), diff --git a/lib/pages/device_bind/wifi_page.dart b/lib/pages/device_bind/wifi_page.dart index 70b7454..e8b1bf8 100644 --- a/lib/pages/device_bind/wifi_page.dart +++ b/lib/pages/device_bind/wifi_page.dart @@ -141,7 +141,7 @@ class _WifiPageState extends State { @override Widget build(BuildContext context) { - print("object"); + print("object1111"); return LayoutBuilder( builder: (context, bodySize) => GestureDetector( // onTap: () => FocusScope.of(context).unfocus(),, @@ -1375,7 +1375,7 @@ class _WifiPageState extends State { blueteethBindController.netType.value = 3; TopSlideNotification.show( context, - text: "设备连接超时，请点击刷新重试".tr, + text: "设备连接超时，请重试".tr, textColor: themeController.currentColor.sc9, ); FlutterBluePlus.stopScan(); @@ -1509,7 +1509,7 @@ class _WifiPageState extends State { } else { TopSlideNotification.show( context, - text: "设备连接失败,请点击刷新重试".tr, + text: "设备连接超时，请重试".tr, textColor: themeController.currentColor.sc9, ); } @@ -1517,7 +1517,7 @@ class _WifiPageState extends State { blueteethBindController.blueConnectFlag.value = 1; TopSlideNotification.show( context, - text: "设备连接失败,请点击刷新重试".tr, + text: "设备连接超时，请重试".tr, textColor: themeController.currentColor.sc9, ); } finally { diff --git a/lib/pages/device_bind/wifi_page_person.dart b/lib/pages/device_bind/wifi_page_person.dart index 754ff29..094e43d 100644 --- a/lib/pages/device_bind/wifi_page_person.dart +++ b/lib/pages/device_bind/wifi_page_person.dart @@ -549,7 +549,7 @@ class _WifiPagePersonState extends State { widget.type['mac'], needSuccess: true); // return; - } + } if (!flag) { blueteethBindController .selectWifi @@ -653,7 +653,6 @@ class _WifiPagePersonState extends State { ); } }); - }, child: Row( mainAxisSize: @@ -1402,7 +1401,7 @@ class _WifiPagePersonState extends State { blueteethBindController.netType.value = 3; TopSlideNotification.show( context, - text: "设备连接超时，请点击刷新重试".tr, + text: "设备连接超时，请重试".tr, textColor: themeController.currentColor.sc9, ); FlutterBluePlus.stopScan(); @@ -1536,7 +1535,7 @@ class _WifiPagePersonState extends State { } else { TopSlideNotification.show( context, - text: "设备连接失败,请点击刷新重试".tr, + text: "设备连接超时，请重试".tr, textColor: themeController.currentColor.sc9, ); } @@ -1544,7 +1543,7 @@ class _WifiPagePersonState extends State { blueteethBindController.blueConnectFlag.value = 1; TopSlideNotification.show( context, - text: "设备连接失败,请点击刷新重试".tr, + text: "设备连接超时，请重试".tr, textColor: themeController.currentColor.sc9, ); } finally { @@ -1716,5 +1715,4 @@ class _WifiPagePersonState extends State { return await getDeviceWifiStatus(blueteethBindController.currentDevice!, 1, link: true); } - } diff --git a/lib/pages/login/th_bind_tel_page.dart b/lib/pages/login/th_bind_tel_page.dart index df45bdd..a5d7ed5 100644 --- a/lib/pages/login/th_bind_tel_page.dart +++ b/lib/pages/login/th_bind_tel_page.dart @@ -429,7 +429,7 @@ class THBindTelWidget extends GetView { color: themeController .currentColor.sc2, fontSize: AppConstants() - .title_text_fontSize, + .middler_text_fontSize, letterSpacing: 0, ), ), diff --git a/lib/pages/main_bottom/mine_page.dart b/lib/pages/main_bottom/mine_page.dart index 6857b8d..24811f8 100644 --- a/lib/pages/main_bottom/mine_page.dart +++ b/lib/pages/main_bottom/mine_page.dart @@ -612,31 +612,31 @@ class _MinePageState extends State { padding: EdgeInsetsDirectional.fromSTEB( 40.rpx, 0.rpx, 40.rpx, 0.rpx), onTap: () async { - UserInfoController userInfoController = - Get.find(); - if (userInfoController.model.login != - LoginStatus.LOGIN.code) { - TopSlideNotification.show( - context, - text: "必须登录提示".tr, - textColor: - themeController.currentColor.sc9, - ); - Get.toNamed("/loginPage"); - } else { - String logContent = - await DailyLogUtils.readLogByDate( - DateTime(2025, 9, 4)); - print(logContent); - // DailyLogUtils.readTodayLog(); - // DailyLogUtils.listLogFiles(); - await DailyLogUtils.writeLog( - "测试日志内容"); // 确保写入日志 - await DailyLogUtils - .exportAllLogs(); // 导出并分享 + // UserInfoController userInfoController = + // Get.find(); + // if (userInfoController.model.login != + // LoginStatus.LOGIN.code) { + // TopSlideNotification.show( + // context, + // text: "必须登录提示".tr, + // textColor: + // themeController.currentColor.sc9, + // ); + // Get.toNamed("/loginPage"); + // } else { + // String logContent = + // await DailyLogUtils.readLogByDate( + // DateTime(2025, 9, 4)); + // print(logContent); + // // DailyLogUtils.readTodayLog(); + // // DailyLogUtils.listLogFiles(); + // await DailyLogUtils.writeLog( + // "测试日志内容"); // 确保写入日志 + // await DailyLogUtils + // .exportAllLogs(); // 导出并分享 - // DailyLogUtils.exportAllLogs(); - } + // // DailyLogUtils.exportAllLogs(); + // } }, child: Container( child: Padding( @@ -674,7 +674,7 @@ class _MinePageState extends State { mainAxisSize: MainAxisSize.max, children: [ Text( - 'V1.0.2510.14', + 'V1.0.2511.14', style: TextStyle( fontFamily: 'Inter', color: Color(0xFFD9E3EB), diff --git a/lib/pages/mh_page/device/mht_wifi_page.dart b/lib/pages/mh_page/device/mht_wifi_page.dart index 11ba834..c4f3ed0 100644 --- a/lib/pages/mh_page/device/mht_wifi_page.dart +++ b/lib/pages/mh_page/device/mht_wifi_page.dart @@ -1259,7 +1259,7 @@ class _MHTWifiPageState extends State { } else { TopSlideNotification.show( context, - text: "设备连接失败,请点击刷新重试".tr, + text: "设备连接超时，请重试".tr, textColor: themeController.currentColor.sc9, ); } @@ -1267,7 +1267,7 @@ class _MHTWifiPageState extends State { blueteethBindController.blueConnectFlag.value = 1; TopSlideNotification.show( context, - text: "设备连接失败,请点击刷新重试".tr, + text: "设备连接超时，请重试".tr, textColor: themeController.currentColor.sc9, ); } finally { diff --git a/lib/pages/mh_page/device/mht_wifi_page_after.dart b/lib/pages/mh_page/device/mht_wifi_page_after.dart index 74b2d0b..2f2a32b 100644 --- a/lib/pages/mh_page/device/mht_wifi_page_after.dart +++ b/lib/pages/mh_page/device/mht_wifi_page_after.dart @@ -1091,7 +1091,7 @@ class _MHTWifiAfterPageState extends State { blueteethBindController.netType.value = 3; TopSlideNotification.show( context, - text: "设备连接超时，请点击刷新重试".tr, + text: "设备连接超时，请重试".tr, textColor: themeController.currentColor.sc9, ); FlutterBluePlus.stopScan(); @@ -1225,7 +1225,7 @@ class _MHTWifiAfterPageState extends State { } else { TopSlideNotification.show( context, - text: "设备连接失败,请点击刷新重试".tr, + text: "设备连接超时，请重试".tr, textColor: themeController.currentColor.sc9, ); } @@ -1233,7 +1233,7 @@ class _MHTWifiAfterPageState extends State { blueteethBindController.blueConnectFlag.value = 1; TopSlideNotification.show( context, - text: "设备连接失败,请点击刷新重试".tr, + text: "设备连接超时，请重试".tr, textColor: themeController.currentColor.sc9, ); } finally { diff --git a/lib/pages/repair/repair_detail_page.dart b/lib/pages/repair/repair_detail_page.dart index 9d9e753..907e3df 100644 --- a/lib/pages/repair/repair_detail_page.dart +++ b/lib/pages/repair/repair_detail_page.dart @@ -126,22 +126,27 @@ class _RepairDetailPageState extends State { themeController.currentColor.sc1, themeController.currentColor.sc2, ], - child: Container( - width: (MediaQuery.sizeOf(context).width * 0.284) - .rpx, - constraints: BoxConstraints( - minWidth: 213.rpx, - minHeight: 91.rpx, - ), - child: Align( - alignment: AlignmentDirectional(0, 0), - child: Text( - "${widget.data['type']}", - style: TextStyle( - letterSpacing: 0.0, - color: themeController.currentColor.sc3, - fontSize: - AppConstants().normal_text_fontSize, + child: Padding( + padding: + EdgeInsets.fromLTRB(32.rpx, 0, 32.rpx, 0), + child: Container( + // width: + // (MediaQuery.sizeOf(context).width * 0.284) + // .rpx, + constraints: BoxConstraints( + // minWidth: 213.rpx, + minHeight: 91.rpx, + ), + child: Align( + alignment: AlignmentDirectional(0, 0), + child: Text( + "${widget.data['type']}", + style: TextStyle( + letterSpacing: 0.0, + color: themeController.currentColor.sc3, + fontSize: + AppConstants().normal_text_fontSize, + ), ), ), ),