Merge pull request #220 from longbai/add_net_ready

longbai · web-flow · commit 624b8c091abc · 2016-09-07T19:39:45.000+08:00
Add net ready
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 #Changelog
 
+## 7.2.3 (2016-09-07)
+
+### 增加
+* 上传中途网络断开回调等待
+
 ## 7.2.2 (2016-08-04)
 
 ### 修正
diff --git a/library/library.iml b/library/library.iml
@@ -65,14 +65,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -81,6 +73,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/docs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
diff --git a/library/src/androidTest/java/com/qiniu/android/ContextTest.java b/library/src/androidTest/java/com/qiniu/android/ContextTest.java
@@ -0,0 +1,13 @@
+package com.qiniu.android;
+
+import android.content.Context;
+import android.test.AndroidTestCase;
+
+import com.qiniu.android.utils.ContextGetter;
+
+public class ContextTest extends AndroidTestCase {
+    public void testEncode() {
+        Context c = ContextGetter.applicationContext();
+        assertNotNull(c);
+    }
+}
diff --git a/library/src/androidTest/java/com/qiniu/android/JsonTest.java b/library/src/androidTest/java/com/qiniu/android/JsonTest.java
@@ -4,14 +4,13 @@
 
 import junit.framework.Assert;
 
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 /**
  * Created by Simon on 3/3/16.
  */
