修改上传helper部分逻辑,待完善

BaseLibrary/src/main/java/com/cooleshow/base/utils/helper/upload/UploadHelper.java

@@ -10,6 +10,7 @@ import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.TimeUtils;
+import com.cooleshow.base.utils.Utils;
 import com.ksyun.ks3.auth.AuthUtils;
 import com.ksyun.ks3.exception.Ks3Error;
 import com.ksyun.ks3.model.PostObjectFormFields;
@@ -59,13 +60,11 @@ public class UploadHelper {
     public static final String DST_BUCKETNAME = "";
     public static final String ak = "AKLTtTeIbadpRG-pil4S0Q4m-Q";
     public static final String sk = "OB1HmNOfDNW95wHoxMkP6IPFZXormk2ngA800TkvKAw7ozhiJGRqrMnnV8ZrAU3WRQ==";
-    public Activity mActivity;
     private Ks3Client mClient;
 
     private String uploadToken = "";
 
     public UploadHelper(Activity activity) {
-        this.mActivity = activity;
         initClient();
     }
 
@@ -90,8 +89,8 @@ public class UploadHelper {
                 }
                 return token;
             }
-        }, configuration, mActivity.getApplicationContext());
-        mClient.setEndpoint("ks3-cn-beijing.ksyuncs.com");
+        }, configuration, Utils.getApp());
+        mClient.setEndpoint(END_POINT);
     }
 
     public void uploadFile(File file) {
@@ -100,15 +99,15 @@ public class UploadHelper {
         }
         String name = FileUtils.getFileName(file);
         long timeStr = TimeUtils.getNowMills();
-        if (name.contains(".")){
+        if (name.contains(".")) {
             String[] split = name.split("\\.");
-            name=timeStr+"."+split[split.length-1];
-        }else {
-            name=""+timeStr;
+            name = timeStr + "." + split[split.length - 1];
+        } else {
+            name = "" + timeStr;
         }
         String lastName = timeStr + "_" + name;
         String month = TimeUtils.date2String(TimeUtils.getNowDate(), TimeUtils.getSafeDateFormat("yyyy-MM"));
-        String key = "androidtest/" + month + "/" + lastName;
+        String key = "android/" + month + "/" + lastName;
         getUploadToken(name, key, file);
     }
 
@@ -123,7 +122,7 @@ public class UploadHelper {
 
             @Override
             public void onTaskSuccess(int i, Header[] headers) {
-                if (null!=upLoadCallBack){
+                if (null != upLoadCallBack) {
                     upLoadCallBack.onSuccess(buildUploadUrl(key));
                 }
                 LogUtils.i("pq", "onSuccess postObject is " + i);
@@ -131,22 +130,30 @@ public class UploadHelper {
 
             @Override
             public void onTaskStart() {
-
+                if (upLoadCallBack != null) {
+                    upLoadCallBack.onUploadStart();
+                }
             }
 
             @Override
             public void onTaskFinish() {
-
+                if (upLoadCallBack != null) {
+                    upLoadCallBack.onUploadFinish();
+                }
             }
 
             @Override
             public void onTaskCancel() {
-
+                if (upLoadCallBack != null) {
+                    upLoadCallBack.onUploadCancel();
+                }
             }
 
             @Override
             public void onTaskProgress(double v) {
-
+                if (upLoadCallBack != null) {
+                    upLoadCallBack.onUploadProgress(v);
+                }
             }
         });
     }
@@ -191,7 +198,7 @@ public class UploadHelper {
                 });
     }
 
-    
+
     private String buildUploadUrl(String key) {
         StringBuilder sb = new StringBuilder();
         sb.append(PROTOCOL)
@@ -211,11 +218,27 @@ public class UploadHelper {
 
     }
 
-    public interface UpLoadCallBack {
-        void onSuccess(String url);
+    public abstract static class UpLoadCallBack {
+        protected abstract void onSuccess(String url);
 
-        void onFailure();
-    }
+        protected abstract void onFailure();
+
+        public void onUploadStart() {
 
+        }
 
+        public void onUploadCancel() {
+
+        }
+
+
+        public void onUploadProgress(double v) {
+
+        }
+
+
+        public void onUploadFinish() {
+
+        }
+    }
 }