更新首页
This commit is contained in:
@@ -6,6 +6,7 @@ import 'package:vbvs_app/common/color/appConstants.dart';
|
|||||||
import 'package:vbvs_app/common/color/app_uri_status.dart';
|
import 'package:vbvs_app/common/color/app_uri_status.dart';
|
||||||
import 'package:vbvs_app/common/util/FitTool.dart';
|
import 'package:vbvs_app/common/util/FitTool.dart';
|
||||||
import 'package:vbvs_app/common/util/MyUtils.dart';
|
import 'package:vbvs_app/common/util/MyUtils.dart';
|
||||||
|
import 'package:vbvs_app/component/NullDataComponentWidget.dart';
|
||||||
import 'package:vbvs_app/component/tool/ClickableContainer.dart';
|
import 'package:vbvs_app/component/tool/ClickableContainer.dart';
|
||||||
import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
|
import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
|
||||||
import 'package:vbvs_app/controller/main_bottom/global_controller.dart';
|
import 'package:vbvs_app/controller/main_bottom/global_controller.dart';
|
||||||
@@ -66,7 +67,8 @@ class _NewHomePageState extends State<NewHomePage> {
|
|||||||
}
|
}
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
if (homeController.sleepDays.value.isNotEmpty) {
|
if (homeController.sleepDays.value.isNotEmpty) {
|
||||||
homeController.selectedDayIndex.value = homeController.sleepDays.value.length - 1;
|
homeController.selectedDayIndex.value =
|
||||||
|
homeController.sleepDays.value.length - 1;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -411,7 +413,8 @@ class _NewHomePageState extends State<NewHomePage> {
|
|||||||
personInfo.value =
|
personInfo.value =
|
||||||
selectedPerson;
|
selectedPerson;
|
||||||
|
|
||||||
homeController.selectedDayIndex =
|
homeController
|
||||||
|
.selectedDayIndex =
|
||||||
(6).obs;
|
(6).obs;
|
||||||
print("$val");
|
print("$val");
|
||||||
if (val == null) {
|
if (val == null) {
|
||||||
@@ -470,11 +473,18 @@ class _NewHomePageState extends State<NewHomePage> {
|
|||||||
.value !=
|
.value !=
|
||||||
null) {
|
null) {
|
||||||
Get.toNamed(
|
Get.toNamed(
|
||||||
"/sleepWebview",
|
"/newSleepReportPage",
|
||||||
arguments: [
|
arguments: {
|
||||||
|
'mac':
|
||||||
formFieldController
|
formFieldController
|
||||||
.value
|
.value!,
|
||||||
]);
|
'type': 1,
|
||||||
|
"person": personInfo
|
||||||
|
.value,
|
||||||
|
'backgroundImg':
|
||||||
|
'assets/images/new_background.png',
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
child: Row(
|
child: Row(
|
||||||
@@ -501,6 +511,13 @@ class _NewHomePageState extends State<NewHomePage> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
if (homeController
|
||||||
|
.sleepDays.value.length ==
|
||||||
|
0)
|
||||||
|
Expanded(child: NullDataWidget()),
|
||||||
|
if (homeController
|
||||||
|
.sleepDays.value.length !=
|
||||||
|
0)
|
||||||
Container(
|
Container(
|
||||||
padding: EdgeInsets.only(
|
padding: EdgeInsets.only(
|
||||||
top: 0.rpx,
|
top: 0.rpx,
|
||||||
@@ -514,7 +531,8 @@ class _NewHomePageState extends State<NewHomePage> {
|
|||||||
mainAxisSize:
|
mainAxisSize:
|
||||||
MainAxisSize.max,
|
MainAxisSize.max,
|
||||||
crossAxisAlignment:
|
crossAxisAlignment:
|
||||||
CrossAxisAlignment.start,
|
CrossAxisAlignment
|
||||||
|
.start,
|
||||||
children: [
|
children: [
|
||||||
...List.generate(
|
...List.generate(
|
||||||
homeController
|
homeController
|
||||||
@@ -524,13 +542,16 @@ class _NewHomePageState extends State<NewHomePage> {
|
|||||||
var day = homeController
|
var day = homeController
|
||||||
.sleepDays[index];
|
.sleepDays[index];
|
||||||
bool isSelected =
|
bool isSelected =
|
||||||
homeController.selectedDayIndex
|
homeController
|
||||||
|
.selectedDayIndex
|
||||||
.value ==
|
.value ==
|
||||||
index;
|
index;
|
||||||
return Expanded(
|
return Expanded(
|
||||||
child: GestureDetector(
|
child:
|
||||||
|
GestureDetector(
|
||||||
onTap: () {
|
onTap: () {
|
||||||
homeController.selectedDayIndex
|
homeController
|
||||||
|
.selectedDayIndex
|
||||||
.value = index;
|
.value = index;
|
||||||
int? timeMillis =
|
int? timeMillis =
|
||||||
parseToInt(day[
|
parseToInt(day[
|
||||||
@@ -549,13 +570,16 @@ class _NewHomePageState extends State<NewHomePage> {
|
|||||||
.value,
|
.value,
|
||||||
'backgroundImg':
|
'backgroundImg':
|
||||||
'assets/images/new_background.png',
|
'assets/images/new_background.png',
|
||||||
|
'date':
|
||||||
|
timeMillis,
|
||||||
// 'backgroundColor':stringToColor("#003058"),
|
// 'backgroundColor':stringToColor("#003058"),
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
child: Container(
|
child: Container(
|
||||||
padding:
|
padding:
|
||||||
EdgeInsets.only(
|
EdgeInsets
|
||||||
|
.only(
|
||||||
top: 10.rpx,
|
top: 10.rpx,
|
||||||
bottom: 20.rpx,
|
bottom: 20.rpx,
|
||||||
),
|
),
|
||||||
@@ -595,13 +619,13 @@ class _NewHomePageState extends State<NewHomePage> {
|
|||||||
30.rpx,
|
30.rpx,
|
||||||
letterSpacing:
|
letterSpacing:
|
||||||
0,
|
0,
|
||||||
color: stringToColor(
|
color:
|
||||||
"#FFFFFF"),
|
stringToColor("#FFFFFF"),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(
|
SizedBox(
|
||||||
height:
|
height: 12
|
||||||
12.rpx),
|
.rpx),
|
||||||
Text(
|
Text(
|
||||||
day['date'],
|
day['date'],
|
||||||
// "哈哈",
|
// "哈哈",
|
||||||
@@ -615,13 +639,13 @@ class _NewHomePageState extends State<NewHomePage> {
|
|||||||
0,
|
0,
|
||||||
fontSize:
|
fontSize:
|
||||||
22.rpx,
|
22.rpx,
|
||||||
color: stringToColor(
|
color:
|
||||||
"#929699"),
|
stringToColor("#929699"),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(
|
SizedBox(
|
||||||
height:
|
height: 39
|
||||||
39.rpx),
|
.rpx),
|
||||||
buildScoreOrIcon(
|
buildScoreOrIcon(
|
||||||
day['score']),
|
day['score']),
|
||||||
],
|
],
|
||||||
|
|||||||
Reference in New Issue
Block a user