图片上传方法修改

韩亚云
1 parent 92ef3449
Showing 4 changed files with 186 additions and 32 deletions
core/imageload/src/main/java/com/cnlive/core/imageload/preview/presenter/ProcessHtmlPresenter.java
core/network/src/main/java/com/cnlive/core/network/upload/UploadLogic.java
core/network/src/main/java/com/cnlive/core/network/upload/UploadProvider.java
core/network/src/main/java/com/cnlive/core/network/upload/model/FeedBackInfo.java
@@ -11,6 +11,7 @@ import android.util.Log;
 import com.bumptech.glide.Glide;
 import com.cnlive.core.imageload.api.ApiServiceStock;
 import com.cnlive.core.imageload.preview.DataProcessingActivity;
+import com.cnlive.core.imageload.preview.model.FeedBackInfo;
 import com.cnlive.core.imageload.preview.model.PreviewData;
 import com.cnlive.core.imageload.preview.view.ProcessHtmlView;
 import com.cnlive.core.libs.base.application.AppConfig;
@@ -22,6 +23,7 @@ import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.request.BaseRequest;
+import com.cnlive.core.network.upload.UploadLogic;
 import com.cnlive.strike.user.auth.UserService;
 import java.io.File;
@@ -56,19 +58,29 @@ public class ProcessHtmlPresenter extends BasePresenter&lt;ProcessHtmlView&gt; {
         if (TextUtils.isEmpty(imagePath) && mContext == null) return;
         List<String> list = new ArrayList();
         list.add(imagePath);
-//
-//        eventQn = new Event<List<FeedBackInfo>>().setFailureCallback((state, message) -> {
-//            if (getView() != null) getView().showMessage(message);
-//        }).setSuccessCallback(data -> {
-//            if (getView() != null && data.size() > 0) {
-//                if (data.get(0).getImageUrl().contains("http")) {
-//                    collection(mContext, data.get(0).getImageUrl(), mContext.previewData);
-//                } else {
-//                    if (getView() != null) getView().showMessage("数据异常");
-//                }
-//            }
-//        });
-//        UploadLogic.uploadonePic(mContext, true, list, eventQn);
+
+        UploadLogic.uploadonePic(mContext, true, list, new NetCallBack<List<com.cnlive.core.network.upload.model.FeedBackInfo>>() {
+            @Override
+            public void onRequestState(int state) {
+
+            }
+
+            @Override
+            public void onSuccess(List<com.cnlive.core.network.upload.model.FeedBackInfo> data) {
+                if(data.size() > 0){
+                    if (data.get(0).getImageUrl().contains("http")) {
+                        collection(mContext, data.get(0).getImageUrl(), mContext.previewData);
+                    } else {
+                        ifViewAttached(view -> view.showMessage("数据异常"));
+                    }
+                }
+            }
+
+            @Override
+            public void onFailure(String errCode, String errMsg) {
+                ifViewAttached(view -> view.showMessage(errMsg));
+            }
+        });
     }
@@ -12,10 +12,17 @@ import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.model.StorageInfoData;
 import com.cnlive.core.network.model.UploadAuthData;
+import com.cnlive.core.network.upload.interfaces.ProgressCallback;
+import com.cnlive.core.network.upload.model.FeedBackInfo;
 import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Observer;
+import io.reactivex.Observable;
 import io.reactivex.ObservableSource;
 import io.reactivex.functions.Function;
