签名图片上传增加loading; 版本更新去掉取消功能;

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -101,17 +101,24 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
     var args = SignaturePageArgs(count: req.dgryName?.split(',').length ?? 0);
     List<Uint8List?>? list = await MyRouter.startSignature(args: args);
     if (list == null || list.isEmpty) return;
-    // 字节转文件
-    List<File> fileList = [];
-    for (int i = 0; i < list.length; i++) {
-      fileList.add(await FileUtils.convertUint8ListToFile(list[i]!, 'signatrue_$i.png'));
+    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();
+    } catch (e) {
+      logger.e(e);
+      MyNavigator.dismissLoading();
+      MyNavigator.showToast('签名上传失败');
+      return;
     }
-    // 上传图片
-    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();
 
-    MyNavigator.showLoading();
     // 已分解
     pageStatus.value.data?.state = 2;
     try {

lib/service/upgrade_service.dart

@@ -61,7 +61,7 @@ class UpgradeService {
     if (!Platform.isAndroid) return;
     if (checking) return;
     checking = true;
-    if (showLoading) MyNavigator.showLoading();
+    if (showLoading) MyNavigator.showLoading(msg: '正在获取版本更新');
     try {
       // 获取apk下载地址
       var path = (await MyApi.get().getAppDownloadUrl()).data;

lib/widget/upgrade_dialog.dart

@@ -61,7 +61,7 @@ class UpgradeDialog extends StatelessWidget {
   void installApk(String path) async {
     bool success = await UpgradeService.installApk(path);
     if (success) {
-      dismiss();
+      // dismiss();
     } else {
       progress.value = -1;
     }
@@ -79,24 +79,27 @@ class UpgradeDialog extends StatelessWidget {
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          Row(
-            children: [
-              Text(
-                '发现新版本 $versionName',
-                style: const TextStyle(color: Color(0xFF333333), fontSize: 16, fontWeight: FontWeight.w500),
-              ),
-              const Spacer(),
-              progress.builder((v) => v == -1
-                  ? GestureDetector(
-                      onTap: dismiss,
-                      child: const Text(
-                        '取消',
-                        style: TextStyle(color: Color(0xFF333333), fontSize: 14),
-                      ),
-                    )
-                  : const SizedBox.shrink()),
-            ],
+          Container(
+            alignment: Alignment.topLeft,
+            child: Text(
+              '发现新版本 $versionName',
+              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()),
+          //   ],
+          // ),
           const SizedBox(height: 24),
           progress.builder((v) => v == -1 ? MyButton('立即下载安装', onTap: onDownload, alignment: null) : buildProgress(v)),
         ],