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

更新界面布局

Browse Source
This commit is contained in:
wyf
2025-06-06 15:53:22 +08:00
parent 45b0d8ccb9
commit c9d7fceb98
8 changed files with 323 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/pages/device_bind/bind_device_success.dart
View File

@@ -3,11 +3,13 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:flutterflow_ui/flutterflow_ui.dart';
import 'package:vbvs_app/common/color/appConstants.dart';
import 'package:vbvs_app/common/color/app_uri_status.dart';
import 'package:vbvs_app/common/util/FitTool.dart';
import 'package:vbvs_app/component/tool/ClickableContainer.dart';
import 'package:vbvs_app/component/tool/CustomCard.dart';
import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart';
import 'package:vbvs_app/controller/device/body_device_controller.dart';
import 'package:vbvs_app/controller/home/home_controller.dart';
import 'package:vbvs_app/controller/main_bottom/global_controller.dart';
import 'package:vbvs_app/controller/person/person_controller.dart';
import 'package:vbvs_app/controller/theme_controller/ThemeController.dart';
@@ -80,6 +82,25 @@ class _EPageState extends State<BindDeviceSuccess> {
child: ClickableContainer(
onTap: () {
if (blueteethBindController.returnPage == 0) {
HomeController homeController = Get.find();
BodyDeviceController deviceController = Get.find();
if (userInfoController.model.login == 1) {
homeController.getSleepReport();
deviceController
.getDeviceNum()
.then((apiResponse) {
if (apiResponse.code != HttpStatusCodes.ok) {}
});
deviceController
.getDeviceList()
.then((apiResponse) {
if (apiResponse.code != HttpStatusCodes.ok) {
} else {
//请求睡眠报告
deviceController.getSleepReport();
}
});
}
Get.until((route) =>
Get.currentRoute == "/mianPageBottomChange");
} else {
@@ -279,6 +300,25 @@ class _EPageState extends State<BindDeviceSuccess> {
BlueteethBindController blueteethBindController =
Get.find();
if (blueteethBindController.returnPage == 0) {
HomeController homeController = Get.find();
BodyDeviceController deviceController = Get.find();
if (userInfoController.model.login == 1) {
homeController.getSleepReport();
deviceController
.getDeviceNum()
.then((apiResponse) {
if (apiResponse.code != HttpStatusCodes.ok) {}
});
deviceController
.getDeviceList()
.then((apiResponse) {
if (apiResponse.code != HttpStatusCodes.ok) {
} else {
//请求睡眠报告
deviceController.getSleepReport();
}
});
}
Get.until((route) =>
Get.currentRoute == "/mianPageBottomChange");
} else {

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

@@ -1043,6 +1043,7 @@ class _HomePageState extends State<HomePage> {
List stateModule = [];
String currentTime = "";
String goalMac = targetDevice?['mac'];
var person = targetDevice?['person'];
return DynamicReportDetailWidget(
key: ValueKey(
'${targetDevice!['mac']}_${homeController.model.type}'), // 添加唯一key
@@ -1090,6 +1091,7 @@ class _HomePageState extends State<HomePage> {
stateModule[j]['time'] =
currentTime;
stateModule[j]['mac'] = goalMac;
stateModule[j]['person'] = person;
return SleepDataModuleWidget(
data: stateModule[j],
);

18
lib/pages/sleep_report/new_sleep_report_page.dart
View File

@@ -431,7 +431,15 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
CrossAxisAlignment.start,
children: [
Text(
'传感器1号',
(widget.data['person']?['name']
?.toString()
.trim()
.isNotEmpty ??
false)
? widget
.data['person']!['name']
.toString()
: '未知数据'.tr,
style:
FlutterFlowTheme.of(context)
.bodyMedium
@@ -444,7 +452,7 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
),
),
Text(
'69',
'${MyUtils.getAgeByDate(MyUtils.formatBirthdayTime(widget.data['person']?['birthday'])) ?? '未知数据'.tr}',
style:
FlutterFlowTheme.of(context)
.bodyMedium
@@ -511,7 +519,7 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
CrossAxisAlignment.start,
children: [
Text(
'1231212',
'${widget.data['code'] ?? '未知数据'.tr}',
// "D11250300003",
style:
FlutterFlowTheme.of(context)
@@ -523,9 +531,11 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
color: themeController
.currentColor.sc3,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
Text(
'55kg',
'${widget.data['person']?['weight'] ?? '未知数据'.tr}kg',
style:
FlutterFlowTheme.of(context)
.bodyMedium