diff --git a/assets/langs/zh_CN.json b/assets/langs/zh_CN.json index 8823628..70c5c71 100644 --- a/assets/langs/zh_CN.json +++ b/assets/langs/zh_CN.json @@ -31,15 +31,15 @@ "当前版本": "当前版本", "未命名": "未命名", "去登录": "去登录", - "头像限制": "头像图片不能超过5MB", "头像上传失败": "头像上传失败", - "未选择图片": "未选择图片", "上传成功": "上传成功", "保存失败": "保存失败", "保存成功": "保存成功", "昵称为空": "昵称不能为空", "查询失败": "查询用户资料失败" }, + "头像限制": "头像图片不能超过5MB", + "未选择图片": "未选择图片", "我的设备": "我的设备", "请选择设备类型": "请选择设备类型", "体征监测设备": "体征监测设备", diff --git a/assets/langs/zh_TW.json b/assets/langs/zh_TW.json index 4b47bd9..649dcca 100644 --- a/assets/langs/zh_TW.json +++ b/assets/langs/zh_TW.json @@ -31,15 +31,15 @@ "当前版本": "當前版本", "未命名": "未命名", "去登录": "去登錄", - "头像限制": "頭像圖片不能超過5MB", "头像上传失败": "頭像上傳失敗", - "未选择图片": "未選擇圖片", "上传成功": "上傳成功", "保存失败": "保存失敗", "保存成功": "保存成功", "昵称为空": "暱稱不能為空", "查询失败": "查詢用戶資料失敗" }, + "头像限制": "頭像圖片不能超過5MB", + "未选择图片": "未選擇圖片", "我的设备": "我的設備", "请选择设备类型": "請選擇設備類型", "体征监测设备": "體徵監測設備", diff --git a/assets/mhlangs/en_US.json b/assets/mhlangs/en_US.json index ce7e76f..98520fe 100644 --- a/assets/mhlangs/en_US.json +++ b/assets/mhlangs/en_US.json @@ -614,5 +614,6 @@ "平均hrv": "Ave HRV", "平均呼吸": "Ave Respiration", "在床时长": "Time in Bed", + "头像限制": "Avatar image cannot exceed 5MB", "生命体征指的是睡眠周期的整体数据。": "Vital signs refer to the overall data of the sleep cycle." } \ No newline at end of file diff --git a/assets/mhlangs/zh_CN.json b/assets/mhlangs/zh_CN.json index 17df8ea..7e68a31 100644 --- a/assets/mhlangs/zh_CN.json +++ b/assets/mhlangs/zh_CN.json @@ -613,5 +613,5 @@ "平均hrv":"平均hrv", "平均呼吸":"平均呼吸", "在床时长": "在床时长", - "生命体征指的是睡眠周期的整体数据。":"生命体征指的是睡眠周期的整体数据。" + "生命体征指的是睡眠周期的整体数据。":"生命体征指的是睡眠周期的整体数据。", "头像限制": "头像图片不能超过5MB" } \ No newline at end of file diff --git a/assets/mhlangs/zh_TW.json b/assets/mhlangs/zh_TW.json index 2caa8cc..45f35f2 100644 --- a/assets/mhlangs/zh_TW.json +++ b/assets/mhlangs/zh_TW.json @@ -612,5 +612,5 @@ "平均hrv": "平均hrv", "平均呼吸": "平均呼吸", "在床时长": "在床時長", - "生命体征指的是睡眠周期的整体数据。": "生命體徵指的是睡眠週期的整體數據。" + "生命体征指的是睡眠周期的整体数据。": "生命體徵指的是睡眠週期的整體數據。", "头像限制": "頭像圖片不能超過5MB" } \ No newline at end of file diff --git a/lib/controller/mh_controller/apply_repair_controller.dart b/lib/controller/mh_controller/apply_repair_controller.dart index ff79e31..f1f8be8 100644 --- a/lib/controller/mh_controller/apply_repair_controller.dart +++ b/lib/controller/mh_controller/apply_repair_controller.dart @@ -121,7 +121,7 @@ class ApplyRepairController extends GetControllerEx { return ApiResponse(code: -1, msg: "失败".tr); } } else { - apiResponse.msg = "我的.未选择图片".tr; + apiResponse.msg = "未选择图片".tr; return apiResponse; } } catch (e) { diff --git a/lib/controller/repair/repair_controller.dart b/lib/controller/repair/repair_controller.dart index 099bb57..df49e3c 100644 --- a/lib/controller/repair/repair_controller.dart +++ b/lib/controller/repair/repair_controller.dart @@ -100,7 +100,7 @@ class RepairController extends GetControllerEx { return ApiResponse(code: -1, msg: "失败".tr); } } else { - apiResponse.msg = "我的.未选择图片".tr; + apiResponse.msg = "未选择图片".tr; return apiResponse; } } catch (e) { diff --git a/lib/controller/user_info_controller.dart b/lib/controller/user_info_controller.dart index ad5bf2d..284ac70 100644 --- a/lib/controller/user_info_controller.dart +++ b/lib/controller/user_info_controller.dart @@ -77,7 +77,7 @@ class UserInfoController extends GetControllerEx { if (image != null) { int fileSize = await image.length(); // 获取图片大小，单位为字节 if (fileSize > 1048576 * 5) { - apiResponse.msg = "我的.头像限制".tr; + apiResponse.msg = "头像限制".tr; return apiResponse; } String serviceAddress = ServiceConstant.service_address; @@ -117,7 +117,7 @@ class UserInfoController extends GetControllerEx { return ApiResponse(code: -1, msg: "服务器失败".tr); } } else { - apiResponse.msg = "我的.未选择图片".tr; + apiResponse.msg = "未选择图片".tr; return apiResponse; } } catch (e) { diff --git a/lib/pages/common/selectDialog.dart b/lib/pages/common/selectDialog.dart index b3cdeaa..2c2dfd1 100644 --- a/lib/pages/common/selectDialog.dart +++ b/lib/pages/common/selectDialog.dart @@ -73,7 +73,7 @@ Widget getOnePickers( itemExtent: 90.rpx, useMagnifier: false, magnification: 1, - diameterRatio: 3, + diameterRatio: 1.3, squeeze: 1, scrollController: FixedExtentScrollController(initialItem: selectedIndex.value), diff --git a/lib/pages/main_bottom/component/main_page_b_bottom_change.dart b/lib/pages/main_bottom/component/main_page_b_bottom_change.dart index c1bb5af..1dba1fd 100644 --- a/lib/pages/main_bottom/component/main_page_b_bottom_change.dart +++ b/lib/pages/main_bottom/component/main_page_b_bottom_change.dart @@ -6,7 +6,6 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get_storage/get_storage.dart'; -import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/util/CommonVariables.dart'; import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; @@ -14,7 +13,6 @@ import 'package:vbvs_app/controller/mh_controller/mh_language_controller.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/model/WebSocketMessage.dart'; import 'package:vbvs_app/pages/common/bezier_bottom_navigation_bar.dart'; -import 'package:vbvs_app/pages/common/selectDialog.dart'; import 'package:vbvs_app/pages/mh_page/MattressControl.dart'; import 'package:vbvs_app/pages/mh_page/homepage/mht_sleep_report_page.dart'; import 'package:vbvs_app/pages/mh_page/homepage/new_Home_page.dart';