-public class JsonTest  extends AndroidTestCase {
+public class JsonTest extends AndroidTestCase {
 
     private boolean showContent = false;
 
diff --git a/library/src/androidTest/java/com/qiniu/android/NetworkTest.java b/library/src/androidTest/java/com/qiniu/android/NetworkTest.java
@@ -0,0 +1,15 @@
+package com.qiniu.android;
+
+import com.qiniu.android.utils.AndroidNetwork;
+
+import junit.framework.TestCase;
+
+/**
+ * Created by bailong on 16/9/7.
+ */
+public class NetworkTest extends TestCase {
+    public void testConnected() {
+        boolean stat = AndroidNetwork.isNetWorkReady();
+        assertTrue(stat);
+    }
+}
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <application android:label="@string/app_name"></application>
 
diff --git a/library/src/main/java/com/qiniu/android/common/Constants.java b/library/src/main/java/com/qiniu/android/common/Constants.java
@@ -2,7 +2,7 @@
 
 
 public final class Constants {
-    public static final String VERSION = "7.2.2";
+    public static final String VERSION = "7.2.3";
 
     public static final String UTF_8 = "utf-8";
 }
diff --git a/library/src/main/java/com/qiniu/android/http/Client.java b/library/src/main/java/com/qiniu/android/http/Client.java
@@ -136,7 +136,7 @@ private static JSONObject buildJsonResp(byte[] body) throws Exception {
         return new JSONObject(str);
     }
 
-    public void asyncSend(final Request.Builder requestBuilder, StringMap headers, final CompletionHandler completionHandler) {
+    public void asyncSend(final Request.Builder requestBuilder, StringMap headers, final CompletionHandler complete) {
         if (headers != null) {
             headers.forEach(new StringMap.Consumer() {
                 @Override
@@ -146,18 +146,6 @@ public void accept(String key, Object value) {
             });
         }
 
-        final CompletionHandler complete = new CompletionHandler() {
-            @Override
-            public void complete(final ResponseInfo info, final JSONObject response) {
-                AsyncRun.run(new Runnable() {
-                    @Override
-                    public void run() {
-                        completionHandler.complete(info, response);
-                    }
-                });
-            }
-        };
-
         requestBuilder.header("User-Agent", UserAgent.instance().toString());
         ResponseTag tag = new ResponseTag();
         httpClient.newCall(requestBuilder.tag(tag).build()).enqueue(new Callback() {
@@ -306,6 +294,6 @@ public void run() {
 
     private static class ResponseTag {
         public String ip = null;
-        public long duration = null;
+        public long duration = 0;
     }
 }
diff --git a/library/src/main/java/com/qiniu/android/storage/FormUploader.java b/library/src/main/java/com/qiniu/android/storage/FormUploader.java
@@ -5,6 +5,7 @@
 import com.qiniu.android.http.PostArgs;
 import com.qiniu.android.http.ProgressHandler;
 import com.qiniu.android.http.ResponseInfo;
+import com.qiniu.android.utils.AndroidNetwork;
 import com.qiniu.android.utils.Crc32;
 import com.qiniu.android.utils.StringMap;
 
@@ -108,6 +109,14 @@ public void onProgress(int bytesWritten, int totalSize) {
         CompletionHandler completion = new CompletionHandler() {
             @Override
             public void complete(ResponseInfo info, JSONObject response) {
+                if (info.isNetworkBroken() && !AndroidNetwork.isNetWorkReady()) {
+                    options.netReadyHandler.waitReady();
+                    if (!AndroidNetwork.isNetWorkReady()) {
+                        completionHandler.complete(key, info, response);
+                        return;
+                    }
+                }
+
                 if (info.isOK()) {
                     options.progressHandler.progress(key, 1.0);
                     completionHandler.complete(key, info, response);
diff --git a/library/src/main/java/com/qiniu/android/storage/NetReadyHandler.java b/library/src/main/java/com/qiniu/android/storage/NetReadyHandler.java
@@ -0,0 +1,8 @@
+package com.qiniu.android.storage;
+
+/**
+ * Created by bailong on 16/9/7.
+ */
+public interface NetReadyHandler {
+    void waitReady();
+}
diff --git a/library/src/main/java/com/qiniu/android/storage/ResumeUploader.java b/library/src/main/java/com/qiniu/android/storage/ResumeUploader.java
@@ -4,6 +4,7 @@
 import com.qiniu.android.http.CompletionHandler;
 import com.qiniu.android.http.ProgressHandler;
 import com.qiniu.android.http.ResponseInfo;
+import com.qiniu.android.utils.AndroidNetwork;
 import com.qiniu.android.utils.Crc32;
 import com.qiniu.android.utils.StringMap;
 import com.qiniu.android.utils.StringUtils;
@@ -221,6 +222,14 @@ private void nextTask(final long offset, final int retried, final URI address) {
             CompletionHandler complete = new CompletionHandler() {
                 @Override
                 public void complete(ResponseInfo info, JSONObject response) {
+                    if (info.isNetworkBroken() && !AndroidNetwork.isNetWorkReady()) {
+                        options.netReadyHandler.waitReady();
+                        if (!AndroidNetwork.isNetWorkReady()) {
+                            completionHandler.complete(key, info, response);
+                            return;
+                        }
+                    }
+
                     if (info.isOK()) {
                         removeRecord();
                         options.progressHandler.progress(key, 1.0);
@@ -255,6 +264,13 @@ public void onProgress(int bytesWritten, int totalSize) {
         CompletionHandler complete = new CompletionHandler() {
             @Override
             public void complete(ResponseInfo info, JSONObject response) {
+                if (info.isNetworkBroken() && !AndroidNetwork.isNetWorkReady()) {
+                    options.netReadyHandler.waitReady();
+                    if (!AndroidNetwork.isNetWorkReady()) {
+                        completionHandler.complete(key, info, response);
+                        return;
+                    }
+                }
                 if (!isChunkOK(info, response)) {
                     if (info.statusCode == 701 && retried < config.retryMax) {
                         nextTask((offset / Configuration.BLOCK_SIZE) * Configuration.BLOCK_SIZE, retried + 1, address);
diff --git a/library/src/main/java/com/qiniu/android/storage/UploadManager.java b/library/src/main/java/com/qiniu/android/storage/UploadManager.java
@@ -4,6 +4,8 @@
 import com.qiniu.android.http.ResponseInfo;
 import com.qiniu.android.utils.AsyncRun;
 
+import org.json.JSONObject;
+
 import java.io.File;
 
 /**
@@ -69,27 +71,34 @@ public void run() {
     /**
      * 上传数据
      *
-     * @param data              上传的数据
-     * @param key               上传数据保存的文件名
-     * @param token             上传凭证
-     * @param completionHandler 上传完成后续处理动作
-     * @param options           上传数据的可选参数
+     * @param data     上传的数据
+     * @param key      上传数据保存的文件名
+     * @param token    上传凭证
+     * @param complete 上传完成后续处理动作
+     * @param options  上传数据的可选参数
      */
     public void put(final byte[] data, final String key, final String token,
-                    final UpCompletionHandler completionHandler, final UploadOptions options) {
-        if (areInvalidArg(key, data, null, token, completionHandler)) {
+                    final UpCompletionHandler complete, final UploadOptions options) {
+        if (areInvalidArg(key, data, null, token, complete)) {
             return;
         }
 
+        final UpCompletionHandler completionHandler = new UpCompletionHandler() {
+            @Override
+            public void complete(final String key, final ResponseInfo info, final JSONObject response) {
+                AsyncRun.run(new Runnable() {
+                    @Override
+                    public void run() {
+                        complete.complete(key, info, response);
+                    }
+                });
+            }
+        };
+
         final UpToken decodedToken = UpToken.parse(token);
         if (decodedToken == null) {
             final ResponseInfo info = ResponseInfo.invalidToken("invalid token");
-            AsyncRun.run(new Runnable() {
-                @Override
-                public void run() {
-                    completionHandler.complete(key, info, null);
-                }
-            });
+            completionHandler.complete(key, info, null);
             return;
         }
         AsyncRun.run(new Runnable() {
@@ -117,26 +126,33 @@ public void put(String filePath, String key, String token, UpCompletionHandler c
     /**
      * 上传文件
      *
-     * @param file              上传的文件对象
-     * @param key               上传文件保存的文件名
-     * @param token             上传凭证
-     * @param completionHandler 上传完成的后续处理动作
-     * @param options           上传数据的可选参数
+     * @param file     上传的文件对象
+     * @param key      上传文件保存的文件名
+     * @param token    上传凭证
+     * @param complete 上传完成的后续处理动作
+     * @param options  上传数据的可选参数
      */
-    public void put(File file, final String key, String token, final UpCompletionHandler completionHandler,
+    public void put(File file, final String key, String token, final UpCompletionHandler complete,
                     final UploadOptions options) {
-        if (areInvalidArg(key, null, file, token, completionHandler)) {
+        if (areInvalidArg(key, null, file, token, complete)) {
             return;
         }
+        final UpCompletionHandler completionHandler = new UpCompletionHandler() {
+            @Override
+            public void complete(final String key, final ResponseInfo info, final JSONObject response) {
+                AsyncRun.run(new Runnable() {
+                    @Override
+                    public void run() {
+                        complete.complete(key, info, response);
+                    }
+                });
+            }
+        };
+
         UpToken decodedToken = UpToken.parse(token);
         if (decodedToken == null) {
             final ResponseInfo info = ResponseInfo.invalidToken("invalid token");
-            AsyncRun.run(new Runnable() {
-                @Override
-                public void run() {
-                    completionHandler.complete(key, info, null);
-                }
-            });
+            completionHandler.complete(key, info, null);
             return;
         }
         long size = file.length();
diff --git a/library/src/main/java/com/qiniu/android/storage/UploadOptions.java b/library/src/main/java/com/qiniu/android/storage/UploadOptions.java
@@ -1,7 +1,10 @@
 package com.qiniu.android.storage;
 
+import android.os.Looper;
 import android.util.Log;
 
+import com.qiniu.android.utils.AndroidNetwork;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -35,8 +38,18 @@ public final class UploadOptions {
      */
     final UpCancellationSignal cancellationSignal;
 
+    /**
+     * 当网络暂时无法使用时，由用户决定是否继续处理
+     */
+    final NetReadyHandler netReadyHandler;
+
     public UploadOptions(Map<String, String> params, String mimeType, boolean checkCrc,
                          UpProgressHandler progressHandler, UpCancellationSignal cancellationSignal) {
+        this(params, mimeType, checkCrc, progressHandler, cancellationSignal, null);
+    }
+
+    public UploadOptions(Map<String, String> params, String mimeType, boolean checkCrc,
+                         UpProgressHandler progressHandler, UpCancellationSignal cancellationSignal, NetReadyHandler netReadyHandler) {
         this.params = filterParam(params);
         this.mimeType = mime(mimeType);
         this.checkCrc = checkCrc;
@@ -52,6 +65,24 @@ public boolean isCancelled() {
                 return false;
             }
         };
+        this.netReadyHandler = netReadyHandler != null ? netReadyHandler : new NetReadyHandler() {
+            @Override
+            public void waitReady() {
+                if (Thread.currentThread() == Looper.getMainLooper().getThread()) {
+                    return;
+                }
+                for (int i = 0; i < 6; i++) {
+                    try {
+                        Thread.sleep(500);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                    if (AndroidNetwork.isNetWorkReady()) {
+                        return;
+                    }
+                }
+            }
+        };
     }
 
     /**
diff --git a/library/src/main/java/com/qiniu/android/utils/AndroidNetwork.java b/library/src/main/java/com/qiniu/android/utils/AndroidNetwork.java
@@ -0,0 +1,25 @@
+package com.qiniu.android.utils;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+
+/**
+ * Created by bailong on 16/9/7.
+ */
+public final class AndroidNetwork {
+    public static boolean isNetWorkReady() {
+        Context c = ContextGetter.applicationContext();
+        if (c == null) {
+            return true;
+        }
+        ConnectivityManager connMgr = (ConnectivityManager)
+                c.getSystemService(Context.CONNECTIVITY_SERVICE);
+        try {
+            NetworkInfo info = connMgr.getActiveNetworkInfo();
+            return info != null && info.isConnected();
+        } catch (Exception e) {
+            return true;
+        }
+    }
+}
diff --git a/library/src/main/java/com/qiniu/android/utils/ContextGetter.java b/library/src/main/java/com/qiniu/android/utils/ContextGetter.java

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`
`4`	`4`	`public final class Constants {`
`5`		`- public static final String VERSION = "7.2.2";`
	`5`	`+ public static final String VERSION = "7.2.3";`
`6`	`6`
`7`	`7`	`public static final String UTF_8 = "utf-8";`
`8`	`8`	`}`