fix progress bug

Author: zhangheng

src/statisticsLog.js

@@ -11,18 +11,19 @@ export class StatisticsLogger{
   send(logString, token){
     let xhr = createXHR();
     let count = 0;
+    let self = this;
     xhr.open("POST", "https://uplog.qbox.me/log/3");
     xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
     xhr.setRequestHeader("Authorization", "UpToken " + token);
     xhr.onreadystatechange = function () {
       if (xhr.readyState === 4) {
         if (xhr.status !== 200) {
             count++;
-            count <= 3 ? xhr.send(logString) : "";
-        } 
+            count <= 3 ? self.send(logString) : "";
+        }
       }
     };
     xhr.send(logString);
   }
 
-}
+}

src/upload.js

@@ -14,7 +14,6 @@ import {
   request,
   computeMd5,
   getUploadUrl,
-  isAndroidBrowser,
   filterParams
 } from "./utils";
 
@@ -57,7 +56,6 @@ export class UploadManager {
     this.onError = () => {};
     this.onComplete = () => {};
     this.retryCount = 0;
-    this.isAndroidBrowser = isAndroidBrowser();
     Object.assign(this, handlers);
   }
 
@@ -190,7 +188,7 @@ export class UploadManager {
           removeLocalFileInfo(this.file);
           return;
         }
-         setLocalFileInfo(this.file, this.ctxList);
+        setLocalFileInfo(this.file, this.ctxList);
       }
     );
     return result;
@@ -233,17 +231,13 @@ export class UploadManager {
         onProgress,
         onCreate
       }).then(response => {
-        if (this.isAndroidBrowser) {
-          // 对于低版本安卓浏览器，因为无法触发 xhr 的 progress 事件，这里 fake 下
-          onProgress({ loaded: chunk.size });
-        }
+        onProgress({ loaded: chunk.size });
         this.ctxList[index] = {
           time: new Date().getTime(),
           ctx: response.data.ctx,
           size: chunk.size,
           md5: md5
         };
-        console.log(this.ctxList);
       });
     });
   }
@@ -281,7 +275,7 @@ export class UploadManager {
 
   finishDirectProgress(){
     // 对于低版本安卓浏览器，progress 为 null， 这里 fake 下
-    if (this.isAndroidBrowser) {
+    if (!this.progress) {
       this.progress = { total: this.getProgressInfoItem(this.file.size, this.file.size) };
       this.onData(this.progress);
       return;

src/utils.js

@@ -332,17 +332,3 @@ export function getTransform(image, orientation) {
         };
   }
 }
-
-// 检查低版本浏览器的措施
-export function isAndroidBrowser() {
-  let navU = navigator.userAgent;
-  // Android Mobile
-  let isAndroidMobile = navU.indexOf("Android") > -1
-    && navU.indexOf("Mozilla/5.0") > -1 && navU.indexOf("AppleWebKit") > -1;
-  // Android Browser (not Chrome)
-  let regExAppleWebKit = new RegExp(/AppleWebKit\/([\d.]+)/);
-  let resultAppleWebKitRegEx = regExAppleWebKit.exec(navU);
-  let appleWebKitVersion = (resultAppleWebKitRegEx === null ? null : parseFloat(regExAppleWebKit.exec(navU)[1]));
-  let isAndroidBrowser = isAndroidMobile && appleWebKitVersion !== null && appleWebKitVersion < 537;
-  return isAndroidBrowser;
-}