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-05-23 14:51:09 +08:00
parent 8a418c9c98
commit c650bad8b1
36 changed files with 1297 additions and 892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/img/black_body_still.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
assets/img/black_body_still.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
assets/img/body_black.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 814 KiB

After

Width:  |  Height:  |  Size: 578 KiB

23
assets/langs/zh_CN.json
View File

@@ -84,8 +84,8 @@
"是":"是", "是":"是",
"否":"否", "否":"否",
"确定绑定提示":"确定绑定该设备吗？", "确定绑定提示":"确定绑定该设备吗？",
"连接成功":"连接成功", "连接成功":"蓝牙连接成功",
"连接异常":"连接异常", "连接异常":"蓝牙连接异常",
"连接":"连接", "连接":"连接",
"输入wifi密码":"请输入wifi密码", "输入wifi密码":"请输入wifi密码",
"显示密码":"显示", "显示密码":"显示",
@@ -108,9 +108,9 @@
"人员资料":{ "人员资料":{
"标题":"人员资料", "标题":"人员资料",
"保存":"保存", "保存":"保存",
"名字输入提示":"使用人员姓名", "名字输入提示":"使用人员姓名(必填)",
"生日输入提示":"生日", "生日输入提示":"生日(必填)",
"体重输入提示":"体重", "体重输入提示":"体重(必填)",
"疾病标题":"慢病管理", "疾病标题":"慢病管理",
"提示":"提示：填写准确的使用人员相关资料，可以使睡眠报告监测数据更加精准！" "提示":"提示：填写准确的使用人员相关资料，可以使睡眠报告监测数据更加精准！"
}, },
@@ -329,7 +329,7 @@
"提交":"提交", "提交":"提交",
"设备参数":"设备参数", "设备参数":"设备参数",
"问题描述":"问题描述（60个字以内）", "问题描述":"问题描述（60个字以内）",
"上传提示":"点击上传设备故障照片或视频", "上传提示":"点击上传设备故障照片",
"设备参数提示":"请输入设备参数", "设备参数提示":"请输入设备参数",
"选择设备":"请选择设备", "选择设备":"请选择设备",
"上传限制":"文件不能超过5MB", "上传限制":"文件不能超过5MB",
@@ -338,7 +338,7 @@
"图片未上传":"图片未上传", "图片未上传":"图片未上传",
"设备未选择":"设备未选择", "设备未选择":"设备未选择",
"参数未填写":"参数未填写", "参数未填写":"参数未填写",
"问题描述未填写":"请上传图片或视频", "问题描述未填写":"请上传图片",
"编辑":"编辑", "编辑":"编辑",
"滑动退出提醒":"再按一次退出程序", "滑动退出提醒":"再按一次退出程序",
"操作说明":"操作说明", "操作说明":"操作说明",
@@ -358,10 +358,13 @@
"微信客服提示":"请先安装微信APP，再联系客服", "微信客服提示":"请先安装微信APP，再联系客服",
"打开微信客服提示":"正在打开微信客服...", "打开微信客服提示":"正在打开微信客服...",
"身高":"身高", "身高":"身高",
"身高输入提示":"请输入身高", "身高输入提示":"请输入身高(必填)",
"用户协议":"用户协议", "用户协议":"用户协议",
"隐私协议":"隐私协议", "隐私协议":"隐私协议",
"呼吸基准":"呼吸基准", "呼吸基准":"呼吸基准",
"呼吸基准介绍":"呼吸基准介绍。" "呼吸基准介绍":"呼吸基准介绍。",
"删除错误提示":"请至少选择一项",
"解绑":"解绑",
"删除":"删除",
"校准未完成提示":"校准还未完成，是否确认退出校准流程？"
} }

4
assets/langs/zh_TW.json
View File

@@ -84,8 +84,8 @@
"是":"是", "是":"是",
"否":"否", "否":"否",
"确定绑定提示":"確定綁定該設備嗎？", "确定绑定提示":"確定綁定該設備嗎？",
"连接成功":"連接成功", "连接成功":"藍牙連接成功",
"连接异常":"連接異常", "连接异常":"藍牙連接異常",
"连接":"連接", "连接":"連接",
"输入wifi密码":"請輸入wifi密碼", "输入wifi密码":"請輸入wifi密碼",
"显示密码":"顯示", "显示密码":"顯示",

37
lib/component/home_page/DynamicReportDetailWidget.dart
View File

