2 커밋 11f997421b ... 208e896681

작성자 SHA1 메시지 날짜
  maqiang 208e896681 Merge remote-tracking branch 'origin/master' 1 년 전
  maqiang effba633e3 签名图片上传增加loading; 版本更新去掉取消功能; 1 년 전
3개의 변경된 파일38개의 추가작업 그리고 28개의 파일을 삭제
  1. 16 9
      lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart
  2. 1 1
      lib/service/upgrade_service.dart
  3. 21 18
      lib/widget/upgrade_dialog.dart

+ 16 - 9
lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -102,17 +102,24 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
102
     var args = SignaturePageArgs(count: req.dgryName?.split(',').length ?? 0);
102
     var args = SignaturePageArgs(count: req.dgryName?.split(',').length ?? 0);
103
     List<Uint8List?>? list = await MyRouter.startSignature(args: args);
103
     List<Uint8List?>? list = await MyRouter.startSignature(args: args);
104
     if (list == null || list.isEmpty) return;
104
     if (list == null || list.isEmpty) return;
105
-    // 字节转文件
106
-    List<File> fileList = [];
107
-    for (int i = 0; i < list.length; i++) {
108
-      fileList.add(await FileUtils.convertUint8ListToFile(list[i]!, 'signatrue_$i.png'));
105
+    MyNavigator.showLoading(msg: '提交中...');
106
+      // 上传图片
107
+    try {
108
+      // 字节转文件
109
+      List<File> fileList = [];
110
+      for (int i = 0; i < list.length; i++) {
111
+        fileList.add(await FileUtils.convertUint8ListToFile(list[i]!, 'signatrue_$i.png'));
112
+      }
113
+      var rspList = await Future.wait(fileList.map((file) => MyApi.get().upload(file)));
114
+      logger.d('图片url:${rspList.map((e) => e.data)}');
115
+      req.filePictureList = rspList.map((e) => UrlItem(url: e.data)).toList();
116
+    } catch (e) {
117
+      logger.e(e);
118
+      MyNavigator.dismissLoading();
119
+      MyNavigator.showToast('签名上传失败');
120
+      return;
109
     }
121
     }
110
-    // 上传图片
111
-    var rspList = await Future.wait(fileList.map((file) => MyApi.get().upload(file)));
112
-    logger.d('图片url:${rspList.map((e) => e.data)}');
113
-    req.filePictureList = rspList.map((e) => UrlItem(url: e.data)).toList();
114
 
122
 
115
-    MyNavigator.showLoading();
116
     // 已分解
123
     // 已分解
117
     pageStatus.value.data?.state = 2;
124
     pageStatus.value.data?.state = 2;
118
     try {
125
     try {

+ 1 - 1
lib/service/upgrade_service.dart

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

+ 21 - 18
lib/widget/upgrade_dialog.dart

@@ -61,7 +61,7 @@ class UpgradeDialog extends StatelessWidget {
61
   void installApk(String path) async {
61
   void installApk(String path) async {
62
     bool success = await UpgradeService.installApk(path);
62
     bool success = await UpgradeService.installApk(path);
63
     if (success) {
63
     if (success) {
64
-      dismiss();
64
+      // dismiss();
65
     } else {
65
     } else {
66
       progress.value = -1;
66
       progress.value = -1;
67
     }
67
     }
@@ -79,24 +79,27 @@ class UpgradeDialog extends StatelessWidget {
79
       child: Column(
79
       child: Column(
80
         mainAxisSize: MainAxisSize.min,
80
         mainAxisSize: MainAxisSize.min,
81
         children: [
81
         children: [
82
-          Row(
83
-            children: [
84
-              Text(
85
-                '发现新版本 $versionName',
86
-                style: const TextStyle(color: Color(0xFF333333), fontSize: 16, fontWeight: FontWeight.w500),
87
-              ),
88
-              const Spacer(),
89
-              progress.builder((v) => v == -1
90
-                  ? GestureDetector(
91
-                      onTap: dismiss,
92
-                      child: const Text(
93
-                        '取消',
94
-                        style: TextStyle(color: Color(0xFF333333), fontSize: 14),
95
-                      ),
96
-                    )
97
-                  : const SizedBox.shrink()),
98
-            ],
82
+          Container(
83
+            alignment: Alignment.topLeft,
84
+            child: Text(
85
+              '发现新版本 $versionName',
86
+              style: const TextStyle(color: Color(0xFF333333), fontSize: 16, fontWeight: FontWeight.w500),
87
+            ),
99
           ),
88
           ),
89
+          // Row(
90
+          //   children: [
91
+          //     const Spacer(),
92
+          //     progress.builder((v) => v == -1
93
+          //         ? GestureDetector(
94
+          //             onTap: dismiss,
95
+          //             child: const Text(
96
+          //               '取消',
97
+          //               style: TextStyle(color: Color(0xFF333333), fontSize: 14),
98
+          //             ),
99
+          //           )
100
+          //         : const SizedBox.shrink()),
101
+          //   ],
102
+          // ),
100
           const SizedBox(height: 24),
103
           const SizedBox(height: 24),
101
           progress.builder((v) => v == -1 ? MyButton('立即下载安装', onTap: onDownload, alignment: null) : buildProgress(v)),
104
           progress.builder((v) => v == -1 ? MyButton('立即下载安装', onTap: onDownload, alignment: null) : buildProgress(v)),
102
         ],
105
         ],