日报周报月报
This commit is contained in:
czz
BIN
assets/images/mine_avatar.png
Normal file
BIN
assets/images/mine_avatar.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
@@ -1 +1 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16.54 31.09"><defs><style>.cls-1{fill:#fff;}</style></defs><title>资源 261 </title><g id="图层_2" data-name="图层 2"><g id="图层_1-2" data-name="图层 1"><path class="cls-1" d="M15.54,31.09a1,1,0,0,1-.7-.3L.29,16.25a1,1,0,0,1,0-1.41L14.84.29a1,1,0,0,1,1.41,0,1,1,0,0,1,0,1.42L2.41,15.54,16.25,29.38a1,1,0,0,1-.71,1.71Z"/></g></g></svg>
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="30" height="30.00006103515625" viewBox="0 0 30 30.00006103515625"><g><g><g transform="matrix(0,1,-1,0,30,-30)"></g></g><g><g><g><path d="M11.342529296875,14.99966720703125C11.342529296875,14.87161720703125,11.391479496875,14.74465720703125,11.489502296875,14.646637207031251C11.489502296875,14.646637207031251,17.804439296875,8.33059720703125,17.804439296875,8.33059720703125C17.999509296875,8.13565060703125,18.316529296875,8.13565060703125,18.511479296875,8.33059720703125C18.706419296874998,8.52664220703125,18.706419296874998,8.84256020703125,18.511479296875,9.03762820703125C18.511479296875,9.03762820703125,12.549439296875,14.99966720703125,12.549439296875,14.99966720703125C12.549439296875,14.99966720703125,18.511479296875,20.96158720703125,18.511479296875,20.96158720703125C18.706419296874998,21.15758720703125,18.706419296874998,21.47368720703125,18.511479296875,21.66858720703125C18.316529296875,21.864687207031253,17.999509296875,21.864687207031253,17.804439296875,21.66858720703125C17.804439296875,21.66858720703125,11.489502296875,15.35366720703125,11.489502296875,15.35366720703125C11.391479496875,15.255647207031249,11.342529296875,15.12759720703125,11.342529296875,14.99966720703125C11.342529296875,14.99966720703125,11.342529296875,14.99966720703125,11.342529296875,14.99966720703125Z" fill="#FFFFFF" fill-opacity="1"/></g></g></g></g></svg>
|
||||||
|
Before Width: | Height: | Size: 397 B After Width: | Height: | Size: 1.4 KiB |
@@ -1 +1 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 7.32 13.63"><defs><style>.cls-1{fill:#fff;}</style></defs><title>资源 274 </title><g id="图层_2" data-name="图层 2"><g id="图层_1-2" data-name="图层 1"><path class="cls-1" d="M7.32,6.82a.5.5,0,0,1-.15.35L.85,13.48a.48.48,0,0,1-.7,0,.48.48,0,0,1,0-.7l6-6-6-6a.48.48,0,0,1,0-.7.48.48,0,0,1,.7,0L7.17,6.46A.51.51,0,0,1,7.32,6.82Z"/></g></g></svg>
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="30" height="30" viewBox="0 0 30 30"><g><g><g transform="matrix(0,-1,1,0,-30,30)"></g></g><g><g><g><path d="M18.657351015625,14.999606171875C18.657351015625,15.127536171875,18.609251015625,15.255586171874999,18.511351015625,15.353606171875C18.511351015625,15.353606171875,12.196167015625,21.668526171875,12.196167015625,21.668526171875C12.000366015625,21.864626171875003,11.684204015625,21.864626171875003,11.488159015625,21.668526171875C11.293334915625,21.473626171875,11.293334915625,21.157526171875,11.488159015625,20.961526171875C11.488159015625,20.961526171875,17.450321015625,14.999606171875,17.450321015625,14.999606171875C17.450321015625,14.999606171875,11.488159015625,9.037567171875,11.488159015625,9.037567171875C11.293334915625,8.842499171875,11.293334915625,8.526581171875,11.488159015625,8.330536171875C11.684204015625,8.135589571875,12.000366015625,8.135589571875,12.196167015625,8.330536171875C12.196167015625,8.330536171875,18.511351015625,14.646576171875001,18.511351015625,14.646576171875001C18.609251015625,14.744596171875,18.657351015625,14.871556171875,18.657351015625,14.999606171875C18.657351015625,14.999606171875,18.657351015625,14.999606171875,18.657351015625,14.999606171875Z" fill="#FFFFFF" fill-opacity="1"/></g></g></g></g></svg>
|
||||||
|
Before Width: | Height: | Size: 406 B After Width: | Height: | Size: 1.3 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 6.1 KiB |
@@ -26,7 +26,7 @@ class _TestWidgetState extends State<NullDataWidget> {
|
|||||||
height: MediaQuery.sizeOf(context).height * 1,
|
height: MediaQuery.sizeOf(context).height * 1,
|
||||||
child: Column(
|
child: Column(
|
||||||
mainAxisSize: MainAxisSize.max,
|
mainAxisSize: MainAxisSize.max,
|
||||||
mainAxisAlignment: MainAxisAlignment.start,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
children: [
|
children: [
|
||||||
Padding(
|
Padding(
|
||||||
padding: EdgeInsetsDirectional.fromSTEB(0, 0.rpx, 0, 0),
|
padding: EdgeInsetsDirectional.fromSTEB(0, 0.rpx, 0, 0),
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ class _MhMessageListWidgetState extends State<MhMessageListWidget> {
|
|||||||
highlightColor: Color(0xFF055466),
|
highlightColor: Color(0xFF055466),
|
||||||
borderRadius: 20.rpx,
|
borderRadius: 20.rpx,
|
||||||
padding:
|
padding:
|
||||||
EdgeInsetsDirectional.fromSTEB(31.rpx, 33.rpx, 26.rpx, 26.rpx),
|
EdgeInsetsDirectional.fromSTEB(30.rpx, 26.rpx, 30.rpx, 26.rpx),
|
||||||
onTap: () {},
|
onTap: () {},
|
||||||
child: Column(
|
child: Column(
|
||||||
mainAxisSize: MainAxisSize.max,
|
mainAxisSize: MainAxisSize.max,
|
||||||
@@ -47,7 +47,7 @@ class _MhMessageListWidgetState extends State<MhMessageListWidget> {
|
|||||||
Container(
|
Container(
|
||||||
width: double.infinity,
|
width: double.infinity,
|
||||||
constraints: BoxConstraints(
|
constraints: BoxConstraints(
|
||||||
minHeight: 66.rpx,
|
minHeight: 60.rpx,
|
||||||
),
|
),
|
||||||
child: Align(
|
child: Align(
|
||||||
alignment: AlignmentDirectional(-1, 0),
|
alignment: AlignmentDirectional(-1, 0),
|
||||||
@@ -63,94 +63,90 @@ class _MhMessageListWidgetState extends State<MhMessageListWidget> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Row(
|
Row(mainAxisSize: MainAxisSize.max, children: [
|
||||||
mainAxisSize: MainAxisSize.max,
|
|
||||||
children: [
|
|
||||||
Container(
|
|
||||||
constraints: BoxConstraints(
|
|
||||||
minWidth: 30.rpx,
|
|
||||||
maxWidth: 140.rpx,
|
|
||||||
),
|
|
||||||
child: Column(
|
|
||||||
mainAxisSize: MainAxisSize.max,
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: messageInfo['data']['val']
|
|
||||||
.map<Widget>((mapItem) =>
|
|
||||||
_buildInfoItem(context, mapItem['k'] ?? ''))
|
|
||||||
.toList(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Container(
|
|
||||||
constraints: BoxConstraints(
|
|
||||||
minWidth: 30.rpx,
|
|
||||||
),
|
|
||||||
child: Column(
|
|
||||||
mainAxisSize: MainAxisSize.max,
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: messageInfo['data']['val']
|
|
||||||
.map<Widget>((mapItem) =>
|
|
||||||
_buildValueItem(context, mapItem['v'] ?? ''))
|
|
||||||
.toList(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
].divide(SizedBox(width: 30.rpx)),
|
|
||||||
),
|
|
||||||
if (messageInfo['type'] == 'app_system')
|
|
||||||
|
|
||||||
// // right: 26.rpx,
|
|
||||||
// left: 26.rpx,
|
|
||||||
Container(
|
Container(
|
||||||
// width: 123.rpx,
|
constraints: BoxConstraints(
|
||||||
height: 61.rpx,
|
minWidth: 60.rpx,
|
||||||
child: CustomCard(
|
maxWidth: 140.rpx,
|
||||||
borderRadius: 16.rpx, // 直角
|
),
|
||||||
gradientDirection: GradientDirection.vertical,
|
child: Column(
|
||||||
colors: [Color(0xFF84F5FF)],
|
mainAxisSize: MainAxisSize.max,
|
||||||
enableAnimation: true, // 有点击缩放动画
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
enableGradient: false, // 不用渐变
|
children: messageInfo['data']['val']
|
||||||
onTap: () {
|
.map<Widget>((mapItem) =>
|
||||||
// if (messageInfo['status'] == 1) {
|
_buildInfoItem(context, mapItem['k'] ?? ''))
|
||||||
// showConfirmDialog(
|
.toList(),
|
||||||
// context, Container(), "是否确认接受该设备".tr,
|
),
|
||||||
// onConfirm: () async {
|
),
|
||||||
// ApiResponse apiResponse =
|
Container(
|
||||||
// await deviceShareController.confirmShare(
|
constraints: BoxConstraints(
|
||||||
// messageInfo['data']['shareCode']);
|
minWidth: 60.rpx,
|
||||||
// if (apiResponse.code == HttpStatusCodes.ok) {
|
),
|
||||||
// TopSlideNotification.show(
|
child: Column(
|
||||||
// context,
|
mainAxisSize: MainAxisSize.max,
|
||||||
// text: apiResponse.msg!,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
// textColor: themeController.currentColor.sc2,
|
children: messageInfo['data']['val']
|
||||||
// );
|
.map<Widget>((mapItem) =>
|
||||||
// messageController.getMessageList();
|
_buildValueItem(context, mapItem['v'] ?? ''))
|
||||||
// messageController.updateAll();
|
.toList(),
|
||||||
// } else {
|
),
|
||||||
// TopSlideNotification.show(
|
),
|
||||||
// context,
|
]),
|
||||||
// text: apiResponse.msg!,
|
if (messageInfo['type'] == 'app_system')
|
||||||
// textColor: themeController.currentColor.sc9,
|
Padding(
|
||||||
// );
|
padding: EdgeInsets.only(top: 28.rpx),
|
||||||
// messageController.getMessageList();
|
child: Container(
|
||||||
// messageController.updateAll();
|
height: 60.rpx,
|
||||||
// }
|
child: CustomCard(
|
||||||
// }, onCancel: () {});
|
borderRadius: 16.rpx, // 直角
|
||||||
// }
|
gradientDirection: GradientDirection.vertical,
|
||||||
Get.toNamed('/messageDetail', arguments: messageInfo);
|
colors: [Color(0xFF84F5FF)],
|
||||||
},
|
enableAnimation: true, // 有点击缩放动画
|
||||||
child: Center(
|
enableGradient: false, // 不用渐变
|
||||||
child: Text(
|
onTap: () {
|
||||||
// getMessageStatus(messageInfo['status']),
|
// if (messageInfo['status'] == 1) {
|
||||||
"查看详情",
|
// showConfirmDialog(
|
||||||
style: TextStyle(
|
// context, Container(), "是否确认接受该设备".tr,
|
||||||
fontFamily: 'Inter',
|
// onConfirm: () async {
|
||||||
fontSize: 26.rpx,
|
// ApiResponse apiResponse =
|
||||||
letterSpacing: 0.0,
|
// await deviceShareController.confirmShare(
|
||||||
color: Color(0xFF011D33),
|
// messageInfo['data']['shareCode']);
|
||||||
|
// if (apiResponse.code == HttpStatusCodes.ok) {
|
||||||
|
// TopSlideNotification.show(
|
||||||
|
// context,
|
||||||
|
// text: apiResponse.msg!,
|
||||||
|
// textColor: themeController.currentColor.sc2,
|
||||||
|
// );
|
||||||
|
// messageController.getMessageList();
|
||||||
|
// messageController.updateAll();
|
||||||
|
// } else {
|
||||||
|
// TopSlideNotification.show(
|
||||||
|
// context,
|
||||||
|
// text: apiResponse.msg!,
|
||||||
|
// textColor: themeController.currentColor.sc9,
|
||||||
|
// );
|
||||||
|
// messageController.getMessageList();
|
||||||
|
// messageController.updateAll();
|
||||||
|
// }
|
||||||
|
// }, onCancel: () {});
|
||||||
|
// }
|
||||||
|
Get.toNamed('/messageDetail', arguments: messageInfo);
|
||||||
|
},
|
||||||
|
child: Center(
|
||||||
|
child: Text(
|
||||||
|
// getMessageStatus(messageInfo['status']),
|
||||||
|
"查看详情",
|
||||||
|
style: TextStyle(
|
||||||
|
fontFamily: 'Inter',
|
||||||
|
fontSize: 26.rpx,
|
||||||
|
letterSpacing: 0.0,
|
||||||
|
color: Color(0xFF011D33),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
)
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -161,7 +157,7 @@ class _MhMessageListWidgetState extends State<MhMessageListWidget> {
|
|||||||
Widget _buildInfoItem(BuildContext context, String label) {
|
Widget _buildInfoItem(BuildContext context, String label) {
|
||||||
return Container(
|
return Container(
|
||||||
constraints: BoxConstraints(
|
constraints: BoxConstraints(
|
||||||
minHeight: 62.rpx,
|
minHeight: 60.rpx,
|
||||||
),
|
),
|
||||||
child: Align(
|
child: Align(
|
||||||
alignment: AlignmentDirectional(-1, 0),
|
alignment: AlignmentDirectional(-1, 0),
|
||||||
@@ -183,7 +179,7 @@ class _MhMessageListWidgetState extends State<MhMessageListWidget> {
|
|||||||
Widget _buildValueItem(BuildContext context, value) {
|
Widget _buildValueItem(BuildContext context, value) {
|
||||||
return Container(
|
return Container(
|
||||||
constraints: BoxConstraints(
|
constraints: BoxConstraints(
|
||||||
minHeight: 62.rpx,
|
minHeight: 60.rpx,
|
||||||
),
|
),
|
||||||
child: Align(
|
child: Align(
|
||||||
alignment: AlignmentDirectional(-1, 0),
|
alignment: AlignmentDirectional(-1, 0),
|
||||||
|
|||||||
@@ -196,7 +196,7 @@ class _ApplyRepairSuccessState extends State<ApplyRepairSuccess> {
|
|||||||
AppConstants().button_container_radius, // 圆角半径
|
AppConstants().button_container_radius, // 圆角半径
|
||||||
gradientDirection: GradientDirection.vertical,
|
gradientDirection: GradientDirection.vertical,
|
||||||
onTap: () async {
|
onTap: () async {
|
||||||
Get.toNamed("/repairListPage");
|
Get.toNamed("/deviceRepairPage");
|
||||||
},
|
},
|
||||||
colors: [
|
colors: [
|
||||||
Color(0xFFFCFCFC),
|
Color(0xFFFCFCFC),
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import 'package:vbvs_app/model/api_response.dart';
|
|||||||
import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart';
|
import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart';
|
||||||
import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart';
|
import 'package:vbvs_app/pages/mh_page/homepage/controller/mht_home_controller.dart';
|
||||||
import 'package:vbvs_app/pages/mh_page/test/WebviewTestModel.dart';
|
import 'package:vbvs_app/pages/mh_page/test/WebviewTestModel.dart';
|
||||||
|
import 'dart:ui' as ui;
|
||||||
|
|
||||||
class BluetoothPage extends StatefulWidget {
|
class BluetoothPage extends StatefulWidget {
|
||||||
final Map data;
|
final Map data;
|
||||||
@@ -21,10 +22,41 @@ class BluetoothPage extends StatefulWidget {
|
|||||||
|
|
||||||
class _BluetoothPageState extends State<BluetoothPage> {
|
class _BluetoothPageState extends State<BluetoothPage> {
|
||||||
late RxMap<String, dynamic> obsData;
|
late RxMap<String, dynamic> obsData;
|
||||||
|
|
||||||
|
double _textHalfWidth = 0;
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
obsData = Map<String, dynamic>.from(widget.data).obs; // 复制成 obs
|
obsData = Map<String, dynamic>.from(widget.data).obs; // 复制成 obs
|
||||||
|
String text;
|
||||||
|
|
||||||
|
if (widget.data.containsKey('name') &&
|
||||||
|
widget.data['name'] != null &&
|
||||||
|
widget.data['name'].toString().isNotEmpty) {
|
||||||
|
text = widget.data['name'].toString();
|
||||||
|
} else {
|
||||||
|
text = '未命名'.tr;
|
||||||
|
}
|
||||||
|
|
||||||
|
_calculateTextHalfWidth(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _calculateTextHalfWidth(String text) {
|
||||||
|
final textSpan = TextSpan(
|
||||||
|
text: text,
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 40.rpx,
|
||||||
|
height: 1,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
final textPainter = TextPainter(
|
||||||
|
text: textSpan,
|
||||||
|
textDirection: ui.TextDirection.ltr,
|
||||||
|
);
|
||||||
|
textPainter.layout(); // 计算文本宽度
|
||||||
|
setState(() {
|
||||||
|
_textHalfWidth = textPainter.width / 2;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
BoxConstraints? bodysize;
|
BoxConstraints? bodysize;
|
||||||
@@ -85,39 +117,53 @@ class _BluetoothPageState extends State<BluetoothPage> {
|
|||||||
children: [
|
children: [
|
||||||
Column(
|
Column(
|
||||||
children: [
|
children: [
|
||||||
Row(
|
Container(
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
width: double.infinity,
|
||||||
children: [
|
child: Stack(
|
||||||
Text(
|
alignment: Alignment.center,
|
||||||
obsData['name']?.toString() ?? '未命名',
|
children: [
|
||||||
style: TextStyle(
|
Text(
|
||||||
color: Colors.white,
|
obsData['name']?.toString() ?? '未命名',
|
||||||
fontSize: 40.rpx,
|
style: TextStyle(
|
||||||
|
color: Colors.white,
|
||||||
|
fontSize: 40.rpx,
|
||||||
|
),
|
||||||
|
overflow:
|
||||||
|
TextOverflow.ellipsis, // 超出部分显示省略号
|
||||||
|
maxLines: 1, // 限制为单行
|
||||||
),
|
),
|
||||||
),
|
Positioned(
|
||||||
SizedBox(width: 27.rpx),
|
left:
|
||||||
ClickableContainer(
|
MediaQuery.of(context).size.width /
|
||||||
backgroundColor: Colors.transparent,
|
2 +
|
||||||
highlightColor: const Color(0xFF055466),
|
_textHalfWidth +
|
||||||
padding: EdgeInsets.only(left: 0),
|
22.rpx,
|
||||||
onTap: () async {
|
top: 5.rpx,
|
||||||
var x = await Get.toNamed(
|
child: ClickableContainer(
|
||||||
"/editBedPage",
|
backgroundColor: Colors.transparent,
|
||||||
arguments: obsData);
|
highlightColor:
|
||||||
if (x != null) {
|
const Color(0xFF055466),
|
||||||
setState(() {
|
padding: EdgeInsets.only(left: 0),
|
||||||
obsData.addAll(x); // 值更新后主动刷新页面
|
onTap: () async {
|
||||||
});
|
var x = await Get.toNamed(
|
||||||
}
|
"/editBedPage",
|
||||||
},
|
arguments: obsData);
|
||||||
child: Container(
|
if (x != null) {
|
||||||
width: 42.rpx,
|
setState(() {
|
||||||
height: 42.rpx,
|
obsData
|
||||||
child: SvgPicture.asset(
|
.addAll(x); // 值更新后主动刷新页面
|
||||||
"assets/img/icon/bluetooth_edit.svg",
|
});
|
||||||
color: Colors.white,
|
}
|
||||||
)))
|
},
|
||||||
],
|
child: Container(
|
||||||
|
width: 42.rpx,
|
||||||
|
height: 42.rpx,
|
||||||
|
child: SvgPicture.asset(
|
||||||
|
"assets/img/icon/bluetooth_edit.svg",
|
||||||
|
color: Colors.white,
|
||||||
|
))))
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
|
|
||||||
const SizedBox(height: 4),
|
const SizedBox(height: 4),
|
||||||
@@ -156,17 +202,17 @@ class _BluetoothPageState extends State<BluetoothPage> {
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|
||||||
const SizedBox(height: 24),
|
const SizedBox(height: 24),
|
||||||
|
|
||||||
Expanded(
|
Expanded(
|
||||||
child: ListView(
|
child: ListView(
|
||||||
padding: EdgeInsets.symmetric(horizontal: 30.rpx),
|
padding: EdgeInsets.only(
|
||||||
|
left: 30.rpx, right: 30.rpx, bottom: 60.rpx),
|
||||||
|
reverse: !isBind,
|
||||||
children: [
|
children: [
|
||||||
_buildMenuButton(
|
|
||||||
context, '详情', "/devicePeopleInfo",
|
|
||||||
arguments: obsData),
|
|
||||||
if (isBind) ...[
|
if (isBind) ...[
|
||||||
|
_buildMenuButton(
|
||||||
|
context, '详情', "/devicePeopleInfo",
|
||||||
|
arguments: obsData),
|
||||||
_buildMenuButton(
|
_buildMenuButton(
|
||||||
context,
|
context,
|
||||||
'人员资料',
|
'人员资料',
|
||||||
@@ -185,164 +231,28 @@ class _BluetoothPageState extends State<BluetoothPage> {
|
|||||||
context, '分享设备', "/deviceSharePage",
|
context, '分享设备', "/deviceSharePage",
|
||||||
arguments: obsData),
|
arguments: obsData),
|
||||||
],
|
],
|
||||||
_buildMenuButton(
|
if (!isBind) ...[
|
||||||
context,
|
_buildMenuButton(
|
||||||
obsData['bind_type'] == 1 ? '解绑' : '删除',
|
context,
|
||||||
"",
|
obsData['bind_type'] == 1 ? '解绑' : '删除',
|
||||||
onTap: () {
|
"",
|
||||||
if (obsData['bind_type'] == 1) {
|
onTap: () {/*...*/},
|
||||||
// 解绑弹窗
|
),
|
||||||
showUnbindConfirmDialog(
|
_buildMenuButton(
|
||||||
context: context,
|
context, '详情', "/devicePeopleInfo",
|
||||||
title: "是否进行解绑?",
|
arguments: obsData),
|
||||||
onConfirm: () async {
|
],
|
||||||
await deviceListController
|
if (isBind) ...[
|
||||||
.unbindDevice(obsData);
|
_buildMenuButton(
|
||||||
await deviceListController
|
context,
|
||||||
.getDeviceList();
|
obsData['bind_type'] == 1 ? '解绑' : '删除',
|
||||||
MHTHomeController homeController =
|
"",
|
||||||
Get.find();
|
onTap: () {/*...*/},
|
||||||
homeController.selectDevcie.value =
|
),
|
||||||
"";
|
],
|
||||||
try {
|
|
||||||
WebviewTestController
|
|
||||||
webviewTestController =
|
|
||||||
Get.find();
|
|
||||||
webviewTestController
|
|
||||||
.web.jsbridge?.dart
|
|
||||||
.unBindDevice();
|
|
||||||
} catch (e) {
|
|
||||||
ef.log("[h5]通知列表更新报错：$e");
|
|
||||||
}
|
|
||||||
Get.toNamed("/mianPageBottomChange");
|
|
||||||
// 执行解绑逻辑
|
|
||||||
},
|
|
||||||
onCancel: () {
|
|
||||||
// 点击取消后的逻辑
|
|
||||||
},
|
|
||||||
);
|
|
||||||
} else if (obsData['bind_type'] == 2) {
|
|
||||||
// 删除弹窗
|
|
||||||
showDeleteDeviceConfirmDialog(
|
|
||||||
context: context,
|
|
||||||
title: "是否进行删除?",
|
|
||||||
onConfirm: () async {
|
|
||||||
await deviceListController
|
|
||||||
.unbindDevice(
|
|
||||||
obsData,
|
|
||||||
);
|
|
||||||
await deviceListController
|
|
||||||
.getDeviceList();
|
|
||||||
Get.toNamed("/mianPageBottomChange");
|
|
||||||
},
|
|
||||||
onCancel: () {
|
|
||||||
// 点击取消后的逻辑
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
||||||
// Expanded(
|
|
||||||
// child: Align(
|
|
||||||
// alignment: Alignment.bottomCenter,
|
|
||||||
// child: SingleChildScrollView(
|
|
||||||
// reverse: true, // 👈 optional，如果你想要滚动时内容从底部弹出
|
|
||||||
// child: Column(
|
|
||||||
// crossAxisAlignment:
|
|
||||||
// CrossAxisAlignment.stretch,
|
|
||||||
// mainAxisSize: MainAxisSize.min,
|
|
||||||
|
|
||||||
// children: [
|
|
||||||
// _buildMenuButton(
|
|
||||||
// context, '详情', "/devicePeopleInfo",
|
|
||||||
// arguments: obsData),
|
|
||||||
// if (isBind) ...[
|
|
||||||
// _buildMenuButton(
|
|
||||||
// context,
|
|
||||||
// '人员资料',
|
|
||||||
// "/peopleInfoPage",
|
|
||||||
// arguments: obsData,
|
|
||||||
// ),
|
|
||||||
// _buildMenuButton(
|
|
||||||
// context, '房间选择', "/roomPickerPage",
|
|
||||||
// arguments: obsData),
|
|
||||||
// _buildMenuButton(context, '设备校准', ""),
|
|
||||||
// _buildMenuButton(context, '体征传感器', ""),
|
|
||||||
// _buildMenuButton(context, 'WIFI配置', ""),
|
|
||||||
// _buildMenuButton(
|
|
||||||
// context, '睡眠习惯', "/sleepHabitPage"),
|
|
||||||
// _buildMenuButton(
|
|
||||||
// context, '分享设备', "/deviceSharePage",
|
|
||||||
// arguments: obsData),
|
|
||||||
// ],
|
|
||||||
// _buildMenuButton(
|
|
||||||
// context,
|
|
||||||
// obsData['bind_type'] == 1 ? '解绑' : '删除',
|
|
||||||
// "",
|
|
||||||
// onTap: () {
|
|
||||||
// if (obsData['bind_type'] == 1) {
|
|
||||||
// // 解绑弹窗
|
|
||||||
// showUnbindConfirmDialog(
|
|
||||||
// context: context,
|
|
||||||
// title: "是否进行解绑?",
|
|
||||||
// onConfirm: () async {
|
|
||||||
// await deviceListController
|
|
||||||
// .unbindDevice(obsData);
|
|
||||||
// await deviceListController
|
|
||||||
// .getDeviceList();
|
|
||||||
// MHTHomeController homeController =
|
|
||||||
// Get.find();
|
|
||||||
// homeController
|
|
||||||
// .selectDevcie.value = "";
|
|
||||||
// try {
|
|
||||||
// WebviewTestController
|
|
||||||
// webviewTestController =
|
|
||||||
// Get.find();
|
|
||||||
// webviewTestController
|
|
||||||
// .web.jsbridge?.dart
|
|
||||||
// .unBindDevice();
|
|
||||||
// } catch (e) {
|
|
||||||
// ef.log("[h5]通知列表更新报错：$e");
|
|
||||||
// }
|
|
||||||
// Get.toNamed(
|
|
||||||
// "/mianPageBottomChange");
|
|
||||||
// // 执行解绑逻辑
|
|
||||||
// },
|
|
||||||
// onCancel: () {
|
|
||||||
// // 点击取消后的逻辑
|
|
||||||
// },
|
|
||||||
// );
|
|
||||||
// } else if (obsData['bind_type'] == 2) {
|
|
||||||
// // 删除弹窗
|
|
||||||
// showDeleteDeviceConfirmDialog(
|
|
||||||
// context: context,
|
|
||||||
// title: "是否进行删除?",
|
|
||||||
// onConfirm: () async {
|
|
||||||
// await deviceListController
|
|
||||||
// .unbindDevice(
|
|
||||||
// obsData,
|
|
||||||
// );
|
|
||||||
// await deviceListController
|
|
||||||
// .getDeviceList();
|
|
||||||
// Get.toNamed(
|
|
||||||
// "/mianPageBottomChange");
|
|
||||||
// },
|
|
||||||
// onCancel: () {
|
|
||||||
// // 点击取消后的逻辑
|
|
||||||
// },
|
|
||||||
// );
|
|
||||||
// }
|
|
||||||
// },
|
|
||||||
// ),
|
|
||||||
// ],
|
|
||||||
// ),
|
|
||||||
// ),
|
|
||||||
// ),
|
|
||||||
// ),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
)),
|
)),
|
||||||
|
|||||||
@@ -46,146 +46,160 @@ class LineView extends StatelessWidget {
|
|||||||
bottom: bottomPadding.rpx,
|
bottom: bottomPadding.rpx,
|
||||||
),
|
),
|
||||||
child: EasyChartView(
|
child: EasyChartView(
|
||||||
size: Size(b.maxWidth, 220.rpx),
|
size: Size(b.maxWidth, 220.rpx),
|
||||||
drawer: ChartDrawer(
|
drawer: ChartDrawer(
|
||||||
xAxis: ChartAxis(
|
xAxis: ChartAxis(
|
||||||
intent: 44,
|
intent: 44,
|
||||||
entintent: 15,
|
entintent: 15,
|
||||||
labels: xLabels,
|
labels: xLabels,
|
||||||
count: xCount,
|
count: xCount,
|
||||||
),
|
),
|
||||||
yAxis: ChartAxis(
|
yAxis: ChartAxis(
|
||||||
color: Colors.transparent,
|
color: Colors.transparent,
|
||||||
isX: false,
|
isX: false,
|
||||||
intent: 0,
|
intent: 0,
|
||||||
entintent: 45.rpx.toInt(),
|
entintent: 45.rpx.toInt(),
|
||||||
labels: yLabels,
|
labels: yLabels,
|
||||||
count: yCount,
|
count: yCount,
|
||||||
),
|
),
|
||||||
ondrawer: (canvas, size, drawer) {
|
ondrawer: (canvas, size, drawer) {
|
||||||
canvas.scale(1, -1);
|
canvas.scale(1, -1);
|
||||||
ChartLables.drawText(
|
ChartLables.drawText(
|
||||||
canvas,
|
|
||||||
xUnit!,
|
|
||||||
Offset(drawer.yAxis.labels.first.offset.dx,
|
|
||||||
-drawer.drawsize.height + 0),
|
|
||||||
style: TextStyle(
|
|
||||||
color: Color(0xFFFFFFFF).withOpacity(0.6),
|
|
||||||
fontSize: 18.rpx,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
canvas.scale(1, -1);
|
|
||||||
// 虚线
|
|
||||||
for (var i = 1;
|
|
||||||
i < drawer.yAxis.labels.first.labels.length;
|
|
||||||
i++) {
|
|
||||||
drawer.drawHorizontalDashedLine(
|
|
||||||
canvas,
|
canvas,
|
||||||
drawer.yAxis.labels.first.steps[i].dy,
|
xUnit!,
|
||||||
drawer.drawsize.width,
|
Offset(drawer.yAxis.labels.first.offset.dx,
|
||||||
dashWidth: 3,
|
-drawer.drawsize.height + 0),
|
||||||
dashSpace: 3,
|
style: TextStyle(
|
||||||
paint: Paint()..color = Colors.grey,
|
color: Color(0xFFFFFFFF).withOpacity(0.6),
|
||||||
|
fontSize: 18.rpx,
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
canvas.scale(1, -1);
|
||||||
|
// 虚线
|
||||||
if (displayMode == ChartDisplayMode.line ||
|
for (var i = 1;
|
||||||
displayMode == ChartDisplayMode.both) {
|
i < drawer.yAxis.labels.first.labels.length;
|
||||||
drawer.drawcurveline(
|
i++) {
|
||||||
canvas,
|
drawer.drawHorizontalDashedLine(
|
||||||
points,
|
|
||||||
Paint()
|
|
||||||
..color = Color(0xFF00C1AA)
|
|
||||||
..strokeWidth = 1.5,
|
|
||||||
);
|
|
||||||
drawer.drawpoints(
|
|
||||||
canvas,
|
|
||||||
points,
|
|
||||||
5,
|
|
||||||
Paint()..color = Color(0Xff00C1AA),
|
|
||||||
values: tips,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (displayMode == ChartDisplayMode.bar ||
|
|
||||||
displayMode == ChartDisplayMode.both) {
|
|
||||||
for (var i = 0; i < points.length; i++) {
|
|
||||||
final offset = points[i];
|
|
||||||
// final color = (barColors != null && barColors!.length > i)
|
|
||||||
// ? barColors![i]
|
|
||||||
// : Colors.yellow.withAlpha(100 + i * 10); // 默认回退
|
|
||||||
drawer.drawBar(
|
|
||||||
canvas,
|
canvas,
|
||||||
Offset(offset.dx, 0),
|
drawer.yAxis.labels.first.steps[i].dy,
|
||||||
barWidth,
|
drawer.drawsize.width,
|
||||||
offset.dy,
|
dashWidth: 3,
|
||||||
|
dashSpace: 3,
|
||||||
Paint()
|
paint: Paint()..color = Colors.grey,
|
||||||
..color = barColors!.length == 0
|
|
||||||
? Colors.white
|
|
||||||
: stringToColor(barColors![i]),
|
|
||||||
value: tips[i],
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if ((displayMode == ChartDisplayMode.dualBar ||
|
|
||||||
displayMode == ChartDisplayMode.both) &&
|
|
||||||
dualBarPoints != null) {
|
|
||||||
for (int i = 0; i < dualBarPoints!.length; i++) {
|
|
||||||
final List<Offset> bar = dualBarPoints![i];
|
|
||||||
if (bar.length < 3) continue;
|
|
||||||
|
|
||||||
final Offset deep = bar[0]; // 深睡：起点 -> deep.dy
|
if (displayMode == ChartDisplayMode.line ||
|
||||||
final Offset light = bar[1]; // 浅睡：起点 -> light.dy
|
displayMode == ChartDisplayMode.both) {
|
||||||
final Offset total = bar[2]; // 总睡眠：起点 -> total.dy
|
drawer.drawcurveline(
|
||||||
|
canvas,
|
||||||
const String deepColor = "#21AD5D"; // 深睡
|
points,
|
||||||
const String lightColor = "#45D989"; // 浅睡
|
Paint()
|
||||||
const String remainColor = "#D3D3D3"; // 剩余
|
..color = Color(0xFF00C1AA)
|
||||||
|
..strokeWidth = 1.5,
|
||||||
// 画深睡
|
);
|
||||||
if (deep.dy > 0) {
|
drawer.drawpoints(
|
||||||
drawer.drawBar(
|
canvas,
|
||||||
canvas,
|
points,
|
||||||
Offset(deep.dx, 0),
|
5,
|
||||||
barWidth,
|
Paint()..color = Color(0Xff00C1AA),
|
||||||
deep.dy,
|
values: tips,
|
||||||
value: tips[i],
|
);
|
||||||
Paint()..color = stringToColor(deepColor),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 画浅睡（从 deep.dy 开始）
|
|
||||||
final double lightHeight = light.dy - deep.dy;
|
|
||||||
if (lightHeight > 0) {
|
|
||||||
drawer.drawBar(
|
|
||||||
canvas,
|
|
||||||
Offset(light.dx, deep.dy),
|
|
||||||
barWidth,
|
|
||||||
lightHeight,
|
|
||||||
Paint()..color = stringToColor(lightColor),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 判断是否需要画灰色剩余段和文字
|
|
||||||
final double remainHeight = total.dy - light.dy;
|
|
||||||
if (remainHeight > 0.01) {
|
|
||||||
// 灰色部分
|
|
||||||
drawer.drawBar(
|
|
||||||
canvas,
|
|
||||||
Offset(total.dx, light.dy),
|
|
||||||
barWidth,
|
|
||||||
remainHeight,
|
|
||||||
Paint()
|
|
||||||
..color = stringToColor(remainColor).withOpacity(0.8),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
// 若已满，不绘制灰色段、也不显示文字（不做任何处理）
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
},
|
if (displayMode == ChartDisplayMode.bar ||
|
||||||
),
|
displayMode == ChartDisplayMode.both) {
|
||||||
));
|
for (var i = 0; i < points.length; i++) {
|
||||||
|
final offset = points[i];
|
||||||
|
// final color = (barColors != null && barColors!.length > i)
|
||||||
|
// ? barColors![i]
|
||||||
|
// : Colors.yellow.withAlpha(100 + i * 10); // 默认回退
|
||||||
|
drawer.drawBar(
|
||||||
|
canvas,
|
||||||
|
Offset(offset.dx, 0),
|
||||||
|
barWidth,
|
||||||
|
offset.dy,
|
||||||
|
Paint()
|
||||||
|
..color = barColors!.length == 0
|
||||||
|
? Colors.white
|
||||||
|
: stringToColor(barColors![i]),
|
||||||
|
value: tips[i],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ((displayMode == ChartDisplayMode.dualBar ||
|
||||||
|
displayMode == ChartDisplayMode.both) &&
|
||||||
|
dualBarPoints != null) {
|
||||||
|
for (int i = 0; i < dualBarPoints!.length; i++) {
|
||||||
|
final List<Offset> bar = dualBarPoints![i];
|
||||||
|
if (bar.length < 3) continue;
|
||||||
|
|
||||||
|
final Offset deep = bar[0]; // 深睡：起点 -> deep.dy
|
||||||
|
final Offset light = bar[1]; // 浅睡：起点 -> light.dy
|
||||||
|
final Offset total = bar[2]; // 总睡眠：起点 -> total.dy
|
||||||
|
|
||||||
|
const String deepColor = "#21AD5D"; // 深睡
|
||||||
|
const String lightColor = "#45D989"; // 浅睡
|
||||||
|
const String remainColor = "#D3D3D3"; // 剩余
|
||||||
|
|
||||||
|
// 画深睡
|
||||||
|
if (deep.dy > 0) {
|
||||||
|
drawer.drawBar(
|
||||||
|
canvas,
|
||||||
|
Offset(deep.dx, 0),
|
||||||
|
barWidth,
|
||||||
|
deep.dy,
|
||||||
|
value: tips[i],
|
||||||
|
Paint()..color = stringToColor(deepColor),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 画浅睡（从 deep.dy 开始）
|
||||||
|
final double lightHeight = light.dy - deep.dy;
|
||||||
|
if (lightHeight > 0) {
|
||||||
|
drawer.drawBar(
|
||||||
|
canvas,
|
||||||
|
Offset(light.dx, deep.dy),
|
||||||
|
barWidth,
|
||||||
|
lightHeight,
|
||||||
|
Paint()..color = stringToColor(lightColor),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 判断是否需要画灰色剩余段和文字
|
||||||
|
final double remainHeight = total.dy - light.dy;
|
||||||
|
if (remainHeight > 0.01) {
|
||||||
|
// 灰色部分
|
||||||
|
drawer.drawBar(
|
||||||
|
canvas,
|
||||||
|
Offset(total.dx, light.dy),
|
||||||
|
barWidth,
|
||||||
|
remainHeight,
|
||||||
|
Paint()
|
||||||
|
..color =
|
||||||
|
stringToColor(remainColor).withOpacity(0.8),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
// 若已满，不绘制灰色段、也不显示文字（不做任何处理）
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
onTips: (view, tips) => Container(
|
||||||
|
padding: EdgeInsets.all(16.rpx), // ✅ 容器内部边距，给文字留空间
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: themeController.currentColor.sc5,
|
||||||
|
borderRadius: BorderRadius.circular(20.rpx),
|
||||||
|
),
|
||||||
|
alignment: Alignment.center,
|
||||||
|
child: Text(
|
||||||
|
tips,
|
||||||
|
style: TextStyle(
|
||||||
|
color: Color(0XFFFFFFFF), // 多了一个 F，建议改成正确格式
|
||||||
|
fontSize: 26.rpx,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -357,7 +357,7 @@ class DeviceInfoWidget extends GetView {
|
|||||||
EdgeInsetsDirectional.fromSTEB(
|
EdgeInsetsDirectional.fromSTEB(
|
||||||
5, 0, 5, 0),
|
5, 0, 5, 0),
|
||||||
child: Text(
|
child: Text(
|
||||||
'${device['suname']?.length > 5 ? device['suname'].substring(0, 5) + '...' : device['suname']}',
|
'${device['source']?.length > 5 ? device['source'].substring(0, 5) + '...' : device['source']}',
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontFamily: 'Readex Pro',
|
fontFamily: 'Readex Pro',
|
||||||
color: Color(0xFF85F5FF),
|
color: Color(0xFF85F5FF),
|
||||||
|
|||||||
@@ -900,17 +900,18 @@ class _NewHomePageState extends State<NewHomePage> {
|
|||||||
SizedBox(width: 40.rpx),
|
SizedBox(width: 40.rpx),
|
||||||
CircleAvatar(
|
CircleAvatar(
|
||||||
radius: 27.rpx, // 可根据需求调整
|
radius: 27.rpx, // 可根据需求调整
|
||||||
|
backgroundColor: Colors.transparent,
|
||||||
backgroundImage: login == 1
|
backgroundImage: login == 1
|
||||||
? (userInfoController.model.user!.avatar == null ||
|
? (userInfoController.model.user!.avatar == null ||
|
||||||
userInfoController.model.user!.avatar!.isEmpty
|
userInfoController.model.user!.avatar!.isEmpty
|
||||||
? const AssetImage(
|
? const AssetImage(
|
||||||
"assets/images/default_avatar.png",
|
"assets/images/mine_avatar.png",
|
||||||
)
|
)
|
||||||
: NetworkImage(
|
: NetworkImage(
|
||||||
userInfoController.model.user!.avatar!,
|
userInfoController.model.user!.avatar!,
|
||||||
))
|
))
|
||||||
: const AssetImage(
|
: const AssetImage(
|
||||||
"assets/images/default_avatar.png",
|
"assets/images/mine_avatar.png",
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(width: 23.rpx), // 左侧头像和文本之间的间距
|
SizedBox(width: 23.rpx), // 左侧头像和文本之间的间距
|
||||||
@@ -923,17 +924,18 @@ class _NewHomePageState extends State<NewHomePage> {
|
|||||||
SizedBox(width: 40.rpx),
|
SizedBox(width: 40.rpx),
|
||||||
CircleAvatar(
|
CircleAvatar(
|
||||||
radius: 27.rpx, // 可根据需求调整
|
radius: 27.rpx, // 可根据需求调整
|
||||||
|
backgroundColor: Colors.transparent,
|
||||||
backgroundImage: login == 1
|
backgroundImage: login == 1
|
||||||
? (userInfoController.model.user!.avatar == null ||
|
? (userInfoController.model.user!.avatar == null ||
|
||||||
userInfoController.model.user!.avatar!.isEmpty
|
userInfoController.model.user!.avatar!.isEmpty
|
||||||
? const AssetImage(
|
? const AssetImage(
|
||||||
"assets/images/default_avatar.png",
|
"assets/images/mine_avatar.png",
|
||||||
)
|
)
|
||||||
: NetworkImage(
|
: NetworkImage(
|
||||||
userInfoController.model.user!.avatar!,
|
userInfoController.model.user!.avatar!,
|
||||||
))
|
))
|
||||||
: const AssetImage(
|
: const AssetImage(
|
||||||
"assets/images/default_avatar.png",
|
"assets/images/mine_avatar.png",
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(width: 23.rpx), // 左侧头像和文本之间的间距
|
SizedBox(width: 23.rpx), // 左侧头像和文本之间的间距
|
||||||
|
|||||||
@@ -192,9 +192,8 @@ class _MessageDetailPageState extends State<MessageDetailPage> {
|
|||||||
getStatusText(widget.data['status']),
|
getStatusText(widget.data['status']),
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontFamily: 'Readex Pro',
|
fontFamily: 'Readex Pro',
|
||||||
color: widget.data['data']['status'] == 1
|
color:
|
||||||
? Colors.white
|
widget.data['status'] == 1 ? Colors.white : Color(0xFF929699),
|
||||||
: Color(0xFF929699),
|
|
||||||
fontSize: 26.rpx,
|
fontSize: 26.rpx,
|
||||||
letterSpacing: 0,
|
letterSpacing: 0,
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -141,7 +141,7 @@ class _MinePageState extends State<NewMinePage> {
|
|||||||
userInfoController
|
userInfoController
|
||||||
.model.user!.avatar!.isEmpty
|
.model.user!.avatar!.isEmpty
|
||||||
? Image.asset(
|
? Image.asset(
|
||||||
"assets/images/default_avatar.png",
|
"assets/images/mine_avatar.png",
|
||||||
fit: BoxFit.cover,
|
fit: BoxFit.cover,
|
||||||
)
|
)
|
||||||
: Image.network(
|
: Image.network(
|
||||||
@@ -149,7 +149,7 @@ class _MinePageState extends State<NewMinePage> {
|
|||||||
fit: BoxFit.cover,
|
fit: BoxFit.cover,
|
||||||
))
|
))
|
||||||
: Image.asset(
|
: Image.asset(
|
||||||
"assets/images/default_avatar.png",
|
"assets/images/mine_avatar.png",
|
||||||
fit: BoxFit.cover,
|
fit: BoxFit.cover,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ class RepairHistoryWidget extends GetView<RepairInfoController> {
|
|||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
repairListController.model.repairList[index]['device']
|
repairListController.model.repairList[index]['device']
|
||||||
[0]['mac'] ??
|
['mac'] ??
|
||||||
'',
|
'',
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
color: Colors.white, fontSize: 30.rpx, height: 1),
|
color: Colors.white, fontSize: 30.rpx, height: 1),
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ Widget WeekDataWidget(
|
|||||||
offset,
|
offset,
|
||||||
textAlign: TextAlign.center,
|
textAlign: TextAlign.center,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
color: Color(0xFFFFFFFF).withOpacity(0.6),
|
color: Color(0xFFFFFFFF).withOpacity(0.06),
|
||||||
fontSize: 18.rpx),
|
fontSize: 18.rpx),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ class AvgSleepScoreWidget extends StatelessWidget {
|
|||||||
Text(
|
Text(
|
||||||
sleepReport['score']?['max']?.toString() ?? '--',
|
sleepReport['score']?['max']?.toString() ?? '--',
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
color: stringToColor("#FF9F66"),
|
color: Colors.white,
|
||||||
fontSize: 48.rpx,
|
fontSize: 48.rpx,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
|
|||||||
final GlobalKey heartRateCardKey = GlobalKey();
|
final GlobalKey heartRateCardKey = GlobalKey();
|
||||||
final GlobalKey breatheCardKey = GlobalKey();
|
final GlobalKey breatheCardKey = GlobalKey();
|
||||||
final ScrollController _scrollController = ScrollController();
|
final ScrollController _scrollController = ScrollController();
|
||||||
|
final RxBool isRightLimit = false.obs;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void didUpdateWidget(NewSleepReportPage oldWidget) {
|
void didUpdateWidget(NewSleepReportPage oldWidget) {
|
||||||
@@ -590,176 +591,180 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
|
|||||||
child: getTimeWidget(),
|
child: getTimeWidget(),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
if (widget.data['person_show'] == null ||
|
if (widget.data['person_show'] == null ||
|
||||||
widget.data['person_show'] != false)
|
widget.data['person_show'] != false)
|
||||||
Padding(
|
Padding(
|
||||||
padding: EdgeInsetsDirectional.fromSTEB(
|
padding: EdgeInsetsDirectional.fromSTEB(
|
||||||
30.rpx, 0.rpx, 30.rpx, 51.rpx),
|
30.rpx, 0.rpx, 30.rpx, 51.rpx),
|
||||||
child: ClickableContainer(
|
child: ClickableContainer(
|
||||||
backgroundColor:
|
backgroundColor:
|
||||||
widget.data['backgroundColor'] != null
|
widget.data['backgroundColor'] != null
|
||||||
? widget.data['backgroundColor']
|
? widget.data['backgroundColor']
|
||||||
: themeController.currentColor.sc5,
|
: themeController.currentColor.sc5,
|
||||||
highlightColor:
|
highlightColor: themeController
|
||||||
themeController.currentColor.sc5, // 或你希望的点击水波纹颜色
|
.currentColor.sc5, // 或你希望的点击水波纹颜色
|
||||||
borderRadius: AppConstants()
|
borderRadius: AppConstants()
|
||||||
.normal_container_radius, // 如果你想加圆角可以设置 eg. 12.rpx
|
.normal_container_radius, // 如果你想加圆角可以设置 eg. 12.rpx
|
||||||
padding: EdgeInsets.zero,
|
padding: EdgeInsets.zero,
|
||||||
onTap: () {},
|
onTap: () {},
|
||||||
child: Row(
|
child: Row(
|
||||||
mainAxisSize: MainAxisSize.max,
|
mainAxisSize: MainAxisSize.max,
|
||||||
children: [
|
children: [
|
||||||
Flexible(
|
Flexible(
|
||||||
flex: 2,
|
flex: 2,
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment:
|
||||||
children: [
|
CrossAxisAlignment.start,
|
||||||
Row(
|
children: [
|
||||||
children: [
|
Row(
|
||||||
Column(
|
children: [
|
||||||
crossAxisAlignment:
|
Column(
|
||||||
CrossAxisAlignment.end,
|
crossAxisAlignment:
|
||||||
children: [
|
CrossAxisAlignment.end,
|
||||||
Text(
|
children: [
|
||||||
'姓名'.tr,
|
Text(
|
||||||
style: TextStyle(
|
'姓名'.tr,
|
||||||
fontFamily: 'Inter',
|
style: TextStyle(
|
||||||
fontSize: 26.rpx,
|
fontFamily: 'Inter',
|
||||||
letterSpacing: 0.0,
|
fontSize: 26.rpx,
|
||||||
color: themeController
|
letterSpacing: 0.0,
|
||||||
.currentColor.sc4,
|
color: themeController
|
||||||
|
.currentColor.sc4,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
Text(
|
||||||
Text(
|
'年龄'.tr,
|
||||||
'年龄'.tr,
|
style: TextStyle(
|
||||||
style: TextStyle(
|
fontFamily: 'Inter',
|
||||||
fontFamily: 'Inter',
|
fontSize: 26.rpx,
|
||||||
fontSize: 26.rpx,
|
letterSpacing: 0.0,
|
||||||
letterSpacing: 0.0,
|
color: themeController
|
||||||
color: themeController
|
.currentColor.sc4,
|
||||||
.currentColor.sc4,
|
),
|
||||||
),
|
),
|
||||||
),
|
].divide(SizedBox(height: 34.rpx)),
|
||||||
].divide(SizedBox(height: 34.rpx)),
|
),
|
||||||
),
|
Column(
|
||||||
Column(
|
crossAxisAlignment:
|
||||||
crossAxisAlignment:
|
CrossAxisAlignment.start,
|
||||||
CrossAxisAlignment.start,
|
children: [
|
||||||
children: [
|
Text(
|
||||||
Text(
|
(widget.data['person']?['name']
|
||||||
(widget.data['person']?['name']
|
?.toString()
|
||||||
?.toString()
|
.trim()
|
||||||
.trim()
|
.isNotEmpty ??
|
||||||
.isNotEmpty ??
|
false)
|
||||||
false)
|
? widget
|
||||||
? widget
|
.data['person']!['name']
|
||||||
.data['person']!['name']
|
.toString()
|
||||||
.toString()
|
: '未知数据'.tr,
|
||||||
: '未知数据'.tr,
|
style: TextStyle(
|
||||||
style: TextStyle(
|
fontFamily: 'Inter',
|
||||||
fontFamily: 'Inter',
|
fontSize: 26.rpx,
|
||||||
fontSize: 26.rpx,
|
letterSpacing: 0.0,
|
||||||
letterSpacing: 0.0,
|
color: themeController
|
||||||
color: themeController
|
.currentColor.sc3,
|
||||||
.currentColor.sc3,
|
),
|
||||||
),
|
),
|
||||||
),
|
Text(
|
||||||
Text(
|
'${MyUtils.getAgeByDate(MyUtils.formatBirthdayTime(widget.data['person']?['birthday'])) ?? '未知数据'.tr}',
|
||||||
'${MyUtils.getAgeByDate(MyUtils.formatBirthdayTime(widget.data['person']?['birthday'])) ?? '未知数据'.tr}',
|
style: TextStyle(
|
||||||
style: TextStyle(
|
fontFamily: 'Inter',
|
||||||
fontFamily: 'Inter',
|
fontSize: 26.rpx,
|
||||||
fontSize: 26.rpx,
|
letterSpacing: 0.0,
|
||||||
letterSpacing: 0.0,
|
color: themeController
|
||||||
color: themeController
|
.currentColor.sc3,
|
||||||
.currentColor.sc3,
|
),
|
||||||
),
|
),
|
||||||
),
|
].divide(SizedBox(height: 34.rpx)),
|
||||||
].divide(SizedBox(height: 34.rpx)),
|
),
|
||||||
),
|
]
|
||||||
]
|
.divide(SizedBox(width: 33.rpx))
|
||||||
.divide(SizedBox(width: 33.rpx))
|
.addToStart(
|
||||||
.addToStart(SizedBox(width: 37.rpx)),
|
SizedBox(width: 37.rpx)),
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
.addToStart(SizedBox(height: 36.rpx))
|
.addToStart(SizedBox(height: 36.rpx))
|
||||||
.addToEnd(SizedBox(height: 36.rpx)),
|
.addToEnd(SizedBox(height: 36.rpx)),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
Flexible(
|
||||||
Flexible(
|
flex: 3,
|
||||||
flex: 3,
|
child: Column(
|
||||||
child: Column(
|
crossAxisAlignment:
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Row(
|
Row(
|
||||||
children: [
|
children: [
|
||||||
Column(
|
Column(
|
||||||
crossAxisAlignment:
|
crossAxisAlignment:
|
||||||
CrossAxisAlignment.end,
|
CrossAxisAlignment.end,
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
'设备ID'.tr,
|
'设备ID'.tr,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontFamily: 'Inter',
|
fontFamily: 'Inter',
|
||||||
fontSize: 26.rpx,
|
fontSize: 26.rpx,
|
||||||
letterSpacing: 0.0,
|
letterSpacing: 0.0,
|
||||||
color: themeController
|
color: themeController
|
||||||
.currentColor.sc4,
|
.currentColor.sc4,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
Text(
|
||||||
Text(
|
'体重'.tr,
|
||||||
'体重'.tr,
|
style: TextStyle(
|
||||||
style: TextStyle(
|
fontFamily: 'Inter',
|
||||||
fontFamily: 'Inter',
|
fontSize: 26.rpx,
|
||||||
fontSize: 26.rpx,
|
letterSpacing: 0.0,
|
||||||
letterSpacing: 0.0,
|
color: themeController
|
||||||
color: themeController
|
.currentColor.sc4,
|
||||||
.currentColor.sc4,
|
),
|
||||||
),
|
),
|
||||||
),
|
].divide(SizedBox(height: 34.rpx)),
|
||||||
].divide(SizedBox(height: 34.rpx)),
|
),
|
||||||
),
|
Column(
|
||||||
Column(
|
crossAxisAlignment:
|
||||||
crossAxisAlignment:
|
CrossAxisAlignment.start,
|
||||||
CrossAxisAlignment.start,
|
children: [
|
||||||
children: [
|
Text(
|
||||||
Text(
|
'${widget.data['code'] ?? '未知数据'.tr}',
|
||||||
'${widget.data['code'] ?? '未知数据'.tr}',
|
// "D11250300003",
|
||||||
// "D11250300003",
|
style: TextStyle(
|
||||||
style: TextStyle(
|
fontFamily: 'Inter',
|
||||||
fontFamily: 'Inter',
|
fontSize: 26.rpx,
|
||||||
fontSize: 26.rpx,
|
letterSpacing: 0.0,
|
||||||
letterSpacing: 0.0,
|
color: themeController
|
||||||
color: themeController
|
.currentColor.sc3,
|
||||||
.currentColor.sc3,
|
),
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
),
|
),
|
||||||
maxLines: 1,
|
Text(
|
||||||
overflow: TextOverflow.ellipsis,
|
'${widget.data['person']?['weight'] ?? '未知数据'.tr}kg',
|
||||||
),
|
style: TextStyle(
|
||||||
Text(
|
fontFamily: 'Inter',
|
||||||
'${widget.data['person']?['weight'] ?? '未知数据'.tr}kg',
|
fontSize: 26.rpx,
|
||||||
style: TextStyle(
|
letterSpacing: 0.0,
|
||||||
fontFamily: 'Inter',
|
color: themeController
|
||||||
fontSize: 26.rpx,
|
.currentColor.sc3,
|
||||||
letterSpacing: 0.0,
|
),
|
||||||
color: themeController
|
|
||||||
.currentColor.sc3,
|
|
||||||
),
|
),
|
||||||
),
|
].divide(SizedBox(height: 34.rpx)),
|
||||||
].divide(SizedBox(height: 34.rpx)),
|
),
|
||||||
),
|
]
|
||||||
]
|
.divide(SizedBox(width: 33.rpx))
|
||||||
.divide(SizedBox(width: 33.rpx))
|
.addToStart(
|
||||||
.addToStart(SizedBox(width: 37.rpx)),
|
SizedBox(width: 37.rpx)),
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
.addToStart(SizedBox(height: 36.rpx))
|
.addToStart(SizedBox(height: 36.rpx))
|
||||||
.addToEnd(SizedBox(height: 36.rpx)),
|
.addToEnd(SizedBox(height: 36.rpx)),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
],
|
||||||
],
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
|
||||||
(sleepReport.value == null || sleepReport.value.isEmpty)
|
(sleepReport.value == null || sleepReport.value.isEmpty)
|
||||||
? Container(
|
? Container(
|
||||||
child: NullDataWidget(),
|
child: NullDataWidget(),
|
||||||
@@ -778,7 +783,6 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
|
|||||||
)),
|
)),
|
||||||
);
|
);
|
||||||
}),
|
}),
|
||||||
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -829,6 +833,7 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void onLeftArrowTap() {
|
void onLeftArrowTap() {
|
||||||
|
isRightLimit.value = false;
|
||||||
if (type == 1) {
|
if (type == 1) {
|
||||||
sleepReportController.selectedDate.value =
|
sleepReportController.selectedDate.value =
|
||||||
selectedDate.subtract(const Duration(days: 1));
|
selectedDate.subtract(const Duration(days: 1));
|
||||||
@@ -877,53 +882,89 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void onRightArrowTap() {
|
void onRightArrowTap() {
|
||||||
|
final now = DateTime.now();
|
||||||
|
final today = DateTime(now.year, now.month, now.day);
|
||||||
|
DateTime targetDate = selectedDate;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (type == 1) {
|
if (type == 1) {
|
||||||
sleepReportController.selectedDate.value =
|
final nextDate = selectedDate.add(const Duration(days: 1));
|
||||||
selectedDate.add(const Duration(days: 1));
|
if (!nextDate.isAfter(today)) {
|
||||||
|
targetDate = nextDate;
|
||||||
|
} else {
|
||||||
|
isRightLimit.value = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
} else if (type == 2) {
|
} else if (type == 2) {
|
||||||
sleepReportController.selectedDate.value =
|
final currentWeekday = today.weekday; // 1=周一，7=周日
|
||||||
selectedDate.add(const Duration(days: 7));
|
final currentWeekEnd = today.add(Duration(days: 7 - currentWeekday));
|
||||||
|
final nextWeek = selectedDate.add(const Duration(days: 7));
|
||||||
|
|
||||||
|
if (!nextWeek.isAfter(currentWeekEnd)) {
|
||||||
|
targetDate = nextWeek;
|
||||||
|
} else {
|
||||||
|
isRightLimit.value = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
} else if (type == 3) {
|
} else if (type == 3) {
|
||||||
sleepReportController.selectedDate.value = DateTime(
|
final currentMonthEnd = DateTime(today.year, today.month + 1, 0);
|
||||||
|
final nextMonth = DateTime(
|
||||||
selectedDate.year,
|
selectedDate.year,
|
||||||
selectedDate.month + 1,
|
selectedDate.month + 1,
|
||||||
selectedDate.day,
|
selectedDate.day,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (!nextMonth.isAfter(currentMonthEnd)) {
|
||||||
|
final correctedDay = DateTime(
|
||||||
|
nextMonth.year,
|
||||||
|
nextMonth.month + 1,
|
||||||
|
0,
|
||||||
|
).day;
|
||||||
|
|
||||||
|
targetDate = DateTime(
|
||||||
|
nextMonth.year,
|
||||||
|
nextMonth.month,
|
||||||
|
nextMonth.day > correctedDay ? correctedDay : nextMonth.day,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
isRightLimit.value = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
calendarController.selectedDate.value =
|
|
||||||
sleepReportController.selectedDate.value;
|
// 👉 更新数据并请求
|
||||||
String data = MyUtils.formatDate(calendarController.selectedDate.value!);
|
sleepReportController.selectedDate.value = targetDate;
|
||||||
|
calendarController.selectedDate.value = targetDate;
|
||||||
|
|
||||||
|
String data = MyUtils.formatDate(targetDate);
|
||||||
requestWithLog(
|
requestWithLog(
|
||||||
logTitle: "查询睡眠报告",
|
logTitle: "查询睡眠报告",
|
||||||
method: MyHttpMethod.get,
|
method: MyHttpMethod.get,
|
||||||
queryUrl:
|
queryUrl:
|
||||||
"https://sleepdata.he-info.com/api/analysis/sleep/analysis?mac=${widget.data['mac']}&time=${data}&type=${sleepReportController.model.type}",
|
"https://sleepdata.he-info.com/api/analysis/sleep/analysis?mac=${widget.data['mac']}&time=${data}&type=${sleepReportController.model.type}",
|
||||||
onSuccess: (res) {
|
onSuccess: (res) {
|
||||||
print(res);
|
print(res);
|
||||||
sleepReportController.sleepReport.value = res.data;
|
sleepReportController.sleepReport.value = res.data;
|
||||||
sleepReportController.updateAll();
|
sleepReportController.updateAll();
|
||||||
},
|
},
|
||||||
onFailure: (res) {
|
onFailure: (res) {
|
||||||
if (MainPageBBottomChange.getCurrentIndex() != null) {
|
final msg = res.msg!;
|
||||||
if (MainPageBBottomChange.getCurrentIndex() == 1) {
|
TopSlideNotification.show(
|
||||||
TopSlideNotification.show(context,
|
context,
|
||||||
text: res.msg!,
|
text: msg,
|
||||||
textColor: themeController.currentColor.sc9);
|
textColor: themeController.currentColor.sc9,
|
||||||
}
|
);
|
||||||
} else {
|
sleepReportController.sleepReport.value = {};
|
||||||
TopSlideNotification.show(context,
|
sleepReportController.updateAll();
|
||||||
text: res.msg!, textColor: themeController.currentColor.sc9);
|
},
|
||||||
}
|
);
|
||||||
sleepReportController.sleepReport.value = {};
|
|
||||||
sleepReportController.updateAll();
|
|
||||||
print(res);
|
|
||||||
});
|
|
||||||
sleepReportController.updateAll();
|
sleepReportController.updateAll();
|
||||||
calendarController.updateAll();
|
calendarController.updateAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void onChangeArrowTap() {
|
||||||
void onChangeArrowTap() {
|
|
||||||
if (type == 1) {
|
if (type == 1) {
|
||||||
sleepReportController.selectedDate.value =
|
sleepReportController.selectedDate.value =
|
||||||
selectedDate.subtract(const Duration(days: 1));
|
selectedDate.subtract(const Duration(days: 1));
|
||||||
@@ -971,8 +1012,6 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
|
|||||||
calendarController.updateAll();
|
calendarController.updateAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return Row(
|
return Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
children: [
|
children: [
|
||||||
@@ -985,9 +1024,9 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
|
|||||||
padding: EdgeInsets.all(10.rpx),
|
padding: EdgeInsets.all(10.rpx),
|
||||||
borderRadius: 8.rpx,
|
borderRadius: 8.rpx,
|
||||||
onTap: onLeftArrowTap,
|
onTap: onLeftArrowTap,
|
||||||
child: SizedBox(
|
child: Container(
|
||||||
width: 9.rpx,
|
width: 30.rpx,
|
||||||
height: 14.rpx,
|
height: 30.rpx,
|
||||||
child: SvgPicture.asset(
|
child: SvgPicture.asset(
|
||||||
'assets/img/icon/arrow_left.svg',
|
'assets/img/icon/arrow_left.svg',
|
||||||
color: themeController.currentColor.sc3,
|
color: themeController.currentColor.sc3,
|
||||||
@@ -1004,21 +1043,36 @@ class _NewSleepReportPageState extends State<NewSleepReportPage> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
ClickableContainer(
|
// ClickableContainer(
|
||||||
backgroundColor: Colors.transparent,
|
// backgroundColor: Colors.transparent,
|
||||||
highlightColor: themeController.currentColor.sc3,
|
// highlightColor: themeController.currentColor.sc3,
|
||||||
padding: EdgeInsets.all(10.rpx),
|
// padding: EdgeInsets.all(10.rpx),
|
||||||
borderRadius: 8.rpx,
|
// borderRadius: 8.rpx,
|
||||||
onTap: onRightArrowTap,
|
// onTap: onRightArrowTap,
|
||||||
child: SizedBox(
|
// child: Container(
|
||||||
width: 9.rpx,
|
// width: 30.rpx,
|
||||||
height: 14.rpx,
|
// height: 30.rpx,
|
||||||
child: SvgPicture.asset(
|
// child: SvgPicture.asset(
|
||||||
'assets/img/icon/arrow_right.svg',
|
// 'assets/img/icon/arrow_right.svg',
|
||||||
color: themeController.currentColor.sc3,
|
// color: themeController.currentColor.sc3,
|
||||||
),
|
// ),
|
||||||
),
|
// ),
|
||||||
),
|
// ),
|
||||||
|
Obx(() => ClickableContainer(
|
||||||
|
backgroundColor: Colors.transparent,
|
||||||
|
highlightColor: themeController.currentColor.sc3,
|
||||||
|
padding: EdgeInsets.all(10.rpx),
|
||||||
|
borderRadius: 8.rpx,
|
||||||
|
onTap: isRightLimit.value ? () {} : onRightArrowTap,
|
||||||
|
child: Container(
|
||||||
|
width: 30.rpx,
|
||||||
|
height: 30.rpx,
|
||||||
|
child: SvgPicture.asset('assets/img/icon/arrow_right.svg',
|
||||||
|
color: isRightLimit.value
|
||||||
|
? Color(0xFF929699)
|
||||||
|
: Color(0xFFFFFFFF)),
|
||||||
|
),
|
||||||
|
))
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
ClickableContainer(
|
ClickableContainer(
|
||||||
|
|||||||
Reference in New Issue
Block a user