diff --git a/assets/langs/zh_CN.json b/assets/langs/zh_CN.json index 39402c3..b5a04c8 100644 --- a/assets/langs/zh_CN.json +++ b/assets/langs/zh_CN.json @@ -132,7 +132,7 @@ "wifi页":{ "标题":"WIFI配置", "跳过":"跳过", - "WLAN":"WLAN", + "WLAN":"网络", "未连接":"未连接", "已连接":"已连接", "可用WLAN":"可用WLAN", @@ -307,7 +307,7 @@ "搜索":"搜索", "名称":"名称：", "账号":"账号：", - "分享时间":"分享时间：", + "分享时间":"分享时间", "设备校准":"设备校准", "离床校准":"离床校准", "未完成":"未完成", @@ -367,5 +367,11 @@ "解绑":"解绑", "删除":"删除", "校准未完成提示":"校准还未完成，是否确认退出校准流程？", - "确定":"确定" + "确定":"确定", + "查看":"查看", + "报修成功标题":"报修成功", + "报修成功":"报修成功！", + "查看报修历史":"查看报修历史", + "报修成功标语":"报修申请提交后，我们的后台客服人员会与您取得联系，请保持电话畅通，感谢您对本产品的支持！", + "问题描述字数限制":"问题描述字数超过限制" } \ No newline at end of file diff --git a/assets/langs/zh_TW.json b/assets/langs/zh_TW.json index 849ac76..e656146 100644 --- a/assets/langs/zh_TW.json +++ b/assets/langs/zh_TW.json @@ -305,7 +305,7 @@ "搜索":"搜索", "名称":"名稱：", "账号":"賬號：", -"分享时间":"分享時間：", +"分享时间":"分享時間", "设备校准":"設備校準", "离床校准":"離床校準", "未完成":"未完成", diff --git a/lib/common/util/MyUtils.dart b/lib/common/util/MyUtils.dart index db9f71b..2db9fce 100644 --- a/lib/common/util/MyUtils.dart +++ b/lib/common/util/MyUtils.dart @@ -163,20 +163,19 @@ class MyUtils { return '${twoDigits(date.month)}/${twoDigits(date.day)}'; } - static String getFormatChineseTime(int date, {bool showWeekday = true}) { - DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(date); - // 格式化年月日 - String dateStr = DateFormat('yyyy年MM月dd日').format(dateTime); + static String getFormatChineseTime(int date, {bool showWeekday = true}) { + DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(date); + // 格式化年月日 + String dateStr = DateFormat('yyyy年MM月dd日').format(dateTime); - if (!showWeekday) return dateStr; + if (!showWeekday) return dateStr; - // 获取星期 - const weekDays = ['星期一', '星期二', '星期三', '星期四', '星期五', '星期六', '星期日']; - String weekStr = weekDays[dateTime.weekday - 1]; - - return '$dateStr $weekStr'; -} + // 获取星期 + const weekDays = ['星期一', '星期二', '星期三', '星期四', '星期五', '星期六', '星期日']; + String weekStr = weekDays[dateTime.weekday - 1]; + return '$dateStr $weekStr'; + } } Color stringToColor(String hexColor) { @@ -313,11 +312,16 @@ var returnIconButtom = IconButton( icon: Icon(Icons.navigate_before, size: 60.rpx), ); -var returnIconButtomAddCallback = (returnCallBack) { +var returnIconButtomAddCallback = ( + VoidCallback? returnCallBack, { + bool enableBack = true, +}) { return IconButton( onPressed: () { returnCallBack?.call(); - Get.back(); + if (enableBack) { + Get.back(); + } }, icon: Icon(Icons.navigate_before, size: 60.rpx), ); diff --git a/lib/controller/repair/repair_controller.dart b/lib/controller/repair/repair_controller.dart index 3a3659b..a3689f3 100644 --- a/lib/controller/repair/repair_controller.dart +++ b/lib/controller/repair/repair_controller.dart @@ -40,7 +40,7 @@ class RepairController extends GetControllerEx { attr = GetModel(RepairModel()).obs; } - RxString device_type = "".obs; + RxDouble device_type = 0.0.obs; RxList repairList = [].obs; RxString name = "".obs; diff --git a/lib/main.dart b/lib/main.dart index 7defdfa..9483a4d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -63,7 +63,6 @@ Future main() async { await initLog(); await messageStatus(); - startMessagePolling(); // 检查网络 Checknetwork.checkNetwork(); @@ -89,11 +88,11 @@ initLanguageSetting() { Future initWX() async { Fluwx fluwx = Fluwx(); fluwx.registerApi( - //请填写自己的微信appid - appId: "wxeb2688220799e2c5", - doOnAndroid: true, - doOnIOS: true, - ); + //请填写自己的微信appid + appId: "wxeb2688220799e2c5", + doOnAndroid: true, + doOnIOS: true, + universalLink: "https://app.he-info.com/theh/"); } Timer? _messageTimer; diff --git a/lib/pages/device/component/DeviceDataComponentWidget.dart b/lib/pages/device/component/DeviceDataComponentWidget.dart index 83661c4..a994fb4 100644 --- a/lib/pages/device/component/DeviceDataComponentWidget.dart +++ b/lib/pages/device/component/DeviceDataComponentWidget.dart @@ -291,12 +291,12 @@ class _DeviceDataComponentWidgetState extends State { }); _popupEntry?.remove(); _popupEntry = null; - dealWifi(widget.device['mac']); + dealWifi(widget.device); }, ), _buildMenuItem( text: "设备校准".tr, - onTap: () { + onTap: () async { setState(() { _isPopupOpen = false; }); @@ -305,7 +305,7 @@ class _DeviceDataComponentWidgetState extends State { BlueteethBindController blueteethBindController = Get.find(); blueteethBindController.currentDeviceMac?.value = widget.device['mac']; - Get.toNamed("/calibrationPage", arguments: 2); + await Get.toNamed("/calibrationPage", arguments: 2); }, ), _buildMenuItem( @@ -848,11 +848,12 @@ class _DeviceDataComponentWidgetState extends State { ), ); }, - child: SvgPicture.asset( - 'assets/img/icon/signal${widget.device['status']['wifi']}.svg', - width: 25.rpx, - height: 25.rpx, - fit: BoxFit.fill, + + child: Container( + width: 30.rpx, + height: 24.rpx, + child: Image.asset( + 'assets/img/signal${_getSignalLevel(widget.device['status']['signal'])}.png'), ), ), if (widget.device['status']['inBed'] != null && @@ -860,10 +861,10 @@ class _DeviceDataComponentWidgetState extends State { widget.device['status']['status'] == 1) ClickableContainer( backgroundColor: Colors.transparent, - highlightColor: Colors.grey, // 可根据需要更换颜色 + highlightColor: Colors.grey, padding: EdgeInsetsDirectional.fromSTEB(0, 0.rpx, 0, 0), - borderRadius: 0, // 如果你希望圆角可修改 + borderRadius: 0, onTap: () { showTipDialog( context, @@ -1285,149 +1286,149 @@ class _DeviceDataComponentWidgetState extends State { return "未知数据".tr; } - Future dealWifi(String mac) async { - bodyDeviceController.wifiMac = mac; - Get.toNamed("/wifiPage", arguments: mac); + Future dealWifi(device) async { + bodyDeviceController.wifiMac = device['mac']; + Get.toNamed("/wifiPage", arguments: device); return; - final blueteethBindController = Get.find(); - final themeController = Get.find(); + // final blueteethBindController = Get.find(); + // final themeController = Get.find(); - // 显示加载对话框 - showLoadingDialog(Get.context!, title: "连接中...".tr); + // // 显示加载对话框 + // showLoadingDialog(Get.context!, title: "连接中...".tr); - // 设置超时定时器 - Timer? timeoutTimer; - bool isConnected = false; + // // 设置超时定时器 + // Timer? timeoutTimer; + // bool isConnected = false; - try { - // 开始扫描蓝牙设备 - await FlutterBluePlus.startScan(timeout: Duration(seconds: 10)); + // try { + // // 开始扫描蓝牙设备 + // await FlutterBluePlus.startScan(timeout: Duration(seconds: 10)); - // 设置超时（20秒） - timeoutTimer = Timer(Duration(seconds: 20), () { - try { - if (!isConnected) { - Navigator.of(context).pop(); // 先关闭 dialog - WidgetsBinding.instance.addPostFrameCallback((_) { - TopSlideNotification.show( - context, - text: "设备连接超时，请重试".tr, - textColor: themeController.currentColor.sc9, - ); - }); - FlutterBluePlus.stopScan(); - } - } catch (e) { - print(e); - } - }); + // // 设置超时（20秒） + // timeoutTimer = Timer(Duration(seconds: 20), () { + // try { + // if (!isConnected) { + // Navigator.of(context).pop(); // 先关闭 dialog + // WidgetsBinding.instance.addPostFrameCallback((_) { + // TopSlideNotification.show( + // context, + // text: "设备连接超时，请重试".tr, + // textColor: themeController.currentColor.sc9, + // ); + // }); + // FlutterBluePlus.stopScan(); + // } + // } catch (e) { + // print(e); + // } + // }); - // 监听扫描结果 - StreamSubscription>? scanSubscription; - scanSubscription = FlutterBluePlus.scanResults.listen((results) async { - // 过滤出符合条件的设备 - ScanResult? targetDevice; + // // 监听扫描结果 + // StreamSubscription>? scanSubscription; + // scanSubscription = FlutterBluePlus.scanResults.listen((results) async { + // // 过滤出符合条件的设备 + // ScanResult? targetDevice; - for (var r in results) { - if (r.advertisementData.manufacturerData.containsKey(0xFFED)) { - List rawData = r.advertisementData.manufacturerData[0xFFED]!; - BleDeviceData deviceData = parseBleData(rawData); - String deviceMac = - deviceData.deviceId.replaceAll(':', '').toLowerCase(); - if (deviceMac == mac.toLowerCase()) { - targetDevice = r; - break; - } - } - } + // for (var r in results) { + // if (r.advertisementData.manufacturerData.containsKey(0xFFED)) { + // List rawData = r.advertisementData.manufacturerData[0xFFED]!; + // BleDeviceData deviceData = parseBleData(rawData); + // String deviceMac = + // deviceData.deviceId.replaceAll(':', '').toLowerCase(); + // if (deviceMac == mac.toLowerCase()) { + // targetDevice = r; + // break; + // } + // } + // } - if (targetDevice != null && !isConnected) { - isConnected = true; - FlutterBluePlus.stopScan(); - scanSubscription?.cancel(); - timeoutTimer?.cancel(); + // if (targetDevice != null && !isConnected) { + // isConnected = true; + // FlutterBluePlus.stopScan(); + // scanSubscription?.cancel(); + // timeoutTimer?.cancel(); - try { - // 连接设备 - // await targetDevice.device.connect(); - THapp bledevice = THapp(device: targetDevice.device); - await bledevice.device.connect(); - var res2 = bledevice.isConnected; - if (res2) { - Navigator.pop(context); - TopSlideNotification.show( - context, - text: "蓝牙绑定.连接成功".tr, - textColor: themeController.currentColor.sc2, - ); - blueteethBindController.currentDevice = bledevice; - if (lisObj != null) { - lisObj!.cancel(); - } - var aa; - lisObj = blueteethBindController.currentDevice!.statusStream - .listen((onData) async { - if (onData.status == BleEventType.recvLineLog) { - final line = onData.val; - print("[bleee]:" + line); - } - if (onData.status == BleEventType.ready) { - aa = await getDeviceNetVersion( - blueteethBindController.currentDevice!, 1); - if (aa == "4g") { - // TopSlideNotification.show( - // Get.context!, - // text: "4g设备配置wifi提示".tr, - // textColor: themeController.currentColor.sc9, - // ); - WidgetsBinding.instance.addPostFrameCallback((_) { - TopSlideNotification.show( - context, - text: "4g设备配置wifi提示".tr, - textColor: themeController.currentColor.sc9, - ); - }); - return; - } else { - Get.toNamed("/wifiPage", arguments: 2); - } - } - }); + // try { + // // 连接设备 + // // await targetDevice.device.connect(); + // THapp bledevice = THapp(device: targetDevice.device); + // await bledevice.device.connect(); + // var res2 = bledevice.isConnected; + // if (res2) { + // Navigator.pop(context); + // TopSlideNotification.show( + // context, + // text: "蓝牙绑定.连接成功".tr, + // textColor: themeController.currentColor.sc2, + // ); + // blueteethBindController.currentDevice = bledevice; + // if (lisObj != null) { + // lisObj!.cancel(); + // } + // var aa; + // lisObj = blueteethBindController.currentDevice!.statusStream + // .listen((onData) async { + // if (onData.status == BleEventType.recvLineLog) { + // final line = onData.val; + // print("[bleee]:" + line); + // } + // if (onData.status == BleEventType.ready) { + // aa = await getDeviceNetVersion( + // blueteethBindController.currentDevice!, 1); + // if (aa == "4g") { + // // TopSlideNotification.show( + // // Get.context!, + // // text: "4g设备配置wifi提示".tr, + // // textColor: themeController.currentColor.sc9, + // // ); + // WidgetsBinding.instance.addPostFrameCallback((_) { + // TopSlideNotification.show( + // context, + // text: "4g设备配置wifi提示".tr, + // textColor: themeController.currentColor.sc9, + // ); + // }); + // return; + // } else { + // Get.toNamed("/wifiPage", arguments: 2); + // } + // } + // }); - // Get.toNamed("/wifiPage", arguments: {bledevice}); - } else { - Navigator.pop(context); - TopSlideNotification.show( - context, - text: "蓝牙绑定.连接失败".tr, - textColor: themeController.currentColor.sc9, - ); - } - } catch (e) { - Navigator.of(Get.context!).pop(); // 关闭加载对话框 - TopSlideNotification.show( - Get.context!, - text: "设备连接失败".tr, - textColor: themeController.currentColor.sc9, - ); - } - } - }); + // // Get.toNamed("/wifiPage", arguments: {bledevice}); + // } else { + // Navigator.pop(context); + // TopSlideNotification.show( + // context, + // text: "蓝牙绑定.连接失败".tr, + // textColor: themeController.currentColor.sc9, + // ); + // } + // } catch (e) { + // Navigator.of(Get.context!).pop(); // 关闭加载对话框 + // TopSlideNotification.show( + // Get.context!, + // text: "设备连接失败".tr, + // textColor: themeController.currentColor.sc9, + // ); + // } + // } + // }); - // 等待扫描完成 - await Future.delayed(Duration(seconds: 20)); - } catch (e) { - timeoutTimer?.cancel(); - Navigator.of(Get.context!).pop(); // 关闭加载对话框 - TopSlideNotification.show( - Get.context!, - text: "扫描过程中发生错误".tr, - textColor: themeController.currentColor.sc9, - ); - } finally { - timeoutTimer?.cancel(); - await FlutterBluePlus.stopScan(); - } + // // 等待扫描完成 + // await Future.delayed(Duration(seconds: 20)); + // } catch (e) { + // timeoutTimer?.cancel(); + // Navigator.of(Get.context!).pop(); // 关闭加载对话框 + // TopSlideNotification.show( + // Get.context!, + // text: "扫描过程中发生错误".tr, + // textColor: themeController.currentColor.sc9, + // ); + // } finally { + // timeoutTimer?.cancel(); + // await FlutterBluePlus.stopScan(); + // } } double _calculateMaxMenuItemWidth(List texts, TextStyle style) { @@ -1448,6 +1449,18 @@ class _DeviceDataComponentWidgetState extends State { return iconWidth + spacing + maxTextWidth + horizontalPadding; } + + int _getSignalLevel(int signal) { + if (signal <= 25) { + return 1; + } else if (signal <= 50) { + return 2; + } else if (signal <= 75) { + return 3; + } else { + return 4; + } + } } _showBluetoothNotEnabledDialog() async { diff --git a/lib/pages/device_bind/bind_device_success.dart b/lib/pages/device_bind/bind_device_success.dart index f9a65b1..fe8dcfe 100644 --- a/lib/pages/device_bind/bind_device_success.dart +++ b/lib/pages/device_bind/bind_device_success.dart @@ -85,7 +85,7 @@ class _EPageState extends State { highlightColor: Colors .grey, // 可以设置为 themeController.currentColor.sc3 之类 borderRadius: 8.rpx, - padding: EdgeInsets.all(0.rpx), // 增加可点击区域 + padding: EdgeInsets.all(8.rpx), // 增加可点击区域 child: SvgPicture.asset( 'assets/img/icon/close.svg', width: 25.rpx, @@ -101,215 +101,210 @@ class _EPageState extends State { actions: [], centerTitle: false, ), - body: SafeArea( top: true, child: Padding( padding: EdgeInsetsDirectional.fromSTEB(113.rpx, 0, 113.rpx, 0), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.max, - children: [ - Padding( - padding: - EdgeInsetsDirectional.fromSTEB(0, 74.rpx, 0, 0), - child: Container( - width: 124.rpx, - height: 124.rpx, - // width: double.infinity, - decoration: BoxDecoration(), - child: SvgPicture.asset( - 'assets/img/icon/tick.svg', - fit: BoxFit.cover, - color: themeController.currentColor.sc3, + child: Column( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Container( + height: bodySize.maxHeight * 0.15, + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 0.rpx, 0, 0), + child: Container( + width: 124.rpx, + height: 124.rpx, + // width: double.infinity, + decoration: BoxDecoration(), + child: SvgPicture.asset( + 'assets/img/icon/tick.svg', + fit: BoxFit.cover, + color: themeController.currentColor.sc3, + ), + ), + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 42.rpx, 0, 0), + child: Container( + width: double.infinity, + decoration: BoxDecoration(), + child: Align( + alignment: AlignmentDirectional(0, 0), + child: Text( + '绑定成功.绑定成功'.tr, + style: FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: 'Inter', + fontSize: 48.rpx, + letterSpacing: 0.0, + color: themeController.currentColor.sc3, + ), ), ), ), - Padding( - padding: - EdgeInsetsDirectional.fromSTEB(0, 42.rpx, 0, 0), - child: Container( - width: double.infinity, - decoration: BoxDecoration(), - child: Align( - alignment: AlignmentDirectional(0, 0), - child: Text( - '绑定成功.绑定成功'.tr, - style: FlutterFlowTheme.of(context) - .bodyMedium - .override( - fontFamily: 'Inter', - fontSize: 48.rpx, - letterSpacing: 0.0, - color: themeController.currentColor.sc3, - ), - ), + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 65.rpx, 0, 0), + child: Container( + width: double.infinity, + decoration: BoxDecoration(), + child: Align( + alignment: AlignmentDirectional(0, 0), + child: Text( + '绑定成功.分享标题'.tr, + style: FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: 'Inter', + fontSize: 30.rpx, + letterSpacing: 0.0, + color: themeController.currentColor.sc4, + ), ), ), ), - Padding( - padding: - EdgeInsetsDirectional.fromSTEB(0, 265.rpx, 0, 0), - child: Container( - width: double.infinity, - decoration: BoxDecoration(), - child: Align( - alignment: AlignmentDirectional(0, 0), - child: Text( - '绑定成功.分享标题'.tr, - style: FlutterFlowTheme.of(context) - .bodyMedium - .override( - fontFamily: 'Inter', - fontSize: 30.rpx, - letterSpacing: 0.0, - color: themeController.currentColor.sc3, - ), - ), + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 48.rpx, 0, 0), + child: Container( + width: double.infinity, + decoration: BoxDecoration(), + child: Align( + alignment: AlignmentDirectional(-1, 0), + child: Text( + '绑定成功.分享内容'.tr, + style: FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: 'Inter', + fontSize: 26.rpx, + letterSpacing: 0.0, + color: themeController.currentColor.sc4, + ), ), ), ), - Padding( - padding: - EdgeInsetsDirectional.fromSTEB(0, 48.rpx, 0, 0), - child: Container( - width: double.infinity, - decoration: BoxDecoration(), - child: Align( - alignment: AlignmentDirectional(-1, 0), - child: Text( - '绑定成功.分享内容'.tr, - style: FlutterFlowTheme.of(context) - .bodyMedium - .override( - fontFamily: 'Inter', - fontSize: 30.rpx, - letterSpacing: 0.0, - color: themeController.currentColor.sc3, - ), - ), - ), - ), - ), - Padding( - padding: - EdgeInsetsDirectional.fromSTEB(0, 110.rpx, 0, 0), - child: CustomCard( - borderRadius: - AppConstants().button_container_radius, // 圆角半径 - onTap: () async { - PersonController personController = Get.find(); - String deviceID = - personController.currentPersonId.value; + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 110.rpx, 0, 0), + child: CustomCard( + borderRadius: + AppConstants().button_container_radius, // 圆角半径 + onTap: () async { + PersonController personController = Get.find(); + String deviceID = + personController.currentPersonId.value; - BodyDeviceController bodyDeviceController = - Get.find(); - await bodyDeviceController.getDeviceList(); - List deviceList = - bodyDeviceController.deviceList.value; + BodyDeviceController bodyDeviceController = + Get.find(); + await bodyDeviceController.getDeviceList(); + List deviceList = + bodyDeviceController.deviceList.value; - if (deviceList != null && deviceList.isNotEmpty) { - // 查找第一个 _id 匹配的设备 - final matchedDevice = deviceList.firstWhere( - (element) => element['_id'] == deviceID, - orElse: () => null, - ); + if (deviceList != null && deviceList.isNotEmpty) { + // 查找第一个 _id 匹配的设备 + final matchedDevice = deviceList.firstWhere( + (element) => element['_id'] == deviceID, + orElse: () => null, + ); - if (matchedDevice != null) { - // 跳转并传入设备 - Get.toNamed("/deviceSharePage", - arguments: matchedDevice); - } else { - print("未找到匹配的设备"); - } + if (matchedDevice != null) { + // 跳转并传入设备 + Get.toNamed("/deviceSharePage", + arguments: matchedDevice); } else { - print("设备列表为空"); + print("未找到匹配的设备"); } - }, - colors: [ - // 渐变色 - themeController.currentColor.sc1, - themeController.currentColor.sc2, - ], - child: Container( - width: MediaQuery.sizeOf(context).width * 0.66, - height: MediaQuery.sizeOf(context).height * 0.055, - constraints: BoxConstraints( - minWidth: 500.rpx, - minHeight: 90.rpx, - ), - child: Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - SvgPicture.asset( - 'assets/img/icon/share.svg', - width: 25.rpx, - height: 25.rpx, // 如果 SVG 中没有固定颜色，可以这样设置 - color: Colors.white, - ), - 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)), - ), + } else { + print("设备列表为空"); + } + }, + colors: [ + // 渐变色 + themeController.currentColor.sc1, + themeController.currentColor.sc2, + ], + child: Container( + width: MediaQuery.sizeOf(context).width * 0.66, + height: MediaQuery.sizeOf(context).height * 0.055, + constraints: BoxConstraints( + minWidth: 500.rpx, + minHeight: 90.rpx, + ), + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + SvgPicture.asset( + 'assets/img/icon/share.svg', + width: 25.rpx, + height: 25.rpx, // 如果 SVG 中没有固定颜色，可以这样设置 + color: Colors.white, + ), + 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)), ), ), ), - Padding( - padding: - EdgeInsetsDirectional.fromSTEB(0, 18.rpx, 0, 0), - child: CustomCard( - borderRadius: - AppConstants().button_container_radius, // 圆角半径 - onTap: () { - Get.offAllNamed("/mianPageBottomChange"); - }, - colors: [ - // 渐变色 - themeController.currentColor.sc1, - themeController.currentColor.sc2, - ], + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 18.rpx, 0, 0), + child: CustomCard( + borderRadius: + AppConstants().button_container_radius, // 圆角半径 + onTap: () { + Get.offAllNamed("/mianPageBottomChange"); + }, + colors: [ + // 渐变色 + themeController.currentColor.sc1, + themeController.currentColor.sc2, + ], - child: Container( - width: MediaQuery.sizeOf(context).width * 0.66, - height: MediaQuery.sizeOf(context).height * 0.055, - constraints: BoxConstraints( - minWidth: 500.rpx, - minHeight: 90.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)), - ), + child: Container( + width: MediaQuery.sizeOf(context).width * 0.66, + height: MediaQuery.sizeOf(context).height * 0.055, + constraints: BoxConstraints( + minWidth: 500.rpx, + minHeight: 90.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)), ), ), ), - ], - ), + ), + ], ), ), ), @@ -318,51 +313,4 @@ class _EPageState extends State { ), ); } - - Widget _buildDeviceCard(BuildContext context, - {required String title, required String imageUrl, required String type}) { - return CustomCard( - borderRadius: 20.rpx, // 圆角大小 - onTap: () { - if (type != null) { - if (type == '1') { - Get.toNamed("/blueteethDevice"); - } - } - }, - - colors: [themeController.currentColor.sc17], // 背景色 - child: Container( - width: double.infinity, - height: MediaQuery.sizeOf(context).height * 0.135, - constraints: BoxConstraints( - minHeight: 220.rpx, - ), - padding: EdgeInsetsDirectional.fromSTEB(77.rpx, 0, 21.rpx, 0), - child: Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - title, - style: FlutterFlowTheme.of(context).bodyMedium.override( - fontFamily: 'Inter', - color: const Color(0xFFC2CED7), - fontSize: 30.rpx, - letterSpacing: 0.0, - ), - ), - ClipRRect( - borderRadius: BorderRadius.circular(8.rpx), - child: Image.asset( - imageUrl, - width: 212.rpx, - height: 168.rpx, - ), - ), - ], - ), - ), - ); - } } diff --git a/lib/pages/device_bind/blueteeth_device_page.dart b/lib/pages/device_bind/blueteeth_device_page.dart index 544f0d7..ab7f719 100644 --- a/lib/pages/device_bind/blueteeth_device_page.dart +++ b/lib/pages/device_bind/blueteeth_device_page.dart @@ -98,14 +98,14 @@ class _BlueteethDevicePageState extends State { context: context, builder: (BuildContext context) { return AlertDialog( - title: Text("权限提示"), - content: Text("应用需要蓝牙和位置权限才能扫描设备。请授予权限。"), + title: Text("权限提示".tr), + content: Text("应用需要蓝牙和位置权限才能扫描设备。请授予权限。".tr), actions: [ TextButton( onPressed: () { Navigator.of(context).pop(); }, - child: Text("确定"), + child: Text("确定".tr), ), ], ); diff --git a/lib/pages/device_bind/componnet/bind_dialog.dart b/lib/pages/device_bind/componnet/bind_dialog.dart index 19bfe71..e21768c 100644 --- a/lib/pages/device_bind/componnet/bind_dialog.dart +++ b/lib/pages/device_bind/componnet/bind_dialog.dart @@ -414,172 +414,175 @@ void showConfirmDialog( ThemeController themeController = Get.find(); BlueteethBindController blueteethBindController = Get.find(); - showDialog( - context: context, - barrierDismissible: true, - barrierColor: Colors.black.withOpacity(0.5), // 背景模糊色 - builder: (BuildContext context) { - return FrostedDialog( - blurSigma: 3.0, - child: Container( - decoration: BoxDecoration( - color: themeController.currentColor.sc17, - borderRadius: BorderRadius.circular(20.0), - ), - padding: EdgeInsetsDirectional.fromSTEB(31.rpx, 0, 31.rpx, 0), + try { + showDialog( + context: context, + barrierDismissible: true, + barrierColor: Colors.black.withOpacity(0.5), // 背景模糊色 + builder: (BuildContext context) { + return FrostedDialog( + blurSigma: 3.0, child: Container( - width: double.infinity, - constraints: BoxConstraints( - maxHeight: MediaQuery.sizeOf(context).height * 0.656, + decoration: BoxDecoration( + color: themeController.currentColor.sc17, + borderRadius: BorderRadius.circular(20.0), ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - // 标题 - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - ClickableContainer( - backgroundColor: Colors.transparent, // 容器背景色 - highlightColor: - themeController.currentColor.sc21, // 点击时的背景色 - padding: EdgeInsets.zero, // 这里去掉外部的 padding，避免影响点击范围 - onTap: () { - Get.back(); - onCancel(); - }, - child: Padding( - // padding: - // EdgeInsetsDirectional.fromSTEB(0, 33.rpx, 0, 0.rpx), - padding: EdgeInsetsDirectional.fromSTEB( - 33.rpx, 33.rpx, 33.rpx, 33.rpx), - child: SvgPicture.asset( - 'assets/img/icon/close.svg', - width: 25.rpx, - height: 25.rpx, // 如果 SVG 中没有固定颜色，使用 color 设置 - color: themeController.currentColor.sc3, - ), - ), - ), - ], - ), - Align( - alignment: AlignmentDirectional(0, 0), - child: Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 33.rpx, 60.rpx, 33.rpx, 33.rpx), - child: Text( - title, - style: FlutterFlowTheme.of(context).bodyMedium.override( - fontFamily: 'Inter', - fontSize: 30.rpx, - letterSpacing: 0.0, - color: themeController.currentColor.sc3, - ), - ), - ), - ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 33.rpx, 0.rpx, 33.rpx, 0.rpx), - child: widget, - ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 33.rpx, 58.rpx, 33.rpx, 60.rpx), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, + padding: EdgeInsetsDirectional.fromSTEB(31.rpx, 0, 31.rpx, 0), + child: Container( + width: double.infinity, + constraints: BoxConstraints( + maxHeight: MediaQuery.sizeOf(context).height * 0.656, + ), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + // 标题 + Row( + mainAxisAlignment: MainAxisAlignment.end, children: [ - CustomCard( - borderRadius: AppConstants().button_container_radius, - onTap: () async { + ClickableContainer( + backgroundColor: Colors.transparent, // 容器背景色 + highlightColor: + themeController.currentColor.sc21, // 点击时的背景色 + padding: EdgeInsets.zero, // 这里去掉外部的 padding，避免影响点击范围 + onTap: () { Get.back(); onCancel(); }, - colors: [ - themeController.currentColor.sc1, - themeController.currentColor.sc2, - ], - child: Container( - width: MediaQuery.sizeOf(context).width * 0.115, - height: MediaQuery.sizeOf(context).height * 0.055, - constraints: BoxConstraints( - minWidth: 160.rpx, - minHeight: 90.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)), + child: Padding( + // padding: + // EdgeInsetsDirectional.fromSTEB(0, 33.rpx, 0, 0.rpx), + padding: EdgeInsetsDirectional.fromSTEB( + 33.rpx, 33.rpx, 33.rpx, 33.rpx), + child: SvgPicture.asset( + 'assets/img/icon/close.svg', + width: 25.rpx, + height: 25.rpx, // 如果 SVG 中没有固定颜色，使用 color 设置 + color: themeController.currentColor.sc3, ), ), ), - CustomCard( - borderRadius: AppConstants().button_container_radius, - onTap: () { - Get.back(); - onConfirm(); - // await Future.delayed(Duration(milliseconds: 300)); - }, - colors: [ - themeController.currentColor.sc1, - themeController.currentColor.sc2, - ], - child: Container( - width: MediaQuery.sizeOf(context).width * 0.215, - height: MediaQuery.sizeOf(context).height * 0.055, - constraints: BoxConstraints( - minWidth: 160.rpx, - minHeight: 90.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)), - ), - ), - ), - ].divide(SizedBox( - width: 70.rpx, - )), + ], ), - ), - ], + Align( + alignment: AlignmentDirectional(0, 0), + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 33.rpx, 60.rpx, 33.rpx, 33.rpx), + child: Text( + title, + style: FlutterFlowTheme.of(context).bodyMedium.override( + fontFamily: 'Inter', + fontSize: 30.rpx, + letterSpacing: 0.0, + color: themeController.currentColor.sc3, + ), + ), + ), + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 33.rpx, 0.rpx, 33.rpx, 0.rpx), + child: widget, + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 33.rpx, 58.rpx, 33.rpx, 60.rpx), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + CustomCard( + borderRadius: AppConstants().button_container_radius, + onTap: () async { + Get.back(); + onCancel(); + }, + colors: [ + themeController.currentColor.sc1, + themeController.currentColor.sc2, + ], + child: Container( + width: MediaQuery.sizeOf(context).width * 0.115, + height: MediaQuery.sizeOf(context).height * 0.055, + constraints: BoxConstraints( + minWidth: 160.rpx, + minHeight: 90.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( + borderRadius: AppConstants().button_container_radius, + onTap: () { + Get.back(); + onConfirm(); + // await Future.delayed(Duration(milliseconds: 300)); + }, + colors: [ + themeController.currentColor.sc1, + themeController.currentColor.sc2, + ], + child: Container( + width: MediaQuery.sizeOf(context).width * 0.215, + height: MediaQuery.sizeOf(context).height * 0.055, + constraints: BoxConstraints( + minWidth: 160.rpx, + minHeight: 90.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)), + ), + ), + ), + ].divide(SizedBox( + width: 70.rpx, + )), + ), + ), + ], + ), ), ), - ), - ); - }, - ); + ); + }, + ); + } catch (e) { + print(e); + } } - void showSingleConfirmDialog( BuildContext context, Widget widget, @@ -667,7 +670,6 @@ void showSingleConfirmDialog( child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - CustomCard( borderRadius: AppConstants().button_container_radius, onTap: () { @@ -706,7 +708,6 @@ void showSingleConfirmDialog( ), ), ), - ].divide(SizedBox( width: 70.rpx, )), diff --git a/lib/pages/device_bind/device_calibration.dart b/lib/pages/device_bind/device_calibration.dart index a8c5922..7331c90 100644 --- a/lib/pages/device_bind/device_calibration.dart +++ b/lib/pages/device_bind/device_calibration.dart @@ -29,6 +29,7 @@ class _CalibrationPageState extends State { DeviceCalibrationController deviceCalibrationController = Get.find(); BlueteethBindController blueteethBindController = Get.find(); int flag = 0; //默认没有开始校准过 + bool exit = false; @override void initState() { super.initState(); @@ -48,730 +49,668 @@ class _CalibrationPageState extends State { @override Widget build(BuildContext context) { - return LayoutBuilder( - builder: (context, bodySize) => GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), - child: Container( - decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage('assets/img/bgNoImg.png'), - fit: BoxFit.fill, - ), - ), - child: Scaffold( - backgroundColor: Colors.transparent, - appBar: AppBar( - backgroundColor: themeController.currentColor.sc17, - automaticallyImplyLeading: false, - iconTheme: IconThemeData(color: themeController.currentColor.sc3), - titleSpacing: 0, - title: Container( - width: double.infinity, - height: 180.rpx, - child: Stack( - alignment: Alignment.center, - children: [ - Text( - '设备校准'.tr, - style: TextStyle( - fontFamily: 'Readex Pro', - color: themeController.currentColor.sc3, - letterSpacing: 0, - fontSize: 30.rpx, - ), - ), - Positioned( - left: 0, - child: returnIconButtom, - ), - if (widget.type == 1) - Positioned( - right: 20.rpx, - child: CustomCard( - borderRadius: 20.rpx, - onTap: () async { + return WillPopScope( + child: LayoutBuilder( + builder: (context, bodySize) => GestureDetector( + onTap: () => FocusScope.of(context).unfocus(), + child: Container( + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage('assets/img/bgNoImg.png'), + fit: BoxFit.fill, + ), + ), + child: Scaffold( + backgroundColor: Colors.transparent, + appBar: AppBar( + backgroundColor: themeController.currentColor.sc17, + automaticallyImplyLeading: false, + iconTheme: + IconThemeData(color: themeController.currentColor.sc3), + titleSpacing: 0, + title: Container( + width: double.infinity, + height: 180.rpx, + child: Stack( + alignment: Alignment.center, + children: [ + Text( + '设备校准'.tr, + style: TextStyle( + fontFamily: 'Readex Pro', + color: themeController.currentColor.sc3, + letterSpacing: 0, + fontSize: 30.rpx, + ), + ), + Positioned( + left: 0, + child: returnIconButtomAddCallback(() { + if (flag != 0) { - 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: () {}); + try { + showConfirmDialog( + context, Container(), "校准未完成提示".tr, + onConfirm: () async { + exit = true; + 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: () { + exit = false; + }); + } catch (e) { + print(e); + } } 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; + exit = true; } + if (exit) { + Get.back(); + } + },enableBack:exit ), + ), + if (widget.type == 1) + Positioned( + right: 20.rpx, + child: CustomCard( + borderRadius: 20.rpx, + onTap: () async { + if (flag != 0) { + 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: [ - themeController.currentColor.sc1, - themeController.currentColor.sc2, - ], + // Get.toNamed("/bindDeviceSuccess"); + }, + colors: [ + themeController.currentColor.sc1, + themeController.currentColor.sc2, + ], + child: Container( + width: 100.rpx, + height: 60.rpx, + alignment: Alignment.center, + padding: EdgeInsetsDirectional.fromSTEB( + 16.rpx, 0, 16.rpx, 0), + child: Text( + '跳过'.tr, + style: TextStyle( + fontFamily: 'Inter Tight', + color: themeController.currentColor.sc3, + letterSpacing: 0.0, + ), + ), + ), + ), + ), + ], + ), + ), + actions: [], + centerTitle: false, + ), + body: SafeArea( + top: true, + // child: Container(), + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 30.rpx, 0.rpx, 30.rpx, 0.rpx), + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 0.rpx, 30.rpx, 0, 0), child: Container( - width: 100.rpx, - height: 60.rpx, - alignment: Alignment.center, - padding: EdgeInsetsDirectional.fromSTEB( - 16.rpx, 0, 16.rpx, 0), - child: Text( - '跳过'.tr, - style: TextStyle( - fontFamily: 'Inter Tight', - color: themeController.currentColor.sc3, - letterSpacing: 0.0, + width: double.infinity, + decoration: BoxDecoration( + color: themeController.currentColor.sc5, + borderRadius: BorderRadius.circular(16.rpx), + ), + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 10.rpx, 20.rpx, 34.rpx, 20.rpx), + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + ClickableContainer( + backgroundColor: Colors.transparent, + highlightColor: + themeController.currentColor.sc21, + borderRadius: 0, // 可按需设置圆角 + padding: EdgeInsets.symmetric( + vertical: 10.rpx), // 可自定义内边距 + onTap: () { + // deviceCalibrationController.process.value = 0; + // deviceCalibrationController.updateAll(); + }, + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Obx(() { + return Visibility( + maintainState: true, + maintainAnimation: true, + maintainSize: true, + visible: + deviceCalibrationController + .process.value == + 0, + child: SvgPicture.asset( + 'assets/img/icon/select_arrow.svg', + width: 17.rpx, + height: 17.rpx, + color: themeController + .currentColor.sc9, + ), + ); + }), + SizedBox(width: 8.rpx), + Text( + '离床校准'.tr, + style: TextStyle( + fontSize: 30.rpx, + letterSpacing: 0.0, + color: themeController + .currentColor.sc3, + ), + ), + ], + ), + Obx(() { + return Text( + deviceCalibrationController + .bed_calibration + .value == + 0 + ? '未完成'.tr + : "已完成".tr, + style: TextStyle( + fontSize: 26.rpx, + letterSpacing: 0.0, + color: deviceCalibrationController + .bed_calibration + .value == + 0 + ? themeController + .currentColor.sc3 + : themeController + .currentColor.sc1, + ), + ); + }), + ], + ), + ), + SizedBox(height: 41.rpx), + ClickableContainer( + backgroundColor: Colors.transparent, + highlightColor: + themeController.currentColor.sc21, + borderRadius: 0, // 可根据需要设为圆角 + padding: EdgeInsets.symmetric( + vertical: 10.rpx), // 可根据需要调整上下内边距 + onTap: () { + // deviceCalibrationController.process.value = 1; + // deviceCalibrationController.updateAll(); + }, + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Obx(() { + return Visibility( + maintainState: true, + maintainAnimation: true, + maintainSize: true, + visible: + deviceCalibrationController + .process.value == + 1, + child: SvgPicture.asset( + 'assets/img/icon/select_arrow.svg', + width: 17.rpx, + height: 17.rpx, + color: themeController + .currentColor.sc9, + ), + ); + }), + SizedBox(width: 8.rpx), + Text( + '位置校准'.tr, + style: TextStyle( + fontSize: 30.rpx, + letterSpacing: 0.0, + color: themeController + .currentColor.sc3, + ), + ), + ], + ), + Obx(() { + return Text( + deviceCalibrationController + .position_calibration + .value == + 0 + ? '未完成'.tr + : "已完成".tr, + style: TextStyle( + fontSize: 26.rpx, + letterSpacing: 0.0, + color: deviceCalibrationController + .position_calibration + .value == + 0 + ? themeController + .currentColor.sc3 + : themeController + .currentColor.sc1, + ), + ); + }), + ], + ), + ), + ], ), ), ), ), - ), - ], - ), - ), - actions: [], - centerTitle: false, - ), - body: SafeArea( - top: true, - // child: Container(), - child: Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 30.rpx, 0.rpx, 30.rpx, 0.rpx), - child: Column( - mainAxisSize: MainAxisSize.max, - children: [ - Padding( - padding: - EdgeInsetsDirectional.fromSTEB(0.rpx, 30.rpx, 0, 0), - child: Container( - width: double.infinity, - decoration: BoxDecoration( - color: themeController.currentColor.sc5, - borderRadius: BorderRadius.circular(16.rpx), - ), - child: Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 10.rpx, 20.rpx, 34.rpx, 20.rpx), - child: Column( - mainAxisSize: MainAxisSize.max, - children: [ - ClickableContainer( - backgroundColor: Colors.transparent, - highlightColor: - themeController.currentColor.sc21, - borderRadius: 0, // 可按需设置圆角 - padding: EdgeInsets.symmetric( - vertical: 10.rpx), // 可自定义内边距 - onTap: () { - // deviceCalibrationController.process.value = 0; - // deviceCalibrationController.updateAll(); - }, - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, + Obx(() { + return Expanded( + child: SizedBox( + width: double.infinity, + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 100.rpx, 55.rpx, 100.rpx, 0), + child: Stack( + clipBehavior: Clip.none, children: [ - Row( - children: [ - Obx(() { - return Visibility( - maintainState: true, - maintainAnimation: true, - maintainSize: true, - visible: deviceCalibrationController - .process.value == - 0, - child: SvgPicture.asset( - 'assets/img/icon/select_arrow.svg', - width: 17.rpx, - height: 17.rpx, - color: themeController - .currentColor.sc9, - ), - ); - }), - SizedBox(width: 8.rpx), - Text( - '离床校准'.tr, - style: TextStyle( - fontSize: 30.rpx, - letterSpacing: 0.0, - color: themeController - .currentColor.sc3, + Container( + width: MediaQuery.sizeOf(context).width * + 0.65, + height: + MediaQuery.sizeOf(context).height * + 0.3, + child: Stack( + children: [ + // Image.asset( + // deviceCalibrationController + // .bed_type.value == + // 0 + // ? "assets/img/single_pillow.png" + // : "assets/img/double_pillow.png", + // width: double.infinity, + // height: double.infinity, + // fit: BoxFit.contain, + // ), + Image.asset( + deviceCalibrationController + .process.value == + 1 && + deviceCalibrationController + .position_calibration + .value == + 1 + ? (deviceCalibrationController + .bed_type.value == + 0 + ? "assets/img/single_person.png" + : "assets/img/double_person.png") + : (deviceCalibrationController + .bed_type.value == + 0 + ? "assets/img/single_pillow.png" + : "assets/img/double_pillow.png"), + width: double.infinity, + height: double.infinity, + fit: BoxFit.contain, ), - ), - ], - ), - Obx(() { - return Text( - deviceCalibrationController - .bed_calibration.value == - 0 - ? '未完成'.tr - : "已完成".tr, - style: TextStyle( - fontSize: 26.rpx, - letterSpacing: 0.0, - color: deviceCalibrationController - .bed_calibration.value == - 0 - ? themeController.currentColor.sc3 - : themeController - .currentColor.sc1, - ), - ); - }), - ], - ), - ), - SizedBox(height: 41.rpx), - ClickableContainer( - backgroundColor: Colors.transparent, - highlightColor: - themeController.currentColor.sc21, - borderRadius: 0, // 可根据需要设为圆角 - padding: EdgeInsets.symmetric( - vertical: 10.rpx), // 可根据需要调整上下内边距 - onTap: () { - // deviceCalibrationController.process.value = 1; - // deviceCalibrationController.updateAll(); - }, - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Row( - children: [ - Obx(() { - return Visibility( - maintainState: true, - maintainAnimation: true, - maintainSize: true, - visible: deviceCalibrationController - .process.value == - 1, - child: SvgPicture.asset( - 'assets/img/icon/select_arrow.svg', - width: 17.rpx, - height: 17.rpx, - color: themeController - .currentColor.sc9, - ), - ); - }), - SizedBox(width: 8.rpx), - Text( - '位置校准'.tr, - style: TextStyle( - fontSize: 30.rpx, - letterSpacing: 0.0, - color: themeController - .currentColor.sc3, - ), - ), - ], - ), - Obx(() { - return Text( - deviceCalibrationController - .position_calibration - .value == - 0 - ? '未完成'.tr - : "已完成".tr, - style: TextStyle( - fontSize: 26.rpx, - letterSpacing: 0.0, - color: deviceCalibrationController - .position_calibration - .value == - 0 - ? themeController.currentColor.sc3 - : themeController - .currentColor.sc1, - ), - ); - }), - ], - ), - ), - ], - ), - ), - ), - ), - Obx(() { - return Expanded( - child: SizedBox( - width: double.infinity, - child: Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 100.rpx, 55.rpx, 100.rpx, 0), - child: Stack( - clipBehavior: Clip.none, - children: [ - Container( - width: - MediaQuery.sizeOf(context).width * 0.65, - height: - MediaQuery.sizeOf(context).height * 0.3, - child: Stack( - children: [ - // Image.asset( - // deviceCalibrationController - // .bed_type.value == - // 0 - // ? "assets/img/single_pillow.png" - // : "assets/img/double_pillow.png", - // width: double.infinity, - // height: double.infinity, - // fit: BoxFit.contain, - // ), - Image.asset( - deviceCalibrationController - .process.value == - 1 && - deviceCalibrationController - .position_calibration - .value == - 1 - ? (deviceCalibrationController - .bed_type.value == - 0 - ? "assets/img/single_person.png" - : "assets/img/double_person.png") - : (deviceCalibrationController - .bed_type.value == - 0 - ? "assets/img/single_pillow.png" - : "assets/img/double_pillow.png"), - width: double.infinity, - height: double.infinity, - fit: BoxFit.contain, - ), - // 床头文字 - Positioned( - top: 23.rpx, - left: - (MediaQuery.sizeOf(context).width * + // 床头文字 + Positioned( + top: 23.rpx, + left: (MediaQuery.sizeOf(context) + .width * 0.65) / 2 - 26.rpx, - child: Text( - '床头'.tr, - style: TextStyle( - fontSize: 26.rpx, - color: themeController - .currentColor.sc4, + child: Text( + '床头'.tr, + style: TextStyle( + fontSize: 26.rpx, + color: themeController + .currentColor.sc4, + ), + ), ), - ), + ], ), - ], - ), - ), - Obx(() { - final double centerLeft = - (bodySize.maxWidth * 0.56) / 2; - if (deviceCalibrationController - .bed_type.value == - 0 && - deviceCalibrationController - .process.value == - 1) { - //单人床位置校准 - return Positioned( - top: -40.rpx, - left: centerLeft - 0.rpx, - child: Container( - width: bodySize.maxWidth * 0.087, - height: bodySize.maxHeight * 0.06, - constraints: BoxConstraints( - minWidth: 65.rpx, - minHeight: 76.rpx, - ), - decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage( - 'assets/img/tip_arrow.gif'), - fit: BoxFit.cover, + ), + Obx(() { + final double centerLeft = + (bodySize.maxWidth * 0.56) / 2; + if (deviceCalibrationController + .bed_type.value == + 0 && + deviceCalibrationController + .process.value == + 1) { + //单人床位置校准 + return Positioned( + top: -40.rpx, + left: centerLeft - 0.rpx, + child: Container( + width: bodySize.maxWidth * 0.087, + height: bodySize.maxHeight * 0.06, + constraints: BoxConstraints( + minWidth: 65.rpx, + minHeight: 76.rpx, + ), + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage( + 'assets/img/tip_arrow.gif'), + fit: BoxFit.cover, + ), + ), ), - ), - ), - ); - } - if (deviceCalibrationController - .bed_type.value == - 1 && - deviceCalibrationController - .process.value == - 1) { - //双人人床位置校准 - return Positioned( - top: -40.rpx, - left: (MediaQuery.sizeOf(context).width * - 0.65) * - 0.22 - - 0.rpx, - child: Container( - width: bodySize.maxWidth * 0.087, - height: bodySize.maxHeight * 0.06, - constraints: BoxConstraints( - minWidth: 65.rpx, - minHeight: 76.rpx, - ), - decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage( - 'assets/img/tip_arrow.gif'), - fit: BoxFit.cover, - ), - ), - ), - ); - } - - return Container(); - }), - Positioned( - top: MediaQuery.sizeOf(context).height * 0.3 + - 82.rpx, - left: 0, - right: 0, - child: Obx(() { - return Column( - children: [ - Text( - (deviceCalibrationController - .process.value == - 0 && - deviceCalibrationController - .bed_calibration - .value == - 1) || - (deviceCalibrationController - .process.value == - 1 && - deviceCalibrationController - .position_calibration - .value == - 1) - ? '校准完成'.tr - : deviceCalibrationController - .process.value == - 0 - ? '离床校准提示'.tr - : '位置校准提示'.tr, - style: TextStyle( - fontSize: 38.rpx, - letterSpacing: 0.0, - color: ((deviceCalibrationController - .process - .value == - 0 && - deviceCalibrationController - .bed_calibration - .value == - 1) || - (deviceCalibrationController - .process - .value == - 1 && - deviceCalibrationController - .position_calibration - .value == - 1)) - ? themeController - .currentColor.sc1 - : themeController - .currentColor.sc9, - ), - ), - ], - ); - }), - ), - ], - ), - ), - ), - ); - }), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 100.rpx, 0.rpx, 100.rpx, 60.rpx), - child: CustomCard( - borderRadius: - AppConstants().button_container_radius, // 圆角半径 - onTap: () async { - flag = 1; - if (deviceCalibrationController.complete) { - showConfirmDialog( - context, Container(), "校准已经完成，是否重新开始校准？", - onConfirm: () { - BlueteethBindController blueteethBindController = - Get.find(); - deviceCalibrationController.process.value = 0; - deviceCalibrationController - .bed_calibration.value = 0; - deviceCalibrationController - .position_calibration.value = 0; - blueteethBindController.cid!.value = ""; - deviceCalibrationController.complete = false; - - String serviceAddress = - "https://caibration.he-info.cn"; - String calibrationApi = - ServiceConstant.start_calibration; - String progressApi = - ServiceConstant.calibration_process; - - String queryUrl = - "$serviceAddress$calibrationApi"; - - final ValueNotifier progressNotifier = - ValueNotifier(0.0); - final ValueNotifier failureNotifier = - ValueNotifier(false); - Timer? pollingTimer; - - Map data = { - "macA": blueteethBindController - .currentDeviceMac!.value, - }; - - // 是否是二次点击（有cid表示进行第二阶段） - bool isSecondStep = blueteethBindController - .cid?.value.isNotEmpty ?? - false; - - if (isSecondStep) { - data["id"] = blueteethBindController.cid!.value; - } - - // 发起校准请求 - requestWithLog( - logTitle: "设备校准", - method: MyHttpMethod.post, - queryUrl: queryUrl, - data: data, - onSuccess: (res) { - if (!isSecondStep) { - // 保存第一次获取的 cid - String cid = res.rawResponse.data['cid']; - blueteethBindController.cid!.value = cid; - } - - void requestCalibrationProgress() { - String cid = - blueteethBindController.cid!.value; - String progressUrl = - "$serviceAddress$progressApi?id=$cid"; - requestWithLog( - logTitle: "设备校准进度", - method: MyHttpMethod.get, - queryUrl: progressUrl, - onSuccess: (res) { - final data = res.data; - double per = - (data['per'] ?? 0).toDouble(); - int currStep = data['currStep'] ?? -1; - bool status = data['status'] ?? false; - String tips = data['statusText'] ?? ''; - - deviceCalibrationController.tips.value = - tips; - - progressNotifier.value = per; - if (!isSecondStep && per >= 20) { - progressNotifier.value = 100; - // 第一步完成：仅 per >= 100 - pollingTimer?.cancel(); - TopSlideNotification.show(context, - text: tips); - deviceCalibrationController - .process.value = 1; - deviceCalibrationController - .bed_calibration.value = 1; - - deviceCalibrationController - .updateAll(); - } - - if (isSecondStep && - per >= 100 && - currStep == 5 && - status == true) { - // 第二步完成：per >= 100 && currStep == 5 && status == true - flag = 0; - pollingTimer?.cancel(); - TopSlideNotification.show(context, - text: "设备校准完成".tr); - // 可在这里执行校准完成后的业务逻辑更新 - deviceCalibrationController - .bed_calibration.value = 1; - deviceCalibrationController - .position_calibration.value = 1; - deviceCalibrationController - .process.value = 1; - deviceCalibrationController.complete = - true; - deviceCalibrationController - .updateAll(); - } - }, - onFailure: (res) { - pollingTimer?.cancel(); - failureNotifier.value = true; - TopSlideNotification.show( - context, - text: res.msg ?? "服务器.失败".tr, - textColor: - themeController.currentColor.sc9, ); - }, - ); + } + if (deviceCalibrationController + .bed_type.value == + 1 && + deviceCalibrationController + .process.value == + 1) { + //双人人床位置校准 + return Positioned( + top: -40.rpx, + left: (MediaQuery.sizeOf(context) + .width * + 0.65) * + 0.22 - + 0.rpx, + child: Container( + width: bodySize.maxWidth * 0.087, + height: bodySize.maxHeight * 0.06, + constraints: BoxConstraints( + minWidth: 65.rpx, + minHeight: 76.rpx, + ), + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage( + 'assets/img/tip_arrow.gif'), + fit: BoxFit.cover, + ), + ), + ), + ); + } + + return Container(); + }), + Positioned( + top: MediaQuery.sizeOf(context).height * + 0.3 + + 82.rpx, + left: 0, + right: 0, + child: Obx(() { + return Column( + children: [ + Text( + (deviceCalibrationController + .process + .value == + 0 && + deviceCalibrationController + .bed_calibration + .value == + 1) || + (deviceCalibrationController + .process + .value == + 1 && + deviceCalibrationController + .position_calibration + .value == + 1) + ? '校准完成'.tr + : deviceCalibrationController + .process.value == + 0 + ? '离床校准提示'.tr + : '位置校准提示'.tr, + style: TextStyle( + fontSize: 38.rpx, + letterSpacing: 0.0, + color: ((deviceCalibrationController + .process + .value == + 0 && + deviceCalibrationController + .bed_calibration + .value == + 1) || + (deviceCalibrationController + .process + .value == + 1 && + deviceCalibrationController + .position_calibration + .value == + 1)) + ? themeController + .currentColor.sc1 + : themeController + .currentColor.sc9, + ), + ), + ], + ); + }), + ), + ], + ), + ), + ), + ); + }), + Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 100.rpx, 0.rpx, 100.rpx, 60.rpx), + child: CustomCard( + borderRadius: + AppConstants().button_container_radius, // 圆角半径 + onTap: () async { + flag = 1; + if (deviceCalibrationController.complete) { + showConfirmDialog( + context, Container(), "校准已经完成，是否重新开始校准？", + onConfirm: () { + BlueteethBindController + blueteethBindController = Get.find(); + deviceCalibrationController.process.value = 0; + deviceCalibrationController + .bed_calibration.value = 0; + deviceCalibrationController + .position_calibration.value = 0; + blueteethBindController.cid!.value = ""; + deviceCalibrationController.complete = false; + + String serviceAddress = + "https://caibration.he-info.cn"; + String calibrationApi = + ServiceConstant.start_calibration; + String progressApi = + ServiceConstant.calibration_process; + + String queryUrl = + "$serviceAddress$calibrationApi"; + + final ValueNotifier progressNotifier = + ValueNotifier(0.0); + final ValueNotifier failureNotifier = + ValueNotifier(false); + Timer? pollingTimer; + + Map data = { + "macA": blueteethBindController + .currentDeviceMac!.value, + }; + + // 是否是二次点击（有cid表示进行第二阶段） + bool isSecondStep = blueteethBindController + .cid?.value.isNotEmpty ?? + false; + + if (isSecondStep) { + data["id"] = + blueteethBindController.cid!.value; } - // 初始调用一次 - requestCalibrationProgress(); - - // 开始轮询 - pollingTimer = - Timer.periodic(Duration(seconds: 2), (_) { - requestCalibrationProgress(); - }); - - // 显示进度弹窗 - showProgressDialog(context, progressNotifier, - failureNotifier); - }, - onFailure: (res) { - TopSlideNotification.show( - context, - text: res.msg ?? "服务器.失败".tr, - textColor: themeController.currentColor.sc9, - ); - }, - ); - }, onCancel: () { - return; - }); - } else { - BlueteethBindController blueteethBindController = - Get.find(); - String serviceAddress = - "https://caibration.he-info.cn"; - String calibrationApi = - ServiceConstant.start_calibration; - String progressApi = - ServiceConstant.calibration_process; - - String queryUrl = "$serviceAddress$calibrationApi"; - - final ValueNotifier progressNotifier = - ValueNotifier(0.0); - final ValueNotifier failureNotifier = - ValueNotifier(false); - Timer? pollingTimer; - - Map data = { - "macA": blueteethBindController - .currentDeviceMac!.value, - }; - - // 是否是二次点击（有cid表示进行第二阶段） - bool isSecondStep = - blueteethBindController.cid?.value.isNotEmpty ?? - false; - - if (isSecondStep) { - data["id"] = blueteethBindController.cid!.value; - } - - // 发起校准请求 - requestWithLog( - logTitle: "设备校准", - method: MyHttpMethod.post, - queryUrl: queryUrl, - data: data, - onSuccess: (res) { - if (!isSecondStep) { - // 保存第一次获取的 cid - String cid = res.rawResponse.data['cid']; - blueteethBindController.cid!.value = cid; - } - - void requestCalibrationProgress() { - String cid = - blueteethBindController.cid!.value; - String progressUrl = - "$serviceAddress$progressApi?id=$cid"; + // 发起校准请求 requestWithLog( - logTitle: "设备校准进度", - method: MyHttpMethod.get, - queryUrl: progressUrl, + logTitle: "设备校准", + method: MyHttpMethod.post, + queryUrl: queryUrl, + data: data, onSuccess: (res) { - final data = res.data; - double per = - (data['per'] ?? 0).toDouble(); - int currStep = data['currStep'] ?? -1; - bool status = data['status'] ?? false; - String tips = data['statusText'] ?? ''; - - deviceCalibrationController.tips.value = - tips; - - progressNotifier.value = per; - if (!isSecondStep && per >= 20) { - progressNotifier.value = 100; - // 第一步完成：仅 per >= 100 - pollingTimer?.cancel(); - TopSlideNotification.show(context, - text: tips); - deviceCalibrationController - .process.value = 1; - deviceCalibrationController - .bed_calibration.value = 1; - - deviceCalibrationController.updateAll(); + if (!isSecondStep) { + // 保存第一次获取的 cid + String cid = + res.rawResponse.data['cid']; + blueteethBindController.cid!.value = + cid; } - if (isSecondStep && - per >= 100 && - currStep == 5 && - status == true) { - // 第二步完成：per >= 100 && currStep == 5 && status == true - pollingTimer?.cancel(); - TopSlideNotification.show(context, - text: "设备校准完成".tr); - // 可在这里执行校准完成后的业务逻辑更新 - deviceCalibrationController - .bed_calibration.value = 1; - deviceCalibrationController - .position_calibration.value = 1; - deviceCalibrationController - .process.value = 1; - deviceCalibrationController.complete = - true; - deviceCalibrationController.updateAll(); + void requestCalibrationProgress() { + String cid = + blueteethBindController.cid!.value; + String progressUrl = + "$serviceAddress$progressApi?id=$cid"; + requestWithLog( + logTitle: "设备校准进度", + method: MyHttpMethod.get, + queryUrl: progressUrl, + onSuccess: (res) { + final data = res.data; + double per = + (data['per'] ?? 0).toDouble(); + int currStep = + data['currStep'] ?? -1; + bool status = + data['status'] ?? false; + String tips = + data['statusText'] ?? ''; + + deviceCalibrationController + .tips.value = tips; + + progressNotifier.value = per; + if (!isSecondStep && per >= 20) { + progressNotifier.value = 100; + // 第一步完成：仅 per >= 100 + pollingTimer?.cancel(); + TopSlideNotification.show(context, + text: tips); + deviceCalibrationController + .process.value = 1; + deviceCalibrationController + .bed_calibration.value = 1; + + deviceCalibrationController + .updateAll(); + } + + if (isSecondStep && + per >= 100 && + currStep == 5 && + status == true) { + // 第二步完成：per >= 100 && currStep == 5 && status == true + flag = 0; + pollingTimer?.cancel(); + TopSlideNotification.show(context, + text: "设备校准完成".tr); + // 可在这里执行校准完成后的业务逻辑更新 + deviceCalibrationController + .bed_calibration.value = 1; + deviceCalibrationController + .position_calibration + .value = 1; + deviceCalibrationController + .process.value = 1; + deviceCalibrationController + .complete = true; + deviceCalibrationController + .updateAll(); + } + }, + onFailure: (res) { + pollingTimer?.cancel(); + failureNotifier.value = true; + TopSlideNotification.show( + context, + text: res.msg ?? "服务器.失败".tr, + textColor: themeController + .currentColor.sc9, + ); + }, + ); } + + // 初始调用一次 + requestCalibrationProgress(); + + // 开始轮询 + pollingTimer = Timer.periodic( + Duration(seconds: 2), (_) { + requestCalibrationProgress(); + }); + + // 显示进度弹窗 + showProgressDialog(context, + progressNotifier, failureNotifier); }, onFailure: (res) { - pollingTimer?.cancel(); - failureNotifier.value = true; TopSlideNotification.show( context, text: res.msg ?? "服务器.失败".tr, @@ -780,74 +719,216 @@ class _CalibrationPageState extends State { ); }, ); + }, onCancel: () { + return; + }); + } else { + BlueteethBindController + blueteethBindController = Get.find(); + String serviceAddress = + "https://caibration.he-info.cn"; + String calibrationApi = + ServiceConstant.start_calibration; + String progressApi = + ServiceConstant.calibration_process; + + String queryUrl = + "$serviceAddress$calibrationApi"; + + final ValueNotifier progressNotifier = + ValueNotifier(0.0); + final ValueNotifier failureNotifier = + ValueNotifier(false); + Timer? pollingTimer; + + Map data = { + "macA": blueteethBindController + .currentDeviceMac!.value, + }; + + // 是否是二次点击（有cid表示进行第二阶段） + bool isSecondStep = blueteethBindController + .cid?.value.isNotEmpty ?? + false; + + if (isSecondStep) { + data["id"] = + blueteethBindController.cid!.value; } - // 初始调用一次 - requestCalibrationProgress(); + // 发起校准请求 + requestWithLog( + logTitle: "设备校准", + method: MyHttpMethod.post, + queryUrl: queryUrl, + data: data, + onSuccess: (res) { + if (!isSecondStep) { + // 保存第一次获取的 cid + String cid = res.rawResponse.data['cid']; + blueteethBindController.cid!.value = cid; + } - // 开始轮询 - pollingTimer = - Timer.periodic(Duration(seconds: 2), (_) { - requestCalibrationProgress(); - }); + void requestCalibrationProgress() { + String cid = + blueteethBindController.cid!.value; + String progressUrl = + "$serviceAddress$progressApi?id=$cid"; + requestWithLog( + logTitle: "设备校准进度", + method: MyHttpMethod.get, + queryUrl: progressUrl, + onSuccess: (res) { + final data = res.data; + double per = + (data['per'] ?? 0).toDouble(); + int currStep = data['currStep'] ?? -1; + bool status = data['status'] ?? false; + String tips = + data['statusText'] ?? ''; - // 显示进度弹窗 - showProgressDialog( - context, progressNotifier, failureNotifier); - }, - onFailure: (res) { - TopSlideNotification.show( - context, - text: res.msg ?? "服务器.失败".tr, - textColor: themeController.currentColor.sc9, + deviceCalibrationController + .tips.value = tips; + + progressNotifier.value = per; + if (!isSecondStep && per >= 20) { + progressNotifier.value = 100; + // 第一步完成：仅 per >= 100 + pollingTimer?.cancel(); + TopSlideNotification.show(context, + text: tips); + deviceCalibrationController + .process.value = 1; + deviceCalibrationController + .bed_calibration.value = 1; + + deviceCalibrationController + .updateAll(); + } + + if (isSecondStep && + per >= 100 && + currStep == 5 && + status == true) { + // 第二步完成：per >= 100 && currStep == 5 && status == true + pollingTimer?.cancel(); + TopSlideNotification.show(context, + text: "设备校准完成".tr); + // 可在这里执行校准完成后的业务逻辑更新 + deviceCalibrationController + .bed_calibration.value = 1; + deviceCalibrationController + .position_calibration.value = 1; + deviceCalibrationController + .process.value = 1; + deviceCalibrationController + .complete = true; + deviceCalibrationController + .updateAll(); + } + }, + onFailure: (res) { + pollingTimer?.cancel(); + failureNotifier.value = true; + TopSlideNotification.show( + context, + text: res.msg ?? "服务器.失败".tr, + textColor: themeController + .currentColor.sc9, + ); + }, + ); + } + + // 初始调用一次 + requestCalibrationProgress(); + + // 开始轮询 + pollingTimer = Timer.periodic( + Duration(seconds: 2), (_) { + requestCalibrationProgress(); + }); + + // 显示进度弹窗 + showProgressDialog(context, + progressNotifier, failureNotifier); + }, + onFailure: (res) { + TopSlideNotification.show( + context, + text: res.msg ?? "服务器.失败".tr, + textColor: + themeController.currentColor.sc9, + ); + }, ); - }, - ); - } - }, + } + }, - colors: [ - themeController.currentColor.sc1, - themeController.currentColor.sc2, - ], - child: Container( - width: bodySize.maxWidth, - height: MediaQuery.sizeOf(context).height * 0.055, - constraints: BoxConstraints( - minWidth: 500.rpx, - minHeight: 90.rpx, - ), - child: Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - '开始校准'.tr, - style: FlutterFlowTheme.of(context) - .bodyMedium - .override( - //todo 颜色 - color: themeController.currentColor.sc3, - fontFamily: 'Inter', - fontSize: - AppConstants().normal_text_fontSize, - letterSpacing: 0.0, - ), + colors: [ + themeController.currentColor.sc1, + themeController.currentColor.sc2, + ], + child: Container( + width: bodySize.maxWidth, + height: MediaQuery.sizeOf(context).height * 0.055, + constraints: BoxConstraints( + minWidth: 500.rpx, + minHeight: 90.rpx, ), - ].divide(SizedBox( - width: 17.rpx, - )), + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + '开始校准'.tr, + style: FlutterFlowTheme.of(context) + .bodyMedium + .override( + //todo 颜色 + color: + themeController.currentColor.sc3, + fontFamily: 'Inter', + fontSize: AppConstants() + .normal_text_fontSize, + letterSpacing: 0.0, + ), + ), + ].divide(SizedBox( + width: 17.rpx, + )), + ), + ), ), ), - ), + ], ), - ], + ), ), ), ), ), ), - ), - ); + onWillPop: () async { + bool exit = false; + if (flag != 0) { + showConfirmDialog(context, Container(), "校准未完成提示".tr, + onConfirm: () async { + exit = true; + 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: () { + exit = false; + }); + } else { + exit = true; + } + return exit; + }); } } diff --git a/lib/pages/device_bind/wifi_page.dart b/lib/pages/device_bind/wifi_page.dart index 935facd..1584344 100644 --- a/lib/pages/device_bind/wifi_page.dart +++ b/lib/pages/device_bind/wifi_page.dart @@ -46,8 +46,11 @@ class _WifiPageState extends State { blueteethBindController.wifiStatus = 0.obs; blueteethBindController.connect_wifi.value = {}; blueteethBindController.selectWifi.value = {}; - - if (widget.type == null) { + if (widget.type != null) { + blueteethBindController.wifiStatus.value = + widget.type['status']['status']; + } + if (widget.type['mac'] == null) { THapp bledevice = blueteethBindController.currentDevice!; bledevice.device.connect().then((Value) { var res2 = bledevice.isConnected; @@ -85,11 +88,18 @@ class _WifiPageState extends State { Get.toNamed("/calibrationPage", arguments: 1); }); } else if (aa == 'unknown') { - TopSlideNotification.show( - context, - text: "获取设备网络类型失败".tr, - textColor: themeController.currentColor.sc9, - ); + // TopSlideNotification.show( + // context, + // text: "获取设备网络类型失败".tr, + // textColor: themeController.currentColor.sc9, + // ); + WidgetsBinding.instance.addPostFrameCallback((_) { + TopSlideNotification.show( + context, + text: "获取设备网络类型失败".tr, + textColor: themeController.currentColor.sc9, + ); + }); } else { await initWifiStatusAndWifiList(); } @@ -106,7 +116,7 @@ class _WifiPageState extends State { } }); } else { - dealWifi(widget.type).then((aa) { + dealWifi(widget.type['mac']).then((aa) { print("object"); }); } @@ -188,7 +198,7 @@ class _WifiPageState extends State { left: 0, child: returnIconButtom, ), - if (widget.type == null) + if (widget.type['mac'] == null) Positioned( right: 20.rpx, child: CustomCard( diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index e800084..2e7ae2e 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -56,7 +56,7 @@ class _EPageState extends State { int errCode = response.errCode ?? -9999; if (errCode == 0) { // TODO 微信登录成功 传递code给后台 再操作逻辑 - String code = response.code ?? ""; + String code = response.code ?? ""; //把微信登录返回的code传给后台，剩下的事就交给后台处理 //首次未注册的用户引导去手机号填写页面 //已注册的用户直接跳转首页 @@ -505,10 +505,11 @@ class _EPageState extends State { // text: "待开发功能".tr); // }, onTap: () async { - if (loginController.model.isIos == true && - loginController - .model.isWeChatNotInstalled != - true) { + //loginController.model.isIos == true && + if (loginController + .model.isWeChatNotInstalled != + true) { + TopSlideNotification.show(context,text: "微信安装提示".tr,textColor: themeController.currentColor.sc9); } else { if (loginController .model.register_agree == diff --git a/lib/pages/login/other_login.dart b/lib/pages/login/other_login.dart index 4b3cb7b..3a4c5e0 100644 --- a/lib/pages/login/other_login.dart +++ b/lib/pages/login/other_login.dart @@ -825,9 +825,33 @@ class _OtherLoginPageState extends State { highlightColor: Colors.grey, // 点击水波纹颜色 borderRadius: 999.rpx, padding: EdgeInsets.zero, - onTap: () { - TopSlideNotification.show(context, - text: "待开发功能".tr); + onTap: () async { + //loginController.model.isIos == true && + if (loginController + .model.isWeChatNotInstalled != + true) { + TopSlideNotification.show(context, + text: "微信安装提示".tr, + textColor: + themeController.currentColor.sc9); + } else { + if (loginController + .model.register_agree == + null || + loginController + .model.register_agree != + true) { + TopSlideNotification.show( + context, + text: "登录页.未同意协议".tr, + textColor: + themeController.currentColor.sc9, + ); + return; + } + await loginController + .wxLoginSendAuth(context); + } }, child: Container( width: 91.rpx, diff --git a/lib/pages/main_bottom/component/MessageWidgetWidget.dart b/lib/pages/main_bottom/component/MessageWidgetWidget.dart index eac401a..0189f35 100644 --- a/lib/pages/main_bottom/component/MessageWidgetWidget.dart +++ b/lib/pages/main_bottom/component/MessageWidgetWidget.dart @@ -153,6 +153,7 @@ class _MessageWidgetWidgetState extends State { ), ), ), + ], ); } diff --git a/lib/pages/repair/apply_repair_page.dart b/lib/pages/repair/apply_repair_page.dart index 2a8ac14..a0d3e7e 100644 --- a/lib/pages/repair/apply_repair_page.dart +++ b/lib/pages/repair/apply_repair_page.dart @@ -63,7 +63,7 @@ class _ApplyRepairPageState extends State { await deviceTypeController.getDeviceType(); // 等待数据加载 if (deviceTypeController.deviceTypeList.isNotEmpty) { repairController.device_type.value = - deviceTypeController.deviceTypeList.first['_id']; + deviceTypeController.deviceTypeList.first['type']; } await bodyDeviceController.getDeviceList(); WidgetsBinding.instance.addPostFrameCallback((_) { @@ -80,7 +80,7 @@ class _ApplyRepairPageState extends State { Widget build(BuildContext context) { if (deviceTypeController.deviceTypeList.isNotEmpty) { repairController.device_type.value = - deviceTypeController.deviceTypeList.first['_id']; + deviceTypeController.deviceTypeList.first['type']; } if (bodyDeviceController.deviceList.isNotEmpty) { repairController.deviceListId = bodyDeviceController.deviceList @@ -169,7 +169,7 @@ class _ApplyRepairPageState extends State { AppConstants().button_container_radius, onTap: () async { repairController.device_type.value = - deviceType['_id']; + deviceType['type']; repairController.repairList .clear(); // 清空旧数据 repairController.repairList @@ -180,7 +180,7 @@ class _ApplyRepairPageState extends State { repairController .updateAll(); // 手动触发更新（如果未自动更新） }, - colors: deviceType['_id'] == + colors: deviceType['type'] == repairController.device_type.value ? [ themeController.currentColor.sc1, @@ -328,7 +328,7 @@ class _ApplyRepairPageState extends State { String queryUrl = "$serviceAddress$serviceName$serviceApi"; var data = { - "device": repairController.repairList, + "device": repairController.repairList.value, "type": repairController.device_type.value, "contacts": { "name": repairController.name.value, @@ -340,8 +340,19 @@ class _ApplyRepairPageState extends State { method: MyHttpMethod.post, queryUrl: queryUrl, data: data, + onSuccess: (res) { + TopSlideNotification.show(context, + text: res.msg!); + // Get.back(); + Get.toNamed("/applyRepairSuccess"); + }, + onFailure: (res) { + TopSlideNotification.show(context, + text: res.msg!, + textColor: + themeController.currentColor.sc9); + }, ); - Get.back(); } }, colors: [ @@ -515,16 +526,32 @@ class _ApplyRepairPageState extends State { // return "第 ${i + 1} 项问题描述未填写"; return "问题描述未填写".tr; } + if (item["issue"] != null && item["issue"].toString().trim().isNotEmpty) { + final issueText = item["issue"].toString().trim(); + final charCount = issueText.runes.length; + + if (charCount > 60) { + _scrollToKey(repairItemKeys[i]); + return "问题描述最多输入60个字".tr; + } + } else { + _scrollToKey(repairItemKeys[i]); + return "问题描述不能为空".tr; + } } // 检查联系人 if (repairController.name.trim().isEmpty) { _scrollToKey(contactKey); - return "联系人不能为空"; + return "联系人不能为空".tr; } if (repairController.phone.trim().isEmpty) { _scrollToKey(phoneKey); - return "联系电话不能为空"; + return "联系电话不能为空".tr; + } + if (!MyUtils.isValidPhoneNumber(repairController.phone.trim())) { + _scrollToKey(phoneKey); + return "无效的手机号码".tr; } return errormsg; diff --git a/lib/pages/repair/apply_repair_success.dart b/lib/pages/repair/apply_repair_success.dart new file mode 100644 index 0000000..a0395ce --- /dev/null +++ b/lib/pages/repair/apply_repair_success.dart @@ -0,0 +1,347 @@ +import 'package:ef/ef.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/svg.dart'; +import 'package:flutterflow_ui/flutterflow_ui.dart'; +import 'package:vbvs_app/common/color/appConstants.dart'; +import 'package:vbvs_app/common/util/FitTool.dart'; +import 'package:vbvs_app/component/tool/ClickableContainer.dart'; +import 'package:vbvs_app/component/tool/CustomCard.dart'; +import 'package:vbvs_app/controller/device/blueteeth_bind_controller.dart'; +import 'package:vbvs_app/controller/main_bottom/global_controller.dart'; +import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; +import 'package:vbvs_app/controller/user_info_controller.dart'; + +class ApplyRepairSuccess extends StatefulWidget { + const ApplyRepairSuccess({super.key}); + + @override + State createState() => _ApplyRepairSuccessState(); +} + +class _ApplyRepairSuccessState extends State { + GlobalController globalController = Get.find(); + UserInfoController userInfoController = Get.find(); + BlueteethBindController blueteethBindController = Get.find(); + ThemeController themeController = Get.find(); + + @override + void initState() { + super.initState(); + } + + @override + Widget build(BuildContext context) { + return LayoutBuilder( + builder: (context, bodySize) => GestureDetector( + onTap: () => FocusScope.of(context).unfocus(), + child: Container( + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage('assets/img/bgNoImg.png'), // 本地图片 + fit: BoxFit.fill, // 填满整个 Container + ), + ), + child: Scaffold( + backgroundColor: Colors.transparent, // 加上这一行 + appBar: AppBar( + backgroundColor: themeController.currentColor.sc17, + automaticallyImplyLeading: false, + iconTheme: IconThemeData( + color: themeController.currentColor.sc3, + ), + titleSpacing: 0, + // leading: returnIconButtom, + title: Container( + width: double.infinity, + height: 180.rpx, + child: Stack( + alignment: Alignment.center, + children: [ + /// 居中标题 + Text( + '报修成功标题'.tr, + style: FlutterFlowTheme.of(context).bodyMedium.override( + fontFamily: 'Readex Pro', + color: themeController.currentColor.sc3, + letterSpacing: 0, + fontSize: 30.rpx, + ), + ), + + /// 左边返回按钮 + // Positioned( + // left: 0, + // child: returnIconButtom, + // ), + Positioned( + left: 40.rpx, + child: ClickableContainer( + onTap: () { + Get.offAllNamed("/mianPageBottomChange"); + }, + backgroundColor: Colors.transparent, + highlightColor: Colors + .grey, // 可以设置为 themeController.currentColor.sc3 之类 + borderRadius: 8.rpx, + padding: EdgeInsets.all(8.rpx), // 增加可点击区域 + child: SvgPicture.asset( + 'assets/img/icon/close.svg', + width: 25.rpx, + height: 25.rpx, + color: themeController.currentColor.sc3, + ), + ), + ), + ], + ), + ), + + actions: [], + centerTitle: false, + ), + + body: SafeArea( + top: true, + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB(113.rpx, 0, 113.rpx, 0), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + mainAxisSize: MainAxisSize.max, + children: [ + Container( + height: bodySize.maxHeight * 0.15, + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 0.rpx, 0, 0), + child: Container( + width: 124.rpx, + height: 124.rpx, + // width: double.infinity, + decoration: BoxDecoration(), + child: SvgPicture.asset( + 'assets/img/icon/tick.svg', + fit: BoxFit.cover, + color: themeController.currentColor.sc3, + ), + ), + ), + Padding( + padding: + EdgeInsetsDirectional.fromSTEB(20.rpx, 42.rpx, 0, 0), + child: Container( + width: double.infinity, + decoration: BoxDecoration(), + child: Align( + alignment: AlignmentDirectional(0, 0), + child: Text( + '报修成功'.tr, + style: FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: 'Inter', + fontSize: 48.rpx, + letterSpacing: 0.0, + color: themeController.currentColor.sc3, + ), + ), + ), + ), + ), + + SizedBox( + height: 90.rpx, + ), + // Padding( + // padding: + // EdgeInsetsDirectional.fromSTEB(0, 265.rpx, 0, 0), + // child: Container( + // width: double.infinity, + // decoration: BoxDecoration(), + // child: Align( + // alignment: AlignmentDirectional(0, 0), + // child: Text( + // '绑定成功.分享标题'.tr, + // style: FlutterFlowTheme.of(context) + // .bodyMedium + // .override( + // fontFamily: 'Inter', + // fontSize: 30.rpx, + // letterSpacing: 0.0, + // color: themeController.currentColor.sc3, + // ), + // ), + // ), + // ), + // ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 48.rpx, 0, 0), + child: Container( + width: double.infinity, + decoration: BoxDecoration(), + child: Align( + alignment: AlignmentDirectional(-1, 0), + child: Text( + '报修成功标语'.tr, + style: FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: 'Inter', + fontSize: 26.rpx, + letterSpacing: 0.0, + color: themeController.currentColor.sc4, + ), + ), + ), + ), + ), + + Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 110.rpx, 0, 0), + child: CustomCard( + borderRadius: + AppConstants().button_container_radius, // 圆角半径 + onTap: () async { + Get.toNamed("/repairListPage"); + }, + colors: [ + // 渐变色 + themeController.currentColor.sc1, + themeController.currentColor.sc2, + ], + child: Container( + width: MediaQuery.sizeOf(context).width * 0.66, + height: MediaQuery.sizeOf(context).height * 0.055, + constraints: BoxConstraints( + minWidth: 500.rpx, + minHeight: 90.rpx, + ), + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 0, 2.rpx, 0, 0), + child: SvgPicture.asset( + 'assets/img/icon/history.svg', + width: 25.rpx, + height: 25.rpx, // 如果 SVG 中没有固定颜色，可以这样设置 + color: Colors.white, + ), + ), + 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)), + ), + ), + ), + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 18.rpx, 0, 0), + child: CustomCard( + borderRadius: + AppConstants().button_container_radius, // 圆角半径 + onTap: () { + Get.offAllNamed("/mianPageBottomChange"); + }, + colors: [ + // 渐变色 + themeController.currentColor.sc1, + themeController.currentColor.sc2, + ], + + child: Container( + width: MediaQuery.sizeOf(context).width * 0.66, + height: MediaQuery.sizeOf(context).height * 0.055, + constraints: BoxConstraints( + minWidth: 500.rpx, + minHeight: 90.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)), + ), + ), + ), + ), + ], + ), + ), + ), + ), + ), + ), + ); + } + + Widget _buildDeviceCard(BuildContext context, + {required String title, required String imageUrl, required String type}) { + return CustomCard( + borderRadius: 20.rpx, // 圆角大小 + onTap: () { + if (type != null) { + if (type == '1') { + Get.toNamed("/blueteethDevice"); + } + } + }, + + colors: [themeController.currentColor.sc17], // 背景色 + child: Container( + width: double.infinity, + height: MediaQuery.sizeOf(context).height * 0.135, + constraints: BoxConstraints( + minHeight: 220.rpx, + ), + padding: EdgeInsetsDirectional.fromSTEB(77.rpx, 0, 21.rpx, 0), + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + title, + style: FlutterFlowTheme.of(context).bodyMedium.override( + fontFamily: 'Inter', + color: const Color(0xFFC2CED7), + fontSize: 30.rpx, + letterSpacing: 0.0, + ), + ), + ClipRRect( + borderRadius: BorderRadius.circular(8.rpx), + child: Image.asset( + imageUrl, + width: 212.rpx, + height: 168.rpx, + ), + ), + ], + ), + ), + ); + } +} diff --git a/lib/pages/repair/component/RepairHistoryInfoWidget.dart b/lib/pages/repair/component/RepairHistoryInfoWidget.dart index 7df5732..2e43835 100644 --- a/lib/pages/repair/component/RepairHistoryInfoWidget.dart +++ b/lib/pages/repair/component/RepairHistoryInfoWidget.dart @@ -1,15 +1,15 @@ -import 'package:ef/base/widget/flutterflow/FlutterFlowTheme.dart'; import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; +import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/component/tool/ClickableContainer.dart'; import 'package:vbvs_app/component/tool/CustomCard.dart'; -import 'package:vbvs_app/routers/routers.dart'; class RepairHistoryInfoWidget extends StatefulWidget { - const RepairHistoryInfoWidget({super.key}); + var data; + RepairHistoryInfoWidget({super.key, required this.data}); @override State createState() => @@ -29,226 +29,283 @@ class _RepairHistoryInfoWidgetState extends State { @override Widget build(BuildContext context) { - return ClickableContainer( - borderRadius: AppConstants().normal_container_radius, - onTap: () { - //跳转详情 - }, - // colors: [ - // themeController.currentColor.sc5, - // ], - backgroundColor: Colors.transparent, - highlightColor: themeController.currentColor.sc21, - padding: EdgeInsetsDirectional.fromSTEB(0.rpx, 0.rpx, 0.rpx, 0.rpx), - child: Container( - width: double.infinity, - decoration: BoxDecoration( - color: themeController.currentColor.sc5, - borderRadius: - BorderRadius.circular(AppConstants().normal_container_radius), - ), - child: Padding( - padding: - EdgeInsetsDirectional.fromSTEB(30.rpx, 36.rpx, 0.rpx, 36.rpx), + return Stack( + children: [ + ClickableContainer( + borderRadius: AppConstants().normal_container_radius, + onTap: () { + //跳转详情 + }, + // colors: [ + // themeController.currentColor.sc5, + // ], + backgroundColor: Colors.transparent, + highlightColor: themeController.currentColor.sc21, + padding: EdgeInsetsDirectional.fromSTEB(0.rpx, 0.rpx, 0.rpx, 0.rpx), child: Container( width: double.infinity, - decoration: BoxDecoration(), - child: Column( - mainAxisSize: MainAxisSize.max, - children: [ - Container( - width: double.infinity, - decoration: BoxDecoration(), - child: Row( - mainAxisSize: MainAxisSize.max, - children: [ - Container( - width: MediaQuery.sizeOf(context).width * 0.14, - constraints: BoxConstraints( - maxWidth: 130.rpx, - ), - decoration: BoxDecoration(), - child: Text( - '设备类型'.tr, - maxLines: 2, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 26.rpx, - letterSpacing: 0.0, - fontWeight: FlutterFlowTheme.of(context) - .bodyMedium - .fontWeight, - fontStyle: FlutterFlowTheme.of(context) - .bodyMedium - .fontStyle, - color: themeController.currentColor.sc4, + decoration: BoxDecoration( + color: themeController.currentColor.sc5, + borderRadius: + BorderRadius.circular(AppConstants().normal_container_radius), + ), + child: Padding( + padding: + EdgeInsetsDirectional.fromSTEB(30.rpx, 36.rpx, 0.rpx, 36.rpx), + child: Container( + width: double.infinity, + decoration: BoxDecoration(), + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + Container( + width: double.infinity, + decoration: BoxDecoration(), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + Container( + width: MediaQuery.sizeOf(context).width * 0.17, + constraints: BoxConstraints( + maxWidth: 140.rpx, + ), + decoration: BoxDecoration(), + child: Text( + '设备类型'.tr, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 26.rpx, + letterSpacing: 0.0, + fontWeight: FlutterFlowTheme.of(context) + .bodyMedium + .fontWeight, + fontStyle: FlutterFlowTheme.of(context) + .bodyMedium + .fontStyle, + color: themeController.currentColor.sc4, + ), + ), ), - ), - ), - Text( - '智能床', - maxLines: 2, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 26.rpx, - letterSpacing: 0.0, - fontWeight: FlutterFlowTheme.of(context) - .bodyMedium - .fontWeight, - fontStyle: - FlutterFlowTheme.of(context).bodyMedium.fontStyle, - color: themeController.currentColor.sc3, - ), - ), - ].divide(SizedBox(width: 33.rpx)), - ), - ), - Container( - width: double.infinity, - decoration: BoxDecoration(), - child: Row( - mainAxisSize: MainAxisSize.max, - children: [ - Container( - width: MediaQuery.sizeOf(context).width * 0.14, - constraints: BoxConstraints( - maxWidth: 130.rpx, - ), - decoration: BoxDecoration(), - child: Text( - '设备ID'.tr, - maxLines: 2, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 26.rpx, - letterSpacing: 0.0, - fontWeight: FlutterFlowTheme.of(context) - .bodyMedium - .fontWeight, - fontStyle: FlutterFlowTheme.of(context) - .bodyMedium - .fontStyle, - color: themeController.currentColor.sc4, + Text( + '${widget.data['type']}', + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 26.rpx, + letterSpacing: 0.0, + fontWeight: FlutterFlowTheme.of(context) + .bodyMedium + .fontWeight, + fontStyle: FlutterFlowTheme.of(context) + .bodyMedium + .fontStyle, + color: themeController.currentColor.sc3, + ), ), - ), + ].divide(SizedBox(width: 33.rpx)), ), - Text( - '15561651', - maxLines: 2, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 26.rpx, - letterSpacing: 0.0, - fontWeight: FlutterFlowTheme.of(context) - .bodyMedium - .fontWeight, - fontStyle: - FlutterFlowTheme.of(context).bodyMedium.fontStyle, - color: themeController.currentColor.sc3, - ), - ), - ].divide(SizedBox(width: 33.rpx)), - ), - ), - Container( - width: double.infinity, - decoration: BoxDecoration(), - child: Row( - mainAxisSize: MainAxisSize.max, - children: [ - Container( - width: MediaQuery.sizeOf(context).width * 0.14, - constraints: BoxConstraints( - maxWidth: 130.rpx, - ), - decoration: BoxDecoration(), - child: Text( - '联系人'.tr, - maxLines: 2, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 26.rpx, - letterSpacing: 0.0, - fontWeight: FlutterFlowTheme.of(context) - .bodyMedium - .fontWeight, - fontStyle: FlutterFlowTheme.of(context) - .bodyMedium - .fontStyle, - color: themeController.currentColor.sc4, + ), + Container( + width: double.infinity, + decoration: BoxDecoration(), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + Container( + width: MediaQuery.sizeOf(context).width * 0.17, + constraints: BoxConstraints( + maxWidth: 140.rpx, + ), + decoration: BoxDecoration(), + child: Text( + '设备ID'.tr, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 26.rpx, + letterSpacing: 0.0, + fontWeight: FlutterFlowTheme.of(context) + .bodyMedium + .fontWeight, + fontStyle: FlutterFlowTheme.of(context) + .bodyMedium + .fontStyle, + color: themeController.currentColor.sc4, + ), + ), ), - ), - ), - Text( - '王明', - maxLines: 2, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 26.rpx, - letterSpacing: 0.0, - fontWeight: FlutterFlowTheme.of(context) - .bodyMedium - .fontWeight, - fontStyle: - FlutterFlowTheme.of(context).bodyMedium.fontStyle, - color: themeController.currentColor.sc3, - ), - ), - ].divide(SizedBox(width: 33.rpx)), - ), - ), - Container( - width: double.infinity, - decoration: BoxDecoration(), - child: Row( - mainAxisSize: MainAxisSize.max, - children: [ - Container( - width: MediaQuery.sizeOf(context).width * 0.14, - constraints: BoxConstraints( - maxWidth: 130.rpx, - ), - decoration: BoxDecoration(), - child: Text( - '发生时间'.tr, - maxLines: 2, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 26.rpx, - letterSpacing: 0.0, - fontWeight: FlutterFlowTheme.of(context) - .bodyMedium - .fontWeight, - fontStyle: FlutterFlowTheme.of(context) - .bodyMedium - .fontStyle, - color: themeController.currentColor.sc4, + Expanded( + child: Text( + '${getDeviceInfo(widget.data)}', + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 26.rpx, + letterSpacing: 0.0, + fontWeight: FlutterFlowTheme.of(context) + .bodyMedium + .fontWeight, + fontStyle: FlutterFlowTheme.of(context) + .bodyMedium + .fontStyle, + color: themeController.currentColor.sc3, + ), + ), ), - ), + ].divide(SizedBox(width: 33.rpx)), ), - Text( - '2022-08-01 15:05', - maxLines: 2, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 26.rpx, - letterSpacing: 0.0, - fontWeight: FlutterFlowTheme.of(context) - .bodyMedium - .fontWeight, - fontStyle: - FlutterFlowTheme.of(context).bodyMedium.fontStyle, - color: themeController.currentColor.sc3, - ), + ), + Container( + width: double.infinity, + decoration: BoxDecoration(), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + Container( + width: MediaQuery.sizeOf(context).width * 0.17, + constraints: BoxConstraints( + maxWidth: 140.rpx, + ), + decoration: BoxDecoration(), + child: Text( + '联系人'.tr, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 26.rpx, + letterSpacing: 0.0, + fontWeight: FlutterFlowTheme.of(context) + .bodyMedium + .fontWeight, + fontStyle: FlutterFlowTheme.of(context) + .bodyMedium + .fontStyle, + color: themeController.currentColor.sc4, + ), + ), + ), + Text( + '${widget.data['contacts']?['name']}', + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 26.rpx, + letterSpacing: 0.0, + fontWeight: FlutterFlowTheme.of(context) + .bodyMedium + .fontWeight, + fontStyle: FlutterFlowTheme.of(context) + .bodyMedium + .fontStyle, + color: themeController.currentColor.sc3, + ), + ), + ].divide(SizedBox(width: 33.rpx)), ), - ].divide(SizedBox(width: 33.rpx)), - ), + ), + Container( + width: double.infinity, + decoration: BoxDecoration(), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + Container( + width: MediaQuery.sizeOf(context).width * 0.17, + constraints: BoxConstraints( + maxWidth: 140.rpx, + ), + decoration: BoxDecoration(), + child: Text( + '发生时间'.tr, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 26.rpx, + letterSpacing: 0.0, + fontWeight: FlutterFlowTheme.of(context) + .bodyMedium + .fontWeight, + fontStyle: FlutterFlowTheme.of(context) + .bodyMedium + .fontStyle, + color: themeController.currentColor.sc4, + ), + ), + ), + Text( + '${MyUtils.timestampToDateString(widget.data['create_time'])}', + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 26.rpx, + letterSpacing: 0.0, + fontWeight: FlutterFlowTheme.of(context) + .bodyMedium + .fontWeight, + fontStyle: FlutterFlowTheme.of(context) + .bodyMedium + .fontStyle, + color: themeController.currentColor.sc3, + ), + ), + ].divide(SizedBox(width: 33.rpx)), + ), + ), + ].divide(SizedBox(height: 34.rpx)), ), - ].divide(SizedBox(height: 34.rpx)), + ), ), ), ), - ), + Positioned( + bottom: 40.rpx, + right: 20.rpx, + child: Container( + width: 123.rpx, + height: 47.rpx, + child: CustomCard( + borderRadius: AppConstants().button_container_radius, // 直角 + colors: [ + themeController.currentColor.sc4.withOpacity(0.3), + ], + enableAnimation: true, // 有点击缩放动画 + enableGradient: false, // 不用渐变 + onTap: () { + Get.toNamed("/repairDetailPage", arguments: widget.data); + }, + child: Center( + child: Text( + "查看".tr, + style: FlutterFlowTheme.of(context).bodyMedium.override( + fontFamily: 'Inter', + fontSize: 26.rpx, + letterSpacing: 0.0, + color: Colors.white, + ), + ), + ), + ), + ), + ), + ], ); } + + String getDeviceInfo(Map data) { + if (data['device'] == null || data['device'] is! List) { + return ''; + } + + List deviceList = data['device']; + List result = deviceList.map((device) { + final name = device['name'] ?? ''; + final code = device['code']; + final mac = device['mac'] ?? ''; + final suffix = (code != null && code.toString().isNotEmpty) ? code : mac; + return '$name($suffix)'; + }).toList(); + + return result.join(', '); + } } diff --git a/lib/pages/repair/component/RepairModelReadOnlyWidget.dart b/lib/pages/repair/component/RepairModelReadOnlyWidget.dart new file mode 100644 index 0000000..37136bf --- /dev/null +++ b/lib/pages/repair/component/RepairModelReadOnlyWidget.dart @@ -0,0 +1,489 @@ +import 'package:ef/ef.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/svg.dart'; +import 'package:flutterflow_ui/flutterflow_ui.dart'; +import 'package:vbvs_app/common/color/appConstants.dart'; +import 'package:vbvs_app/common/color/app_uri_status.dart'; +import 'package:vbvs_app/common/util/FitTool.dart'; +import 'package:vbvs_app/common/util/MyUtils.dart'; +import 'package:vbvs_app/component/tool/ClickableContainer.dart'; +import 'package:vbvs_app/component/tool/CustomCard.dart'; +import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; +import 'package:vbvs_app/controller/device/body_device_controller.dart'; +import 'package:vbvs_app/controller/repair/repair_controller.dart'; +import 'package:vbvs_app/controller/user_info_controller.dart'; +import 'package:vbvs_app/model/api_response.dart'; + +class RepairModelReadOnlyWidget extends StatefulWidget { + var model; + final VoidCallback onTap; // 添加回调函数 + int length; + final GlobalKey widgetKey; // 新增 + final bool showDelete; // ✅ 新增 + + RepairModelReadOnlyWidget({ + super.key, + required this.model, + required this.onTap, + required this.length, + required this.widgetKey, + this.showDelete = true, // ✅ 默认为 false + }); + + @override + State createState() => + _RepairModelReadOnlyWidgetState(); +} + +class _RepairModelReadOnlyWidgetState extends State { + FormFieldController _deviceController = + FormFieldController(null); + RepairController repairController = Get.find(); + UserInfoController userInfoController = Get.find(); + late FormFieldController? _issueController; + BodyDeviceController bodyDeviceController = Get.find(); + + @override + void setState(VoidCallback callback) { + super.setState(callback); + } + + @override + void initState() { + super.initState(); + _issueController = + FormFieldController(widget.model['issue'] ?? ''); + } + + @override + void dispose() { + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return Container( + key: widget.widgetKey, // 使用传入的 key + width: double.infinity, + decoration: BoxDecoration( + color: themeController.currentColor.sc5, + borderRadius: + BorderRadius.circular(AppConstants().normal_container_radius), + ), + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB(30.rpx, 35.rpx, 30.rpx, 35.rpx), + child: Container( + width: double.infinity, + decoration: BoxDecoration(), + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + Container( + width: double.infinity, + decoration: BoxDecoration(), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + Container( + width: 110.rpx, + decoration: BoxDecoration(), + child: Text( + '设备ID'.tr, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc4, + ), + ), + ), + Obx(() { + return Expanded( + child: Container( + width: 200.rpx, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.rpx), + color: Colors.transparent, + ), + child: TextFormField( + readOnly: true, + controller: repairController.onReDraw( + TextEditingController(text: widget.model['id']), + (textEditingController) { + textEditingController.text = widget.model['id']; + }), + autofocus: false, + obscureText: false, + decoration: InputDecoration( + isDense: true, + labelStyle: TextStyle( + letterSpacing: 0.0, + fontWeight: FlutterFlowTheme.of(context) + .labelMedium + .fontWeight, + fontStyle: FlutterFlowTheme.of(context) + .labelMedium + .fontStyle, + ), + hintText: "设备参数提示".tr, + hintStyle: TextStyle( + letterSpacing: 0.0, + fontSize: AppConstants().normal_text_fontSize, + color: themeController.currentColor.sc4, + ), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.rpx, + ), + borderRadius: BorderRadius.circular( + AppConstants().normal_container_radius), + ), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Colors.transparent, + width: 1.rpx, + ), + borderRadius: BorderRadius.circular(8.rpx), + ), + errorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: FlutterFlowTheme.of(context).error, + width: 1.rpx, + ), + borderRadius: BorderRadius.circular(8.rpx), + ), + focusedErrorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: FlutterFlowTheme.of(context).error, + width: 1.rpx, + ), + borderRadius: BorderRadius.circular(8.rpx), + ), + filled: true, + fillColor: themeController.currentColor.sc15, + ), + style: TextStyle( + letterSpacing: 0.0, + color: themeController.currentColor.sc4, + fontSize: AppConstants().normal_text_fontSize, + ), + cursorColor: themeController.currentColor.sc4, + onChanged: (value) { + widget.model['id'] = value; + }, + ), + ), + ); + }), + ].divide(SizedBox(width: 24.rpx)), + ), + ), + Container( + width: double.infinity, + decoration: BoxDecoration(), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + Container( + width: 110.rpx, + decoration: BoxDecoration(), + child: Text( + '设备参数'.tr, + style: TextStyle( + fontSize: 26.rpx, + color: themeController.currentColor.sc4, + ), + maxLines: 2, + overflow: TextOverflow.ellipsis, + ), + ), + Obx(() { + return Expanded( + child: Container( + width: 200.rpx, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.rpx), + color: Colors.transparent, + ), + child: TextFormField( + readOnly: true, + controller: repairController.onReDraw( + TextEditingController( + text: widget.model['param']), + (textEditingController) { + textEditingController.text = + widget.model['param']; + }), + // initialValue: widget.model['param'], + autofocus: false, + obscureText: false, + decoration: InputDecoration( + isDense: true, + labelStyle: TextStyle( + letterSpacing: 0.0, + fontWeight: FlutterFlowTheme.of(context) + .labelMedium + .fontWeight, + fontStyle: FlutterFlowTheme.of(context) + .labelMedium + .fontStyle, + ), + hintText: "设备参数提示".tr, + hintStyle: TextStyle( + letterSpacing: 0.0, + fontSize: AppConstants().normal_text_fontSize, + color: themeController.currentColor.sc4, + ), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.rpx, + ), + borderRadius: BorderRadius.circular( + AppConstants().normal_container_radius), + ), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Colors.transparent, + width: 1.rpx, + ), + borderRadius: BorderRadius.circular(8.rpx), + ), + errorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: FlutterFlowTheme.of(context).error, + width: 1.rpx, + ), + borderRadius: BorderRadius.circular(8.rpx), + ), + focusedErrorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: FlutterFlowTheme.of(context).error, + width: 1.rpx, + ), + borderRadius: BorderRadius.circular(8.rpx), + ), + filled: true, + fillColor: themeController.currentColor.sc15, + ), + style: TextStyle( + letterSpacing: 0.0, + color: themeController.currentColor.sc4, + fontSize: AppConstants().normal_text_fontSize, + ), + cursorColor: themeController.currentColor.sc4, + onChanged: (value) { + widget.model['param'] = value; + }, + ), + ), + ); + }), + ].divide(SizedBox(width: 24.rpx)), + ), + ), + Container( + width: double.infinity, + height: 151.rpx, + decoration: BoxDecoration( + color: themeController.currentColor.sc15, + borderRadius: BorderRadius.circular(20.rpx), + ), + child: Container( + width: 200.rpx, + child: TextFormField( + readOnly: true, + controller: repairController.onReDraw( + TextEditingController(text: widget.model['issue']), + (textEditingController) { + textEditingController.text = widget.model['issue']; + }), + onChanged: (value) { + widget.model['issue'] = value; + }, + maxLines: null, // 👈 支持无限行 + // controller: TextEditingController(), + autofocus: false, + obscureText: false, + decoration: InputDecoration( + isDense: true, + labelStyle: TextStyle( + letterSpacing: 0.0, + fontWeight: + FlutterFlowTheme.of(context).labelMedium.fontWeight, + fontStyle: + FlutterFlowTheme.of(context).labelMedium.fontStyle, + ), + hintText: '问题描述'.tr, + hintStyle: TextStyle( + fontSize: 26.rpx, + letterSpacing: 0.0, + color: themeController.currentColor.sc4, + ), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1, + ), + borderRadius: BorderRadius.circular(8.rpx), + ), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1, + ), + borderRadius: BorderRadius.circular(8.rpx), + ), + errorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: FlutterFlowTheme.of(context).error, + width: 1, + ), + borderRadius: BorderRadius.circular(8.rpx), + ), + focusedErrorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: FlutterFlowTheme.of(context).error, + width: 1, + ), + borderRadius: BorderRadius.circular(8.rpx), + ), + filled: false, + contentPadding: EdgeInsets.symmetric( + vertical: 20.rpx, horizontal: 20.rpx), + ), + style: TextStyle( + color: themeController.currentColor.sc4, + fontSize: AppConstants().normal_text_fontSize, + ), + cursorColor: themeController.currentColor.sc4, + ), + ), + ), + ClickableContainer( + backgroundColor: themeController.currentColor.sc15, + highlightColor: themeController.currentColor.sc21, + borderRadius: 20.rpx, + padding: EdgeInsets.zero, + onTap: () async { + ApiResponse apiResponse = await repairController.uploadImg(); + print(apiResponse); + if (apiResponse.code == HttpStatusCodes.ok) { + print(widget.model); + // setState(() { + // widget.model['path'] = apiResponse.data['path']; + // }); + widget.model['path'] = apiResponse.data['path']; + repairController.repairList + .refresh(); // 通知 Obx 更新（如果用了 GetX） + print(widget.model); + } else { + if (widget.model['path'] == null || + widget.model['path'].isEmpty) { + TopSlideNotification.show( + context, + text: apiResponse.msg!, + textColor: apiResponse.code == HttpStatusCodes.ok + ? themeController.currentColor.sc2 + : themeController.currentColor.sc9, + ); + } + } + }, + child: SizedBox( + width: double.infinity, + height: MediaQuery.sizeOf(context).height * 0.203, + child: ConstrainedBox( + constraints: BoxConstraints( + minHeight: 151.rpx, + ), + child: Obx(() { + var list = repairController.repairList; + print(list); + if (widget.model['path'] == null || + widget.model['path'] == "") { + return Column( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + width: 60.rpx, + height: 53.rpx, + child: SvgPicture.asset( + 'assets/img/icon/camera.svg', + width: 24.rpx, + height: 24.rpx, + color: themeController.currentColor.sc4, + ), + ), + Text( + '上传提示'.tr, + style: TextStyle( + fontSize: 26.rpx, + letterSpacing: 0.0, + color: themeController.currentColor.sc4, + ), + ), + ].divide(SizedBox(height: 28.rpx)), + ); + } + return Container( + // clipBehavior: Clip.antiAlias, + child: Image.network( + widget.model['path'], + fit: BoxFit.cover, + ), + ); + })), + ), + ), + if (widget.length > 1 && widget.showDelete == true) + Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 100.rpx, 0.rpx, 100.rpx, 0.rpx), + child: CustomCard( + borderRadius: + AppConstants().button_container_radius, // 圆角半径 + onTap: widget.onTap, + colors: [ + Colors.transparent, + ], + child: Container( + decoration: BoxDecoration( + color: Colors.transparent, + borderRadius: BorderRadius.circular( + AppConstants().button_container_radius), + ), + width: MediaQuery.sizeOf(context).width * 0.216, + height: MediaQuery.sizeOf(context).height * 0.038, + constraints: BoxConstraints( + minHeight: 62.rpx, + ), + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + '删除'.tr, + style: FlutterFlowTheme.of(context) + .bodyMedium + .override( + color: themeController.currentColor.sc9, + fontFamily: 'Inter', + fontSize: AppConstants().normal_text_fontSize, + letterSpacing: 0.0, + ), + ), + ].divide(SizedBox( + width: 17.rpx, + )), + ), + ), + ), + ), + ].divide(SizedBox(height: 29.rpx)), + ), + ), + ), + ); + } +} diff --git a/lib/pages/repair/component/RepairModelWidget.dart b/lib/pages/repair/component/RepairModelWidget.dart index ba9e562..440ed1b 100644 --- a/lib/pages/repair/component/RepairModelWidget.dart +++ b/lib/pages/repair/component/RepairModelWidget.dart @@ -5,26 +5,30 @@ import 'package:flutterflow_ui/flutterflow_ui.dart'; import 'package:vbvs_app/common/color/appConstants.dart'; import 'package:vbvs_app/common/color/app_uri_status.dart'; import 'package:vbvs_app/common/util/FitTool.dart'; +import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/component/base/THFlutterFlowDropDown.dart'; import 'package:vbvs_app/component/tool/ClickableContainer.dart'; import 'package:vbvs_app/component/tool/CustomCard.dart'; import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; +import 'package:vbvs_app/controller/device/body_device_controller.dart'; import 'package:vbvs_app/controller/repair/repair_controller.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/model/api_response.dart'; -import 'package:vbvs_app/routers/routers.dart'; class RepairModelWidget extends StatefulWidget { var model; final VoidCallback onTap; // 添加回调函数 int length; final GlobalKey widgetKey; // 新增 + final bool showDelete; // ✅ 新增 + RepairModelWidget({ super.key, required this.model, required this.onTap, required this.length, required this.widgetKey, + this.showDelete = true, // ✅ 默认为 false }); @override @@ -36,6 +40,8 @@ class _RepairModelWidgetState extends State { FormFieldController(null); RepairController repairController = Get.find(); UserInfoController userInfoController = Get.find(); + late FormFieldController? _issueController; + BodyDeviceController bodyDeviceController = Get.find(); @override void setState(VoidCallback callback) { @@ -45,6 +51,8 @@ class _RepairModelWidgetState extends State { @override void initState() { super.initState(); + _issueController = + FormFieldController(widget.model['issue'] ?? ''); } @override @@ -54,7 +62,6 @@ class _RepairModelWidgetState extends State { @override Widget build(BuildContext context) { - // _deviceController.value = ""; return Container( key: widget.widgetKey, // 使用传入的 key width: double.infinity, @@ -97,8 +104,31 @@ class _RepairModelWidgetState extends State { ), height: AppConstants().dropdown_height, child: THFlutterFlowDropDown( + controller: _issueController, onChanged: (val) { widget.model['id'] = val; + final targetId = widget.model['id']; + final matchedDevice = + bodyDeviceController.deviceList.firstWhere( + (device) => device['_id'] == targetId, + orElse: () => null, // 如果找不到，返回 null（可选） + ); + if (matchedDevice != null) { + // 找到了匹配的项 + widget.model['param'] = matchedDevice['mac']; + widget.model['mac'] = matchedDevice['mac']; + widget.model['code'] = + matchedDevice['code'] ?? ''; + widget.model['name'] = (matchedDevice['person'] + ?['name'] + ?.toString() + .trim() + .isNotEmpty ?? + false) + ? matchedDevice['person']['name'] + : '未命名'.tr; + repairController.updateAll(); + } }, width: 200.rpx, height: 40.rpx, @@ -127,7 +157,7 @@ class _RepairModelWidgetState extends State { isOverButton: false, isSearchable: false, isMultiSelect: false, - controller: _deviceController, + // controller: _deviceController, options: repairController.deviceListId!, optionLabels: repairController.deviceListId!, ), @@ -155,84 +185,87 @@ class _RepairModelWidgetState extends State { overflow: TextOverflow.ellipsis, ), ), - Expanded( - child: Container( - width: 200.rpx, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10.rpx), - color: Colors.transparent, - ), - child: TextFormField( - controller: repairController.onReDraw( - TextEditingController( - text: widget.model['param']), - (textEditingController) { - textEditingController.text = widget.model['param']; - }), - // initialValue: widget.model['param'], - autofocus: false, - obscureText: false, - decoration: InputDecoration( - isDense: true, - labelStyle: TextStyle( - letterSpacing: 0.0, - fontWeight: FlutterFlowTheme.of(context) - .labelMedium - .fontWeight, - fontStyle: FlutterFlowTheme.of(context) - .labelMedium - .fontStyle, + Obx(() { + return Expanded( + child: Container( + width: 200.rpx, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.rpx), + color: Colors.transparent, + ), + child: TextFormField( + controller: repairController.onReDraw( + TextEditingController( + text: widget.model['param']), + (textEditingController) { + textEditingController.text = + widget.model['param']; + }), + // initialValue: widget.model['param'], + autofocus: false, + obscureText: false, + decoration: InputDecoration( + isDense: true, + labelStyle: TextStyle( + letterSpacing: 0.0, + fontWeight: FlutterFlowTheme.of(context) + .labelMedium + .fontWeight, + fontStyle: FlutterFlowTheme.of(context) + .labelMedium + .fontStyle, + ), + hintText: "设备参数提示".tr, + hintStyle: TextStyle( + letterSpacing: 0.0, + fontSize: AppConstants().normal_text_fontSize, + color: themeController.currentColor.sc4, + ), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.rpx, + ), + borderRadius: BorderRadius.circular( + AppConstants().normal_container_radius), + ), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Colors.transparent, + width: 1.rpx, + ), + borderRadius: BorderRadius.circular(8.rpx), + ), + errorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: FlutterFlowTheme.of(context).error, + width: 1.rpx, + ), + borderRadius: BorderRadius.circular(8.rpx), + ), + focusedErrorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: FlutterFlowTheme.of(context).error, + width: 1.rpx, + ), + borderRadius: BorderRadius.circular(8.rpx), + ), + filled: true, + fillColor: themeController.currentColor.sc15, ), - hintText: "设备参数提示".tr, - hintStyle: TextStyle( + style: TextStyle( letterSpacing: 0.0, + color: themeController.currentColor.sc3, fontSize: AppConstants().normal_text_fontSize, - color: themeController.currentColor.sc4, ), - enabledBorder: OutlineInputBorder( - borderSide: BorderSide( - color: Color(0x00000000), - width: 1.rpx, - ), - borderRadius: BorderRadius.circular( - AppConstants().normal_container_radius), - ), - focusedBorder: OutlineInputBorder( - borderSide: BorderSide( - color: Colors.transparent, - width: 1.rpx, - ), - borderRadius: BorderRadius.circular(8.rpx), - ), - errorBorder: OutlineInputBorder( - borderSide: BorderSide( - color: FlutterFlowTheme.of(context).error, - width: 1.rpx, - ), - borderRadius: BorderRadius.circular(8.rpx), - ), - focusedErrorBorder: OutlineInputBorder( - borderSide: BorderSide( - color: FlutterFlowTheme.of(context).error, - width: 1.rpx, - ), - borderRadius: BorderRadius.circular(8.rpx), - ), - filled: true, - fillColor: themeController.currentColor.sc15, + cursorColor: themeController.currentColor.sc3, + onChanged: (value) { + widget.model['param'] = value; + }, ), - style: TextStyle( - letterSpacing: 0.0, - color: themeController.currentColor.sc3, - fontSize: AppConstants().normal_text_fontSize, - ), - cursorColor: themeController.currentColor.sc3, - onChanged: (value) { - widget.model['param'] = value; - }, ), - ), - ), + ); + }), ].divide(SizedBox(width: 24.rpx)), ), ), @@ -246,11 +279,16 @@ class _RepairModelWidgetState extends State { child: Container( width: 200.rpx, child: TextFormField( + controller: repairController.onReDraw( + TextEditingController(text: widget.model['issue']), + (textEditingController) { + textEditingController.text = widget.model['issue']; + }), onChanged: (value) { widget.model['issue'] = value; }, maxLines: null, // 👈 支持无限行 - controller: TextEditingController(), + // controller: TextEditingController(), autofocus: false, obscureText: false, decoration: InputDecoration( @@ -385,7 +423,7 @@ class _RepairModelWidgetState extends State { })), ), ), - if (widget.length > 1) + if (widget.length > 1 && widget.showDelete == true) Padding( padding: EdgeInsetsDirectional.fromSTEB( 100.rpx, 0.rpx, 100.rpx, 0.rpx), @@ -428,7 +466,7 @@ class _RepairModelWidgetState extends State { ), ), ), - ), + ), ].divide(SizedBox(height: 29.rpx)), ), ), diff --git a/lib/pages/repair/repair_detail_page.dart b/lib/pages/repair/repair_detail_page.dart new file mode 100644 index 0000000..0330408 --- /dev/null +++ b/lib/pages/repair/repair_detail_page.dart @@ -0,0 +1,285 @@ +import 'package:ef/ef.dart'; +import 'package:flutter/material.dart'; +import 'package:flutterflow_ui/flutterflow_ui.dart'; +import 'package:vbvs_app/common/color/appConstants.dart'; +import 'package:vbvs_app/common/util/FitTool.dart'; +import 'package:vbvs_app/common/util/MyUtils.dart'; +import 'package:vbvs_app/component/tool/CustomCard.dart'; +import 'package:vbvs_app/controller/device/body_device_controller.dart'; +import 'package:vbvs_app/controller/device/device_type_controller.dart'; +import 'package:vbvs_app/controller/repair/repair_controller.dart'; +import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; +import 'package:vbvs_app/pages/repair/component/RepairModelReadOnlyWidget.dart'; + +class RepairDetailPage extends StatefulWidget { + final dynamic data; + + const RepairDetailPage({super.key, required this.data}); + + @override + State createState() => _RepairDetailPageState(); +} + +class _RepairDetailPageState extends State { + final ThemeController themeController = Get.find(); + final DeviceTypeController deviceTypeController = Get.find(); + final RepairController repairController = Get.find(); + final BodyDeviceController bodyDeviceController = Get.find(); + + List> devices = []; + final List repairItemKeys = []; + final GlobalKey contactKey = GlobalKey(); + final GlobalKey phoneKey = GlobalKey(); + + late final TextEditingController _contactController; + late final TextEditingController _phoneController; + + @override + void initState() { + super.initState(); + devices = List>.from(widget.data['device'] ?? []); + _updateRepairItemKeys(); + + _contactController = TextEditingController( + text: widget.data['contacts']?['name'] ?? '', + ); + _phoneController = TextEditingController( + text: widget.data['contacts']?['phone'] ?? '', + ); + } + + void _updateRepairItemKeys() { + repairItemKeys + ..clear() + ..addAll(List.generate(devices.length, (_) => GlobalKey())); + } + + @override + void dispose() { + _contactController.dispose(); + _phoneController.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return LayoutBuilder( + builder: (context, bodysize) => GestureDetector( + onTap: () => FocusScope.of(context).unfocus(), + child: Container( + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage('assets/img/bgNoImg.png'), + fit: BoxFit.fill, + ), + ), + child: Scaffold( + backgroundColor: Colors.transparent, + appBar: AppBar( + backgroundColor: themeController.currentColor.sc17, + automaticallyImplyLeading: false, + iconTheme: IconThemeData( + color: themeController.currentColor.sc3, + ), + titleSpacing: 0, + title: Container( + width: double.infinity, + height: 180.rpx, + child: Stack( + alignment: Alignment.center, + children: [ + Text( + '设备报修'.tr, + style: TextStyle( + fontFamily: 'Readex Pro', + color: themeController.currentColor.sc3, + letterSpacing: 0, + fontSize: 30.rpx, + ), + ), + Positioned( + left: 0, + // child: returnIconButtom, + child: returnIconButtomAddCallback(() {}), + ), + ], + ), + ), + centerTitle: false, + ), + body: SafeArea( + top: true, + child: Padding( + padding: + EdgeInsetsDirectional.fromSTEB(30.rpx, 29.rpx, 30.rpx, 0), + child: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + Row( + children: [ + CustomCard( + borderRadius: + AppConstants().button_container_radius, + onTap: () {}, + colors: [ + themeController.currentColor.sc1, + themeController.currentColor.sc2, + ], + child: Container( + width: (MediaQuery.sizeOf(context).width * 0.284) + .rpx, + constraints: BoxConstraints( + minWidth: 213.rpx, + minHeight: 91.rpx, + ), + child: Align( + alignment: AlignmentDirectional(0, 0), + child: Text( + "${widget.data['type']}", + style: TextStyle( + letterSpacing: 0.0, + color: themeController.currentColor.sc3, + fontSize: + AppConstants().normal_text_fontSize, + ), + ), + ), + ), + ), + ], + ), + + /// 设备列表 + Column( + children: List.generate(devices.length, (index) { + final item = devices[index]; + return RepairModelReadOnlyWidget( + widgetKey: repairItemKeys[index], + model: item, + onTap: () {}, + length: devices.length, + showDelete: false, + ); + }).divide(SizedBox(height: 25.rpx)), + ), + + /// 联系方式区域 + Container( + width: double.infinity, + decoration: BoxDecoration( + color: themeController.currentColor.sc5, + borderRadius: BorderRadius.circular( + AppConstants().normal_container_radius), + ), + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 30.rpx, 30.rpx, 30.rpx, 30.rpx), + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + _buildParamRow( + context, + "联系人".tr, + "名称输入提示".tr, + (value) => repairController.name.value = value, + key: contactKey, + controller: _contactController, + ), + _buildParamRow( + context, + "手机号".tr, + "手机号输入提示".tr, + (value) => repairController.phone.value = value, + key: phoneKey, + controller: _phoneController, + ), + ].divide(SizedBox(height: 30.rpx)), + ), + ), + ), + ] + .divide(SizedBox(height: 25.rpx)) + .addToEnd(SizedBox(height: 25.rpx)), + ), + ), + ), + ), + ), + ), + ), + ); + } + + Widget _buildParamRow( + BuildContext context, + String text, + String hinttext, + void Function(String)? onChanged, { + Key? key, + required TextEditingController controller, + }) { + return Row( + key: key, + mainAxisSize: MainAxisSize.max, + children: [ + Container( + width: 110.rpx, + child: Text( + text, + style: TextStyle( + fontSize: 26.rpx, + letterSpacing: 0.0, + color: themeController.currentColor.sc3, + ), + overflow: TextOverflow.ellipsis, + softWrap: false, + maxLines: 1, + ), + ), + Expanded( + child: Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.rpx), + color: Colors.transparent, + ), + child: TextFormField( + readOnly: true, + controller: controller, + autofocus: false, + decoration: InputDecoration( + isDense: true, + hintText: hinttext, + hintStyle: TextStyle( + letterSpacing: 0.0, + fontSize: AppConstants().normal_text_fontSize, + color: themeController.currentColor.sc4, + ), + enabledBorder: OutlineInputBorder( + borderSide: + BorderSide(color: Colors.transparent, width: 1.rpx), + borderRadius: BorderRadius.circular( + AppConstants().normal_container_radius), + ), + focusedBorder: OutlineInputBorder( + borderSide: + BorderSide(color: Colors.transparent, width: 1.rpx), + borderRadius: BorderRadius.circular(8.rpx), + ), + filled: true, + fillColor: themeController.currentColor.sc15, + ), + style: TextStyle( + letterSpacing: 0.0, + color: themeController.currentColor.sc4, + fontSize: AppConstants().normal_text_fontSize, + ), + cursorColor: themeController.currentColor.sc3, + onChanged: onChanged, + ), + ), + ), + ].divide(SizedBox(width: 24.rpx)), + ); + } +} diff --git a/lib/pages/repair/repair_list_page.dart b/lib/pages/repair/repair_list_page.dart index 2c7503b..1674d93 100644 --- a/lib/pages/repair/repair_list_page.dart +++ b/lib/pages/repair/repair_list_page.dart @@ -1,8 +1,13 @@ import 'package:ef/ef.dart'; import 'package:flutter/material.dart'; import 'package:flutterflow_ui/flutterflow_ui.dart'; +import 'package:vbvs_app/common/color/ServiceConstant.dart'; import 'package:vbvs_app/common/util/FitTool.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/controller/repair/repair_controller.dart'; +import 'package:vbvs_app/model/api_response.dart'; import 'package:vbvs_app/pages/repair/component/RepairHistoryInfoWidget.dart'; class RepairListPage extends StatefulWidget { @@ -13,6 +18,8 @@ class RepairListPage extends StatefulWidget { } class _RepairListPageState extends State { + RepairController repairController = Get.find(); + @override void initState() { super.initState(); @@ -92,26 +99,23 @@ class _RepairListPageState extends State { child: Padding( padding: EdgeInsetsDirectional.fromSTEB(30.rpx, 29.rpx, 30.rpx, 0), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.max, - children: [ - RepairHistoryInfoWidget(), - RepairHistoryInfoWidget(), - RepairHistoryInfoWidget(), - RepairHistoryInfoWidget(), - RepairHistoryInfoWidget(), - RepairHistoryInfoWidget(), - RepairHistoryInfoWidget(), - ] - .divide(SizedBox( - height: 25.rpx, - )) - .addToEnd(SizedBox( - height: 25.rpx, - )), - ), - ), + child: Obx(() { + final isEmpty = repairController.repairHistory.value.isEmpty; + if (isEmpty) { + return Expanded(child: NullDataWidget()); + } + return SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.max, + children: repairController.repairHistory.value + .map((item) => RepairHistoryInfoWidget( + data: item)) // 假设组件支持传 data + .toList() + .divide(SizedBox(height: 25.rpx)) + .addToEnd(SizedBox(height: 25.rpx)), + ), + ); + }), ), ), ), @@ -121,11 +125,14 @@ class _RepairListPageState extends State { } Future loadData() async { - // repairController.repairHistory.value = [{}]; - // ApiResponse apiResponse = await requestWithLog( - // logTitle: "请求维修列表", method: MyHttpMethod.get, queryUrl: ""); - // if (apiResponse.code == HttpStatusCodes.ok) { - // //请求维修列表 - // } + String serviceAddress = ServiceConstant.service_address; + String serviceName = ServiceConstant.server_service; + String serviceApi = ServiceConstant.submit_repair; + String queryUrl = "${serviceAddress}${serviceName}${serviceApi}"; + ApiResponse apiResponse = await requestWithLog( + logTitle: "查询报修数据", method: MyHttpMethod.get, queryUrl: queryUrl); + RepairController repairController = Get.find(); + repairController.repairHistory.value = apiResponse.data; + repairController.updateAll(); } } diff --git a/lib/routers/routers.dart b/lib/routers/routers.dart index 6180639..45d6143 100644 --- a/lib/routers/routers.dart +++ b/lib/routers/routers.dart @@ -1,7 +1,7 @@ import 'package:ef/ef.dart'; import 'package:flutter/cupertino.dart'; +import 'package:vbvs_app/common/util/MyUtils.dart'; import 'package:vbvs_app/component/tool/TopSlideNotification.dart'; -import 'package:vbvs_app/controller/theme_controller/ThemeController.dart'; import 'package:vbvs_app/controller/user_info_controller.dart'; import 'package:vbvs_app/pages/device/BodyDeviceWidget.dart'; import 'package:vbvs_app/pages/device/device_detail.dart'; @@ -27,6 +27,8 @@ import 'package:vbvs_app/pages/main_bottom/mine_page.dart'; import 'package:vbvs_app/pages/person/person_page.dart'; import 'package:vbvs_app/pages/person/update_person_page.dart'; import 'package:vbvs_app/pages/repair/apply_repair_page.dart'; +import 'package:vbvs_app/pages/repair/apply_repair_success.dart'; +import 'package:vbvs_app/pages/repair/repair_detail_page.dart'; import 'package:vbvs_app/pages/repair/repair_list_page.dart'; import 'package:vbvs_app/pages/setting/language_setting.dart'; import 'package:vbvs_app/pages/sleep_report/new_sleep_report_page.dart'; @@ -37,8 +39,6 @@ import 'package:vbvs_app/pages/user/setting_page.dart'; import 'package:vbvs_app/pages/user/update_user_page.dart'; import 'package:vbvs_app/pages/user/user_scheme_page.dart'; -ThemeController themeController = Get.find(); - var routes = { "/homePage": (contxt) => HomePage(), "/sleepReportPage": (contxt, {arguments}) => @@ -52,12 +52,12 @@ var routes = { "/blueteethDevice": (contxt) => BlueteethDevicePage(), "/personPage": (contxt) => PersonPage(), "/bindDeviceSuccess": (contxt) => BindDeviceSuccess(), - "/wifiPage": (contxt, {arguments}) => WifiPage(type:arguments), + "/wifiPage": (contxt, {arguments}) => WifiPage(type: arguments), "/otherLoginPage": (contxt) => OtherLoginPage(), "/updateUserPage": (contxt) => UpdateUserPage(), "/settingPage": (contxt) => SettingPage(), "/aboutUsPage": (contxt) => AboutUsPage(), - "/bodyDevice": (contxt,{arguments}) => BodyDeviceWidget(type:arguments), + "/bodyDevice": (contxt, {arguments}) => BodyDeviceWidget(type: arguments), "/deviceTypeList": (contxt) => DeviceTypeListPage(), "/deviceDetail": (contxt, {arguments}) => DeviceDetailPage(device: arguments), "/instantBodyPage": (contxt, {arguments}) => @@ -79,6 +79,9 @@ var routes = { NewSleepReportPage(date: arguments), "/userSchemePage": (contxt) => UserSchemePage(), "/privacyPage": (contxt) => PrivacySchemePage(), + "/repairDetailPage": (contxt, {arguments}) => + RepairDetailPage(data: arguments), + "/applyRepairSuccess": (contxt) => ApplyRepairSuccess(), }; var onGenerateRoute = (RouteSettings settings) {