@@ -40,7 +40,7 @@ class DynamicReportDetailWidget extends StatelessWidget {
child: Column( child: Column(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: [ children: [
_buildHeader(context), _buildHeader(context,targetDevice),
SizedBox( SizedBox(
height: 33.rpx, height: 33.rpx,
), ),
@@ -54,21 +54,30 @@ class DynamicReportDetailWidget extends StatelessWidget {
); );
} }
Widget _buildHeader(BuildContext context) { Widget _buildHeader(BuildContext context, Map targetDevice) {
return Container( return Container(
width: double.infinity, width: double.infinity,
child: Row( child: Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Text( ClickableContainer(
'${targetDevice['person']?['name'] == null ? '未命名'.tr : targetDevice['person']['name']}', backgroundColor: Colors.transparent,
style: FlutterFlowTheme.of(context).bodyMedium.override( highlightColor: themeController.currentColor.sc3.withOpacity(0.2),
fontFamily: 'Inter', borderRadius: 0,
fontSize: 30.rpx, padding: EdgeInsets.zero,
letterSpacing: 0.0, onTap: () async {
color: themeController.currentColor.sc3, await Get.toNamed("/bodyDevice",arguments: targetDevice);
), },
child: Text(
'${targetDevice['person']?['name'] == null ? '未命名'.tr : targetDevice['person']['name']}',
style: FlutterFlowTheme.of(context).bodyMedium.override(
fontFamily: 'Inter',
fontSize: 30.rpx,
letterSpacing: 0.0,
color: themeController.currentColor.sc3,
),
),
), ),
ClickableContainer( ClickableContainer(
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
@@ -136,16 +145,11 @@ class DynamicReportDetailWidget extends StatelessWidget {
} }
Widget _buildSleepDataModuleWidgets() { Widget _buildSleepDataModuleWidgets() {
// bool hasData = sleepDataModuleWidgets.any((w) {
// final data = w.data;
// return data['state'] != null &&
// data['state'].toString().trim().isNotEmpty;
// });
bool hasData = sleepDataModuleWidgets.length > 0; bool hasData = sleepDataModuleWidgets.length > 0;
if (!hasData) { if (!hasData) {
return Container( return Container(
height: 100.rpx, height: 200.rpx,
alignment: Alignment.center, alignment: Alignment.center,
child: Text( child: Text(
'暂无数据'.tr, '暂无数据'.tr,
@@ -160,6 +164,7 @@ class DynamicReportDetailWidget extends StatelessWidget {
return Container( return Container(
width: double.infinity, width: double.infinity,
height: 200.rpx,
child: SingleChildScrollView( child: SingleChildScrollView(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
child: Row( child: Row(

6
lib/component/home_page/SleepDataModuleWidget.dart
View File

@@ -63,6 +63,8 @@ class _SleepDataModuleWidgetState extends State<SleepDataModuleWidget> {
letterSpacing: 0.0, letterSpacing: 0.0,
color: themeController.currentColor.sc3, color: themeController.currentColor.sc3,
), ),
maxLines: 1,
overflow: TextOverflow.ellipsis,
), ),
Row( Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
@@ -80,6 +82,8 @@ class _SleepDataModuleWidgetState extends State<SleepDataModuleWidget> {
letterSpacing: 0.0, letterSpacing: 0.0,
color: themeController.currentColor.sc3, color: themeController.currentColor.sc3,
), ),
maxLines: 1,
overflow: TextOverflow.ellipsis,
), ),
Padding( Padding(
padding: EdgeInsetsDirectional.fromSTEB(0, 0, 0, 10.rpx), padding: EdgeInsetsDirectional.fromSTEB(0, 0, 0, 10.rpx),
@@ -91,6 +95,8 @@ class _SleepDataModuleWidgetState extends State<SleepDataModuleWidget> {
letterSpacing: 0.0, letterSpacing: 0.0,
color: themeController.currentColor.sc3, color: themeController.currentColor.sc3,
), ),
maxLines: 1,
overflow: TextOverflow.ellipsis,
), ),
), ),
], ],

12
lib/component/home_page/SleepDateWidget.dart
View File

@@ -113,11 +113,13 @@ class _SleepDateWidgetState extends State<SleepDateWidget> {
Text( Text(
(widget.score?.isEmpty ?? true) ? '--' : widget.score!, (widget.score?.isEmpty ?? true) ? '--' : widget.score!,
style: FlutterFlowTheme.of(context).bodyMedium.override( style: FlutterFlowTheme.of(context).bodyMedium.override(
fontFamily: 'Inter', fontFamily: 'Inter',
fontSize: 48.rpx, fontSize: 48.rpx,
letterSpacing: 0.0, letterSpacing: 0.0,
color: widget.textColor ?? color: widget.textColor ??
themeController.currentColor.sc4), themeController.currentColor.sc4,
fontWeight: FontWeight.bold, // 加粗
),
), ),
if ((widget.score?.trim().isNotEmpty ?? false)) if ((widget.score?.trim().isNotEmpty ?? false))
Padding( Padding(

2
lib/component/tool/SelectableTagButton.dart
View File

@@ -52,7 +52,7 @@ class SelectableTagButton extends StatelessWidget {
? null ? null
: Border.all( : Border.all(
color: themeController.currentColor.sc4, color: themeController.currentColor.sc4,
width: 1.rpx, width: 0.5.rpx,
), // 未选中时无边框 ), // 未选中时无边框
borderRadius: BorderRadius.circular(12.0), // 如果需要圆角 borderRadius: BorderRadius.circular(12.0), // 如果需要圆角
), ),

4
lib/component/tool/cmd.dart
View File

@@ -220,7 +220,7 @@ getDeviceWifiStatus(THapp tHapp, int times) async {
} }
} }
Future<String> getDeviceNetVersion(THapp tHapp, int times) async { Future<String> getDeviceNetVersion(THapp tHapp, int times) async {
edm.EasyDartModule.logger.info("发送请求设备的网络信息"); edm.EasyDartModule.logger.info("发送请求设备的网络信息");
DailyLogUtils.writeLog("发送请求设备的网络信息"); DailyLogUtils.writeLog("发送请求设备的网络信息");
print("ls /root/mnt"); print("ls /root/mnt");
@@ -237,6 +237,8 @@ getDeviceWifiStatus(THapp tHapp, int times) async {
netType = "wifi"; netType = "wifi";
} else if (log.contains("a76xx.json")) { } else if (log.contains("a76xx.json")) {
netType = "4g"; netType = "4g";
} else {
netType = "unknown";
} }
ss.over = true; ss.over = true;
ss.result = netType; ss.result = netType;

40
lib/controller/device/device_share_list_controller.dart
View File

@@ -15,6 +15,8 @@ part 'device_share_list_controller.g.dart'; // 由json_serializable自动生成
class DeviceShareListModel { class DeviceShareListModel {
String? key; //关键字搜索 String? key; //关键字搜索
int? all = 0; //是否全选 0：不全选 1：全选 int? all = 0; //是否全选 0：不全选 1：全选
String? accountKey = 'uid';//账户key
DeviceShareListModel(); DeviceShareListModel();
// 从JSON反序列化时的异常处理 // 从JSON反序列化时的异常处理
@@ -50,17 +52,17 @@ class DeviceShareListController extends GetControllerEx<DeviceShareListModel> {
String serviceApi = ServiceConstant.device_share; String serviceApi = ServiceConstant.device_share;
String queryUrl = "${serviceAddress}${serviceName}${serviceApi}" String queryUrl = "${serviceAddress}${serviceName}${serviceApi}"
"${key != null ? '?key=$key&' : '?'}mac=$mac"; "${key != null ? '?key=$key&' : '?'}mac=$mac";
String? language = ""; String? language = "";
if (languageController.selectLanguage != null) { if (languageController.selectLanguage != null) {
language = languageController.selectLanguage.value!.language_code; language = languageController.selectLanguage.value!.language_code;
} }
if (language != null && language.isNotEmpty) { if (language != null && language.isNotEmpty) {
if (queryUrl.contains("?")) { if (queryUrl.contains("?")) {
queryUrl += "&lang=$language"; queryUrl += "&lang=$language";
} else { } else {
queryUrl += "?lang=$language"; queryUrl += "?lang=$language";
}
} }
}
var response = await EasyDartModule.dio.get(queryUrl); var response = await EasyDartModule.dio.get(queryUrl);
if (response != null) { if (response != null) {
var responseData = var responseData =
@@ -95,16 +97,16 @@ String? language = "";
String serviceApi = ServiceConstant.share_deleted; String serviceApi = ServiceConstant.share_deleted;
String queryUrl = "${serviceAddress}${serviceName}${serviceApi}"; String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";
String? language = ""; String? language = "";
if (languageController.selectLanguage != null) { if (languageController.selectLanguage != null) {
language = languageController.selectLanguage.value!.language_code; language = languageController.selectLanguage.value!.language_code;
} }
if (language != null && language.isNotEmpty) { if (language != null && language.isNotEmpty) {
if (queryUrl.contains("?")) { if (queryUrl.contains("?")) {
queryUrl += "&lang=$language"; queryUrl += "&lang=$language";
} else { } else {
queryUrl += "?lang=$language"; queryUrl += "?lang=$language";
}
} }
}
final data = { final data = {
"mac": "", "mac": "",
}; };

20
lib/controller/person/person_controller.dart
View File

@@ -38,13 +38,13 @@ class PersonController extends GetControllerEx<PersonModel> {
attr = GetModel(PersonModel()).obs; attr = GetModel(PersonModel()).obs;
} }
RxList selectedDiseaseIds = [].obs; RxList selectedDiseaseIds = [].obs;
RxString currentPersonId = "".obs; RxString currentPersonId = "".obs;
RxString name = "".obs; RxString name = "".obs;
RxInt gender = 1.obs; RxInt gender = 1.obs;
RxString birthday = "".obs; RxString birthday = "".obs;
RxInt weight = 65.obs; RxString weight = "".obs;
RxInt height = 175.obs; RxString height = "".obs;
DateTime? dateTime = DateTime.now(); //选择时间 DateTime? dateTime = DateTime.now(); //选择时间
RxList diseaseList = [].obs; RxList diseaseList = [].obs;
@@ -70,15 +70,15 @@ class PersonController extends GetControllerEx<PersonModel> {
apiResponse.msg = "请输入姓名".tr; apiResponse.msg = "请输入姓名".tr;
return apiResponse; return apiResponse;
} }
// if (birthday.value.isEmpty) { if (birthday.value.isEmpty) {
// apiResponse.msg = "请选择生日".tr; apiResponse.msg = "请选择生日".tr;
// return apiResponse; return apiResponse;
// } }
if (weight.value == 0) { if (weight == null || weight.value.isEmpty) {
apiResponse.msg = "请输入体重".tr; apiResponse.msg = "请输入体重".tr;
return apiResponse; return apiResponse;
} }
if (height.value == 0) { if (height == null || height.value.isEmpty) {
apiResponse.msg = "请输入身高".tr; apiResponse.msg = "请输入身高".tr;
return apiResponse; return apiResponse;
} }
@@ -90,7 +90,7 @@ class PersonController extends GetControllerEx<PersonModel> {
"birthday": (birthday.value == null || birthday.value!.isEmpty) "birthday": (birthday.value == null || birthday.value!.isEmpty)
? MyUtils.formatBindTime(dateTime!) ? MyUtils.formatBindTime(dateTime!)
: birthday.value, : birthday.value,
"weight": weight.value, "weight": weight!.value,
"height": height.value, "height": height.value,
"disease": selectedDiseaseIds.value, "disease": selectedDiseaseIds.value,
}; };

73
lib/controller/repair/repair_controller.dart
View File

@@ -76,7 +76,7 @@ class RepairController extends GetControllerEx<RepairModel> {
} }
} }
var formData = dio.FormData.fromMap({ var formData = dio.FormData.fromMap({
"type": 1, "type": 2,
"file": await dio.MultipartFile.fromFile( "file": await dio.MultipartFile.fromFile(
image.path, // 确保 image 是 File 类型 image.path, // 确保 image 是 File 类型
filename: image.path.split('/').last, filename: image.path.split('/').last,
@@ -105,4 +105,75 @@ class RepairController extends GetControllerEx<RepairModel> {
return ApiResponse(code: -1, msg: "服务器.失败".tr); return ApiResponse(code: -1, msg: "服务器.失败".tr);
} }
} }
// Future<ApiResponse> uploadImg() async {
// EasyDartModule.logger.info("请求上传媒体文件");
// DailyLogUtils.writeLog("请求上传媒体文件");
// final ImagePicker picker = ImagePicker();
// final XFile? file = await picker.pickMedia(); // ✅ 支持图片或视频
// try {
// ApiResponse apiResponse = ApiResponse(code: -1, msg: "我的.媒体上传失败".tr);
// if (file == null) {
// apiResponse.msg = "我的.未选择文件".tr;
// return apiResponse;
// }
// final String filePath = file.path;
// final String fileName = filePath.split('/').last;
// final int fileSize = await file.length();
// final isImage = filePath.endsWith(".jpg") ||
// filePath.endsWith(".jpeg") ||
// filePath.endsWith(".png") ||
// filePath.endsWith(".gif");
// final isVideo = filePath.endsWith(".mp4") ||
// filePath.endsWith(".mov") ||
// filePath.endsWith(".avi") ||
// filePath.endsWith(".mkv");
// // 限制大小
// if (isImage && fileSize > 1048576 * 5) {
// apiResponse.msg = "上传限制（图片最大5MB）".tr;
// return apiResponse;
// } else if (isVideo && fileSize > 1048576 * 50) {
// apiResponse.msg = "上传限制（视频最大50MB）".tr;
// return apiResponse;
// }
// // 构建上传地址
// String queryUrl =
// "${ServiceConstant.service_address}${ServiceConstant.server_service}${ServiceConstant.upload_file}";
// String? language =
// languageController.selectLanguage?.value?.language_code;
// if (language != null && language.isNotEmpty) {
// queryUrl +=
// queryUrl.contains("?") ? "&lang=$language" : "?lang=$language";
// }
// // 构建 formData
// var formData = dio.FormData.fromMap({
// "type": 2,
// "file": await dio.MultipartFile.fromFile(filePath, filename: fileName),
// });
// var response = await EasyDartModule.dio.post(queryUrl, data: formData);
// if (response != null) {
// var responseData =
// response.data is String ? jsonDecode(response.data) : response.data;
// ApiResponse res =
// ApiResponse.fromJson(responseData, (object) => object);
// MyUtils.formatResponse(res, "我的.上传成功".tr, "我的.媒体上传失败".tr);
// updateAll();
// return res;
// } else {
// return ApiResponse(code: -1, msg: "服务器.失败".tr);
// }
// } catch (e) {
// EasyDartModule.logger.error("上传媒体失败->$e");
// DailyLogUtils.writeError("上传媒体失败->$e");
// return ApiResponse(code: -1, msg: "服务器.失败".tr);
// }
// }
} }

4
lib/controller/weather/weather_controller.dart
View File

@@ -307,6 +307,7 @@ class WeatherModelController extends GetControllerEx<WeatherModel> {
// 获取天气信息 // 获取天气信息
Future<void> _getCurrentWeather() async { Future<void> _getCurrentWeather() async {
if (model.latitude == null || model.longitude == null) { if (model.latitude == null || model.longitude == null) {
EasyDartModule.logger.error("获取天气失败:位置数据获取失败");
return; // 如果位置数据没有获取到，则不更新天气 return; // 如果位置数据没有获取到，则不更新天气
} }
String? language = "zh_CN"; String? language = "zh_CN";
@@ -341,14 +342,13 @@ class WeatherModelController extends GetControllerEx<WeatherModel> {
model.current_temperature = weather.temperature?.celsius?.toInt(); model.current_temperature = weather.temperature?.celsius?.toInt();
model.wind_speed = weather.windSpeed?.toInt(); model.wind_speed = weather.windSpeed?.toInt();
model.weatherIcon = weather.weatherIcon; model.weatherIcon = weather.weatherIcon;
if (model.weatherIcon != null) { if (model.weatherIcon != null) {
model.weatherIconurl = model.weatherIconurl =
"https://openweathermap.org/img/w/${model.weatherIcon}.png"; "https://openweathermap.org/img/w/${model.weatherIcon}.png";
} }
updateAll(); // 更新 UI updateAll(); // 更新 UI
} catch (e) { } catch (e) {
EasyDartModule.logger.error("获取天气失败: $e");
print('获取天气失败: $e'); print('获取天气失败: $e');
} }
} }

119
lib/pages/device/BodyDeviceWidget.dart
View File

@@ -1,5 +1,4 @@
import 'dart:async'; import 'dart:async';
import 'package:ef/ef.dart'; import 'package:ef/ef.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
@@ -18,7 +17,8 @@ import 'package:vbvs_app/controller/theme_controller/ThemeController.dart';
import 'package:vbvs_app/pages/device/component/DeviceDataComponentWidget.dart'; import 'package:vbvs_app/pages/device/component/DeviceDataComponentWidget.dart';
class BodyDeviceWidget extends StatefulWidget { class BodyDeviceWidget extends StatefulWidget {
const BodyDeviceWidget({super.key}); var type;
BodyDeviceWidget({super.key, required this.type});
@override @override
State<BodyDeviceWidget> createState() => _BodyDevicePageState(); State<BodyDeviceWidget> createState() => _BodyDevicePageState();
@@ -29,6 +29,7 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
final BodyDeviceController bodyDeviceController = Get.find(); final BodyDeviceController bodyDeviceController = Get.find();
HomeController homeController = Get.find(); HomeController homeController = Get.find();
final GlobalKey addIconKey = GlobalKey(); final GlobalKey addIconKey = GlobalKey();
final ScrollController _scrollController = ScrollController();
OverlayEntry? _popupEntry; OverlayEntry? _popupEntry;
Timer? _timer; Timer? _timer;
@@ -36,7 +37,6 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
final renderBox = final renderBox =
addIconKey.currentContext?.findRenderObject() as RenderBox?; addIconKey.currentContext?.findRenderObject() as RenderBox?;
if (renderBox == null) return; if (renderBox == null) return;
final position = renderBox.localToGlobal(Offset.zero); final position = renderBox.localToGlobal(Offset.zero);
final size = renderBox.size; final size = renderBox.size;
double popupWidth = 190.rpx; double popupWidth = 190.rpx;
@@ -44,7 +44,7 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
// 移除之前的弹窗 // 移除之前的弹窗
_popupEntry?.remove(); _popupEntry?.remove();
// 创建新的 OverlayEntry // 创建新的OverlayEntry
_popupEntry = OverlayEntry( _popupEntry = OverlayEntry(
builder: (context) => Stack( builder: (context) => Stack(
children: [ children: [
@@ -54,7 +54,6 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
color: Colors.transparent, color: Colors.transparent,
onDismiss: _hidePopup, onDismiss: _hidePopup,
), ),
// 弹窗内容 // 弹窗内容
Positioned( Positioned(
top: position.dy + size.height + 26.rpx, top: position.dy + size.height + 26.rpx,
@@ -143,7 +142,7 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
), ),
); );
// 插入新的 OverlayEntry // 插入新的OverlayEntry
Overlay.of(context)!.insert(_popupEntry!); Overlay.of(context)!.insert(_popupEntry!);
} }
@@ -156,17 +155,39 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
void initState() { void initState() {
bodyDeviceController.keyWord.value = ""; bodyDeviceController.keyWord.value = "";
super.initState(); super.initState();
// 初次请求一次
_fetchDeviceList();
// 每 5 秒定时请求一次 // 处理传入的type参数
if (widget.type != null && widget.type is Map) {
final bindType = widget.type['bind_type'];
final mac = widget.type['mac'];
if (bindType != null) {
bodyDeviceController.model.type = bindType;
homeController.model.type = bindType;
}
// 初次请求设备列表
_fetchDeviceList().then((_) {
if (mac != null) {
// 延迟执行以确保列表已渲染
WidgetsBinding.instance.addPostFrameCallback((_) {
_scrollToDeviceWithMac(mac);
});
}
});
} else {
// 没有传入type时的默认逻辑
_fetchDeviceList();
}
// 每5秒定时请求一次
_timer = Timer.periodic(Duration(seconds: 5), (timer) { _timer = Timer.periodic(Duration(seconds: 5), (timer) {
_fetchDeviceList(); _fetchDeviceList();
}); });
} }
void _fetchDeviceList() { Future<void> _fetchDeviceList() async {
bodyDeviceController.getDeviceList().then((apiResponse) { await bodyDeviceController.getDeviceList().then((apiResponse) {
if (apiResponse.code != HttpStatusCodes.ok) { if (apiResponse.code != HttpStatusCodes.ok) {
TopSlideNotification.show( TopSlideNotification.show(
Get.context!, Get.context!,
@@ -177,9 +198,32 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
}); });
} }
void _scrollToDeviceWithMac(String mac) {
final deviceList = bodyDeviceController.deviceList.value;
final index = deviceList.indexWhere((device) => device['mac'] == mac);
if (index != -1 && _scrollController.hasClients) {
// 动态计算高度：最小为 501.rpx，最大为 26.6% 屏幕高度
final screenHeight = MediaQuery.of(Get.context!).size.height;
final dynamicItemHeight = (screenHeight * 0.266).rpx;
final itemHeight =
dynamicItemHeight < 501.rpx ? 501.rpx : dynamicItemHeight;
final spacing = 25.rpx;
final targetPosition = index * (itemHeight + spacing);
_scrollController.animateTo(
targetPosition,
duration: const Duration(milliseconds: 500),
curve: Curves.easeInOut,
);
}
}
@override @override
void dispose() { void dispose() {
_timer?.cancel(); // 页面销毁时取消定时器 _timer?.cancel(); // 页面销毁时取消定时器
_scrollController.dispose();
super.dispose(); super.dispose();
} }
@@ -189,16 +233,14 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
builder: (context, bodysize) => GestureDetector( builder: (context, bodysize) => GestureDetector(
onTap: () => FocusScope.of(context).unfocus(), onTap: () => FocusScope.of(context).unfocus(),
child: Container( child: Container(
// width: bodysize.maxWidth,
// height: bodysize.maxHeight * 1,
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage( image: DecorationImage(
image: AssetImage('assets/img/bgNoImg.png'), // 本地图片 image: AssetImage('assets/img/bgNoImg.png'),
fit: BoxFit.fill, // 填满整个 Container fit: BoxFit.fill,
), ),
), ),
child: Scaffold( child: Scaffold(
backgroundColor: Colors.transparent, // 加上这一行 backgroundColor: Colors.transparent,
appBar: AppBar( appBar: AppBar(
backgroundColor: themeController.currentColor.sc17, backgroundColor: themeController.currentColor.sc17,
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
@@ -216,7 +258,7 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
Text( Text(
'体征检测设备.标题'.tr, '体征检测设备.标题'.tr,
style: TextStyle( style: TextStyle(
fontFamily: 'Readex Pro', fontFamily: 'ReadexPro',
color: themeController.currentColor.sc3, color: themeController.currentColor.sc3,
letterSpacing: 0, letterSpacing: 0,
fontSize: 30.rpx, fontSize: 30.rpx,
@@ -224,7 +266,6 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
), ),
Positioned( Positioned(
left: 0, left: 0,
// child: returnIconButtom,
child: returnIconButtomAddCallback(() { child: returnIconButtomAddCallback(() {
bodyDeviceController.getDeviceNum(); bodyDeviceController.getDeviceNum();
bodyDeviceController.getDeviceList(); bodyDeviceController.getDeviceList();
@@ -316,10 +357,8 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: [ children: [
Container( Container(
width: width: 160.rpx,
160.rpx, // 固定宽度为 160.rpx alignment: Alignment.center,
alignment:
Alignment.center, // 文字居中
child: Text( child: Text(
'体征检测设备.我的e护'.tr, '体征检测设备.我的e护'.tr,
style: FlutterFlowTheme.of( style: FlutterFlowTheme.of(
@@ -372,10 +411,8 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: [ children: [
Container( Container(
width: width: 160.rpx,
160.rpx, // 固定宽度为 160.rpx alignment: Alignment.center,
alignment:
Alignment.center, // 文字居中
child: Text( child: Text(
'体征检测设备.云关爱'.tr, '体征检测设备.云关爱'.tr,
style: FlutterFlowTheme.of( style: FlutterFlowTheme.of(
@@ -407,19 +444,18 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
], ],
), ),
Obx(() { Obx(() {
// 横线宽度固定为 160.rpx // 横线宽度固定为160.rpx
double lineWidth = 160.rpx; double lineWidth = 160.rpx;
return AnimatedPositioned( return AnimatedPositioned(
duration: Duration(milliseconds: 300), duration: Duration(milliseconds: 300),
curve: Curves.easeInOut, curve: Curves.easeInOut,
bottom: 0, bottom: 0,
left: bodyDeviceController.model.type == left:
1 bodyDeviceController.model.type == 1
? 0 ? 0
: 160.rpx, // 第二个按钮横线从 160.rpx 开始 : 160.rpx,
child: Container( child: Container(
width: lineWidth, // 横线宽度固定为 160.rpx width: lineWidth,
height: 4.rpx, height: 4.rpx,
decoration: BoxDecoration( decoration: BoxDecoration(
color: themeController color: themeController
@@ -482,12 +518,12 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
.of(context) .of(context)
.labelMedium .labelMedium
.override( .override(
fontFamily: 'Inter', fontFamily: 'Inter',
fontSize: 26.rpx, fontSize: 26.rpx,
letterSpacing: 0.0, letterSpacing: 0.0,
color: themeController color: themeController
.currentColor .currentColor.sc4,
.sc4), ),
enabledBorder: enabledBorder:
OutlineInputBorder( OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
@@ -625,6 +661,7 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
padding: EdgeInsetsDirectional.fromSTEB( padding: EdgeInsetsDirectional.fromSTEB(
30.rpx, 26.rpx, 30.rpx, 0), 30.rpx, 26.rpx, 30.rpx, 0),
child: SingleChildScrollView( child: SingleChildScrollView(
controller: _scrollController,
child: Column( child: Column(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: bodyDeviceController children: bodyDeviceController
@@ -653,7 +690,7 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
Widget _buildDeviceCard(BuildContext context, Widget _buildDeviceCard(BuildContext context,
{required String title, required String imageUrl, required String type}) { {required String title, required String imageUrl, required String type}) {
return CustomCard( return CustomCard(
borderRadius: 20.rpx, // 圆角大小 borderRadius: 20.rpx,
onTap: () { onTap: () {
if (type != null) { if (type != null) {
if (type == '1') { if (type == '1') {
@@ -661,7 +698,7 @@ class _BodyDevicePageState extends State<BodyDeviceWidget> {
} }
} }
}, },
colors: [themeController.currentColor.sc17], // 背景色 colors: [themeController.currentColor.sc17],
child: Container( child: Container(
width: double.infinity, width: double.infinity,
height: MediaQuery.sizeOf(context).height * 0.135, height: MediaQuery.sizeOf(context).height * 0.135,

366
lib/pages/device/component/DeviceDataComponentWidget.dart
View File

@@ -97,7 +97,7 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
final menuWidth = _calculateMaxMenuItemWidth(allTexts, textStyle); final menuWidth = _calculateMaxMenuItemWidth(allTexts, textStyle);
popupWidth = menuWidth; popupWidth = menuWidth;
// 计算弹窗需要的实际高度（估算） // 计算弹窗需要的实际高度（估算）
final estimatedItemHeight = 60.rpx; // 每个菜单项的估算高度 final estimatedItemHeight = 66.rpx; // 每个菜单项的估算高度
//todo 更新菜单项，需要在此添加数量 //todo 更新菜单项，需要在此添加数量
final itemCount = final itemCount =
widget.device['bind_type'] == BindType.active.code ? 9 : 5; widget.device['bind_type'] == BindType.active.code ? 9 : 5;
@@ -210,7 +210,9 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
// ), // ),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: _buildMenuItems(), children: _buildMenuItems().divide(SizedBox(
height: 6.rpx,
)),
), ),
); );
@@ -228,7 +230,9 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
// 构建共享设备的菜单项 // 构建共享设备的菜单项
Widget _buildSharedDeviceContent(Widget content) { Widget _buildSharedDeviceContent(Widget content) {
return content; return IntrinsicWidth(
child: content,
);
} }
// 构建菜单项列表 // 构建菜单项列表
@@ -299,7 +303,8 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
_popupEntry?.remove(); _popupEntry?.remove();
_popupEntry = null; _popupEntry = null;
BlueteethBindController blueteethBindController = Get.find(); BlueteethBindController blueteethBindController = Get.find();
blueteethBindController.currentDeviceMac?.value = widget.device['mac']; blueteethBindController.currentDeviceMac?.value =
widget.device['mac'];
Get.toNamed("/calibrationPage", arguments: 2); Get.toNamed("/calibrationPage", arguments: 2);
}, },
), ),
@@ -342,7 +347,9 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
}, },
), ),
_buildMenuItem( _buildMenuItem(
text: "体征检测设备.删除".tr, text: widget.device['bind_type'] == BindType.active.code
? "解绑".tr
: "删除".tr,
onTap: () { onTap: () {
setState(() { setState(() {
_isPopupOpen = false; _isPopupOpen = false;
@@ -745,13 +752,15 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
), ),
), ),
Text( Text(
'uusne12', (widget.device['source']?.toString().isEmpty ?? true)
? '未知数据'.tr
: widget.device['source'].toString(),
style: style:
FlutterFlowTheme.of(context).bodyMedium.override( FlutterFlowTheme.of(context).bodyMedium.override(
fontFamily: 'Inter', fontFamily: 'Inter',
fontSize: 26.rpx, fontSize: 26.rpx,
letterSpacing: 0.0, letterSpacing: 0.0,
color: themeController.currentColor.sc4, color: themeController.currentColor.sc3,
), ),
), ),
].divide(SizedBox(width: 34.rpx)), ].divide(SizedBox(width: 34.rpx)),
@@ -798,7 +807,9 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: [ children: [
if (widget.device['status']['signal'] != null && if (widget.device['status']['signal'] != null &&
widget.device['status']['signal'] != -1) widget.device['status']['signal'] != -1 &&
widget.device['status']['status'] != null &&
widget.device['status']['status'] == 1)
ClickableContainer( ClickableContainer(
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
highlightColor: Colors.grey, // 或根据你主题定制颜色 highlightColor: Colors.grey, // 或根据你主题定制颜色
@@ -842,7 +853,9 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
fit: BoxFit.fill, fit: BoxFit.fill,
), ),
), ),
if (widget.device['status']['inBed'] != null) if (widget.device['status']['inBed'] != null &&
widget.device['status']['status'] != null &&
widget.device['status']['status'] == 1)
ClickableContainer( ClickableContainer(
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
highlightColor: Colors.grey, // 可根据需要更换颜色 highlightColor: Colors.grey, // 可根据需要更换颜色
@@ -889,7 +902,9 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
), ),
), ),
), ),
if (widget.device['status']['failure'] != 0) if (widget.device['status']['failure'] != 0 &&
widget.device['status']['status'] != null &&
widget.device['status']['status'] == 1)
ClickableContainer( ClickableContainer(
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
highlightColor: Colors.grey, // 可自定义点击水波纹颜色 highlightColor: Colors.grey, // 可自定义点击水波纹颜色
@@ -934,7 +949,9 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
), ),
), ),
), ),
if (widget.device['status']['upgrade'] != 0) if (widget.device['status']['upgrade'] != 0 &&
widget.device['status']['status'] != null &&
widget.device['status']['status'] == 1)
ClickableContainer( ClickableContainer(
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
highlightColor: Colors.grey, // 可自定义点击效果颜色 highlightColor: Colors.grey, // 可自定义点击效果颜色
@@ -954,7 +971,8 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
), ),
), ),
), ),
if (widget.device['status']['status'] != null) if (widget.device['status']['status'] != null &&
widget.device['status']['status'] == 0)
ClickableContainer( ClickableContainer(
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
highlightColor: Colors.grey, // 可替换为点击高亮色 highlightColor: Colors.grey, // 可替换为点击高亮色
@@ -997,9 +1015,10 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
width: 27.rpx, width: 27.rpx,
height: 27.rpx, height: 27.rpx,
child: SvgPicture.asset( child: SvgPicture.asset(
widget.device['status']['status'] == 1 // widget.device['status']['status'] == 1
? 'assets/img/icon/device_online.svg' // ? 'assets/img/icon/device_online.svg'
: 'assets/img/icon/device_offline.svg', // : 'assets/img/icon/device_offline.svg',
'assets/img/icon/device_issue.svg',
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
), ),
@@ -1017,44 +1036,92 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: [
CustomCard( Expanded(
borderRadius: AppConstants().button_container_radius, // 使用 Expanded 来占据屏幕宽度
onTap: () async { child: CustomCard(
// personController.currentPersonId = widget.device borderRadius: AppConstants().button_container_radius,
if (widget.device['person'] != null) { onTap: () async {
personController.currentPersonId.value = if (widget.device['person'] != null) {
widget.device['_id']; personController.currentPersonId.value =
personController.name.value = widget.device['_id'];
widget.device['person']['name']; personController.name.value =
personController.gender.value = widget.device['person']['name'];
widget.device['person']['gender'] ?? 1; personController.gender.value =
personController.weight.value = widget.device['person']['gender'] ?? 1;
widget.device['person']['weight'] ?? 0; personController.weight?.value =
personController.height.value = widget.device['person']['weight'].toString() ??
widget.device['person']['height'] ?? 0; "";
personController.selectedDiseaseIds.value = personController.height.value =
widget.device['person']['disease'] ?? []; widget.device['person']['height'].toString() ??
personController.birthday.value = "";
widget.device['person']['birthday'] ?? ''; personController.selectedDiseaseIds.value =
personController.dateTime = MyUtils.formatBirthdayTime( widget.device['person']['disease'] ?? [];
widget.device['person']['birthday']); personController.birthday.value =
} else { widget.device['person']['birthday'] ?? '';
personController.currentPersonId.value = personController.dateTime =
widget.device['_id']; MyUtils.formatBirthdayTime(
} widget.device['person']['birthday']);
await Get.toNamed("/updatePersonPage", } else {
arguments: widget.device['bind_type']); personController.currentPersonId.value =
bodyDeviceController.getDeviceList(); widget.device['_id'];
}, }
colors: [ await Get.toNamed("/updatePersonPage",
themeController.currentColor.sc1, arguments: widget.device['bind_type']);
themeController.currentColor.sc2, bodyDeviceController.getDeviceList();
], },
child: Padding( colors: [
padding: EdgeInsetsDirectional.fromSTEB( themeController.currentColor.sc1,
0.rpx, 0.rpx, 0.rpx, 0.rpx), themeController.currentColor.sc2,
],
child: Padding(
padding: EdgeInsetsDirectional.fromSTEB(
0.rpx, 0.rpx, 0.rpx, 0.rpx),
child: Container(
alignment: Alignment.center,
height: MediaQuery.sizeOf(context).height * 0.0037,
constraints: BoxConstraints(
minWidth: 143.rpx,
minHeight: 61.rpx,
),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
"体征检测设备.人员资料".tr,
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
color: themeController.currentColor.sc3,
fontFamily: 'Inter',
fontSize:
AppConstants().normal_text_fontSize,
letterSpacing: 0.0,
),
),
].divide(SizedBox(width: 17.rpx)),
),
),
),
),
),
SizedBox(
width: 20.rpx,
),
Expanded(
// 使用 Expanded 来占据屏幕宽度
child: CustomCard(
borderRadius: AppConstants().button_container_radius,
onTap: () {
Get.toNamed("/instantBodyPage",
arguments: widget.device);
},
colors: [
themeController.currentColor.sc1,
themeController.currentColor.sc2,
],
child: Container( child: Container(
width: MediaQuery.sizeOf(context).width * 0.19, alignment: Alignment.center,
height: MediaQuery.sizeOf(context).height * 0.0037, height: MediaQuery.sizeOf(context).height * 0.0037,
constraints: BoxConstraints( constraints: BoxConstraints(
minWidth: 143.rpx, minWidth: 143.rpx,
@@ -1063,10 +1130,9 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
child: Row( child: Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Text( Text(
"体征检测设备.人员资料".tr, "体征检测设备.实时体征".tr,
style: FlutterFlowTheme.of(context) style: FlutterFlowTheme.of(context)
.bodyMedium .bodyMedium
.override( .override(
@@ -1082,112 +1148,104 @@ class _DeviceDataComponentWidgetState extends State<DeviceDataComponentWidget> {
), ),
), ),
), ),
CustomCard( ],
borderRadius: AppConstants().button_container_radius, ),
onTap: () { SizedBox(
Get.toNamed("/instantBodyPage", arguments: widget.device); height: 20.rpx,
}, ),
colors: [ Row(
themeController.currentColor.sc1, mainAxisAlignment: MainAxisAlignment.spaceAround,
themeController.currentColor.sc2, children: [
], Expanded(
child: Container( // 使用 Expanded 来占据屏幕宽度的一半
width: MediaQuery.sizeOf(context).width * 0.19, child: CustomCard(
height: MediaQuery.sizeOf(context).height * 0.0037, borderRadius: AppConstants().button_container_radius,
constraints: BoxConstraints( onTap: () {
minWidth: 143.rpx, TopSlideNotification.show(context, text: "待开发功能".tr);
minHeight: 61.rpx, },
), colors: [
child: Row( themeController.currentColor.sc1,
mainAxisSize: MainAxisSize.max, themeController.currentColor.sc2,
mainAxisAlignment: MainAxisAlignment.center, ],
children: [ child: Padding(
Text( padding: EdgeInsetsDirectional.fromSTEB(
"体征检测设备.实时体征".tr, 0.rpx, 0.rpx, 0.rpx, 0.rpx),
style: FlutterFlowTheme.of(context) child: Container(
.bodyMedium alignment: Alignment.center,
.override( height: MediaQuery.sizeOf(context).height * 0.0037,
color: themeController.currentColor.sc3, constraints: BoxConstraints(
fontFamily: 'Inter', minWidth: 143.rpx,
fontSize: AppConstants().normal_text_fontSize, minHeight: 61.rpx,
letterSpacing: 0.0,
),
), ),
].divide(SizedBox(width: 17.rpx)), child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
"体征检测设备.消息回看".tr,
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
color: themeController.currentColor.sc3,
fontFamily: 'Inter',
fontSize:
AppConstants().normal_text_fontSize,
letterSpacing: 0.0,
),
),
].divide(SizedBox(width: 17.rpx)),
),
),
), ),
), ),
), ),
CustomCard( SizedBox(
borderRadius: AppConstants().button_container_radius, width: 20.rpx,
onTap: () {
TopSlideNotification.show(context, text: "待开发功能".tr);
},
colors: [
themeController.currentColor.sc1,
themeController.currentColor.sc2,
],
child: Container(
width: MediaQuery.sizeOf(context).width * 0.19,
height: MediaQuery.sizeOf(context).height * 0.0037,
constraints: BoxConstraints(
minWidth: 143.rpx,
minHeight: 61.rpx,
),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
"体征检测设备.消息回看".tr,
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
color: themeController.currentColor.sc3,
fontFamily: 'Inter',
fontSize: AppConstants().normal_text_fontSize,
letterSpacing: 0.0,
),
),
].divide(SizedBox(width: 17.rpx)),
),
),
), ),
CustomCard( Expanded(
borderRadius: AppConstants().button_container_radius, // 使用 Expanded 来占据屏幕宽度的一半
onTap: () { child: CustomCard(
String mac = widget.device['mac']; borderRadius: AppConstants().button_container_radius,
String sleepReportUrl = onTap: () {
"${ServiceConstant.sleep_report_url}?mac=${mac}&token=${ServiceConstant.sleep_token}"; String mac = widget.device['mac'];
Get.toNamed("/sleepReportPage", String sleepReportUrl =
arguments: sleepReportUrl); "${ServiceConstant.sleep_report_url}?mac=${mac}&token=${ServiceConstant.sleep_token}";
}, Get.toNamed("/sleepReportPage",
colors: [ arguments: sleepReportUrl);
themeController.currentColor.sc1, },
themeController.currentColor.sc2, colors: [
], themeController.currentColor.sc1,
child: Container( themeController.currentColor.sc2,
width: MediaQuery.sizeOf(context).width * 0.19, ],
height: MediaQuery.sizeOf(context).height * 0.0037, child: Padding(
constraints: BoxConstraints( padding: EdgeInsetsDirectional.fromSTEB(
minWidth: 143.rpx, 0.rpx, 0.rpx, 0.rpx, 0.rpx),
minHeight: 61.rpx, child: Container(
), alignment: Alignment.center,
child: Row( height: MediaQuery.sizeOf(context).height * 0.0037,
mainAxisSize: MainAxisSize.max, constraints: BoxConstraints(
mainAxisAlignment: MainAxisAlignment.center, minWidth: 143.rpx,
children: [ minHeight: 61.rpx,
Text(
"体征检测设备.健康报告".tr,
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
color: themeController.currentColor.sc3,
fontFamily: 'Inter',
fontSize: AppConstants().normal_text_fontSize,
letterSpacing: 0.0,
),
), ),
].divide(SizedBox(width: 17.rpx)), child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
"体征检测设备.健康报告".tr,
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
color: themeController.currentColor.sc3,
fontFamily: 'Inter',
fontSize:
AppConstants().normal_text_fontSize,
letterSpacing: 0.0,
),
),
].divide(SizedBox(width: 17.rpx)),
),
),
), ),
), ),
), ),

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

@@ -173,354 +173,375 @@ class _InstantBodyPageState extends State<InstantBodyPage> {
), ),
body: SafeArea( body: SafeArea(
top: true, top: true,
child: Padding( child: Container(
padding: decoration: BoxDecoration(
EdgeInsetsDirectional.fromSTEB(0.rpx, 29.rpx, 0.rpx, 0.rpx), image: DecorationImage(
child: Column( image: AssetImage(
mainAxisSize: MainAxisSize.max, (onlineState == "离线".tr || inBed == '离床'.tr)
children: [ ? 'assets/img/black_body_still.png' // 静态图
Padding( : 'assets/img/body_black.gif', // 动图
padding: EdgeInsetsDirectional.fromSTEB(
30.rpx, 0.rpx, 30.rpx, 120.rpx),
child: ClickableContainer(
backgroundColor: themeController.currentColor.sc5,
highlightColor:
themeController.currentColor.sc5, // 或你希望的点击水波纹颜色
borderRadius: AppConstants()
.normal_container_radius, // 如果你想加圆角可以设置 eg. 12.rpx
padding: EdgeInsets.zero,
onTap: () {
print('点击了体征卡片');
},
child: Row(
mainAxisSize: MainAxisSize.max,
children: [
Expanded(
flex: 1,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Column(
crossAxisAlignment:
CrossAxisAlignment.end,
children: [
Text(
'实时体征.姓名'.tr,
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController
.currentColor.sc4,
),
),
Text(
'实时体征.年龄'.tr,
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController
.currentColor.sc4,
),
),
].divide(SizedBox(height: 34.rpx)),
),
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
'${device['person']?['name'] ?? '未命名'.tr}',
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController
.currentColor.sc3,
),
),
Text(
'${MyUtils.getAgeByDate(MyUtils.formatBirthdayTime(device['person']?['birthday'])) ?? '未知数据'.tr}',
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController
.currentColor.sc3,
),
),
].divide(SizedBox(height: 34.rpx)),
),
]
.divide(SizedBox(width: 33.rpx))
.addToStart(SizedBox(width: 37.rpx)),
),
]
.addToStart(SizedBox(height: 36.rpx))
.addToEnd(SizedBox(height: 36.rpx)),
),
),
Expanded(
flex: 1,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Column(
crossAxisAlignment:
CrossAxisAlignment.end,
children: [
Text(
'实时体征.设备ID'.tr,
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController
.currentColor.sc4,
),
),
Text(
'实时体征.体重'.tr,
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController
.currentColor.sc4,
),
),
].divide(SizedBox(height: 34.rpx)),
),
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
'${device['code'] ?? '未知数据'.tr}',
// "D11250300003",
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController
.currentColor.sc3,
),
),
Text(
'${device['person']?['weight'] ?? '未知数据'.tr}kg',
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController
.currentColor.sc3,
),
),
].divide(SizedBox(height: 34.rpx)),
),
]
.divide(SizedBox(width: 33.rpx))
.addToStart(SizedBox(width: 37.rpx)),
),
]
.addToStart(SizedBox(height: 36.rpx))
.addToEnd(SizedBox(height: 36.rpx)),
),
),
],
),
),
), ),
Expanded( fit: BoxFit.cover,
child: SingleChildScrollView( ),
child: Column( ),
children: [ child: Padding(
Padding( padding: EdgeInsetsDirectional.fromSTEB(
padding: EdgeInsetsDirectional.fromSTEB( 0.rpx, 29.rpx, 0.rpx, 0.rpx),
66.rpx, 0, 66.rpx, 0), child: Column(
child: Container( mainAxisSize: MainAxisSize.max,
children: [
decoration: BoxDecoration( Padding(
image: DecorationImage( padding: EdgeInsetsDirectional.fromSTEB(
image: AssetImage( 30.rpx, 0.rpx, 30.rpx, 120.rpx),
onlineState == "离线".tr child: ClickableContainer(
? 'assets/img/black_body_still.jpg' // 静态图 backgroundColor: themeController.currentColor.sc5,
: 'assets/img/body_black.gif', // 动图 highlightColor:
), themeController.currentColor.sc5, // 或你希望的点击水波纹颜色
fit: BoxFit.cover, borderRadius: AppConstants()
.normal_container_radius, // 如果你想加圆角可以设置 eg. 12.rpx
padding: EdgeInsets.zero,
onTap: () {
print('点击了体征卡片');
},
child: Row(
mainAxisSize: MainAxisSize.max,
children: [
Expanded(
flex: 1,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Column(
crossAxisAlignment:
CrossAxisAlignment.end,
children: [
Text(
'实时体征.姓名'.tr,
style:
FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController
.currentColor.sc4,
),
),
Text(
'实时体征.年龄'.tr,
style:
FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController
.currentColor.sc4,
),
),
].divide(SizedBox(height: 34.rpx)),
),
Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
'${device['person']?['name'] ?? '未命名'.tr}',
style:
FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController
.currentColor.sc3,
),
),
Text(
'${MyUtils.getAgeByDate(MyUtils.formatBirthdayTime(device['person']?['birthday'])) ?? '未知数据'.tr}',
style:
FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController
.currentColor.sc3,
),
),
].divide(SizedBox(height: 34.rpx)),
),
]
.divide(SizedBox(width: 33.rpx))
.addToStart(SizedBox(width: 37.rpx)),
),
]
.addToStart(SizedBox(height: 36.rpx))
.addToEnd(SizedBox(height: 36.rpx)),
), ),
), ),
child: Column( Expanded(
children: [ flex: 1,
Row( child: Column(
mainAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
MainAxisAlignment.spaceBetween, children: [
children: [ Row(
DeviceStatusInfoWidget( children: [
title: "在离床".tr, Column(
iconAsset: crossAxisAlignment:
"assets/img/icon/bed_status.svg", CrossAxisAlignment.end,
value: inBed, children: [
), Text(
DeviceStatusInfoWidget( '实时体征.设备ID'.tr,
title: "体动".tr, style:
iconAsset: FlutterFlowTheme.of(context)
"assets/img/icon/bodymotion.svg", .bodyMedium
value: (bodyMotion == null || .override(
bodyMotion == -1) fontFamily: 'Inter',
? "未知数据".tr fontSize: 26.rpx,
: "$bodyMotion", letterSpacing: 0.0,
), color: themeController
], .currentColor.sc4,
), ),
Row( ),
mainAxisAlignment: Text(
MainAxisAlignment.spaceBetween, '实时体征.体重'.tr,
children: [ style:
DeviceStatusInfoWidget( FlutterFlowTheme.of(context)
title: "心率".tr, .bodyMedium
iconAsset: "assets/img/icon/heart.svg", .override(
value: (heartrate == null || fontFamily: 'Inter',
heartrate == -1) fontSize: 26.rpx,
? "未知数据".tr letterSpacing: 0.0,
: "$heartrate", color: themeController
), .currentColor.sc4,
DeviceStatusInfoWidget( ),
title: "打鼾".tr, ),
iconAsset: "assets/img/icon/snore.svg", ].divide(SizedBox(height: 34.rpx)),
value: '${snores}'.tr, ),
), Column(
], crossAxisAlignment:
), CrossAxisAlignment.start,
Row( children: [
mainAxisAlignment: Text(
MainAxisAlignment.spaceBetween, '${device['code'] ?? '未知数据'.tr}',
children: [ // "D11250300003",
DeviceStatusInfoWidget( style:
title: "呼吸".tr, FlutterFlowTheme.of(context)
iconAsset: .bodyMedium
"assets/img/icon/breathe.svg", .override(
value: (breathrate == null || fontFamily: 'Inter',
breathrate == -1) fontSize: 26.rpx,
? "未知数据".tr letterSpacing: 0.0,
: "$breathrate", color: themeController
), .currentColor.sc3,
DeviceStatusInfoWidget( ),
title: "呼吸暂停".tr, ),
iconAsset: Text(
"assets/img/icon/breathe_pause.svg", '${device['person']?['weight'] ?? '未知数据'.tr}kg',
value: '${breathState}', style:
), FlutterFlowTheme.of(context)
], .bodyMedium
), .override(
].divide(SizedBox(height: 49.rpx)), fontFamily: 'Inter',
), fontSize: 26.rpx,
), letterSpacing: 0.0,
), color: themeController
Padding( .currentColor.sc3,
padding: EdgeInsetsDirectional.fromSTEB( ),
0.rpx, 67.rpx, 0.rpx, 0.rpx), ),
child: Container( ].divide(SizedBox(height: 34.rpx)),
height: 40.rpx, ),
child: Text( ]
bodyMotion >= maxBodyMotion ? '请保持静止'.tr : "", .divide(SizedBox(width: 33.rpx))
style: FlutterFlowTheme.of(context) .addToStart(SizedBox(width: 37.rpx)),
.bodyMedium
.override(
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController.currentColor.sc9,
), ),
]
.addToStart(SizedBox(height: 36.rpx))
.addToEnd(SizedBox(height: 36.rpx)),
),
), ),
), ],
),
// SizedBox(
// height: 207.rpx,
// ),
],
),
)),
ClickableContainer(
backgroundColor: Colors.transparent, // 可自定义背景色
highlightColor: Colors.white, // 点击涟漪颜色
borderRadius: 16.rpx, // 圆角大小，可按需调整
padding: EdgeInsetsDirectional.fromSTEB(
30.rpx, 0.rpx, 30.rpx, 0.rpx),
onTap: () {},
child: Container(
padding: EdgeInsetsDirectional.fromSTEB(
26.rpx, 26.rpx, 26.rpx, 26.rpx),
decoration: BoxDecoration(
// color: FlutterFlowTheme.of(context)
// .primaryBackground
// .withOpacity(0.6), // 半透明背景
borderRadius: BorderRadius.circular(16.rpx),
border: Border.all(
color: themeController.currentColor.sc4
.withOpacity(0.5),
width: 0.5.rpx,
), ),
), ),
child: Row( ),
crossAxisAlignment: CrossAxisAlignment.start, Expanded(
child: SingleChildScrollView(
child: Column(
children: [ children: [
Padding( Padding(
padding: EdgeInsetsDirectional.fromSTEB( padding: EdgeInsetsDirectional.fromSTEB(
0, 8.rpx, 0, 0), 66.rpx, 0, 66.rpx, 0),
child: Container( child: Container(
width: 23.rpx, // decoration: BoxDecoration(
height: 23.rpx, // image: DecorationImage(
// width: double.infinity, // image: AssetImage(
decoration: BoxDecoration(), // onlineState == "离线".tr
child: SvgPicture.asset( // ? 'assets/img/black_body_still.png' // 静态图
'assets/img/icon/tips.svg', // : 'assets/img/body_black.gif', // 动图
fit: BoxFit.cover, // ),
color: themeController.currentColor.sc4, // fit: BoxFit.cover,
// ),
// ),
child: Column(
children: [
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
DeviceStatusInfoWidget(
title: "在离床".tr,
iconAsset:
"assets/img/icon/bed_status.svg",
value: inBed,
),
DeviceStatusInfoWidget(
title: "体动".tr,
iconAsset:
"assets/img/icon/bodymotion.svg",
value: (bodyMotion == null ||
bodyMotion == -1)
? "未知数据".tr
: "$bodyMotion",
),
],
),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
DeviceStatusInfoWidget(
title: "心率".tr,
iconAsset:
"assets/img/icon/heart.svg",
value: (heartrate == null ||
heartrate == -1)
? "未知数据".tr
: "$heartrate",
),
DeviceStatusInfoWidget(
title: "打鼾".tr,
iconAsset:
"assets/img/icon/snore.svg",
value: '${snores}'.tr,
),
],
),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
DeviceStatusInfoWidget(
title: "呼吸".tr,
iconAsset:
"assets/img/icon/breathe.svg",
value: (breathrate == null ||
breathrate == -1)
? "未知数据".tr
: "$breathrate",
),
DeviceStatusInfoWidget(
title: "呼吸暂停".tr,
iconAsset:
"assets/img/icon/breathe_pause.svg",
value: '${breathState}',
),
],
),
].divide(SizedBox(height: 49.rpx)),
), ),
), ),
), ),
Expanded( Padding(
child: Text( padding: EdgeInsetsDirectional.fromSTEB(
'实时体征.提示'.tr, 0.rpx, 67.rpx, 0.rpx, 0.rpx),
style: FlutterFlowTheme.of(context) child: Container(
.bodyMedium height: 40.rpx,
.override( child: Text(
fontFamily: 'Inter', bodyMotion >= maxBodyMotion ? '请保持静止'.tr : "",
letterSpacing: 0.0, style: FlutterFlowTheme.of(context)
color: themeController.currentColor.sc4, .bodyMedium
), .override(
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController.currentColor.sc9,
),
),
), ),
), ),
].divide(SizedBox(width: 23.rpx)), // SizedBox(
// height: 207.rpx,
// ),
],
),
)),
ClickableContainer(
backgroundColor: Colors.transparent, // 可自定义背景色
highlightColor: Colors.white, // 点击涟漪颜色
borderRadius: 16.rpx, // 圆角大小，可按需调整
padding: EdgeInsetsDirectional.fromSTEB(
30.rpx, 0.rpx, 30.rpx, 0.rpx),
onTap: () {},
child: Container(
padding: EdgeInsetsDirectional.fromSTEB(
26.rpx, 26.rpx, 26.rpx, 26.rpx),
decoration: BoxDecoration(
// color: FlutterFlowTheme.of(context)
// .primaryBackground
// .withOpacity(0.6), // 半透明背景
borderRadius: BorderRadius.circular(16.rpx),
border: Border.all(
color: themeController.currentColor.sc4
.withOpacity(0.5),
width: 0.5.rpx,
),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsetsDirectional.fromSTEB(
0, 8.rpx, 0, 0),
child: Container(
width: 23.rpx,
height: 23.rpx,
// width: double.infinity,
decoration: BoxDecoration(),
child: SvgPicture.asset(
'assets/img/icon/tips.svg',
fit: BoxFit.cover,
color: themeController.currentColor.sc4,
),
),
),
Expanded(
child: Text(
'实时体征.提示'.tr,
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Inter',
letterSpacing: 0.0,
color: themeController.currentColor.sc4,
),
),
),
].divide(SizedBox(width: 23.rpx)),
),
), ),
), ),
), SizedBox(
SizedBox( height: 26.rpx,
height: 26.rpx, ),
), ],
], ),
), ),
), ),
), ),

