已扦样单信息修改。发布27版。

lib/model/rsp/sample_task_rsp.dart

@@ -29,6 +29,7 @@ class SampleTaskItem {
   String? ypbh; // 样品编号
   String? jtpzmc; // 具体品种名称
   num? deliveryStatus; // 任务单任务状态：0是待领取,1是待扦样,2已扦样
+  bool get isReapSample => deliveryStatus == 2;
   num? ypdj; // 样品等级--字典获取
   String? jyzb; // 检验指标：质量/品质/食安
   String? qydq; // 扦样地区
@@ -244,7 +245,7 @@ class SampleTaskItem {
     return switch (deliveryStatus) { 0 => '待领取', 1 => '待扦样', 2 => '已扦样', _ => '' };
   }
 
-  Map<String, dynamic> getReqJson({int isConformity = 0}) {
+  Map<String, dynamic> getReqJson({int isConformity = 0, bool isChange = false}) {
     Map<String, dynamic> map = {};
     map['state'] = state;
     map['id'] = id;
@@ -287,15 +288,34 @@ class SampleTaskItem {
     map['zjdswrlx'] = zjdswrlx;
     map['jnlbdsfzjswr'] = jnlbdsfzjswr;
     map['zjswrlx'] = zjswrlx;
-    List<UseMedicineItem>? medicineList = codeUseMedicineList?.where((e) => e.id == null).toList();
-    if (medicineList != null && medicineList.isNotEmpty) {
-      map['codeUseMedicineList'] = medicineList.map((e) => e.toReqJson()).toList();
-    }
     map['dgryName'] = dgryName;
     map['tqqk'] = tqqk;
-    List<NonghuItem>? nonghuList = codeSamplingNonghuList?.where((e) => e.id == null).toList();
-    if (nonghuList != null && nonghuList.isNotEmpty) {
-      map['codeSamplingNonghuList'] = nonghuList.map((e) => e.toReqJson()).toList();
+    if(isChange){
+      List<UseMedicineItem>? medicineList = codeUseMedicineList;
+      if (medicineList != null && medicineList.isNotEmpty) {
+        for(UseMedicineItem item in medicineList){
+          item.id = null;
+        }
+        map['codeUseMedicineList'] = medicineList.map((e) => e.toReqJson()).toList();
+      }
+
+      List<NonghuItem>? nonghuList = codeSamplingNonghuList;
+      if (nonghuList != null && nonghuList.isNotEmpty) {
+        for(NonghuItem item in nonghuList){
+          item.id = null;
+        }
+        map['codeSamplingNonghuList'] = nonghuList.map((e) => e.toReqJson()).toList();
+      }
+    }else {
+      List<UseMedicineItem>? medicineList = codeUseMedicineList?.where((e) => e.id == null).toList();
+      if (medicineList != null && medicineList.isNotEmpty) {
+        map['codeUseMedicineList'] = medicineList.map((e) => e.toReqJson()).toList();
+      }
+
+      List<NonghuItem>? nonghuList = codeSamplingNonghuList?.where((e) => e.id == null).toList();
+      if (nonghuList != null && nonghuList.isNotEmpty) {
+        map['codeSamplingNonghuList'] = nonghuList.map((e) => e.toReqJson()).toList();
+      }
     }
     map['filePictureList'] = filePictureList;
     return map;
@@ -305,9 +325,9 @@ class SampleTaskItem {
 @JsonSerializable(converters: [NumConverter(), StringConverter()])
 class UrlItem {
   final String? name;
-  final String? url;
+  String? url;
 
-  const UrlItem({this.name,this.url});
+  UrlItem({this.name,this.url});
 
   factory UrlItem.fromJson(Map<String, dynamic> json) => _$UrlItemFromJson(json);
 

lib/network/api.dart

@@ -56,6 +56,11 @@ abstract class Api {
   @GET('/admin-api/zj/base-file/getAppDownLoadUrl')
   Future<ApiRsp<String?>> getAppDownloadUrl();
 
+  /// 获取app下载地址 和 更新内容
+  @GET('/admin-api/zj/base-file/getAppDownLoadUrlAndName')
+  Future<ApiRsp<UrlItem?>> getAppDownLoadUrlAndName();
+
+
   /// 扦样任务单更新-收购
   @PUT('/admin-api/zj/code-sampling-task-details-sgjc/update')
   Future<ApiRsp<DeviationLoactionRsp?>> updateSampleTaskSgjc(@Body() Map<String, dynamic> map);
@@ -122,4 +127,8 @@ abstract class Api {
     @Query('offsetRange') double? offsetRange,
   });
 
+  /// 已扦样信息修改
+  @PUT('/admin-api/zj/code-sampling-task-details-sgjc/appSgjcUpdate')
+  Future<ApiRsp<bool?>> changeSampleTaskKcjc(@Body() Map<String, dynamic> map);
+
 }

lib/network/api.g.dart

@@ -248,6 +248,37 @@ class _Api implements Api {
   }
 
   @override
+  Future<ApiRsp<UrlItem?>> getAppDownLoadUrlAndName() async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _headers = <String, dynamic>{};
+    final Map<String, dynamic>? _data = null;
+    final _result = await _dio
+        .fetch<Map<String, dynamic>>(_setStreamType<ApiRsp<UrlItem>>(Options(
+      method: 'GET',
+      headers: _headers,
+      extra: _extra,
+    )
+            .compose(
+              _dio.options,
+              '/admin-api/zj/base-file/getAppDownLoadUrlAndName',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
+    final value = ApiRsp<UrlItem?>.fromJson(
+      _result.data!,
+      (json) =>
+          json == null ? null : UrlItem.fromJson(json as Map<String, dynamic>),
+    );
+    return value;
+  }
+
+  @override
   Future<ApiRsp<DeviationLoactionRsp?>> updateSampleTaskSgjc(
       Map<String, dynamic> map) async {
     const _extra = <String, dynamic>{};
@@ -730,6 +761,37 @@ class _Api implements Api {
     return value;
   }
 
+  @override
+  Future<ApiRsp<bool?>> changeSampleTaskKcjc(Map<String, dynamic> map) async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _headers = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(map);
+    final _result = await _dio
+        .fetch<Map<String, dynamic>>(_setStreamType<ApiRsp<bool>>(Options(
+      method: 'PUT',
+      headers: _headers,
+      extra: _extra,
+    )
+            .compose(
+              _dio.options,
+              '/admin-api/zj/code-sampling-task-details-sgjc/appSgjcUpdate',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
+    final value = ApiRsp<bool?>.fromJson(
+      _result.data!,
+      (json) => json as bool?,
+    );
+    return value;
+  }
+
   RequestOptions _setStreamType<T>(RequestOptions requestOptions) {
     if (T != dynamic &&
         !(requestOptions.responseType == ResponseType.bytes ||

lib/network/my_api.dart

@@ -7,14 +7,14 @@ class MyApi {
   MyApi._();
 
   /// 华为 生产url
-  //static String productUrl = 'http://121.36.17.6:39099';
+  static String productUrl = 'http://121.36.17.6:9399';
 
   /// 紫光 生产正式 url
-  static String productUrl = 'http://101.36.160.117:39099';
+ // static String productUrl = 'http://101.36.160.117:39099';
 
   /// 测试url
-   static String testUrl = 'http://101.36.160.117:31070';
- // static String testUrl = 'http://223.71.72.182:9399';
+  // static String testUrl = 'http://101.36.160.117:31070';
+  static String testUrl = 'http://121.36.17.6:9398';
 
 
   static late String globalUrl;

lib/page/login/login_page.dart

@@ -121,8 +121,8 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
     LocationUtils.updatePrivacyAgree(true);
     LocationUtils.setApiKey(
         AppConfig.env == AppEnvironment.product
-            ? '2c783509376e267b24d63b21681686fa'
-            : '7d0c033909f84adc14a0e60a835f044f',
+            ? '8e72f096764c13f2b35dbd88c22d3346'
+            : 'a86e6903c698f11743a9120989f4b67d',
         '');
 
     /// 获取手机设备信息

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -4,6 +4,7 @@ import 'dart:typed_data';
 import 'package:amap_flutter_location/amap_location_option.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:card_swiper/card_swiper.dart';
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:image_gallery_saver/image_gallery_saver.dart';
 import 'package:lszlgl/main.dart';
@@ -167,10 +168,12 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
           for (var name in nameList) {
             if (person.name == name) {
               person.isChose = true;
+              nameList.remove(name);
               break;
             }
           }
         }
+        otherStr = nameList.join(','); // 输入人员名字赋值
       }
     } catch (e) {
       logger.e(e);
@@ -343,14 +346,14 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     }
     MyNavigator.showDialog(
       builder: (_) => Container(
-        padding: const EdgeInsets.all(16),
-        margin: const EdgeInsets.all(24),
+        padding: const EdgeInsets.all(8),
+        margin: const EdgeInsets.all(8),
         decoration: const BoxDecoration(
           color: Colors.white,
-          borderRadius: BorderRadius.all(Radius.circular(24)),
+          borderRadius: BorderRadius.all(Radius.circular(12)),
         ),
         child: AspectRatio(
-          aspectRatio: 1 / 1,
+          aspectRatio: 5 / 4,
           child: Swiper(
             itemCount: data!.filePictureList!.length,
             itemBuilder: (_, index) => CachedNetworkImage(
@@ -359,12 +362,29 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
               placeholder: (_, __) => const Center(child: CircularProgressIndicator()),
               errorWidget: (context, url, error) => const Center(child: Icon(Icons.error)),
             ),
-            viewportFraction: 0.8,
             scale: 0.9,
             fade: 0.0,
             loop: false,
-            pagination: const FractionPaginationBuilder(color: Colors.grey),
-            // control: const SwiperControl(padding: EdgeInsets.zero, size: 25),
+            plugins: const [
+              SwiperPagination(
+                  margin: EdgeInsets.all(0),
+                  alignment: Alignment.topRight,
+                  builder: FractionPaginationBuilder(
+                    activeFontSize: 24,
+                    fontSize: 16,
+                    activeColor: Color(0xFF25A6EE),
+                    color: Colors.black,
+                  )),
+              SwiperPagination(
+                alignment: Alignment.bottomCenter,
+                builder: DotSwiperPaginationBuilder(
+                  activeColor: Color(0xFF25A6EE),
+                  color: Color(0xFFBDBDBD),
+                  activeSize: 12,
+                  size: 8
+                )
+              )
+            ],
           ),
         ),
       ),
@@ -382,11 +402,11 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     UrlItem picInfo = data!.ewmfilePictureList!.first;
     MyNavigator.showDialog(
       builder: (_) => Container(
-        padding: const EdgeInsets.all(16),
+        padding: const EdgeInsets.fromLTRB(16,16,16,24),
         margin: const EdgeInsets.all(24),
         decoration: const BoxDecoration(
           color: Colors.white,
-          borderRadius: BorderRadius.all(Radius.circular(24)),
+          borderRadius: BorderRadius.all(Radius.circular(12)),
         ),
         child: Column(
           mainAxisSize: MainAxisSize.min,
@@ -441,9 +461,15 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
             ),
             Row(
               children: [
-                Expanded(child: MyButton('打印', onTap: () => printPic(picInfo.name))),
+                Expanded(child: MyButton('打印',
+                    radius: 8,
+                    gradient: const LinearGradient(colors: [Color(0xFF3BD2E5), Color(0xFF247AF8)]),
+                    onTap: () => printPic(picInfo.name))),
                 const SizedBox(width: 16),
-                Expanded(child: MyButton('保存图片', onTap: () => savePic(picInfo.name))),
+                Expanded(child: MyButton('保存图片',
+                    radius: 8,
+                    gradient: const LinearGradient(colors: [Color(0xFF3BD2E5), Color(0xFF247AF8)]),
+                    onTap: () => savePic(picInfo.name))),
               ],
             ),
           ],
@@ -460,7 +486,12 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   }
 
   void savePic(String? name) async {
-    bool res = await PermissionHandler.handleWith(Permission.storage);
+    final androidInfo = await DeviceInfoPlugin().androidInfo;
+    int sdkVersion = androidInfo.version.sdkInt;
+    bool res = true;
+    if (sdkVersion <= 32) {
+      res = await PermissionHandler.handleWith(Permission.storage);
+    }
     if (!res) {
       return ;
     }
@@ -558,7 +589,9 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     otherpeople.value = data?.dgryName;
     // 编辑数据
     if (!isDetail) {
-      initLocation();
+      if(data?.deliveryStatus != 2){ // 已扦样，省市县不可修改
+        initLocation();
+      }
       getPersonData();
     }
   }
@@ -584,98 +617,130 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   Widget buildList() {
     return Column(
       children: [
-        CardItemWidget('样品单号', rightText: data?.qyrwdh, bottomLine: true),
-        CardItemWidget('扦样人员', rightText: data?.name, bottomLine: true),
-
-        otherpeople.builder((v) => CardItemWidget(
-              '陪同人员',
-              rightText: v,
-              bottomLine: true,
-              onTap: isDetail ? null : showPopView,
-              trailing: isDetail ? null : const Icon(Icons.keyboard_arrow_down, size: 24, color: Color(0xFF01B2C8),),
-            )),
-        //
-        // name.builder(
-        //   (v) => CardWidgets.buildMenuDialog(
-        //     isDetail,
-        //     '扦样/陪同人员',
-        //     v,
-        //     personList,
-        //     personSelCallback,
-        //     multiple: true,
-        //     selectCountMax: 3,
-        //   ),
-        // ),
-        sheng.builder((v) => CardItemWidget('省份', rightText: v?.name, bottomLine: true)),
-        if(!isXJ)
-        shi.builder((v) => CardItemWidget('市/州', rightText: v?.name, bottomLine: true)),
-
-        if(isXJ)
-          CardWidgets.buildMenu(
-            isDetail,
-            '市/州',
-            xjCityList,
-            xjcitysel,
-                (_, sel) => data?.shiXzqh = sel.value,
+        Container(
+          clipBehavior: Clip.hardEdge,
+          decoration: const BoxDecoration(
+            borderRadius: BorderRadius.all(Radius.circular(8)),
           ),
-
-        qu.builder((v) => CardItemWidget('区县', rightText: v?.name, bottomLine: true)),
-        // xian.builder((v) => CardItemWidget('乡镇', rightText: v?.name, bottomLine: true)),
-        // cun.builder((v) => CardItemWidget('村', rightText: v?.name, bottomLine: true)),
-        CardWidgets.buildEdit(
-          isDetail,
-          ctrl: xian,
-          '乡镇',
-          data?.xiangXzqhName?.toString(),
-          onChanged: (value) => data?.xiangXzqhName = value.isEmpty ? null : value,
-        ),
-        CardWidgets.buildEdit(
-          isDetail,
-          ctrl: cun,
-          '村',
-          data?.cunXzqhName?.toString(),
-          onChanged: (value) => data?.cunXzqhName = value.isEmpty ? null : value,
-        ),
-        qyddjwd.builder(
-          (v) => CardItemWidget(
-            '扦样地点经纬度',
-            rightText: v,
-            bottomLine: true,
-            trailing: isDetail || v != null ? null : const MyButton('获取经纬度', alignment: null),
-            onTap: isDetail ? null : getLocation,
+          child: Column(
+            children: [
+              CardItemWidget('样品单号', rightText: data?.qyrwdh),
+              CardItemWidget('扦样人员', rightText: data?.name, bottomLine: true),
+              otherpeople.builder((v) => CardItemWidget(
+                '陪同人员',
+                rightText: v,
+                onTap: isDetail ? null : showPopView,
+                trailing: isDetail ? null : const Icon(Icons.keyboard_arrow_down, size: 24, color: Color(0xFF01B2C8),),
+              )),
+            ],
           ),
         ),
-        CardWidgets.buildEdit(
-          isDetail,
-          '种植面积（亩地）',
-          data?.zzmj?.toString(),
-          inputType: const TextInputType.numberWithOptions(decimal: true),
-          formatters: [XNumberTextInputFormatter()],
-          onChanged: (value) => data?.zzmj = value.isEmpty ? null : num.parse(value),
-        ),
-        CardWidgets.buildMenu(
-          isDetail,
-          '土壤地理类型',
-          trxxList,
-          trxx,
-          (_, sel) => data?.trdllx = sel.value,
+
+        const SizedBox(height: 12),
+
+        Container(
+          clipBehavior: Clip.hardEdge,
+          decoration: const BoxDecoration(
+            borderRadius: BorderRadius.all(Radius.circular(8)),
+          ),
+          child: Column(
+            children: [
+              sheng.builder((v) => CardItemWidget('省份', rightText: v?.name, bottomLine: true)),
+              if(!isXJ)
+                shi.builder((v) => CardItemWidget('市/州', rightText: v?.name, bottomLine: true)),
+
+              if(isXJ)
+                CardWidgets.buildMenu(
+                  isDetail || data?.deliveryStatus == 2,
+                  '市/州',
+                  xjCityList,
+                  xjcitysel,
+                      (_, sel) => data?.shiXzqh = sel.value,
+                ),
+
+              qu.builder((v) => CardItemWidget('区县', rightText: v?.name, bottomLine: true)),
+              CardWidgets.buildEdit(
+                isDetail,
+                ctrl: xian,
+                '乡镇',
+                data?.xiangXzqhName?.toString(),
+                onChanged: (value) => data?.xiangXzqhName = value.isEmpty ? null : value,
+              ),
+              CardWidgets.buildEdit(
+                isDetail,
+                ctrl: cun,
+                '村',
+                data?.cunXzqhName?.toString(),
+                onChanged: (value) => data?.cunXzqhName = value.isEmpty ? null : value,
+              ),
+              qyddjwd.builder(
+                    (v) => CardItemWidget(
+                  '扦样地点经纬度',
+                  rightText: v,
+                  bottomLine: true,
+                  trailing: isDetail || v != null ? null : const MyButton('获取经纬度', alignment: null),
+                  onTap: isDetail || data?.deliveryStatus == 2 ? null : getLocation,
+                ),
+              ),
+              CardWidgets.buildEdit(
+                isDetail,
+                '种植面积（亩地）',
+                data?.zzmj?.toString(),
+                inputType: const TextInputType.numberWithOptions(decimal: true),
+                formatters: [XNumberTextInputFormatter()],
+                onChanged: (value) => data?.zzmj = value.isEmpty ? null : num.parse(value),
+              ),
+              CardWidgets.buildMenu(
+                isDetail,
+                '土壤地理类型',
+                trxxList,
+                trxx,
+                    (_, sel) => data?.trdllx = sel.value,
+              ),
+            ],
+          ),
         ),
-        isDetail
-            ? CardItemWidget(
-                '电子签名',
-                rightText: '点击查看',
-                bottomLine: true,
-                onTap: showSignature,
-              )
-            : const SizedBox.shrink(),
-        isDetail
-            ? CardItemWidget(
-                '样品二维码',
-                rightText: '点击查看',
-                bottomLine: true,
-                onTap: showQRCode,
+
+        const SizedBox(height: 12),
+
+        Container(
+          clipBehavior: Clip.hardEdge,
+          decoration: const BoxDecoration(
+            borderRadius: BorderRadius.all(Radius.circular(8)),
+          ),
+          child: Column(
+            children: [
+              isDetail
+                  ? Stack(
+                alignment: Alignment.centerLeft,
+                    children: [
+                      CardItemWidget(
+                        '电子签名',
+                        rightText: '点击查看',
+                        bottomLine: true,
+                        onTap: showSignature,
+                      ),
+                      Container(width: 4,height: 4,color:const Color(0xFF01B2C8))
+                    ],
+                  )
+                  : const SizedBox.shrink(),
+              isDetail
+                  ? Stack(
+                alignment: Alignment.centerLeft,
+                children: [
+                  CardItemWidget(
+                    '样品二维码',
+                    rightText: '点击查看',
+                    bottomLine: true,
+                    onTap: showQRCode,
+                  ),
+                  Container(width: 4,height: 4,color:const Color(0xFF01B2C8))
+                ],
               )
-            : const SizedBox.shrink(),
+                  : const SizedBox.shrink(),
+            ],
+          ),
+        ),
 
         // CardWidgets.buildEdit(
         //   isDetail,

lib/page/sample_task/reap_sample_detail/reap_sample_medicine_detail_page.dart

@@ -139,9 +139,9 @@ class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMe
   }
 
   Widget buildItem(int index, UseMedicineItem item) {
-    bool detail = item.id != null;
+   // bool detail = item.id != null;
     return GestureDetector(
-      onLongPress: detail ? null : () => onRemove(item),
+      onLongPress: isDetail ? null : () => onRemove(item),
       child: Container(
         clipBehavior: Clip.hardEdge,
         decoration: const BoxDecoration(
@@ -167,14 +167,14 @@ class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMe
                   mainAxisSize: MainAxisSize.min,
                   children: [
                     CardWidgets.buildEdit(
-                      detail,
+                      isDetail,
                       '使用农药品种',
                       item.synypz,
                       backgroundColor: null,
                       onChanged: (value) => item.synypz = value,
                     ),
                     CardWidgets.buildEdit(
-                      detail,
+                      isDetail,
                       '使用农药的数量(毫升/每亩地)',
                       item.synysl?.toString(),
                       backgroundColor: null,
@@ -185,15 +185,15 @@ class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMe
                     CardItemWidget(
                       '施药时间',
                       rightText: item.sysj,
-                      trailing: detail || item.sysj != null
+                      trailing: isDetail || item.sysj != null
                           ? null
                           : const Icon(Icons.keyboard_arrow_down, size: 24, color: Color(0xFF01B2C8),),
                       bottomLine: true,
                       backgroundColor: null,
-                      onTap: detail ? null : () => showDate(item),
+                      onTap: isDetail ? null : () => showDate(item),
                     ),
                     CardWidgets.buildEdit(
-                      detail,
+                      isDetail,
                       '施药方法',
                       item.syff,
                       backgroundColor: null,

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -2,6 +2,8 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:cached_network_image/cached_network_image.dart';
+import 'package:card_swiper/card_swiper.dart';
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
 import 'package:image_gallery_saver/image_gallery_saver.dart';
@@ -31,10 +33,12 @@ import '../../../widget/page_widget.dart';
 class ReapSampleTaskPageArgs {
   final bool detail;
   final num? id;
+  final num? deliveryStatus;
 
   ReapSampleTaskPageArgs({
     this.detail = false,
     this.id,
+    this.deliveryStatus,
   });
 
   @override
@@ -74,6 +78,7 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
   late List<Widget> pageList;
 
   ValueNotifier<int> tabIndex = ValueNotifier(0);
+  int signatureIndex = 0; // 重签名时用
 
   void startEdit() async {
     bool? success = await MyRouter.startReapSampleTask(args: ReapSampleTaskPageArgs(id: args.id));
@@ -93,6 +98,178 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
     pageCtrl.jumpToPage(tabIndex.value - 1);
   }
 
+  // 单个重新签名
+  void reSignature() async{
+    SampleTaskItem req = pageStatus.value.data!;
+    List<Uint8List?>? list = await MyRouter.startSignature(args: SignaturePageArgs(count: 1 ));
+    if (list == null || list.isEmpty) return;
+    MyNavigator.showLoading(msg: '提交中...');
+    // 上传图片
+    try {
+      // 字节转文件
+      List<File> fileList = [];
+      for (int i = 0; i < list.length; i++) {
+        fileList.add(await FileUtils.convertUint8ListToFile(list[i]!, 'signatrue_$i.png'));
+      }
+      var rspList = await Future.wait(fileList.map((file) => MyApi.get().upload(file)));
+      logger.d('图片url:${rspList.map((e) => e.data)}');
+      req.filePictureList![signatureIndex].url = rspList.first.data;
+      MyNavigator.dismissLoading();
+      MyNavigator.showToast('签名上传成功');
+      changeSubmit();
+    } catch (e) {
+      logger.e(e);
+      MyNavigator.dismissLoading();
+      MyNavigator.showToast('签名上传失败');
+      return;
+    }
+  }
+
+  // 已扦样修改信息验证
+  void changeSubmit() async{
+    // 空值判断
+    for (int i = 0; i < ctrlList.length; i++) {
+      if (!(ctrlList[i].verifyData?.call() ?? true)) {
+        pageCtrl.jumpToPage(i);
+        return;
+      }
+    }
+
+    // 处理签名  看是否有增加或删除
+    SampleTaskItem req = pageStatus.value.data!;
+    int? sCount = req.dgryName?.split(',').length;
+    if(sCount == null){
+      sCount = 1;
+    }else{
+      sCount = sCount + 1 ;
+    }
+
+    if(sCount == req.filePictureList!.length){ // 没有增加或删除
+      MyNavigator.showDialog(
+        tag: 'sign',
+        builder: (_) => Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Container(
+              padding: const EdgeInsets.all(8),
+              margin: const EdgeInsets.all(8),
+              decoration: const BoxDecoration(
+                color: Colors.white,
+                borderRadius: BorderRadius.all(Radius.circular(12)),
+              ),
+              child: Stack(
+                alignment: Alignment.bottomCenter,
+                children: [
+                  AspectRatio(
+                    aspectRatio: 5 / 4,
+                    child: Swiper(
+                      itemCount: req.filePictureList!.length,
+                      itemBuilder: (_, index) => CachedNetworkImage(
+                        fit: BoxFit.contain,
+                        imageUrl: req.filePictureList![index].url ?? '',
+                        placeholder: (_, __) => const Center(child: CircularProgressIndicator()),
+                        errorWidget: (context, url, error) => const Center(child: Icon(Icons.error)),
+                      ),
+                      scale: 0.9,
+                      fade: 0.0,
+                      loop: false,
+                      index: signatureIndex,
+                      onIndexChanged: (index){
+                        signatureIndex = index;
+                      },
+                      plugins: const [
+                        SwiperPagination(
+                            margin: EdgeInsets.all(0),
+                            alignment: Alignment.topRight,
+                            builder: FractionPaginationBuilder(
+                              activeFontSize: 24,
+                              fontSize: 16,
+                              activeColor: Color(0xFF25A6EE),
+                              color: Colors.black,
+                            )),
+                      ],
+                    ),
+                  ),
+
+                  TextButton(
+                    style: ButtonStyle(
+                        backgroundColor: WidgetStateProperty.all(MyColor.c_25A6EE),
+                        shape: WidgetStateProperty.all(
+                          RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
+                        ),
+                        padding: WidgetStateProperty.all(const EdgeInsets.symmetric(horizontal: 26,vertical: 0))
+                    ),
+                    onPressed: () {
+                      MyNavigator.dismiss(tag: 'sign');
+                      reSignature();
+                    },
+                    child: const Text("重 签",style: TextStyle(fontSize: 14,color: Colors.white),),
+                  )
+                ],
+              ),
+            ),
+           const SizedBox(height: 8),
+            MyButton(
+              '提交',
+              fountSize: 18,
+              fontWeight: FontWeight.bold,
+              radius: 8,
+              margin: const EdgeInsets.symmetric(horizontal: 8),
+              gradient: const LinearGradient(colors: [Color(0xFF3BD2E5), Color(0xFF247AF8)]),
+              onTap: (){
+                MyNavigator.dismiss(tag: 'sign');
+                MyNavigator.showLoading(msg: '提交中...');
+                postChangeData();
+              },
+            )
+          ],
+        )
+      );
+    } else {
+      MyNavigator.showToast('扦样人员发生变动');
+      List<Uint8List?>? list = await MyRouter.startSignature(args: SignaturePageArgs(count: sCount ));
+      if (list == null || list.isEmpty) return;
+      MyNavigator.showLoading(msg: '提交中...');
+      // 上传图片
+      try {
+        // 字节转文件
+        List<File> fileList = [];
+        for (int i = 0; i < list.length; i++) {
+          fileList.add(await FileUtils.convertUint8ListToFile(list[i]!, 'signatrue_$i.png'));
+        }
+        var rspList = await Future.wait(fileList.map((file) => MyApi.get().upload(file)));
+        logger.d('图片url:${rspList.map((e) => e.data)}');
+        req.filePictureList = rspList.map((e) => UrlItem(url: e.data)).toList();
+
+        postChangeData();
+      } catch (e) {
+        logger.e(e);
+        MyNavigator.dismissLoading();
+        MyNavigator.showToast('签名上传失败');
+        return;
+      }
+    }
+  }
+
+  // 修改后的数据提交
+  void postChangeData() async{
+    SampleTaskItem req = pageStatus.value.data!;
+    pageStatus.value.data?.state = 2;
+    try {
+      var rsp = await MyApi.get().changeSampleTaskKcjc(req.getReqJson(isChange: true));
+      if (!mounted) return;
+      if (rsp.data ?? false) {
+        MyNavigator.showToast('修改成功');
+        MyNavigator.pop(true);
+      } else {
+        MyNavigator.showToast('修改失败');
+      }
+    } catch (e) {
+      logger.e(e);
+    }
+    MyNavigator.dismissLoading();
+  }
+
   void submit() async {
     // 空值判断
     for (int i = 0; i < ctrlList.length; i++) {
@@ -221,11 +398,11 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
     UrlItem picInfo = pageStatus.value.data!.ewmfilePictureList!.first;
     MyNavigator.showDialog(
       builder: (_) => Container(
-        padding: const EdgeInsets.all(16),
+        padding: const EdgeInsets.fromLTRB(16,16,16,24),
         margin: const EdgeInsets.all(24),
         decoration: const BoxDecoration(
           color: Colors.white,
-          borderRadius: BorderRadius.all(Radius.circular(24)),
+          borderRadius: BorderRadius.all(Radius.circular(12)),
         ),
         child: Column(
           mainAxisSize: MainAxisSize.min,
@@ -243,10 +420,34 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
                       placeholder: (_, __) => const Center(child: CircularProgressIndicator()),
                       errorWidget: (context, url, error) => const Center(child: Icon(Icons.error)),
                     ),
+                    const Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                      children: [
+                        Row(
+                          children: [
+                            Icon(Icons.check_box_outline_blank_outlined,size: 18),
+                            Text('质量',textScaler: TextScaler.noScaling,style: TextStyle(fontSize: 14)),
+                          ],
+                        ),
+                        Row(
+                          children: [
+                            Icon(Icons.check_box_outline_blank_outlined,size: 18),
+                            Text('品质',textScaler: TextScaler.noScaling,style: TextStyle(fontSize: 14)),
+                          ],
+                        ),
+                        Row(
+                          children: [
+                            Icon(Icons.check_box_outline_blank_outlined,size: 18),
+                            Text('食安',textScaler: TextScaler.noScaling,style: TextStyle(fontSize: 14)),
+                          ],
+                        ),
+                      ],
+                    ),
                     Padding(
                       padding: const EdgeInsets.symmetric(vertical: 16),
                       child: Text(
                         picInfo.name ?? '',
+                        textScaler:TextScaler.noScaling,
                         style: const TextStyle(fontSize: 18, color: MyColor.c_333333),
                       ),
                     ),
@@ -256,9 +457,18 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
             ),
             Row(
               children: [
-                Expanded(child: MyButton('打印', onTap: () => printPic(picInfo.name))),
+                Expanded(child: MyButton(
+                    '打印',
+                    onTap: () => printPic(picInfo.name),
+                    radius: 8,
+                    gradient: const LinearGradient(colors: [Color(0xFF3BD2E5), Color(0xFF247AF8)]),
+                )),
                 const SizedBox(width: 16),
-                Expanded(child: MyButton('保存图片', onTap: () => savePic(picInfo.name))),
+                Expanded(child: MyButton('保存图片',
+                    onTap: () => savePic(picInfo.name),
+                    radius: 8,
+                  gradient: const LinearGradient(colors: [Color(0xFF3BD2E5), Color(0xFF247AF8)]),
+                )),
               ],
             ),
           ],
@@ -277,7 +487,12 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
   }
 
   void savePic(String? name) async {
-    bool res = await PermissionHandler.handleWith(Permission.storage);
+    final androidInfo = await DeviceInfoPlugin().androidInfo;
+    int sdkVersion = androidInfo.version.sdkInt;
+    bool res = true;
+    if (sdkVersion <= 32) {
+      res = await PermissionHandler.handleWith(Permission.storage);
+    }
     if (!res) {
       return ;
     }
@@ -366,7 +581,7 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
       dismissOnCapturedTaps: true,
       child: Column(
         children: [
-          myAppBar(title: args.detail ? '扦样完成详情' : '扦样任务单'),
+          myAppBar(title: args.detail ? '扦样完成详情' : args.deliveryStatus==2 ? '扦样单修改':'扦样任务单'),
           pageStatus.builder((v) {
             return switch (v.status) {
               DataStatus.loading => const PageLoadingWidget.loading(),
@@ -490,7 +705,10 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
             children: [
               Expanded(child: MyButton('上一步', onTap: previous, margin: margin)),
               Expanded(child: MyButton('查看二维码', onTap: showQRCode, margin: margin)),
-              Expanded(child: MyButton('提交', onTap: submit, margin: margin)),
+              if(args.deliveryStatus==2)
+                Expanded(child: MyButton('保存', onTap: changeSubmit, margin: margin))
+              else
+                Expanded(child: MyButton('提交', onTap: submit, margin: margin))
             ],
           );
         }

lib/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart

@@ -327,9 +327,9 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
   }
 
   Widget buildNonghu(int index, NonghuItem item) {
-    bool detail = item.id != null;
+   // bool detail = item.id != null;
     return GestureDetector(
-      onLongPress: detail ? null : () => onRemove(index, item),
+      onLongPress: isDetail ? null : () => onRemove(index, item),
       child: Container(
         clipBehavior: Clip.hardEdge,
         decoration: const BoxDecoration(
@@ -341,7 +341,7 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
           mainAxisSize: MainAxisSize.min,
           children: [
             CardWidgets.buildEdit(
-              detail,
+              isDetail,
               '扦样数量（公斤）',
               item.qysl?.toString(),
               inputType: const TextInputType.numberWithOptions(decimal: true),
@@ -350,7 +350,7 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
               backgroundColor: null,
             ),
             CardWidgets.buildEdit(
-              detail,
+              isDetail,
               '扦样代表数量（公斤）',
               item.qydbsl?.toString(),
               inputType: const TextInputType.numberWithOptions(decimal: true),
@@ -359,14 +359,14 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
               backgroundColor: null,
             ),
             CardWidgets.buildEdit(
-              detail,
+              isDetail,
               '被调查农户或合作社',
               item.bdcnhhhzs,
               onChanged: (value) => item.bdcnhhhzs = value,
               backgroundColor: null,
             ),
             CardWidgets.buildEdit(
-              detail,
+              isDetail,
               '联系方式',
               inputType: TextInputType.number,
               item.lxfs,

lib/page/sample_task/sample_task_list_page.dart

@@ -33,18 +33,21 @@ class SampleTaskListPage extends StatefulWidget {
   State<SampleTaskListPage> createState() => _SampleTaskListPageState();
 }
 
-class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> with AutomaticKeepAliveClientMixin {
+class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage>
+    with AutomaticKeepAliveClientMixin {
   late SampleListVM vm;
 
   /// 详情
-  void startTaskDetail(bool detail, SampleTaskItem data) async {
+  void startTaskDetail(bool detail, SampleTaskItem data, {num? deliveryStatus}) async {
     bool? success;
     switch (widget.type) {
       case StepType.reap:
-        success = await MyRouter.startReapSampleTask(args: ReapSampleTaskPageArgs(detail: detail, id: data.id));
+        success = await MyRouter.startReapSampleTask(
+            args: ReapSampleTaskPageArgs(detail: detail, id: data.id,deliveryStatus: deliveryStatus));
         break;
       case StepType.stock:
-        success = await MyRouter.startStockSampleTask(args: StockSampleTaskPageArgs(detail: detail, id: data.id));
+        success = await MyRouter.startStockSampleTask(
+            args: StockSampleTaskPageArgs(detail: detail, id: data.id));
         break;
     }
     if (success ?? false) {
@@ -125,7 +128,8 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
       var list = v.data;
       if (v.status == DataStatus.error) {
         // 加载失败
-        return SliverToBoxAdapter(child: PageLoadingWidget.error(onTap: () => vm.refresh(widget.tabIndex)));
+        return SliverToBoxAdapter(
+            child: PageLoadingWidget.error(onTap: () => vm.refresh(widget.tabIndex)));
       } else if (list == null || list.isEmpty) {
         // 无数据
         return const SliverToBoxAdapter(child: PageLoadingWidget.empty());
@@ -182,7 +186,12 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
   Widget buildTop() {
     return Row(
       children: [
-        Image.asset(imgListTitleIcon,width: 4,height: 20,fit: BoxFit.fill,),
+        Image.asset(
+          imgListTitleIcon,
+          width: 4,
+          height: 20,
+          fit: BoxFit.fill,
+        ),
         const SizedBox(width: 4),
         const Text(
           '扦样任务单号',
@@ -192,19 +201,16 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
     );
   }
 
-
   Widget buildState(String state) {
     String img = imgQYStateOff;
     Color color = const Color(0xFF149723);
-    if(state != '已扦样'){
+    if (state != '已扦样') {
       img = imgQYStateOn;
       color = const Color(0xFFDEA70A);
     }
     return Container(
       padding: const EdgeInsets.fromLTRB(40, 4, 20, 16),
-      decoration: BoxDecoration(
-        image: DecorationImage(image: AssetImage(img), fit: BoxFit.fill)
-      ),
+      decoration: BoxDecoration(image: DecorationImage(image: AssetImage(img), fit: BoxFit.fill)),
       child: Text(
         state,
         style: TextStyle(color: color, fontSize: 15),
@@ -231,7 +237,10 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
         inList.add(ItemMsgModel(tit: '检验指标', content: item.jyzb, img: imgIconJYZB));
       }
       if (item.ypdj != null) {
-        inList.add(ItemMsgModel(tit: '样品层级', content: DictService.getDict(DictType.ypdj, value: item.ypdj)?.label, img: imgIconYPDJ));
+        inList.add(ItemMsgModel(
+            tit: '样品层级',
+            content: DictService.getDict(DictType.ypdj, value: item.ypdj)?.label,
+            img: imgIconYPDJ));
       }
       inList.add(ItemMsgModel(tit: '扦样地区', content: item.qydq, img: imgIconQYDQ));
     } else {
@@ -241,7 +250,10 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
         inList.add(ItemMsgModel(tit: '检验指标', content: item.jyzb, img: imgIconJYZB));
       }
       if (item.ypdj != null) {
-        inList.add(ItemMsgModel(tit: '样品层级', content: DictService.getDict(DictType.ypdj, value: item.ypdj)?.label, img: imgIconYPDJ));
+        inList.add(ItemMsgModel(
+            tit: '样品层级',
+            content: DictService.getDict(DictType.ypdj, value: item.ypdj)?.label,
+            img: imgIconYPDJ));
       }
       inList.add(ItemMsgModel(tit: '扦样地区', content: item.qydq, img: imgIconQYDQ));
       inList.add(ItemMsgModel(tit: '扦样人员', content: item.name, img: imgIconQYRY));
@@ -261,14 +273,18 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
                 children: [
                   Padding(
                     padding: const EdgeInsets.fromLTRB(0, 4, 6, 0),
-                    child: Image.asset(item.img,width: 36),
+                    child: Image.asset(item.img, width: 36),
                   ),
                   Expanded(
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-                        Text(item.tit,style: const TextStyle(color: MyColor.c_666666)),
-                        Text(item.content ?? '', style: const TextStyle(color: MyColor.c_666666,fontWeight: FontWeight.bold),)
+                        Text(item.tit, style: const TextStyle(color: MyColor.c_666666)),
+                        Text(
+                          item.content ?? '',
+                          style:
+                              const TextStyle(color: MyColor.c_666666, fontWeight: FontWeight.bold),
+                        )
                       ],
                     ),
                   )
@@ -282,7 +298,6 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
   }
 
   Widget buildBottom(SampleTaskItem item) {
-    if (item.deliveryStatus == 2) return const SizedBox.shrink();
     Widget button = const SizedBox.shrink();
     if (widget.type == StepType.reap && item.deliveryStatus == 0) {
       button = MyButton(
@@ -293,7 +308,7 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
         alignment: null,
         padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 12),
       );
-    } else {
+    } else if (widget.type == StepType.reap && item.deliveryStatus == 1) {
       button = MyButton(
         '开始扦样',
         onTap: () => startTaskDetail(false, item),
@@ -302,25 +317,40 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
         alignment: null,
         padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 12),
       );
+    } else {
+      button = MyButton(
+        '修改信息',
+        onTap: () => startTaskDetail(false, item,deliveryStatus: item.deliveryStatus),
+        fountSize: 13,
+        radius: 6,
+        alignment: null,
+        padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 12),
+      );
     }
     return Container(
       padding: const EdgeInsets.fromLTRB(8, 14, 12, 14),
       decoration: const BoxDecoration(
-        gradient: LinearGradient(
-            begin: Alignment.topCenter,
-            end: Alignment.bottomCenter,
-            colors: [Color(0xFFE4F5FC), Color(0xFFF5FDFD)])
-      ),
+          gradient: LinearGradient(
+              begin: Alignment.topCenter,
+              end: Alignment.bottomCenter,
+              colors: [Color(0xFFE4F5FC), Color(0xFFF5FDFD)])),
       child: Row(
         children: [
-          Image.asset(imgIconEdit,width: 10,),
+          Image.asset(
+            imgIconEdit,
+            width: 10,
+          ),
           const SizedBox(width: 4),
           Expanded(
-            child: Text(
-              '扦样单据创建于${DateTimeUtils.yyyymmdd(timestamp: item.createTime) ?? ''}',
-              style: const TextStyle(fontSize: 14, color: MyColor.c_666666),
-            ),
-          ),
+              child: item.deliveryStatus == 2
+                  ? Text(
+                      '扦样单据完成于${item.qysj ?? ''}',
+                      style: const TextStyle(fontSize: 14, color: MyColor.c_666666),
+                    )
+                  : Text(
+                      '扦样单据创建于${DateTimeUtils.yyyymmdd(timestamp: item.createTime) ?? ''}',
+                      style: const TextStyle(fontSize: 14, color: MyColor.c_666666),
+                    )),
           const SizedBox(width: 4),
           button,
         ],

lib/page/user_center/setting_page.dart

@@ -2,6 +2,8 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/config/app_config.dart';
+import 'package:lszlgl/config/colors.dart';
+import 'package:lszlgl/network/my_api.dart';
 import 'package:lszlgl/service/upgrade_service.dart';
 import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/card_item.dart';
@@ -52,6 +54,12 @@ class _SettingPageState extends BaseState<SettingPage> {
           minHeight: 40,
           margin: const EdgeInsets.symmetric(horizontal: 12),
         ),
+
+        if(AppConfig.env == AppEnvironment.develop)
+          Padding(
+            padding: const EdgeInsets.only(top: 38.0),
+            child: Text(MyApi.testUrl,style: const TextStyle(color: Color(0xFFA4A4A4),fontSize: 12),),
+          )
       ],
     );
   }

lib/service/print_service.dart

@@ -1,6 +1,5 @@
 
 
-import 'dart:ffi';
 import 'dart:io';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:lszlgl/utils/permission_utils.dart';
@@ -9,7 +8,6 @@ import 'package:permission_handler/permission_handler.dart';
 import '../model/rsp/sample_task_rsp.dart';
 import '../plugin/bluetooth_plugin.dart';
 import '../router/my_navigator.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 import 'dict_service.dart';

lib/service/upgrade_service.dart

@@ -64,7 +64,9 @@ class UpgradeService {
     if (showLoading) MyNavigator.showLoading(msg: '正在获取版本更新');
     try {
       // 获取apk下载地址
-      var path = (await MyApi.get().getAppDownloadUrl()).data;
+      var rsp = await MyApi.get().getAppDownLoadUrlAndName();
+      var path = rsp.data?.url;
+      var contents = rsp.data?.name ?? '';
       if (showLoading) MyNavigator.dismissLoading();
       if (path != null) {
         // 获取线上版本 lszlgl_release_0.0.2_2.apk
@@ -76,7 +78,7 @@ class UpgradeService {
           if (showLoading) MyNavigator.showToast('已是最新版本');
         } else {
           // 版本更新
-          UpgradeDialog.showDialog(path);
+          UpgradeDialog.showDialog(path,contents);
         }
       }
     } catch (e) {

lib/widget/card_item.dart

@@ -97,9 +97,9 @@ class CardItemWidget extends StatelessWidget {
     return Text(
       title,
       style: const TextStyle(
-        color: Color(0xFF333333),
+        color: Color(0xFF515151),
         fontSize: 14,
-        fontWeight: FontWeight.w500,
+        fontWeight: FontWeight.w300,
       ),
     );
   }

lib/widget/upgrade_dialog.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:lszlgl/main.dart';
 import 'package:lszlgl/service/upgrade_service.dart';
@@ -7,19 +9,20 @@ import 'package:lszlgl/ext/value_notifier_ext.dart';
 import '../router/my_navigator.dart';
 
 class UpgradeDialog extends StatelessWidget {
-  static void showDialog(String path) {
+  static void showDialog(String path,String contents) {
     MyNavigator.showDialog(
-      builder: (_) => UpgradeDialog(path),
+      builder: (_) => UpgradeDialog(path,contents),
       tag: 'upgrade',
       clickDismiss: false,
     );
   }
 
   final String path;
+  final String contents;
   final String versionName;
 
   UpgradeDialog(
-    this.path, {
+    this.path,this.contents, {
     super.key,
   }) : versionName = path.split('_')[path.split('_').length - 2];
 
@@ -77,6 +80,7 @@ class UpgradeDialog extends StatelessWidget {
         borderRadius: BorderRadius.all(Radius.circular(8)),
       ),
       child: Column(
+       // crossAxisAlignment: CrossAxisAlignment.stretch,
         mainAxisSize: MainAxisSize.min,
         children: [
           Container(
@@ -86,20 +90,15 @@ class UpgradeDialog extends StatelessWidget {
               style: const TextStyle(color: Color(0xFF333333), fontSize: 16, fontWeight: FontWeight.w500),
             ),
           ),
-          // Row(
-          //   children: [
-          //     const Spacer(),
-          //     progress.builder((v) => v == -1
-          //         ? GestureDetector(
-          //             onTap: dismiss,
-          //             child: const Text(
-          //               '取消',
-          //               style: TextStyle(color: Color(0xFF333333), fontSize: 14),
-          //             ),
-          //           )
-          //         : const SizedBox.shrink()),
-          //   ],
-          // ),
+
+          SizedBox(
+            width: double.infinity,
+            child: Text(
+             '更新内容：\n$contents',
+             style: const TextStyle(fontSize: 14,color: Color(0xFF333333)),
+                     ),
+          ),
+
           const SizedBox(height: 24),
           progress.builder((v) => v == -1 ? MyButton('立即下载安装', onTap: onDownload, alignment: null) : buildProgress(v)),
         ],

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.0.25+25
+version: 0.0.27+27
 
 environment:
   sdk: '>=3.1.5 <4.0.0'