1 修改编译版本测试，无法上传图片问题

YangShuai
1 parent 3dc5665b
Showing 3 changed files with 42 additions and 11 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/UploadLogic.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/UploadProvider.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.10-beta1",
+            version: "1.0.10-beta1.1",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -2,6 +2,7 @@ package com.cnlive.moudle.pedometer.upload;
 import android.content.Context;
 import android.media.MediaMetadataRetriever;
+import android.os.Build;
 import android.os.Environment;
 import android.text.TextUtils;
 import android.util.Log;
@@ -335,9 +336,25 @@ public class UploadLogic {
             this.imageHeight = imageHeight;
         }
     }
+//
+//    private static String getPath(String cachePath) {
+//        String path = Environment.getExternalStorageDirectory() + cachePath;
+//        File file = new File(path);
+//        if (file.mkdirs()) {
+//            return path;
+//        }
+//        return path;
+//    }
-    private static String getPath(String cachePath) {
+    /**
+     * 鲁班压缩后图片的存储位置
+     *
+     * @return
+     */
+    public static String getPath(Context context, String cachePath) {
         String path = Environment.getExternalStorageDirectory() + cachePath;
+        if (Build.VERSION.SDK_INT >= 29)
+            path = context.getExternalFilesDir("").getAbsolutePath();
         File file = new File(path);
         if (file.mkdirs()) {
             return path;
@@ -358,11 +375,11 @@ public class UploadLogic {
                 .action((BaseInfo<UploadAuthData> data, DataCallback<Map<String, Object>> callback) ->
                         Logic.process(() -> {
                             Map map = new HashMap();
-                            File file = new File(getPath("/strike/cache/") + "share.jpg");
+                            File file = new File(getPath(context,"/strike/cache/") + "share.jpg");
                             if (file.exists()) {
-                                src = getPath("/strike/cache/") + "share.jpg";
+                                src = getPath(context,"/strike/cache/") + "share.jpg";
                             } else {
-                                src = getPath("/strike/cache/") + "sharefirst.jpg";
+                                src = getPath(context,"/strike/cache/") + "sharefirst.jpg";
                             }
                             map.put("image", src);
                             map.put("tocken", data.getData().getToken());
@@ -224,7 +224,7 @@ public class UploadProvider {
                     Luban.with(context)
                             .load(imageFiles.get(i))
                             .ignoreBy(500)
-                            .setTargetDir(getPath(TYPE_IMAGE_PATH))
+                            .setTargetDir(getPath(context, TYPE_IMAGE_PATH))
                             .filter(new CompressionPredicate() {
                                 @Override
                                 public boolean apply(String path) {
@@ -248,7 +248,7 @@ public class UploadProvider {
                                 @Override
                                 public void onError(Throwable e) {
-                                    Log.e(TAG, "onError: 失败"+e.getMessage() );
+                                    Log.e(TAG, "onError: 失败" + e.getMessage());
                                     // TODO 当压缩过程出现问题时调用
                                     AlertUtil.showDeftToast(context, "图片压缩失败，请重新上传");
                                 }
@@ -298,7 +298,7 @@ public class UploadProvider {
             return;
         }
         //PLShortVideoTranscoder初始化，三个参数，第一个context，第二个要压缩文件的路径，第三个视频压缩后输出的路径
-        PLShortVideoTranscoder mShortVideoTranscoder = new PLShortVideoTranscoder(mContext, filepath, getPath(TYPE_VIDEO_PATH) + MD5.getFileMD5(new File(filepath)) + ".mp4");
+        PLShortVideoTranscoder mShortVideoTranscoder = new PLShortVideoTranscoder(mContext, filepath, getPath(mContext,TYPE_VIDEO_PATH) + MD5.getFileMD5(new File(filepath)) + ".mp4");
         MediaMetadataRetriever retr = new MediaMetadataRetriever();
         retr.setDataSource(filepath);
         String height = retr.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT); // 视频高度
@@ -357,9 +357,25 @@ public class UploadProvider {
             8000 * 1000,
     };
+//
+//    private static String getPath(String cachePath) {
+//        String path = Environment.getExternalStorageDirectory() + cachePath;
+//        File file = new File(path);
+//        if (file.mkdirs()) {
+//            return path;
+//        }
+//        return path;
+//    }
-    private static String getPath(String cachePath) {
+    /**
+     * 鲁班压缩后图片的存储位置
+     *
+     * @return
+     */
+    public static String getPath(Context context, String cachePath) {
         String path = Environment.getExternalStorageDirectory() + cachePath;
+        if (Build.VERSION.SDK_INT >= 29)
+            path = context.getExternalFilesDir("").getAbsolutePath();
         File file = new File(path);
         if (file.mkdirs()) {
             return path;
@@ -432,7 +448,6 @@ public class UploadProvider {
     }
-
     private static List<MultipartBody.Part> getImageParams(List<String> imageFiles, ProgressCallback callback) {
         List<MultipartBody.Part> imageParams = new ArrayList<>();
@@ -585,7 +600,6 @@ public class UploadProvider {
     }
-
     private static RequestBody getRequestString(String value) {
         RequestBody requestString = RequestBody.create(MediaType.parse("text/plain"), value);
         return requestString;