2.6.1

pages/main/add.js

@@ -537,11 +537,7 @@ Page({
 
               });
             } else {
-              wx.showToast({
-                title: '图片上传失败1',
-                image: "../images/universalpic_exclamation_white_120x120.png",
-                mask: true,
-              });
+              isSave = true;
             }
           });
         }
@@ -642,122 +638,109 @@ Page({
   },
   uploadImageAll: function (arr, callback) {
     var that = this;
-    var b = false;
-    var arrSource = [],
-      arrResult = [];
+    var uploadList = [];
     for (var i = 0; i < arr.length; i++) {
       for (var j = 0; j < arr[i].length; j++) {
         if (arr[i][j].Type == "image" && arr[i][j].Content) {
-          arrSource.push(arr[i][j].Content);
-          if (arr[i][j].ContentServer.indexOf(app.globalData.uploadImageUrl) >= 0 ||
-            arr[i][j].ContentServer.indexOf("baidu.com") >= 0 ||
-            arr[i][j].ContentServer.indexOf("bcebos.com") >= 0) {
-            var result = {};
-            result.Source = arr[i][j].ContentServer;
-            result.Target = arr[i][j].ContentServer;
-
-            arrResult.push(result);
-          } else {
-            var source = arr[i][j].Content;
-            that.uploadFileToServer(source, function (data) {
-              if (data) {
-                var result = data;
-                result.Target = app.globalData.uploadImageUrl + result.Target;
-                arrResult.push(result);
-              }
-            });
-          }
+          var contentServer = arr[i][j].ContentServer || "";
+          if (contentServer.indexOf(app.globalData.uploadImageUrl) < 0 &&
+            contentServer.indexOf("baidu.com") < 0 &&
+            contentServer.indexOf("bcebos.com") < 0)
+            uploadList.push(arr[i][j]);
         }
       }
     }
 
-    //检查是否上传成功
-    setTimeout(function () {
-      console.log(arrResult.length);
-      console.log(arrSource.length);
-      if (arrResult.length >= arrSource.length) {
-        //console.log("arrResult:" + JSON.stringify(arrResult));
-
-        var success = true;
-
-        var ari = 0;
-        for (var i = 0; i < arr.length; i++) {
-          for (var j = 0; j < arr[i].length; j++) {
-            if (arr[i][j].Type == "image" && arr[i][j].Content) {
-              var tempUrl = arr[i][j].Content;
-              var serverUrl = "";
-              for (var k = 0; k < arrResult.length; k++) {
-                if (tempUrl.indexOf(arrResult[k].Source) >= 0) {
-                  serverUrl = arrResult[k].Target;
-                  break;
-                }
-              }
-              console.log("serverUrl:" + serverUrl);
-
-              arr[i][j].Content = serverUrl;
-              arr[i][j].ContentServer = serverUrl;
+    if (uploadList.length == 0) {
+      callback(true, arr);
+      return;
+    }
 
-              if (serverUrl == "") {
-                success = false;
-                break;
-              }
-            }
-          }
-        }
-        //console.log(JSON.stringify(arr));
-        callback(success, arr);
-      }
-    }, 2000);
-  },
-  uploadFileToServer: function (file, callback) {
-    var url = common.Encrypt("MiaoguoUploadFile2");
+    var finishedCount = 0;
+    var failedCount = 0;
     wx.showLoading({
-      title: '上传中',
+      title: '上传 0/' + uploadList.length,
       mask: true,
     });
-    wx.uploadFile({
-      url: app.globalData.serverUrl + url,
-      filePath: file,
-      name: 'file',
-      success(res) {
-        var err = JSON.parse(res.data);
-        if (err.errcode == 10000) {
+
+    for (var k = 0; k < uploadList.length; k++) {
+      (function (image) {
+        that.uploadFileToServer(image.Content, function (data) {
+          if (data && data.Target) {
+            var serverUrl = app.globalData.uploadImageUrl + data.Target;
+            image.Content = serverUrl;
+            image.ContentServer = serverUrl;
+          } else {
+            failedCount++;
+          }
+
+          finishedCount++;
+          if (finishedCount < uploadList.length) {
+            wx.showLoading({
+              title: '上传 ' + finishedCount + '/' + uploadList.length,
+              mask: true,
+            });
+            return;
+          }
+
+          clearTimeout(timeoutUploadImage);
           wx.hideLoading();
-          callback(err.result);
-          // setTimeout(function () {
-          //   wx.downloadFile({
-          //     url: err.result.Target,
-          //     success(res) {
-          //       wx.hideLoading();
-          //       if (res.statusCode != 200) {
-          //         wx.showModal({
-          //           title: '上传图片可能失败',
-          //           showCancel: false,
-          //           confirmText: '知道了',
-          //           content: "请点左下角“复查”后编辑上一张题卡重新上传图片。"
-          //         });
-          //       } else {
-          //         console.log("上传成功");
-          //       }
-          //     }
-          //   });
-          // }, 5000);
-        } else {
+          if (failedCount > 0) {
+            wx.showModal({
+              title: '图片上传失败',
+              showCancel: false,
+              confirmText: '知道了',
+              content: '有' + failedCount + '张图片未上传成功，请检查网络后再次保存。已经上传成功的图片不需要重传。',
+            });
+          }
+          callback(failedCount == 0, arr);
+        }, 0, true);
+      })(uploadList[k]);
+    }
+  },
+  uploadFileToServer: function (file, callback, retryCount, silentFailure) {
+    var that = this;
+    var currentRetry = retryCount || 0;
+    var url = common.Encrypt("MiaoguoUploadFile2");
+
+    function retryOrComplete(errorMessage) {
+      if (currentRetry < 1) {
+        setTimeout(function () {
+          that.uploadFileToServer(file, callback, currentRetry + 1, silentFailure);
+        }, 600);
+      } else {
+        if (!silentFailure) {
           wx.hideLoading();
           wx.showModal({
             title: '上传文件失败',
             showCancel: false,
-            content: JSON.stringify(err.errMsg),
+            content: errorMessage || '请检查网络后重试',
           });
         }
+        callback(null);
+      }
+    }
+
+    wx.uploadFile({
+      url: app.globalData.serverUrl + url,
+      filePath: file,
+      name: 'file',
+      success(res) {
+        var result;
+        try {
+          result = JSON.parse(res.data);
+        } catch (error) {
+          retryOrComplete('服务器返回数据格式错误');
+          return;
+        }
+
+        if (result.errcode == 10000)
+          callback(result.result);
+        else
+          retryOrComplete(result.errMsg || '服务器未能完成上传');
       },
-      fail: function (err) {
-        wx.hideLoading();
-        wx.showModal({
-          title: '上传文件失败',
-          showCancel: false,
-          content: JSON.stringify(err),
-        });
+      fail: function (error) {
+        retryOrComplete(error.errMsg || '网络连接失败');
       }
     });
   },