enchantedwyf/tuiche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://10.20.2.7:8080/r/~enchantedwyf/vbvs_app

Browse Source
This commit is contained in:
czz
2025-11-17 17:05:06 +08:00
parent 7541c18304 0f4833e5ae
commit a0172b394b
4 changed files with 51 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
lib/common/util/MyUtils.dart
View File

@@ -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<Color>(
themeController.currentColor.sc1,

25
lib/pages/device/instant_body_page.dart
View File

@@ -329,14 +329,23 @@ class _InstantBodyPageState extends State<InstantBodyPage>
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(

23
lib/pages/device/message_review_page.dart
View File

@@ -142,14 +142,21 @@ class _MessageReviewPageState extends State<MessageReviewPage> {
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(

2
lib/pages/main_bottom/mine_page.dart
View File

@@ -674,7 +674,7 @@ class _MinePageState extends State<MinePage> {
mainAxisSize: MainAxisSize.max,
children: [
Text(
'V1.0.2511.14',
'V1.0.2511.17',
style: TextStyle(
fontFamily: 'Inter',
color: Color(0xFFD9E3EB),