更新快检报告

2026-04-02 16:02:25 +08:00
parent 9a431e907e
commit bdeef22130
12 changed files with 2080 additions and 732 deletions
--- a/assets/miniapp/mhtControl_1.0.94.zip
+++ b/assets/miniapp/mhtControl_1.0.94.zip
--- a/lib/common/color/appConstants.dart
+++ b/lib/common/color/appConstants.dart
@@ -8,8 +8,8 @@ import 'package:vbvs_app/enum/APPPackageType.dart';
 class AppConstants {
  // App-related constants

-  static const String zhmht_app_version = "SWES_1.2026.3.30"; //眠花糖
-  static const String theh_app_version = "1.2603.30"; //太和
+  static const String zhmht_app_version = "SWES_1.2026.04.02"; //眠花糖
+  static const String theh_app_version = "1.2604.02"; //太和

  // 1. 纯字符串列表格式
  static const List<String> integerTimeZones = [
@@ -91,8 +91,8 @@ class AppConstants {

  //系统参数
  //运行打包APP模式
-  // int ent_type = APPPackageType.MHT.code; //1.默认太和 2.欢睡 3.眠花糖
-  int ent_type = APPPackageType.TH.code; //1.默认太和 2.欢睡 3.眠花糖
+  int ent_type = APPPackageType.MHT.code; //1.默认太和 2.欢睡 3.眠花糖
+  // int ent_type = APPPackageType.TH.code; //1.默认太和 2.欢睡 3.眠花糖
  // int ent_type = APPPackageType.HUANSHUI.code; //1.默认太和 2.欢睡 3.眠花糖
  // int ent_type = APPPackageType.DONGHUA.code; //1.默认太和 2.欢睡 3.眠花糖 4.东华
  // int ent_type = APPPackageType.HAIER.code; //1.默认太和 2.欢睡 3.眠花糖 4.东华 5.海尔沃棣
--- a/lib/controller/device/device_type_controller.dart
+++ b/lib/controller/device/device_type_controller.dart
@@ -106,10 +106,11 @@ class DeviceTypeController extends GetControllerEx<DeviceTypeModel> {
  }

  Future<bool> checkReportStatus(String mac) async {
+    bool flag = false;
+    try {
      String serviceAddress = ServiceConstant.qc_service_address;
      String serviceApi = ServiceConstant.checkQuickStatus;
      String queryUrl = "$serviceAddress$serviceApi?mac=${mac}";
-    bool flag = false;
      await requestWithLog(
        logTitle: "查询快检状态",
        method: MyHttpMethod.get,
@@ -127,6 +128,9 @@ class DeviceTypeController extends GetControllerEx<DeviceTypeModel> {
          experience_status.value = -1;
        },
      );
+    } catch (e) {
+      print("查询快检状态出错: $e");
+    }
    return flag;
  }

@@ -299,6 +303,9 @@ class DeviceTypeController extends GetControllerEx<DeviceTypeModel> {
        flag = true;
      },
      onFailure: (res) {
+        NewTopSlideNotification.show(
+            text:res.msg ?? "请求失败".tr,
+            textColor: themeController.currentColor.sc9);
        flag = false;
      },
    );
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -698,7 +698,7 @@ void initEasyDartModule() {
    EasyDartModule.init(
        loggerConfig: LoggerConfig(
            host: "https://zhmht.swes.com.cn:27020/vsbs_log",
-            serviceName: "太和e护test2026-03-30"),
+            serviceName: "太和e护test2026-04-01"),
        webSocketConfig:
            WebSocketConfig(ServiceConstant.webSocketService, (data) {
          // 接收到服务消息
--- a/lib/pages/device/component/SpeedControlledGif.dart
+++ b/lib/pages/device/component/SpeedControlledGif.dart
@@ -0,0 +1,92 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+
+import 'dart:ui' as ui;
+
+import 'package:flutter/services.dart';
+
+class SpeedControlledGif extends StatefulWidget {
+  final String assetPath;
+  final double speedFactor;
+  final BoxFit? fit;
+
+  /// [speedFactor] 播放速度倍数，默认1.0，
+  /// 大于1表示加速播放，小于1表示减速播放
+  const SpeedControlledGif(
+    this.assetPath, {
+    Key? key,
+    this.speedFactor = 1.0,
+    this.fit,
+  }) : super(key: key);
+
+  @override
+  _SpeedControlledGifState createState() => _SpeedControlledGifState();
+}
+
+class _SpeedControlledGifState extends State<SpeedControlledGif> {
+  ui.Codec? _codec;
+  ui.FrameInfo? _currentFrame;
+  Timer? _timer;
+  bool _isDisposed = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadGif();
+  }
+
+  Future<void> _loadGif() async {
+    final data = await rootBundle.load(widget.assetPath);
+    _codec = await ui.instantiateImageCodec(data.buffer.asUint8List());
+
+    if (_isDisposed) return;
+
+    _showNextFrame();
+  }
+
+  Future<void> _showNextFrame() async {
+    if (_isDisposed || _codec == null) return;
+
+    _currentFrame = await _codec!.getNextFrame();
+
+    if (_isDisposed) return;
+
+    if (mounted) {
+      setState(() {});
+    }
+
+    // 取当前帧持续时间，单位毫秒
+    final baseDuration = _currentFrame?.duration.inMilliseconds ?? 100;
+
+    // 限制最小帧间隔，防止刷新过快
+    const minFrameDuration = 50;
+
+    // 计算实际播放帧间隔，speedFactor越大速度越快
+    final adjustedDuration = (baseDuration / widget.speedFactor)
+        .round()
+        .clamp(minFrameDuration, 10000);
+
+    _timer = Timer(Duration(milliseconds: adjustedDuration), _showNextFrame);
+  }
+
+  @override
+  void dispose() {
+    _isDisposed = true;
+    _timer?.cancel();
+    _codec?.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (_currentFrame == null) {
+      // 加载中或无帧时显示空容器或占位
+      return Container();
+    }
+    return RawImage(
+      image: _currentFrame!.image,
+      fit: widget.fit,
+    );
+  }
+}
--- a/lib/pages/device/component/health_experience_tool.dart
+++ b/lib/pages/device/component/health_experience_tool.dart
@@ -0,0 +1,63 @@
+import 'package:ef/ef.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/src/widgets/framework.dart';
+import 'package:vbvs_app/controller/device/device_type_controller.dart';
+import 'package:vbvs_app/pages/device_bind/componnet/bind_dialog.dart';
+
+DeviceTypeController deviceTypeController = Get.find();
+String getGenderText(dynamic gender) {
+  var genderMap = {
+    '1': '男'.tr,
+    '2': '女'.tr,
+  };
+
+  String genderStr = gender.toString().trim();
+  return genderMap[genderStr] ?? '-'.tr;
+}
+
+// 显示解绑确认对话框
+void showCancelConfirmDialog(BuildContext context, personInfo) {
+  showConfirmDialog(
+    context,
+    Container(),
+    "是否确认结束？".tr,
+    onConfirm: () async {
+      bool opRes = await deviceTypeController.qcCheckControl(personInfo, 2);
+      if (!opRes) {
+        return;
+      }
+      deviceTypeController.experience_status.value = 404;
+      deviceTypeController.updateAll();
+    },
+    onCancel: () {},
+  );
+}
+
+
+ String calculateAge(String birthdayStr) {
+    try {
+      // 解析生日字符串 (格式: yyyy/MM/dd)
+      List<String> parts = birthdayStr.trim().split('/');
+      if (parts.length != 3) return '-'.tr;
+
+      int year = int.parse(parts[0]);
+      int month = int.parse(parts[1]);
+      int day = int.parse(parts[2]);
+
+      DateTime birthDate = DateTime(year, month, day);
+      DateTime today = DateTime.now();
+
+      // 计算年龄
+      int age = today.year - birthDate.year;
+
+      // 如果今年还没过生日，年龄减1
+      if (today.month < birthDate.month ||
+          (today.month == birthDate.month && today.day < birthDate.day)) {
+        age--;
+      }
+
+      return age.toString();
+    } catch (e) {
+      return '-'.tr;
+    }
+  }
--- a/lib/pages/device/health_experience.dart
+++ b/lib/pages/device/health_experience.dart
--- a/lib/pages/mh_page/MattressControl.dart
+++ b/lib/pages/mh_page/MattressControl.dart
@@ -1,4 +1,5 @@
 import 'dart:ui';
+import 'dart:io'; // 添加这个导入

 import 'package:ef/ef.dart';
 import 'package:flutter/material.dart';
@@ -22,6 +23,18 @@ class _MattressControlPageState extends State<MattressControlPage> {

  @override
  Widget build(BuildContext context) {
+    // 如果是 iOS 平台，使用 PopScope 禁用左滑返回
+    if (Platform.isIOS) {
+      return PopScope(
+        canPop: false, // 禁用返回手势
+        child: buildContent(),
+      );
+    }
+    return buildContent();
+  }
+
+  // 将原有的 build 内容提取到这个方法中
+  Widget buildContent() {
    return LayoutBuilder(
      builder: (context, bodySize) => GestureDetector(
        child: Obx(() {
--- a/lib/pages/sleep_report/chart/QcTimeSeriesChart.dart
+++ b/lib/pages/sleep_report/chart/QcTimeSeriesChart.dart
@@ -14,10 +14,12 @@
 // class QcTimeSeriesChart extends StatelessWidget {
 //   final List<QcTimeSeriesPoint> dataPoints;
 //   final double yMin;
-//   final double yMax;
+//   final double yMax; // 注意：这个值在使用时会自动加 padding
 //   final int xSegmentCount;
 //   final double? baseValue; // 基准值，可选
 //   final String? baseLabel; // 基准值标签，可选
+//   final double yAxisPadding; // Y轴顶部留白，默认为20
+//   final double yAxisMargin; // Y轴上下边距，默认为2

 //   const QcTimeSeriesChart({
 //     Key? key,
@@ -27,16 +29,21 @@
 //     this.xSegmentCount = 11,
 //     this.baseValue,
 //     this.baseLabel,
+//     this.yAxisPadding = 20.0, // 默认为20
+//     this.yAxisMargin = 2.0, // Y轴上下边距，默认为2
 //   }) : super(key: key);

+//   // 添加一个 getter 来获取实际使用的 yMax（自动加 padding）
+//   double get _actualYMax => yMax + yAxisPadding;
+
 //   int get _dataPointCount => dataPoints.length;

 //   List<double> _generateYAxisTicks() {
-//     if (yMin >= yMax) {
+//     if (yMin >= _actualYMax) {
 //       return [0, 20, 40, 60, 80, 100];
 //     }

-//     double step = (yMax - yMin) / 5;
+//     double step = (_actualYMax - yMin) / 5;
 //     List<double> ticks = [];

 //     for (int i = 0; i <= 5; i++) {
@@ -114,7 +121,7 @@
 //   Widget build(BuildContext context) {
 //     // final yTicks = _generateYAxisTicks();
 //     final double xMax = _dataPointCount.toDouble();
-//     final double yRange = yMax - yMin;
+//     final double yRange = _actualYMax - yMin;
 //     final double yInterval = yRange > 0 ? yRange / 5 : 20.0;

 //     final tickIndices = _getTickIndices();
@@ -229,8 +236,8 @@
 //                 LineChartData(
 //                   minX: 1,
 //                   maxX: xMax + 0.5,
-//                   minY: yMin - 2,
-//                   maxY: yMax + 2,
+//                   minY: yMin - yAxisMargin,
+//                   maxY: _actualYMax + yAxisMargin,
 //                   gridData: FlGridData(show: false),
 //                   extraLinesData: ExtraLinesData(
 //                     horizontalLines: horizontalLines,
@@ -333,7 +340,7 @@
 //               // 使用 Positioned 来绘制最大值和最小值的标签
 //               if (minMaxData['minIndex'] != -1 || minMaxData['maxIndex'] != -1)
 //                 _buildMinMaxLabels(
-//                     context, constraints, minMaxData, xMax, yMin, yMax),
+//                     context, constraints, minMaxData, xMax, yMin, _actualYMax),
 //             ],
 //           );
 //         },
@@ -360,11 +367,11 @@
 //     double chartHeight = constraints.maxHeight - topPadding - bottomPadding;

 //     // X轴范围：1 到 xMax
-//     // Y轴范围：yMin - 2 到 yMax + 2
+//     // Y轴范围：yMin - yAxisMargin 到 yMax + yAxisMargin
 //     double xMin = 1;
 //     double xMaxValue = xMax;
-//     double yMinValue = yMin - 2;
-//     double yMaxValue = yMax + 2;
+//     double yMinValue = yMin - yAxisMargin;
+//     double yMaxValue = yMax + yAxisMargin;

 //     double xRange = xMaxValue - xMin;
 //     double yRange = yMaxValue - yMinValue;
@@ -400,14 +407,12 @@
 //               children: [
 //                 // SVG图片作为背景
 //                 SvgPicture.asset(
-//                   'assets/img/icon/location.svg', // 替换为你的SVG图片路径
-//                   // width: 28.rpx,
-//                   // height: 40.rpx,
+//                   'assets/img/icon/location.svg',
 //                   fit: BoxFit.contain,
 //                   color: stringToColor("#d69dd2"),
 //                 ),
 //                 Padding(
-//                   padding: EdgeInsets.only(bottom: 12.rpx), // 调整这个值来控制向上移动的距离
+//                   padding: EdgeInsets.only(bottom: 12.rpx),
 //                   child: Text(
 //                     '${minMaxData['minValue'].toStringAsFixed(0)}',
 //                     style: TextStyle(
@@ -453,23 +458,12 @@
 //               children: [
 //                 // SVG图片作为背景
 //                 SvgPicture.asset(
-//                   'assets/img/icon/location.svg', // 替换为你的SVG图片路径
-//                   // width: 28.rpx,
-//                   // height: 40.rpx,
+//                   'assets/img/icon/location.svg',
 //                   fit: BoxFit.contain,
 //                   color: stringToColor("#FF9F66"),
 //                 ),
-//                 // 文字覆盖在SVG上
-//                 // Text(
-//                 //   '${minMaxData['maxValue'].toStringAsFixed(0)}',
-//                 //   style: TextStyle(
-//                 //     color: Colors.white,
-//                 //     fontSize: AppConstants().smaller_text_fontSize,
-//                 //     // fontWeight: FontWeight.bold,
-//                 //   ),
-//                 // ),
 //                 Padding(
-//                   padding: EdgeInsets.only(bottom: 12.rpx), // 调整这个值来控制向上移动的距离
+//                   padding: EdgeInsets.only(bottom: 12.rpx),
 //                   child: Text(
 //                     '${minMaxData['maxValue'].toStringAsFixed(0)}',
 //                     style: TextStyle(
@@ -512,6 +506,7 @@ class QcTimeSeriesChart extends StatelessWidget {
  final double? baseValue; // 基准值，可选
  final String? baseLabel; // 基准值标签，可选
  final double yAxisPadding; // Y轴顶部留白，默认为20
+  final double yAxisMargin; // Y轴上下边距，默认为2

  const QcTimeSeriesChart({
    Key? key,
@@ -522,6 +517,7 @@ class QcTimeSeriesChart extends StatelessWidget {
    this.baseValue,
    this.baseLabel,
    this.yAxisPadding = 20.0, // 默认为20
+    this.yAxisMargin = 2.0, // Y轴上下边距，默认为2
  }) : super(key: key);

  // 添加一个 getter 来获取实际使用的 yMax（自动加 padding）
@@ -618,6 +614,10 @@ class QcTimeSeriesChart extends StatelessWidget {
    final tickIndices = _getTickIndices();
    final minMaxData = _findMinMax();

+    // 计算实际显示的Y轴范围
+    final double actualMinY = yMin - yAxisMargin;
+    final double actualMaxY = _actualYMax + yAxisMargin;
+
    // 将数据点分割成多个连续段
    List<List<FlSpot>> lineSegments = [];
    List<FlSpot> currentSegment = [];
@@ -727,8 +727,8 @@ class QcTimeSeriesChart extends StatelessWidget {
                LineChartData(
                  minX: 1,
                  maxX: xMax + 0.5,
-                  minY: yMin - 2,
-                  maxY: _actualYMax + 2,
+                  minY: actualMinY,
+                  maxY: actualMaxY,
                  gridData: FlGridData(show: false),
                  extraLinesData: ExtraLinesData(
                    horizontalLines: horizontalLines,
@@ -776,6 +776,19 @@ class QcTimeSeriesChart extends StatelessWidget {
                        reservedSize: 60.rpx,
                        interval: yInterval,
                        getTitlesWidget: (value, meta) {
+                          // 不显示最小值和最大值
+                          // 判断是否是实际显示范围的最小值或最大值
+                          if (value == actualMinY || value == actualMaxY) {
+                            return const SizedBox.shrink();
+                          }
+
+                          // 检查值是否为整数（避免显示小数）
+                          double roundedValue = value.roundToDouble();
+                          if ((value - roundedValue).abs() > 0.01) {
+                            // 如果不是整数，不显示
+                            return const SizedBox.shrink();
+                          }
+
                          return Padding(
                            padding: const EdgeInsets.only(right: 8.0),
                            child: Text(
@@ -858,11 +871,11 @@ class QcTimeSeriesChart extends StatelessWidget {
    double chartHeight = constraints.maxHeight - topPadding - bottomPadding;

    // X轴范围：1 到 xMax
-    // Y轴范围：yMin - 2 到 yMax + 2
+    // Y轴范围：yMin - yAxisMargin 到 yMax + yAxisMargin
    double xMin = 1;
    double xMaxValue = xMax;
-    double yMinValue = yMin - 2;
-    double yMaxValue = yMax + 2;
+    double yMinValue = yMin - yAxisMargin;
+    double yMaxValue = yMax + yAxisMargin;

    double xRange = xMaxValue - xMin;
    double yRange = yMaxValue - yMinValue;
--- a/lib/pages/sleep_report/qc_report/QcBreatheStandardWidget.dart
+++ b/lib/pages/sleep_report/qc_report/QcBreatheStandardWidget.dart
@@ -110,19 +110,19 @@ class _QcBreatheStandardWidgetState extends State<QcBreatheStandardWidget> {
      };

      Map<String, dynamic> baseBreath = {
-        'name': '基础呼吸',
+        'name': '基准呼吸'.tr,
        'value': brData['base'].toInt() ?? 0,
        'unit': '次/分',
      };

      Map<String, dynamic> minBreath = {
-        'name': '最低呼吸',
+        'name': '最低呼吸'.tr,
        'value': brData['min'].toInt() ?? 0,
        'unit': '次/分',
      };

      Map<String, dynamic> maxBreath = {
-        'name': '最高呼吸',
+        'name': '最高呼吸'.tr,
        'value': brData['max'].toInt() ?? 0,
        'unit': '次/分',
      };
@@ -260,6 +260,7 @@ class _QcBreatheStandardWidgetState extends State<QcBreatheStandardWidget> {
                        // baseValue: 16, // 传入基准值
                        baseLabel: '基准', // 可选的自定义标签
                        yAxisPadding: 0,
+                        
                      ),
                    ),
                  ].divide(SizedBox(
--- a/lib/pages/sleep_report/qc_report/QcHeartRateStandardWidget.dart
+++ b/lib/pages/sleep_report/qc_report/QcHeartRateStandardWidget.dart
@@ -267,7 +267,8 @@ class _QcHeartRateStandardWidgetState extends State<QcHeartRateStandardWidget> {
                          baseValue: hrData['base'].toDouble(), // 传入基准值
                          // baseValue: 65, // 传入基准值
                          baseLabel: '基准', // 可选的自定义标签
-                          yAxisPadding: 20,
+                          yAxisPadding: 0,
+                          yAxisMargin: 5,
                        ),
                      ),
                    ),
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -92,6 +92,7 @@ dependencies:
  network_info_plus: ^5.0.1
  # wifi_info_flutter: ^2.0.2
  shelf_static: ^1.1.3
+  vibration: ^3.1.8


 dev_dependencies: