diff --git a/assets/langs/en_US.json b/assets/langs/en_US.json index 9a8ddca..ba5e0d8 100644 --- a/assets/langs/en_US.json +++ b/assets/langs/en_US.json @@ -549,7 +549,7 @@ "设备已被用户解绑，将取消当前分享！": "The device has been unbound by the user, and the current sharing will be cancelled.", "消息列表": "message list", "睡眠报告提示": "This page is not a medical standard, and the data is for reference only.", - "MAC号": "MAC Address", + "MAC号": "MAC", "微信用户": "WeChat User", "其他设备正在绑定中，是否终止其他设备绑定？": "Another device is binding. Terminate?", "未配置网络提示": "Network Not Configured", diff --git a/assets/langs/zh_CN.json b/assets/langs/zh_CN.json index 20337c5..1ed6687 100644 --- a/assets/langs/zh_CN.json +++ b/assets/langs/zh_CN.json @@ -552,7 +552,7 @@ "设备已被用户解绑，将取消当前分享！": "设备已被用户解绑，将取消当前分享！", "消息列表": "消息列表", "睡眠报告提示": "本页内容非医疗标准，数据仅供参考", - "MAC号": "MAC号", + "MAC号": "MAC", "微信用户": "微信用户", "其他设备正在绑定中，是否终止其他设备绑定？": "其他设备正在绑定中，是否终止其他设备绑定？", "图形参考": "图像参考", diff --git a/assets/langs/zh_TW.json b/assets/langs/zh_TW.json index d709999..2bc2448 100644 --- a/assets/langs/zh_TW.json +++ b/assets/langs/zh_TW.json @@ -546,7 +546,7 @@ "设备已被用户解绑，将取消当前分享！": "設備已被用戶解綁，將取消當前分享！", "消息列表": "消息列表", "睡眠报告提示": "本頁內容非醫療標準，數據僅供參考", - "MAC号": "MAC號", + "MAC号": "MAC", "微信用户": "微信用戶", "其他设备正在绑定中，是否终止其他设备绑定？": "其他設備正在綁定中，是否終止其他設備綁定？", "未配置网络提示": "當前設備未進行網路配置，是否確認跳過網路配置？", diff --git a/lib/pages/device/instant_body_page.dart b/lib/pages/device/instant_body_page.dart index 2aa7fd2..f802efc 100644 --- a/lib/pages/device/instant_body_page.dart +++ b/lib/pages/device/instant_body_page.dart @@ -630,7 +630,7 @@ class _InstantBodyPageState extends State style: TextStyle( color: themeController.currentColor.sc4, fontSize: - AppConstants().middler_text_fontSize, + AppConstants().smaller_text_fontSize, ), ), SizedBox( @@ -641,7 +641,7 @@ class _InstantBodyPageState extends State style: TextStyle( color: themeController.currentColor.sc4, fontSize: - AppConstants().middler_text_fontSize, + AppConstants().smaller_text_fontSize, ), ), ], diff --git a/lib/pages/main_bottom/mine_page.dart b/lib/pages/main_bottom/mine_page.dart index 2eea3ae..3a30998 100644 --- a/lib/pages/main_bottom/mine_page.dart +++ b/lib/pages/main_bottom/mine_page.dart @@ -143,7 +143,7 @@ class _MinePageState extends State { decoration: BoxDecoration( shape: BoxShape.circle, ), - /* child: login == 1 + child: login == 1 ? (userInfoController.model.user! .avatar == null || @@ -161,25 +161,25 @@ class _MinePageState extends State { : Image.asset( "assets/img/avatar.png", fit: BoxFit.cover, - ), */ - child: login == 1 - ? (userInfoController.model.user! - .avatar == - null || - userInfoController.model - .user!.avatar!.isEmpty - ? Image.asset( - "assets/img/avatar.png", - fit: BoxFit.cover, - ) - : Image.asset( - "assets/img/avatar.png", - fit: BoxFit.cover, - )) - : Image.asset( - "assets/img/avatar.png", - fit: BoxFit.cover, - ), + ), + // child: login == 1 + // ? (userInfoController.model.user! + // .avatar == + // null || + // userInfoController.model + // .user!.avatar!.isEmpty + // ? Image.asset( + // "assets/img/avatar.jpg", + // fit: BoxFit.cover, + // ) + // : Image.asset( + // "assets/img/avatar.jpg", + // fit: BoxFit.cover, + // )) + // : Image.asset( + // "assets/img/avatar.jpg", + // fit: BoxFit.cover, + // ), ), Column( mainAxisSize: MainAxisSize.max, diff --git a/lib/pages/sleep_report/new_sleep_report_page.dart b/lib/pages/sleep_report/new_sleep_report_page.dart index 2486fca..a1e0e18 100644 --- a/lib/pages/sleep_report/new_sleep_report_page.dart +++ b/lib/pages/sleep_report/new_sleep_report_page.dart @@ -919,7 +919,7 @@ class _NewSleepReportPageState extends State { style: TextStyle( color: themeController.currentColor.sc4, fontSize: - AppConstants().middler_text_fontSize, + AppConstants().smaller_text_fontSize, ), ), SizedBox( @@ -930,7 +930,7 @@ class _NewSleepReportPageState extends State { style: TextStyle( color: themeController.currentColor.sc4, fontSize: - AppConstants().middler_text_fontSize, + AppConstants().smaller_text_fontSize, ), ), ],