131
lib/pages/device_bind/componnet/DeviceShareInfoWidget.dart
View File

@@ -24,10 +24,25 @@ class _DeviceShareInfoWidgetState extends State<DeviceShareInfoWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
bool selected = false; final key = deviceShareListController.model.accountKey;
final matchedValues = [];
for (final item in widget.data) {
if (item is Map && item.containsKey(key)) {
final value = item[key];
if (value != null) {
final strValue = value.toString();
if (strValue.isNotEmpty) {
matchedValues.add(strValue);
break;
}
}
}
}
return ClickableContainer( return ClickableContainer(
backgroundColor: themeController.currentColor.sc5, backgroundColor: themeController.currentColor.sc5,
highlightColor: themeController.currentColor.sc3, highlightColor: themeController.currentColor.sc4,
borderRadius: 20.rpx, borderRadius: 20.rpx,
padding: EdgeInsetsDirectional.fromSTEB(0.rpx, 33.rpx, 0.rpx, 33.rpx), padding: EdgeInsetsDirectional.fromSTEB(0.rpx, 33.rpx, 0.rpx, 33.rpx),
onTap: () {}, onTap: () {},
@@ -35,6 +50,11 @@ class _DeviceShareInfoWidgetState extends State<DeviceShareInfoWidget> {
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: [ children: [
Obx(() { Obx(() {
// 判断当前项是否被选中
var aa = deviceShareListController.selectedShareInfo;
print(aa);
final isSelected = matchedValues.any((v) =>
deviceShareListController.selectedShareInfo.value.contains(v));
return Theme( return Theme(
data: ThemeData( data: ThemeData(
checkboxTheme: CheckboxThemeData( checkboxTheme: CheckboxThemeData(
@@ -47,18 +67,52 @@ class _DeviceShareInfoWidgetState extends State<DeviceShareInfoWidget> {
unselectedWidgetColor: Color(0xFFD3D3D3), unselectedWidgetColor: Color(0xFFD3D3D3),
), ),
child: Checkbox( child: Checkbox(
value: deviceShareListController.selectedShareInfo.value value: isSelected,
.contains(widget.data[0]['k']),
onChanged: (newValue) async { onChanged: (newValue) async {
if (newValue != null) { if (newValue != null) {
if (newValue == true) { final key = deviceShareListController.model.accountKey;
deviceShareListController.selectedShareInfo.value // 提取包含指定 key 的 value
.add(widget.data[0]['k']); final List<String> matchedValues = [];
} else { for (final item in widget.data) {
deviceShareListController.selectedShareInfo.value if (item is Map && item.containsKey(key)) {
.remove(widget.data[0]['k']); final value = item[key];
if (value != null) {
final strValue = value.toString();
if (strValue.isNotEmpty) {
matchedValues.add(strValue);
break;
}
}
}
} }
if (newValue == true) {
// 添加匹配值到已选列表中（避免重复）
for (final v in matchedValues) {
if (!deviceShareListController.selectedShareInfo.value
.contains(v)) {
deviceShareListController.selectedShareInfo.value
.add(v);
}
}
} else {
// 从已选列表中移除匹配值
deviceShareListController.selectedShareInfo.value
.removeWhere((v) => matchedValues.contains(v));
}
// 刷新 UI 和全选状态
final selectedCount =
deviceShareListController.selectedShareInfo.length;
final totalCount =
deviceShareListController.shareInfoList.length;
deviceShareListController.model.all =
(selectedCount == totalCount) ? 1 : 0;
deviceShareListController.selectedShareInfo.refresh();
deviceShareListController.updateAll();
} }
final selectedCount = final selectedCount =
deviceShareListController.selectedShareInfo.length; deviceShareListController.selectedShareInfo.length;
final totalCount = final totalCount =
@@ -66,8 +120,7 @@ class _DeviceShareInfoWidgetState extends State<DeviceShareInfoWidget> {
deviceShareListController.model.all = deviceShareListController.model.all =
(selectedCount == totalCount) ? 1 : 0; (selectedCount == totalCount) ? 1 : 0;
deviceShareListController.selectedShareInfo deviceShareListController.selectedShareInfo.refresh();
.refresh(); // ✅ 关键代码
deviceShareListController.updateAll(); deviceShareListController.updateAll();
}, },
side: BorderSide( side: BorderSide(
@@ -91,22 +144,52 @@ class _DeviceShareInfoWidgetState extends State<DeviceShareInfoWidget> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: List.generate(widget.data.length, (index) { children: List.generate(widget.data.length, (index) {
final item = widget.data[index]; final item = widget.data[index];
if (item is Map &&
item.containsKey('show') &&
item['show'] == false) {
return Container();
}
return Container( return Container(
constraints: BoxConstraints( constraints: BoxConstraints(
minHeight: 62.rpx, minHeight: 62.rpx,
), ),
child: Align( child: Row(
alignment: AlignmentDirectional(-1, 0), children: [
child: Text( SizedBox(
"${item['k']}" + ":" + "${item['v']}", width: 105.rpx,
style: child: Align(
FlutterFlowTheme.of(context).bodyMedium.override( alignment: AlignmentDirectional(-1, 0),
fontFamily: 'Inter', child: Text(
fontSize: 26.rpx, "${item['k']}",
letterSpacing: 0.0, style: FlutterFlowTheme.of(context)
color: themeController.currentColor.sc3, .bodyMedium
), .override(
), fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController.currentColor.sc4,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
),
Text(
"${item['v']}",
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Inter',
fontSize: 26.rpx,
letterSpacing: 0.0,
color: themeController.currentColor.sc3,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
].divide(SizedBox(
width: 34.rpx,
)),
), ),
); );
}), }),

4
lib/pages/device_bind/componnet/SingleBlueteethDeviceCompoentWidget.dart
View File

@@ -8,7 +8,6 @@ import 'package:vbvs_app/common/util/DailyLogUtils.dart';
import 'package:vbvs_app/common/util/FitTool.dart'; import 'package:vbvs_app/common/util/FitTool.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/component/tool/cmd.dart';
import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart'; import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart';
import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart';
import 'package:vbvs_app/model/BleDeviceData.dart'; import 'package:vbvs_app/model/BleDeviceData.dart';
@@ -86,7 +85,8 @@ class _SingleBlueteethDeviceCompoentWidgetState
TopSlideNotification.show(context, text: response.msg!); TopSlideNotification.show(context, text: response.msg!);
if (response.code == HttpStatusCodes.ok) { if (response.code == HttpStatusCodes.ok) {
// showLoadingDialog(context); // 显示 loading // showLoadingDialog(context); // 显示 loading
Get.toNamed("/personPage"); // Get.toNamed("/personPage");
Get.toNamed("/wifiPage");
THapp bledevice = THapp(device: widget.bleDevice.device); THapp bledevice = THapp(device: widget.bleDevice.device);
blueteethBindController.currentDevice = bledevice; blueteethBindController.currentDevice = bledevice;
// await bledevice.device.connect(); // await bledevice.device.connect();

2
lib/pages/device_bind/componnet/bind_dialog.dart
View File

@@ -530,9 +530,9 @@ void showConfirmDialog(
CustomCard( CustomCard(
borderRadius: AppConstants().button_container_radius, borderRadius: AppConstants().button_container_radius,
onTap: () { onTap: () {
Get.back();
onConfirm(); onConfirm();
// await Future.delayed(Duration(milliseconds: 300)); // await Future.delayed(Duration(milliseconds: 300));
Get.back();
}, },
colors: [ colors: [
themeController.currentColor.sc1, themeController.currentColor.sc1,

33
lib/pages/device_bind/device_calibration.dart
View File

@@ -28,6 +28,7 @@ class CalibrationPage extends StatefulWidget {
class _CalibrationPageState extends State<CalibrationPage> { class _CalibrationPageState extends State<CalibrationPage> {
DeviceCalibrationController deviceCalibrationController = Get.find(); DeviceCalibrationController deviceCalibrationController = Get.find();
BlueteethBindController blueteethBindController = Get.find(); BlueteethBindController blueteethBindController = Get.find();
int flag = 0; //默认没有开始校准过
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@@ -89,8 +90,32 @@ class _CalibrationPageState extends State<CalibrationPage> {
child: CustomCard( child: CustomCard(
borderRadius: 20.rpx, borderRadius: 20.rpx,
onTap: () async { onTap: () async {
// Get.toNamed("/personPage"); if (flag != 0) {
Get.toNamed("/bindDeviceSuccess"); showConfirmDialog(
context, Container(), "校准未完成提示".tr,
onConfirm: () async {
await Get.toNamed("/personPage");
print("object");
deviceCalibrationController.process.value = 0;
deviceCalibrationController
.bed_calibration.value = 0;
deviceCalibrationController
.position_calibration.value = 0;
blueteethBindController.cid!.value = "";
deviceCalibrationController.complete = false;
}, onCancel: () {});
} else {
await Get.toNamed("/personPage");
deviceCalibrationController.process.value = 0;
deviceCalibrationController
.bed_calibration.value = 0;
deviceCalibrationController
.position_calibration.value = 0;
blueteethBindController.cid!.value = "";
deviceCalibrationController.complete = false;
}
// Get.toNamed("/bindDeviceSuccess");
}, },
colors: [ colors: [
themeController.currentColor.sc1, themeController.currentColor.sc1,
@@ -491,6 +516,7 @@ class _CalibrationPageState extends State<CalibrationPage> {
borderRadius: borderRadius:
AppConstants().button_container_radius, // 圆角半径 AppConstants().button_container_radius, // 圆角半径
onTap: () async { onTap: () async {
flag = 1;
if (deviceCalibrationController.complete) { if (deviceCalibrationController.complete) {
showConfirmDialog( showConfirmDialog(
context, Container(), "校准已经完成，是否重新开始校准？", context, Container(), "校准已经完成，是否重新开始校准？",
@@ -504,7 +530,7 @@ class _CalibrationPageState extends State<CalibrationPage> {
.position_calibration.value = 0; .position_calibration.value = 0;
blueteethBindController.cid!.value = ""; blueteethBindController.cid!.value = "";
deviceCalibrationController.complete = false; deviceCalibrationController.complete = false;
String serviceAddress = String serviceAddress =
"https://caibration.he-info.cn"; "https://caibration.he-info.cn";
String calibrationApi = String calibrationApi =
@@ -589,6 +615,7 @@ class _CalibrationPageState extends State<CalibrationPage> {
currStep == 5 && currStep == 5 &&
status == true) { status == true) {
// 第二步完成：per >= 100 && currStep == 5 && status == true // 第二步完成：per >= 100 && currStep == 5 && status == true
flag = 0;
pollingTimer?.cancel(); pollingTimer?.cancel();
TopSlideNotification.show(context, TopSlideNotification.show(context,
text: "设备校准完成".tr); text: "设备校准完成".tr);

199
lib/pages/device_bind/device_share_list_page.dart
View File

@@ -2,14 +2,17 @@ import 'package:ef/ef.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart';
import 'package:vbvs_app/common/color/ServiceConstant.dart';
import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/color/appConstants.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/common/util/requestWithLog.dart';
import 'package:vbvs_app/component/NullDataComponentWidget.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/controller/device/device_share_list_controller.dart'; import 'package:vbvs_app/controller/device/device_share_list_controller.dart';
import 'package:vbvs_app/model/BleDeviceData.dart';
import 'package:vbvs_app/pages/device_bind/componnet/DeviceShareInfoWidget.dart'; import 'package:vbvs_app/pages/device_bind/componnet/DeviceShareInfoWidget.dart';
import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart';
class DeviceShareListPage extends StatefulWidget { class DeviceShareListPage extends StatefulWidget {
String device = ""; String device = "";
@@ -27,7 +30,10 @@ class _DeviceShareListPageState extends State<DeviceShareListPage> {
deviceShareListController.model.key = null; deviceShareListController.model.key = null;
deviceShareListController.shareInfoList.value = []; deviceShareListController.shareInfoList.value = [];
deviceShareListController.selectedShareInfo.value = []; deviceShareListController.selectedShareInfo.value = [];
deviceShareListController.getDeviceShareList(widget.device); deviceShareListController.model.all = 0;
deviceShareListController.getDeviceShareList(widget.device).then((value) {
deviceShareListController.updateAll();
});
super.initState(); super.initState();
} }
@@ -70,7 +76,6 @@ class _DeviceShareListPageState extends State<DeviceShareListPage> {
fontSize: 30.rpx, fontSize: 30.rpx,
), ),
), ),
//todo 返回刷新列表
Positioned( Positioned(
left: 0, left: 0,
child: returnIconButtom, child: returnIconButtom,
@@ -207,8 +212,8 @@ class _DeviceShareListPageState extends State<DeviceShareListPage> {
fontSize: 26.rpx, fontSize: 26.rpx,
letterSpacing: 0.0, letterSpacing: 0.0,
), ),
cursorColor: themeController cursorColor:
.currentColor.sc3, themeController.currentColor.sc3,
), ),
), ),
), ),
@@ -253,6 +258,10 @@ class _DeviceShareListPageState extends State<DeviceShareListPage> {
// themeController.currentColor.sc9, // themeController.currentColor.sc9,
// ); // );
// } // }
deviceShareListController
.getDeviceShareList(widget.device,
key: deviceShareListController
.model.key);
}, },
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 10.rpx, vertical: 6.rpx), horizontal: 10.rpx, vertical: 6.rpx),
@@ -310,15 +319,40 @@ class _DeviceShareListPageState extends State<DeviceShareListPage> {
: true, : true,
onChanged: (newValue) async { onChanged: (newValue) async {
if (newValue == true) { if (newValue == true) {
// 设置为全选 try {
deviceShareListController.model.all = deviceShareListController
1; .model.all = 1;
deviceShareListController
.selectedShareInfo.value = final key =
deviceShareListController deviceShareListController
.shareInfoList .model.accountKey;
.map((e) => e['id'] as String) final List<String> selectedList =
.toList(); [];
final allShareInfo =
deviceShareListController
.shareInfoList;
for (final sublist
in allShareInfo) {
if (sublist is List) {
for (final item in sublist) {
if (item is Map &&
item.containsKey(key)) {
selectedList.add(item[key]);
break;
}
}
}
}
deviceShareListController
.selectedShareInfo
.value = selectedList;
print("已全选: $selectedList");
} catch (e) {
print("全选失败: $e");
}
} else { } else {
// 取消全选 // 取消全选
deviceShareListController.model.all = deviceShareListController.model.all =
@@ -356,19 +390,56 @@ class _DeviceShareListPageState extends State<DeviceShareListPage> {
), ),
ClickableContainer( ClickableContainer(
onTap: () async { onTap: () async {
//todo 删除分享 showConfirmDialog(context, Container(), "删除提示".tr,
// ApiResponse apiResponse = onConfirm: () async {
// await deviceShareListController if (deviceShareListController
// .deleteShareDevice(); .selectedShareInfo ==
// if (apiResponse.code == HttpStatusCodes.ok) { null ||
// TopSlideNotification.show(context, deviceShareListController
// text: apiResponse.msg!); .selectedShareInfo.isEmpty) {
// } else { TopSlideNotification.show(context,
// TopSlideNotification.show(context, text: "删除错误提示".tr,
// text: apiResponse.msg!, textColor:
// textColor: themeController.currentColor.sc9);
// themeController.currentColor.sc9); return;
// } }
String serviceAddress =
ServiceConstant.service_address;
String serviceName =
ServiceConstant.server_service;
String serviceApi = ServiceConstant.device_bind;
String queryUrl =
"${serviceAddress}${serviceName}${serviceApi}";
final data = {
"mac": widget.device,
"uid": deviceShareListController
.selectedShareInfo.value
.join(','),
};
await requestWithLog(
logTitle: "删除分享设备",
method: MyHttpMethod.delete,
queryUrl: queryUrl,
data: data,
onSuccess: (res) {
TopSlideNotification.show(context,
text: res.msg!);
deviceShareListController.model.all = 0;
deviceShareListController
.selectedShareInfo.value = [];
deviceShareListController
.getDeviceShareList(widget.device);
deviceShareListController.updateAll();
},
onFailure: (res) {
TopSlideNotification.show(context,
text: res.msg!,
textColor:
themeController.currentColor.sc9);
deviceShareListController.updateAll();
},
);
}, onCancel: () {});
}, },
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 20.rpx, vertical: 10.rpx), horizontal: 20.rpx, vertical: 10.rpx),
@@ -387,28 +458,27 @@ class _DeviceShareListPageState extends State<DeviceShareListPage> {
], ],
), ),
), ),
Expanded( Obx(() {
child: deviceShareListController final list =
.shareInfoList.value.isNotEmpty deviceShareListController.shareInfoList.value;
? SingleChildScrollView( final selected =
child: Obx(() { deviceShareListController.selectedShareInfo.value;
var selected = deviceShareListController
.selectedShareInfo.value; return Expanded(
return Column( child: list.isNotEmpty
children: deviceShareListController ? SingleChildScrollView(
.shareInfoList.value child: Column(
children: list
.map((item) => .map((item) =>
DeviceShareInfoWidget(data: item)) DeviceShareInfoWidget(data: item))
.toList() .toList()
.divide(SizedBox(height: 30.rpx)) .divide(SizedBox(height: 30.rpx))
.addToEnd(SizedBox( .addToEnd(SizedBox(height: 30.rpx)),
height: 30.rpx, ),
)), )
); : NullDataWidget(),
}), );
) })
: NullDataWidget(),
),
].divide(SizedBox(height: 30.rpx)), ].divide(SizedBox(height: 30.rpx)),
), ),
), ),
@@ -419,42 +489,3 @@ class _DeviceShareListPageState extends State<DeviceShareListPage> {
); );
} }
} }
BleDeviceData parseBleData(List<int> data) {
if (data.length < 18) {
throw Exception('BLE广播数据长度不足18字节');
}
int type = data[0];
int sn = data[1];
// 设备唯一ID (6字节)，格式化为 MAC 地址样式
String deviceId =
List.generate(6, (i) => data[2 + i].toRadixString(16).padLeft(2, '0'))
.join(":")
.toUpperCase();
int bre = data[8];
int ht = data[9];
int active = data[10];
int flag = data[11];
// version 是4字节 uint，大端字节序
int version =
(data[12] << 24) | (data[13] << 16) | (data[14] << 8) | data[15];
// qsn 是2字节 ushort，大端字节序
int qsn = (data[16] << 8) | data[17];
return BleDeviceData(
type: type,
sn: sn,
deviceId: deviceId,
bre: bre,
ht: ht,
active: active,
flag: flag,
version: version,
qsn: qsn,
);
}

9
lib/pages/device_bind/wifi_page.dart
View File

@@ -72,7 +72,7 @@ class _WifiPageState extends State<WifiPage> {
} }
if (onData.status == BleEventType.ready) { if (onData.status == BleEventType.ready) {
aa = await getDeviceNetVersion( aa = await getDeviceNetVersion(
blueteethBindController.currentDevice!, 1); blueteethBindController.currentDevice!, 2);
if (aa == "4g") { if (aa == "4g") {
TopSlideNotification.show( TopSlideNotification.show(
context, context,
@@ -84,6 +84,12 @@ class _WifiPageState extends State<WifiPage> {
Future.delayed(const Duration(seconds: 1), () { Future.delayed(const Duration(seconds: 1), () {
Get.toNamed("/calibrationPage", arguments: 1); Get.toNamed("/calibrationPage", arguments: 1);
}); });
} else if (aa == 'unknown') {
TopSlideNotification.show(
context,
text: "获取设备网络类型失败".tr,
textColor: themeController.currentColor.sc9,
);
} else { } else {
await initWifiStatusAndWifiList(); await initWifiStatusAndWifiList();
} }
@@ -1020,6 +1026,7 @@ class _WifiPageState extends State<WifiPage> {
text: "4g设备配置wifi提示".tr, text: "4g设备配置wifi提示".tr,
textColor: themeController.currentColor.sc9, textColor: themeController.currentColor.sc9,
); );
Get.back();
}); });
return; return;
} else { } else {

2
lib/pages/login/login.dart
View File

@@ -3,14 +3,12 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart';
import 'package:fluwx/fluwx.dart'; import 'package:fluwx/fluwx.dart';
import 'package:vbvs_app/common/color/ServiceConstant.dart';
import 'package:vbvs_app/common/color/appConstants.dart'; 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/CheckNetwork.dart'; import 'package:vbvs_app/common/util/CheckNetwork.dart';
import 'package:vbvs_app/common/util/CommonVariables.dart'; import 'package:vbvs_app/common/util/CommonVariables.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/common/util/requestWithLog.dart';
import 'package:vbvs_app/component/tool/ClickableContainer.dart'; import 'package:vbvs_app/component/tool/ClickableContainer.dart';
import 'package:vbvs_app/component/tool/CustomCard.dart'; import 'package:vbvs_app/component/tool/CustomCard.dart';
import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; import 'package:vbvs_app/component/tool/TopSlideNotification.dart';

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

@@ -231,9 +231,10 @@ class _HomePageState extends State<HomePage> {
padding: EdgeInsetsDirectional.fromSTEB( padding: EdgeInsetsDirectional.fromSTEB(
AppConstants().content_left_right_padding, AppConstants().content_left_right_padding,
0, 0,
AppConstants().content_left_right_padding, 0,
0), 0),
child: Container( child: Container(
// color: Colors.red,
width: double.infinity, width: double.infinity,
child: Row( child: Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
@@ -307,7 +308,7 @@ class _HomePageState extends State<HomePage> {
return Row( return Row(
children: [ children: [
Text( Text(
"${weatherModelController.model.cityName??'未知数据'.tr}", "${weatherModelController.model.cityName ?? '未知数据'.tr}",
style: TextStyle( style: TextStyle(
color: themeController color: themeController
.currentColor.sc4, .currentColor.sc4,
@@ -372,7 +373,7 @@ class _HomePageState extends State<HomePage> {
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
highlightColor: highlightColor:
themeController.currentColor.sc16, themeController.currentColor.sc16,
padding: EdgeInsets.all(8.rpx), padding: EdgeInsets.all(0.rpx),
onTap: () { onTap: () {
UserInfoController userInfoController = UserInfoController userInfoController =
Get.find(); Get.find();

28
lib/pages/person/person_page.dart
View File

@@ -49,8 +49,8 @@ class _EPageState extends State<PersonPage> {
personController.name.value = ''; personController.name.value = '';
personController.gender.value = 1; personController.gender.value = 1;
personController.birthday.value = ""; personController.birthday.value = "";
personController.weight.value = 65; personController.weight.value = "";
personController.dateTime = DateTime.now(); personController.dateTime = null;
} }
@override @override
@@ -107,8 +107,8 @@ class _EPageState extends State<PersonPage> {
if (apiRespons.code == HttpStatusCodes.ok) { if (apiRespons.code == HttpStatusCodes.ok) {
TopSlideNotification.show(context, TopSlideNotification.show(context,
text: apiRespons.msg!); text: apiRespons.msg!);
// Get.offAllNamed("/bindDeviceSuccess"); Get.offAllNamed("/bindDeviceSuccess");
Get.toNamed("/wifiPage"); // Get.toNamed("/wifiPage");
} else { } else {
TopSlideNotification.show(context, TopSlideNotification.show(context,
text: apiRespons.msg!, text: apiRespons.msg!,
@@ -200,6 +200,7 @@ class _EPageState extends State<PersonPage> {
fontFamily: 'Inter', fontFamily: 'Inter',
fontSize: 26.rpx, fontSize: 26.rpx,
letterSpacing: 0.0, letterSpacing: 0.0,
color: themeController.currentColor.sc4,
), ),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
@@ -440,6 +441,7 @@ class _EPageState extends State<PersonPage> {
personController.dateTime = d; personController.dateTime = d;
personController.updateAll(); personController.updateAll();
}, },
title: "生日".tr
); );
}); });
}, },
@@ -499,8 +501,7 @@ class _EPageState extends State<PersonPage> {
.height.value .height.value
.toString(), .toString(),
onChanged: (value) { onChanged: (value) {
personController.height.value = personController.height.value = value;
int.tryParse(value) ?? 0;
}, },
autofocus: false, autofocus: false,
obscureText: false, obscureText: false,
@@ -573,7 +574,8 @@ class _EPageState extends State<PersonPage> {
Obx(() { Obx(() {
final height = final height =
personController.height.value; personController.height.value;
return height == 0 return (height == null ||
height.isEmpty)
? const SizedBox.shrink() // 不显示任何内容 ? const SizedBox.shrink() // 不显示任何内容
: Text( : Text(
'${height}cm', '${height}cm',
@@ -621,12 +623,10 @@ class _EPageState extends State<PersonPage> {
FilteringTextInputFormatter FilteringTextInputFormatter
.digitsOnly, .digitsOnly,
], ],
initialValue: personController initialValue:
.weight.value personController.weight.value,
.toString(),
onChanged: (value) { onChanged: (value) {
personController.weight.value = personController.weight.value = value;
int.tryParse(value) ?? 0;
}, },
autofocus: false, autofocus: false,
obscureText: false, obscureText: false,
@@ -699,7 +699,8 @@ class _EPageState extends State<PersonPage> {
Obx(() { Obx(() {
final weight = final weight =
personController.weight.value; personController.weight.value;
return weight == 0 return (weight == null ||
weight.isEmpty)
? const SizedBox.shrink() // 不显示任何内容 ? const SizedBox.shrink() // 不显示任何内容
: Text( : Text(
'${weight}kg', '${weight}kg',
@@ -768,7 +769,6 @@ class _EPageState extends State<PersonPage> {
} }
personController.model.read = 0; personController.model.read = 0;
personController.updateAll(); personController.updateAll();
}, },
); );
}).toList(), }).toList(),

253
lib/pages/person/select_time.dart
View File

@@ -3,6 +3,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/color/appConstants.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/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/controller/theme_controller/ThemeController.dart';
Future showDateSelectionDialog(BuildContext context, Future showDateSelectionDialog(BuildContext context,
@@ -68,70 +69,76 @@ Future showDateSelectionDialog(BuildContext context,
color: themeController.currentColor.sc5, color: themeController.currentColor.sc5,
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
height: 80.rpx, height: 80.rpx,
child: Row( child: Padding(
mainAxisAlignment: MainAxisAlignment.spaceBetween, padding: EdgeInsets.only(left: 30.rpx, right: 30.rpx),
crossAxisAlignment: CrossAxisAlignment.center, child: Row(
children: [ mainAxisAlignment: MainAxisAlignment.spaceBetween,
InkWell( crossAxisAlignment: CrossAxisAlignment.center,
child: Text( children: [
"日期.取消".tr, InkWell(
child: Text(
"日期.取消".tr,
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Readex Pro',
color:
themeController.currentColor.sc3,
letterSpacing: 0,
fontSize: AppConstants()
.normal_text_fontSize),
),
onTap: () {
Get.back();
},
),
Text(
"$title",
style: FlutterFlowTheme.of(context) style: FlutterFlowTheme.of(context)
.bodyMedium .bodyMedium
.override( .override(
fontFamily: 'Readex Pro', fontFamily: 'Readex Pro',
color: themeController.currentColor.sc3, color: themeController.currentColor.sc3,
letterSpacing: 0, letterSpacing: 0,
fontSize: AppConstants() fontSize:
.normal_text_fontSize), AppConstants().title_text_fontSize),
), ),
onTap: () { // closeIconWhite,
Get.back(); InkWell(
}, child: Text(
), "日期.确定".tr,
Text( style: FlutterFlowTheme.of(context)
"$title", .bodyMedium
style: FlutterFlowTheme.of(context) .override(
.bodyMedium fontFamily: 'Readex Pro',
.override( color:
fontFamily: 'Readex Pro', themeController.currentColor.sc2,
color: themeController.currentColor.sc3, letterSpacing: 0,
letterSpacing: 0, fontSize: AppConstants()
fontSize: .normal_text_fontSize),
AppConstants().title_text_fontSize), ),
), onTap: () {
// closeIconWhite, checkChange?.call(DateTime(years[yearIndex],
InkWell( months[monthIndex], days[dayIndex]));
child: Text( Get.back();
"日期.确定".tr, },
style: FlutterFlowTheme.of(context) )
.bodyMedium ],
.override( ),
fontFamily: 'Readex Pro',
color: themeController.currentColor.sc3,
letterSpacing: 0,
fontSize: AppConstants()
.normal_text_fontSize),
),
onTap: () {
checkChange?.call(DateTime(years[yearIndex],
months[monthIndex], days[dayIndex]));
Get.back();
},
)
],
), ),
), ),
Container( Container(
height: 240.rpx, height: 240.rpx,
margin: EdgeInsets.only(top: 60.rpx, bottom: 60.rpx), margin: EdgeInsets.only(top: 60.rpx, bottom: 60.rpx),
padding: EdgeInsets.only(left: 30.rpx, right: 30.rpx), padding: EdgeInsets.symmetric(horizontal: 30.rpx),
child: Container( child: Row(
child: Row( mainAxisAlignment: MainAxisAlignment.center, // ✅ 整体居中
children: [ crossAxisAlignment: CrossAxisAlignment.center,
Expanded( children: [
child: Container( Row(
padding: EdgeInsets.only( children: [
left: 40.rpx, right: 30.rpx), SizedBox(
width: 120.rpx,
child: getOnePicker(context, years, yearIndex, child: getOnePicker(context, years, yearIndex,
(d) { (d) {
yearIndex = d; yearIndex = d;
@@ -147,26 +154,18 @@ Future showDateSelectionDialog(BuildContext context,
.day; .day;
days_select.value = days_select.value =
days.sublist(0, day_len); days.sublist(0, day_len);
}), }, "年".tr),
), ),
), ],
Container( ),
child: Text(
"年", SizedBox(width: 100.rpx),
style: FlutterFlowTheme.of(context)
.bodyMedium // 月
.override( Row(
fontFamily: 'Readex Pro', children: [
color: SizedBox(
themeController.currentColor.sc3, width: 80.rpx,
letterSpacing: 0,
fontSize: 30.rpx),
),
),
Expanded(
child: Container(
padding: EdgeInsets.only(
left: 30.rpx, right: 30.rpx),
child: getOnePicker( child: getOnePicker(
context, months, monthIndex, (d) { context, months, monthIndex, (d) {
monthIndex = d; monthIndex = d;
@@ -182,58 +181,29 @@ Future showDateSelectionDialog(BuildContext context,
.day; .day;
days_select.value = days_select.value =
days.sublist(0, day_len); days.sublist(0, day_len);
}, "月".tr),
),
],
),
SizedBox(width: 100.rpx),
Row(
children: [
SizedBox(
width: 80.rpx,
child: Obx(() {
return getOnePicker(
context, days_select, dayIndex, (d) {
dayIndex = d;
}, "日".tr);
}), }),
), ),
), ],
Container( ),
child: Text( ],
"月",
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Readex Pro',
color:
themeController.currentColor.sc3,
letterSpacing: 0,
fontSize: 30.rpx),
),
),
Expanded(
child: Container(
padding: EdgeInsets.only(
left: 30.rpx, right: 40.rpx),
child: Obx(
() {
// print("${dayIndex} ${day_len}");
return getOnePicker(
context,
days_select,
dayIndex,
(d) {
dayIndex = d;
},
);
},
),
),
),
Container(
child: Text(
"日",
style: FlutterFlowTheme.of(context)
.bodyMedium
.override(
fontFamily: 'Readex Pro',
color:
themeController.currentColor.sc3,
letterSpacing: 0,
fontSize: 30.rpx),
),
),
],
),
), ),
), )
], ],
), ),
), ),
@@ -246,9 +216,20 @@ Future showDateSelectionDialog(BuildContext context,
); );
} }
getOnePicker(context, List arr, int checkIndex, Function onSelectedItemChanged, TextStyle _unitStyle(BuildContext context) {
return FlutterFlowTheme.of(context).bodyMedium.override(
fontFamily: 'Readex Pro',
color: themeController.currentColor.sc3,
fontSize: 30.rpx,
letterSpacing: 0,
);
}
getOnePicker(BuildContext context, List arr, int checkIndex,
Function onSelectedItemChanged, String unit,
{bool looping = false}) { {bool looping = false}) {
ThemeController themeController = Get.find(); ThemeController themeController = Get.find();
return CupertinoPicker( return CupertinoPicker(
key: UniqueKey(), key: UniqueKey(),
useMagnifier: false, useMagnifier: false,
@@ -258,24 +239,22 @@ getOnePicker(context, List arr, int checkIndex, Function onSelectedItemChanged,
squeeze: 1, squeeze: 1,
looping: looping, looping: looping,
scrollController: FixedExtentScrollController(initialItem: checkIndex), scrollController: FixedExtentScrollController(initialItem: checkIndex),
selectionOverlay: Container(), selectionOverlay: Container(), // 不要默认选中遮罩
onSelectedItemChanged: (int value) { onSelectedItemChanged: (int value) {
// print("$value");
onSelectedItemChanged.call(value); onSelectedItemChanged.call(value);
}, },
children: [ children: List.generate(arr.length, (index) {
...List.generate(arr.length, (index) { return Container(
return Container( alignment: Alignment.center,
alignment: Alignment.center, child: Text(
width: 400.rpx, "${arr[index]}$unit", // ✅ 每项都带单位
child: Text("${arr[index]}", style: FlutterFlowTheme.of(context).bodyMedium.override(
style: FlutterFlowTheme.of(context).bodyMedium.override( fontFamily: 'Readex Pro',
fontFamily: 'Readex Pro', color: themeController.currentColor.sc3,
color: themeController.currentColor.sc3, fontSize: 30.rpx,
letterSpacing: 0, ),
fontSize: 30.rpx)), ),
); );
}) }),
],
); );
} }

23
lib/pages/person/update_person_page.dart
View File

@@ -38,6 +38,7 @@ class _UpdatePageState extends State<UpdatePersonPage> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
personController.dateTime = null;
personController.getDiseaseData().then((apiResponse) { personController.getDiseaseData().then((apiResponse) {
if (apiResponse.code != HttpStatusCodes.ok) { if (apiResponse.code != HttpStatusCodes.ok) {
TopSlideNotification.show( TopSlideNotification.show(
@@ -108,7 +109,6 @@ class _UpdatePageState extends State<UpdatePersonPage> {
if (apiRespons.code == HttpStatusCodes.ok) { if (apiRespons.code == HttpStatusCodes.ok) {
TopSlideNotification.show(context, TopSlideNotification.show(context,
text: apiRespons.msg!); text: apiRespons.msg!);
} else { } else {
TopSlideNotification.show(context, TopSlideNotification.show(context,
text: apiRespons.msg!, text: apiRespons.msg!,
@@ -201,6 +201,8 @@ class _UpdatePageState extends State<UpdatePersonPage> {
fontFamily: 'Inter', fontFamily: 'Inter',
fontSize: 26.rpx, fontSize: 26.rpx,
letterSpacing: 0.0, letterSpacing: 0.0,
color: themeController
.currentColor.sc4,
), ),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
@@ -269,7 +271,7 @@ class _UpdatePageState extends State<UpdatePersonPage> {
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.center, MainAxisAlignment.center,
children: [ children: [
Obx( Obx(
() { () {
bool isMaleGreyed = bool isMaleGreyed =
@@ -441,6 +443,7 @@ class _UpdatePageState extends State<UpdatePersonPage> {
personController.dateTime = d; personController.dateTime = d;
personController.updateAll(); personController.updateAll();
}, },
title: "生日".tr,
); );
}); });
}, },
@@ -488,7 +491,7 @@ class _UpdatePageState extends State<UpdatePersonPage> {
alignment: AlignmentDirectional(0, 0), alignment: AlignmentDirectional(0, 0),
child: Stack( child: Stack(
alignment: Alignment.center, alignment: Alignment.center,
children: [ children: [
TextFormField( TextFormField(
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
inputFormatters: [ inputFormatters: [
@@ -499,8 +502,7 @@ class _UpdatePageState extends State<UpdatePersonPage> {
.height.value .height.value
.toString(), .toString(),
onChanged: (value) { onChanged: (value) {
personController.height.value = personController.height.value = value;
int.tryParse(value) ?? 0;
}, },
autofocus: false, autofocus: false,
obscureText: false, obscureText: false,
@@ -573,7 +575,8 @@ class _UpdatePageState extends State<UpdatePersonPage> {
Obx(() { Obx(() {
final height = final height =
personController.height.value; personController.height.value;
return height == 0 return (height == null ||
height.isEmpty)
? const SizedBox.shrink() // 不显示任何内容 ? const SizedBox.shrink() // 不显示任何内容
: Text( : Text(
'${height}cm', '${height}cm',
@@ -625,8 +628,7 @@ class _UpdatePageState extends State<UpdatePersonPage> {
.weight.value .weight.value
.toString(), .toString(),
onChanged: (value) { onChanged: (value) {
personController.weight.value = personController.weight.value = value;
int.tryParse(value) ?? 0;
}, },
autofocus: false, autofocus: false,
obscureText: false, obscureText: false,
@@ -698,8 +700,9 @@ class _UpdatePageState extends State<UpdatePersonPage> {
), ),
Obx(() { Obx(() {
final weight = final weight =
personController.weight.value; personController.weight?.value;
return weight == 0 return (weight == null ||
weight.isEmpty)
? const SizedBox.shrink() // 不显示任何内容 ? const SizedBox.shrink() // 不显示任何内容
: Text( : Text(
'${weight}kg', '${weight}kg',

5
lib/pages/repair/component/RepairModelWidget.dart
View File

@@ -304,8 +304,7 @@ class _RepairModelWidgetState extends State<RepairModelWidget> {
color: themeController.currentColor.sc3, color: themeController.currentColor.sc3,
fontSize: AppConstants().normal_text_fontSize, fontSize: AppConstants().normal_text_fontSize,
), ),
cursorColor: themeController cursorColor: themeController.currentColor.sc3,
.currentColor.sc3,
), ),
), ),
), ),
@@ -313,7 +312,7 @@ class _RepairModelWidgetState extends State<RepairModelWidget> {
backgroundColor: themeController.currentColor.sc15, backgroundColor: themeController.currentColor.sc15,
highlightColor: themeController.currentColor.sc21, highlightColor: themeController.currentColor.sc21,
borderRadius: 20.rpx, borderRadius: 20.rpx,
padding: EdgeInsets.zero, // 原来没有额外 padding，这里保持一致 padding: EdgeInsets.zero,
onTap: () async { onTap: () async {
ApiResponse apiResponse = await repairController.uploadImg(); ApiResponse apiResponse = await repairController.uploadImg();
print(apiResponse); print(apiResponse);

2
lib/pages/setting/language_setting.dart
View File

@@ -83,7 +83,7 @@ class _LanguageSettingState extends State<LanguageSetting> {
children: [ children: [
Padding( Padding(
padding: EdgeInsetsDirectional.fromSTEB( padding: EdgeInsetsDirectional.fromSTEB(
30.rpx, 25.rpx, 30.rpx, 0), 0.rpx, 25.rpx, 0.rpx, 0),
child: Container( child: Container(
width: double.infinity, width: double.infinity,
decoration: BoxDecoration( decoration: BoxDecoration(

26
lib/pages/user/privacy_scheme_page.dart
View File

@@ -15,21 +15,21 @@ class PrivacySchemePage extends StatefulWidget {
class _PrivacySchemePageState extends State<PrivacySchemePage> { class _PrivacySchemePageState extends State<PrivacySchemePage> {
PrivacyPdfController pdfController = Get.find(); PrivacyPdfController pdfController = Get.find();
@override @override
void initState() { void initState() {
super.initState(); super.initState();
String language = "zh_CN"; // 默认语言 String language = "zh_CN"; // 默认语言
if (languageController.selectLanguage?.value?.language_code != null) { if (languageController.selectLanguage?.value?.language_code != null) {
language = languageController.selectLanguage!.value!.language_code!; language = languageController.selectLanguage!.value!.language_code!;
}
pdfController.loadPdf(
2,
"https://vsbst-api.he-info.cn/vsbs_sotrage/privacy-scheme/$language.pdf",
);
} }
pdfController.loadPdf(2,
"https://vsbst-api.he-info.cn/vsbs_sotrage/privacy-scheme/$language.pdf",
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return LayoutBuilder( return LayoutBuilder(
@@ -84,7 +84,7 @@ void initState() {
body: SafeArea( body: SafeArea(
top: true, top: true,
child: Padding( child: Padding(
padding: EdgeInsets.symmetric(horizontal: 30.rpx), padding: EdgeInsets.symmetric(horizontal: 0.rpx),
child: Column( child: Column(
children: [ children: [
Expanded( Expanded(

2
lib/pages/user/user_scheme_page.dart
View File

@@ -85,7 +85,7 @@ class _UserSchemePageState extends State<UserSchemePage> {
body: SafeArea( body: SafeArea(
top: true, top: true,
child: Padding( child: Padding(
padding: EdgeInsets.symmetric(horizontal: 30.rpx), padding: EdgeInsets.symmetric(horizontal: 0.rpx),
child: Column( child: Column(
children: [ children: [
Expanded( Expanded(

2
lib/routers/routers.dart
View File

@@ -57,7 +57,7 @@ var routes = {
"/updateUserPage": (contxt) => UpdateUserPage(), "/updateUserPage": (contxt) => UpdateUserPage(),
"/settingPage": (contxt) => SettingPage(), "/settingPage": (contxt) => SettingPage(),
"/aboutUsPage": (contxt) => AboutUsPage(), "/aboutUsPage": (contxt) => AboutUsPage(),
"/bodyDevice": (contxt) => BodyDeviceWidget(), "/bodyDevice": (contxt,{arguments}) => BodyDeviceWidget(type:arguments),
"/deviceTypeList": (contxt) => DeviceTypeListPage(), "/deviceTypeList": (contxt) => DeviceTypeListPage(),
"/deviceDetail": (contxt, {arguments}) => DeviceDetailPage(device: arguments), "/deviceDetail": (contxt, {arguments}) => DeviceDetailPage(device: arguments),
"/instantBodyPage": (contxt, {arguments}) => "/instantBodyPage": (contxt, {arguments}) =>

4
macos/Flutter/GeneratedPluginRegistrant.swift
View File

@@ -22,6 +22,8 @@ import rive_common
import shared_preferences_foundation import shared_preferences_foundation
import sqflite_darwin import sqflite_darwin
import url_launcher_macos import url_launcher_macos
import video_player_avfoundation
import wakelock_plus
import webview_flutter_wkwebview import webview_flutter_wkwebview
import window_to_front import window_to_front
@@ -43,6 +45,8 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin")) WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin"))
WindowToFrontPlugin.register(with: registry.registrar(forPlugin: "WindowToFrontPlugin")) WindowToFrontPlugin.register(with: registry.registrar(forPlugin: "WindowToFrontPlugin"))
} }

64
pubspec.lock
View File

@@ -303,6 +303,14 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.3" version: "2.0.3"
chewie:
dependency: "direct main"
description:
name: chewie
sha256: "645fbca3f22309381edb5af59a4c8aa544a3d3872d7b7b7c986c2b18b3bdd265"
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.10.0"
clock: clock:
dependency: transitive dependency: transitive
description: description:
@@ -2234,6 +2242,46 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.1.4" version: "2.1.4"
video_player:
dependency: "direct main"
description:
name: video_player
sha256: "7d78f0cfaddc8c19d4cb2d3bebe1bfef11f2103b0a03e5398b303a1bf65eeb14"
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.9.5"
video_player_android:
dependency: transitive
description:
name: video_player_android
sha256: "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898"
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.7.16"
video_player_avfoundation:
dependency: transitive
description:
name: video_player_avfoundation
sha256: "9ee764e5cd2fc1e10911ae8ad588e1a19db3b6aa9a6eb53c127c42d3a3c3f22f"
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.7.1"
video_player_platform_interface:
dependency: transitive
description:
name: video_player_platform_interface
sha256: df534476c341ab2c6a835078066fc681b8265048addd853a1e3c78740316a844
url: "https://pub.flutter-io.cn"
source: hosted
version: "6.3.0"
video_player_web:
dependency: transitive
description:
name: video_player_web
sha256: e8bba2e5d1e159d5048c9a491bb2a7b29c535c612bb7d10c1e21107f5bd365ba
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.3.5"
vm_service: vm_service:
dependency: transitive dependency: transitive
description: description:
@@ -2250,6 +2298,22 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.4.6" version: "0.4.6"
wakelock_plus:
dependency: transitive
description:
name: wakelock_plus
sha256: a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.3.2"
wakelock_plus_platform_interface:
dependency: transitive
description:
name: wakelock_plus_platform_interface
sha256: e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.2.3"
watcher: watcher:
dependency: transitive dependency: transitive
description: description:

2
pubspec.yaml
View File

@@ -52,6 +52,8 @@ dependencies:
weather: ^3.1.1 weather: ^3.1.1
geocoding: ^2.1.0 geocoding: ^2.1.0
# fl_chart: ^1.0.0 # fl_chart: ^1.0.0
video_player: ^2.9.5
chewie: ^1.10.0
dev_dependencies: dev_dependencies: