diff --git a/lib/common/util/MyUtils.dart b/lib/common/util/MyUtils.dart index 8ec7d57..8bec5e0 100644 --- a/lib/common/util/MyUtils.dart +++ b/lib/common/util/MyUtils.dart @@ -20,11 +20,11 @@ LanguageController languageController = Get.find(); MHLanguageController mhLanguageController = Get.find(); class MyUtils { - static String formatTimestampToSleep(int milliseconds) { final date = DateTime.fromMillisecondsSinceEpoch(milliseconds); return "${date.year}-${date.month}-${date.day}"; } + static String formatDate(DateTime dateTime) { return "${dateTime.year}-${dateTime.month}-${dateTime.day.toString().padLeft(2, '0')}"; } @@ -382,32 +382,13 @@ var closeIconWhite = GestureDetector( ), ); -var returnIconButtom = IconButton( - // padding: EdgeInsets.zero, // 去除默认 padding - // constraints: BoxConstraints(), // 去除最小尺寸限制 - onPressed: () => Get.back(), - icon: Icon(Icons.navigate_before, size: 60.rpx), +var returnIconButtom = returnIconButtomNew( + onBack: () { + // ⚡这里写你需要在返回前执行的逻辑 + Get.back(); + }, ); -// var returnIconButtomNew = ClickableContainer( -// backgroundColor: Colors.transparent, -// highlightColor: Colors.transparent, -// padding: EdgeInsets.fromLTRB(20.rpx, 20.rpx, 20.rpx, 20.rpx), -// onTap: () => Get.back(), -// child: Container( -// // height: 42.rpx, -// // width: 42.rpx, -// child: SvgPicture.asset( -// 'assets/img/icon/return_buttom.svg', -// width: 42.rpx, -// height: 42.rpx, -// ), -// // SvgPicture.asset( -// // 'assets/img/icon/expand.svg', -// // color: Colors.white, -// // ) -// )); - Widget returnIconButtomNew({VoidCallback? onBack}) { return ClickableContainer( backgroundColor: Colors.transparent, @@ -425,29 +406,25 @@ Widget returnIconButtomNew({VoidCallback? onBack}) { ); } -// IconButton( -// padding: EdgeInsets.zero, // 去除默认 padding -// constraints: BoxConstraints(), // 去除最小尺寸限制 -// onPressed: () => Get.back(), -// icon: SvgPicture.asset( -// 'assets/img/icon/return_buttom.svg', -// width: 42.rpx, -// height: 42.rpx, -// ), -// ); - var returnIconButtomAddCallback = ( VoidCallback? returnCallBack, { bool enableBack = true, }) { - return IconButton( - onPressed: () { + return ClickableContainer( + backgroundColor: Colors.transparent, + highlightColor: Colors.transparent, + padding: EdgeInsets.fromLTRB(20.rpx, 20.rpx, 20.rpx, 20.rpx), + onTap: () { returnCallBack?.call(); if (enableBack) { Get.back(); } }, - icon: Icon(Icons.navigate_before, size: 60.rpx), + child: SvgPicture.asset( + 'assets/img/icon/return_buttom.svg', + width: 42.rpx, + height: 42.rpx, + ), ); }; @@ -533,7 +510,7 @@ class LoadingDialog { SizedBox( height: 30.rpx, ), - CircularProgressIndicator( + CircularProgressIndicator( strokeWidth: 2, valueColor: AlwaysStoppedAnimation( themeController.currentColor.sc1, diff --git a/lib/pages/device/instant_body_page.dart b/lib/pages/device/instant_body_page.dart index fb22c5f..2aa7fd2 100644 --- a/lib/pages/device/instant_body_page.dart +++ b/lib/pages/device/instant_body_page.dart @@ -329,14 +329,23 @@ class _InstantBodyPageState extends State crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - '${device['person']?['name'] ?? '未命名'.tr}', - style: TextStyle( - fontFamily: 'Inter', - fontSize: 26.rpx, - letterSpacing: 0.0, - color: themeController - .currentColor.sc3, + Container( + width: + MediaQuery.sizeOf(context) + .width * + 0.2, + child: Text( + '${device['person']?['name'] ?? '未命名'.tr}', + style: TextStyle( + fontFamily: 'Inter', + fontSize: 26.rpx, + letterSpacing: 0.0, + color: themeController + .currentColor.sc3, + ), + maxLines: 1, + overflow: + TextOverflow.ellipsis, ), ), // Text( diff --git a/lib/pages/device/message_review_page.dart b/lib/pages/device/message_review_page.dart index 1a14af9..01be645 100644 --- a/lib/pages/device/message_review_page.dart +++ b/lib/pages/device/message_review_page.dart @@ -142,14 +142,21 @@ class _MessageReviewPageState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text( - '${widget.data['person']?['name'] ?? '未命名'.tr}', - style: TextStyle( - fontFamily: 'Inter', - fontSize: 26.rpx, - letterSpacing: 0.0, - color: themeController - .currentColor.sc3, + Container( + width: MediaQuery.sizeOf(context) + .width * + 0.2, + child: Text( + '${widget.data['person']?['name'] ?? '未命名'.tr}', + style: TextStyle( + fontFamily: 'Inter', + fontSize: 26.rpx, + letterSpacing: 0.0, + color: themeController + .currentColor.sc3, + ), + maxLines: 1, + overflow: TextOverflow.ellipsis, ), ), // Text( @@ -233,7 +240,7 @@ class _MessageReviewPageState extends State { // color: themeController // .currentColor.sc3, // ), - // ), + // ), ].divide(SizedBox(height: 34.rpx)), ), ), diff --git a/lib/pages/main_bottom/mine_page.dart b/lib/pages/main_bottom/mine_page.dart index 24811f8..c79da92 100644 --- a/lib/pages/main_bottom/mine_page.dart +++ b/lib/pages/main_bottom/mine_page.dart @@ -674,7 +674,7 @@ class _MinePageState extends State { mainAxisSize: MainAxisSize.max, children: [ Text( - 'V1.0.2511.14', + 'V1.0.2511.17', style: TextStyle( fontFamily: 'Inter', color: Color(0xFFD9E3EB),