@@ -190,7 +197,7 @@ public class UploadLogic {
      * 张楠上传地图信息用
      */
-    public static void uploadAddressPicInfo(Context context, List<String> picPath, NetCallBack<String> callBack) {
+    public static void uploadAddressPicInfo(Context context, List<String> picPath, NetCallBack<List<String>> callBack) {
         HttpConn.action(
                 UploadProvider.getStorageInfo()
                         .concatMap(new Function<BaseResult<List<StorageInfoData>>, ObservableSource<BaseResult<UploadAuthData>>>() {
@@ -508,18 +515,109 @@ public class UploadLogic {
 //        Log.d(TAG, String.format(ERROR_DEF, tag, stateCode, code, message));
 //    }
-//    /**
-//     * Im收藏的时候图片单张上传的方法
-//     *
-//     * @param context
-//     * @param isZip
-//     * @param picPath
-//     * @param event
-//     */
-//    public static void uploadonePic(Context context, boolean isZip, List<String> picPath, Event<List<FeedBackInfo>> event) {
-//
+    /**
+     * Im收藏的时候图片单张上传的方法
+     *
+     * @param context
+     * @param isZip
+     * @param picPath
+     * @param callBack
+     */
+    public static void uploadonePic(Context context, boolean isZip, List<String> picPath,  NetCallBack<List<FeedBackInfo>> callBack) {
+
+        HttpConn.action(UploadProvider.getStorageInfo().flatMap(new Function<BaseResult<List<StorageInfoData>>, ObservableSource<BaseResult<UploadAuthData>>>() {
+
+            @Override
+            public ObservableSource<BaseResult<UploadAuthData>> apply(BaseResult<List<StorageInfoData>> data) throws Exception {
+                if (data.isSuccess()) {
+                    if (data.getData().size() > 0 || data.getData() != null) {
+                        return UploadProvider.uploadAuth(data.getData().get(0).getStorageName());
+                    } else {
+                        return HttpConn.error("-1", "storage info null");
+                    }
+                }
+                return HttpConn.error(data);
+            }
+        }).flatMap(new Function<BaseResult<UploadAuthData>, ObservableSource<Map<String, Object>>>() {
+
+            @Override
+            public ObservableSource<Map<String, Object>> apply(BaseResult<UploadAuthData> uploadAuthDataBaseResult) throws Exception {
+                String token = uploadAuthDataBaseResult.getData().getToken();
+                if (isZip) {
+                    UploadProvider.zipFiles(context, picPath, new UploadProvider.ZipFilesCallBack() {
+                        @Override
+                        public void onSuccess(List<String> files) {
+                            UploadProvider.doUploadPic(context, files, token, new NetCallBack<List<String>>() {
+                                @Override
+                                public void onRequestState(int state) {
+                                    if (null != callBack) {
+                                        callBack.onRequestState(state);
+                                    }
+                                }
+
+                                @Override
+                                public void onSuccess(List<String> data) {
+                                    List<FeedBackInfo> list = new ArrayList<>();
+                                    for (int i = 0; i < ((ArrayList) data).size(); i++) {
+                                        FeedBackInfo info = new FeedBackInfo();
+                                        info.setImageUrl(SEVEN + ((ArrayList) data).get(i));
+                                        list.add(info);
+                                    }
+                                    if (null != callBack) {
+                                        callBack.onSuccess(list);
+                                    }
+                                }
+
+                                @Override
+                                public void onFailure(String errCode, String errMsg) {
+                                    if (null != callBack) {
+                                        callBack.onFailure(errCode, errMsg);
+                                    }
+                                }
+                            }, null);
+                        }
+
+                        @Override
+                        public void onFail(String errCode, String errMsg) {
+                            HttpConn.error(errCode, errMsg);
+                        }
+                    });
+                } else {
+                    UploadProvider.doUploadPic(context, picPath, token, new NetCallBack<List<String>>() {
+                        @Override
+                        public void onRequestState(int state) {
+                            if (null != callBack) {
+                                callBack.onRequestState(state);
+                            }
+                        }
+
+                        @Override
+                        public void onSuccess(List<String> data) {
+                            List<FeedBackInfo> list = new ArrayList<>();
+                            for (int i = 0; i < ((ArrayList) data).size(); i++) {
+                                FeedBackInfo info = new FeedBackInfo();
+                                info.setImageUrl(SEVEN + ((ArrayList) data).get(i));
+                                list.add(info);
+                            }
+                            if (null != callBack) {
+                                callBack.onSuccess(list);
+                            }
+                        }
+
+                        @Override
+                        public void onFailure(String errCode, String errMsg) {
+                            if (null != callBack) {
+                                callBack.onFailure(errCode, errMsg);
+                            }
+                        }
+                    }, null);
+                }
+                return null;
+            }
+        }), null);
+//        UploadProvider.getStorageInfo()
 //        Logic.create()
-//                .action((Object data, DataCallback<BaseInfo<List<StorageInfoData>>> callback) ->
+//                .action((Object data, DataCallback<BaseResult<List<StorageInfoData>>> callback) ->
 //                        UploadProvider.getStorageInfo(context, callback))
 //                .action((BaseInfo<List<StorageInfoData>> data, DataCallback<BaseInfo<UploadAuthData>> callback) ->
 //                        UploadProvider.uploadAuth(context, data.getData().get(0).getStorageName(), callback)
@@ -556,8 +654,8 @@ public class UploadLogic {
 //                            return list;
 //                        }, callback))
 //                .start(event);
-//
-//    }
+
+    }
 }
@@ -14,6 +14,7 @@ import com.cnlive.core.network.model.BaseResult;
 import com.cnlive.core.network.HttpConn;
 import com.cnlive.core.network.NetCallBack;
 import com.cnlive.core.network.api.ApiBaseServiceOpen;
+import com.cnlive.core.network.model.StorageInfoData;
 import com.cnlive.core.network.request.BaseRequest;
 import com.cnlive.core.network.model.UploadAuthData;
 import com.cnlive.core.network.upload.interfaces.ProgressCallback;
@@ -104,7 +105,7 @@ public class UploadProvider {
      *
      * @return
      */
-    public static Observable<BaseResult<List<com.cnlive.core.network.model.StorageInfoData>>> getStorageInfo() {
+    public static Observable<BaseResult<List<StorageInfoData>>> getStorageInfo() {
         Map<String, String> map = new HashMap<>();
         map.put("appId", AppConfig.getAppId());
         map.put("storageType", "2");
@@ -477,7 +478,7 @@ public class UploadProvider {
 //    }
-    public static void doUploadPic(Context context, List<String> file, String uploadToken, NetCallBack<String> callBack, ProgressCallback progressCallback) {
+    public static void doUploadPic(Context context, List<String> file, String uploadToken, NetCallBack<List<String>> callBack, ProgressCallback progressCallback) {
         ArrayList<String> netpiclist = new ArrayList<>();
         UploadManager uploadManager = new UploadManager();
         //正式环境：769/img/2018/01/29/"时间戳".jpg
@@ -494,14 +495,13 @@ public class UploadProvider {
                     ((Activity) context).runOnUiThread(() -> {
                         if (info.isOK()) {
                             try {
-                                netpiclist.add((String) info.response.get("key"));
+                                netpiclist.add(UploadLogic.SEVEN + (String) info.response.get("key"));
                             } catch (JSONException e) {
                                 e.printStackTrace();
                                 HttpConn.error(info.statusCode + "", info.error);
                             }
                             if (netpiclist.size() == file.size()) {
-                                String addressImageUrl = UploadLogic.SEVEN + netpiclist.get(0);
-                                callBack.onSuccess(addressImageUrl);
+                                callBack.onSuccess(netpiclist);
                             }
                         } else {
                             HttpConn.error(info.statusCode + "", info.error);
+package com.cnlive.core.network.upload.model;
+
+/**
+ * Created by Lynn on 2018/9/4.
+ */
+
+public class FeedBackInfo {
+    private String imageUrl;
+    private long imageWidth;
+    private long imageHeight;
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+
+    public long getImageWidth() {
+        return imageWidth;
+    }
+
+    public void setImageWidth(long imageWidth) {
+        this.imageWidth = imageWidth;
+    }
+
+    public long getImageHeight() {
+        return imageHeight;
+    }
+
+    public void setImageHeight(long imageHeight) {
+        this.imageHeight = imageHeight;
+    }
+
+    @Override
+    public String toString() {
+        return "FeedBackInfo{" +
+                "imageUrl='" + imageUrl + '\'' +
+                ", imageWidth=" + imageWidth +
+                ", imageHeight=" + imageHeight +
+                '}';
+    }
+}