修改上传路径

BaseLibrary/src/main/java/com/cooleshow/base/constanst/UploadConstants.java

@@ -0,0 +1,43 @@
+package com.cooleshow.base.constanst;
+
+/**
+ * Author by pq, Date on 2022/7/7.
+ */
+public class UploadConstants {
+    //学生上传作业(视频)
+    public static final String BUCKET_NAME_HOMEWORK = "homework";
+    //聊天上传视频 图片 文件(老师端和学生端)
+    public static final String BUCKET_NAME_IM = "i-m";
+
+    //1.用户上传头像
+    //3.广告管理上传广告封面 广告视频
+    //4.APP按钮管理 上传APP按钮图片
+    //5.Banner管理上传banner图片
+    //6.闪页管理 上传闪页图片
+    //10.专业管理 上传声部图片
+    //11.乐理章节管理  上传章节封面
+    //1.用户头像上传(老师端和学生端)
+    //3.老师端上传老师风采(视频)
+    //老师认证
+    public static final String BUCKET_NAME_DAYA = "daya";
+
+    public static final int UPLOAD_TYPE_HOMEWORK = 0;//对应BUCKET_NAME_HOMEWORK桶
+    public static final int UPLOAD_TYPE_IM = 1;//对应BUCKET_NAME_IM桶
+    public static final int UPLOAD_TYPE_OTHER = 2;//对应BUCKET_NAME_DAYA桶
+
+    /**
+     * 获取桶名称
+     *
+     * @param type
+     * @return
+     */
+    public static String getBucketNameByType(int type) {
+        if (type == UPLOAD_TYPE_HOMEWORK) {
+            return BUCKET_NAME_HOMEWORK;
+        }
+        if (type == UPLOAD_TYPE_IM) {
+            return BUCKET_NAME_IM;
+        }
+        return BUCKET_NAME_DAYA;
+    }
+}

BaseLibrary/src/main/java/com/cooleshow/base/utils/JumpUtils.java

@@ -54,7 +54,7 @@ public class JumpUtils {
                             if (!TextUtils.isEmpty(params)) {
                                 String courseId = getParams(params, "courseId");
                                 String studentId = getParams(params, "studentId");
-                                if (TextUtils.isEmpty(courseId) && TextUtils.isEmpty(studentId)) {
+                                if (!TextUtils.isEmpty(courseId) && !TextUtils.isEmpty(studentId)) {
                                     ARouter.getInstance().build(RouterPath.WorkCenter.TEACHER_WORK_ASSIGN_HOMEWORK)
                                             .withString("course_id", courseId)
                                             .withString("student_id", studentId)
@@ -66,7 +66,7 @@ public class JumpUtils {
                             String params = routeBean.params;
                             if (!TextUtils.isEmpty(params)) {
                                 String courseId = getParams(params, "courseId");
-                                if (TextUtils.isEmpty(courseId)) {
+                                if (!TextUtils.isEmpty(courseId)) {
                                     ARouter.getInstance().build(RouterPath.WorkCenter.STUDENT_HOMEWORK_DETAIL)
                                             .withString("course_id", courseId)
                                             .navigation();

BaseLibrary/src/main/java/com/cooleshow/base/utils/helper/WebParamsHelper.java

@@ -0,0 +1,19 @@
+package com.cooleshow.base.utils.helper;
+
+import org.json.JSONObject;
+
+/**
+ * Author by pq, Date on 2022/7/7.
+ */
+public class WebParamsHelper {
+    public static String getParams(JSONObject json, String key) {
+        try {
+            JSONObject content = json.getJSONObject("content");
+            String s = content.optString(key);
+            return s;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+}

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

@@ -1,8 +1,10 @@
 package com.cooleshow.base.utils.helper.upload;
 
 import android.app.Activity;
+import android.text.TextUtils;
 
 import com.cooleshow.base.bean.UploadTokenInfoBean;
+import com.cooleshow.base.constanst.UploadConstants;
 import com.cooleshow.base.data.api.UploadApi;
 import com.cooleshow.base.data.net.BaseResponse;
 import com.cooleshow.base.data.net.RetrofitFactory;
@@ -55,7 +57,7 @@ import okhttp3.RequestBody;
  * Author by pq, Date on 2022/5/11.
  */
 public class UploadHelper {
-    public static final String SRC_BUCKETNAME = "daya";
+    public String SRC_BUCKETNAME = UploadConstants.BUCKET_NAME_DAYA;
     public static final String END_POINT = "ks3-cn-beijing.ksyuncs.com";
     public static final String PROTOCOL = "https://";
     public static final String SRC_OBJECTKEY = "";
@@ -68,14 +70,26 @@ public class UploadHelper {
     private Activity mActivity;
     private UploadProgressLoading mProgressLoading;
 
-    public UploadHelper(Activity activity) {
+    public UploadHelper(Activity activity, int type) {
+        this(activity, UploadConstants.getBucketNameByType(type));
+    }
+
+    public UploadHelper(Activity activity, String bukName) {
         this.mActivity = activity;
+        //获取桶名称
+        SRC_BUCKETNAME = bukName;
+        if (TextUtils.isEmpty(bukName)) {
+            SRC_BUCKETNAME = UploadConstants.BUCKET_NAME_DAYA;
+        }
+        LogUtils.i("UploadHelper", "SRC_BUCKETNAME:" + SRC_BUCKETNAME);
         initUploadProgressDialog();
         initClient();
     }
 
     private void initUploadProgressDialog() {
-        mProgressLoading = UploadProgressLoading.Companion.create(mActivity);
+        if (mActivity != null) {
+            mProgressLoading = UploadProgressLoading.Companion.create(mActivity);
+        }
     }
 
     private void initClient() {
@@ -122,7 +136,7 @@ public class UploadHelper {
     }
 
     private void doUpload(String key, File file) {
-        PutObjectRequest putObjectRequest = new PutObjectRequest("daya", key, file);
+        PutObjectRequest putObjectRequest = new PutObjectRequest(SRC_BUCKETNAME, key, file);
         putObjectRequest.setCannedAcl(CannedAccessControlList.PublicRead);
         mClient.putObject(putObjectRequest, new PutObjectResponseHandler() {
             @Override
@@ -216,8 +230,10 @@ public class UploadHelper {
 
                     @Override
                     public void onNext(@NonNull BaseResponse<UploadTokenInfoBean> response) {
-                        uploadToken = "KSS " + response.getData().kssAccessKeyId + ":" + response.getData().signature;
-                        doUpload(key, file);
+                        if (response != null) {
+                            uploadToken = "KSS " + response.getData().kssAccessKeyId + ":" + response.getData().signature;
+                            doUpload(key, file);
+                        }
                     }
 
                     @Override

rong_im/common_im_ui/src/main/java/com/common/im/ui/activity/ImAppealActivity.java

@@ -21,6 +21,8 @@ import com.common.im.contract.ImAppealContract;
 import com.common.im.presenter.ImAppealPresenter;
 import com.common.im_ui.R;
 import com.common.im_ui.databinding.ActivityImAppealBinding;
+import com.cooleshow.base.common.WebConstants;
+import com.cooleshow.base.constanst.UploadConstants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
@@ -122,7 +124,7 @@ public class ImAppealActivity extends BaseMVPActivity<ActivityImAppealBinding, I
 
 
     public void upLoadVideo(Activity activity, String filePath) {
-        UploadHelper uploadHelper = new UploadHelper(activity);
+        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_IM);
         uploadHelper.uploadFile(new File(filePath));
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override

rong_im/kit/src/main/java/io/rong/imkit/IMCenter.java

@@ -6,6 +6,11 @@ import android.net.Uri;
 import android.text.TextUtils;
 
 
+import com.cooleshow.base.constanst.UploadConstants;
+import com.cooleshow.base.utils.FileUtils;
+import com.cooleshow.base.utils.LogUtils;
+import com.cooleshow.base.utils.helper.upload.UploadHelper;
+
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
@@ -517,39 +522,79 @@ public class IMCenter {
                     callback.onAttached(message, uploader);
                 SightMessage sightMessage = (SightMessage) message.getContent();
                 String filePath = sightMessage.getLocalPath().getPath();
-//                if (isCompressVideo) {
-//                    final String compressPath = com.rui.common_base.util.FileUtils.getCacheDir(mContext) + File.separator
-//                            + "VID_" + new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()) + ".mp4";
-//                    VideoCompress.compressVideo(mContext, sightMessage.getLocalPath().getPath(), compressPath, new VideoCompress.CompressListener() {
-//                        @Override
-//                        public void onStart() {
-//
-//                        }
-//
-//                        @Override
-//                        public void onSuccess() {
-//                            uploadFile(uploader, compressPath, true);
-//
-//                        }
-//
-//                        @Override
-//                        public void onFail() {
-//                            uploader.error();
-//                        }
-//
-//                        @Override
-//                        public void onProgress(float percent) {
-//
-//                        }
-//                    });
-//                } else {
-//                    uploadFile(uploader, filePath, false);
-//                }
+                if (isCompressVideo) {
+                    final String compressPath = FileUtils.getCacheDir(mContext) + File.separator
+                            + "VID_" + new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.CHINA).format(new Date()) + ".mp4";
+                    VideoCompress.compressVideo(mContext, sightMessage.getLocalPath().getPath(), compressPath, new VideoCompress.CompressListener() {
+                        @Override
+                        public void onStart() {
+
+                        }
+
+                        @Override
+                        public void onSuccess() {
+                            uploadFile(uploader, compressPath, true);
+
+                        }
+
+                        @Override
+                        public void onFail() {
+                            uploader.error();
+                        }
+
+                        @Override
+                        public void onProgress(float percent) {
+
+                        }
+                    });
+                } else {
+                    uploadFile(uploader, filePath, false);
+                }
 
 
             }
 
             private void uploadFile(final IRongCallback.MediaMessageUploader uploader, final String filePath, final boolean isDelete) {
+                UploadHelper uploadHelper = new UploadHelper(null, UploadConstants.UPLOAD_TYPE_IM);
+                uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
+                    @Override
+                    protected void onSuccess(String url) {
+                        if (uploader != null) {
+                            uploader.update(100);
+                            uploader.success(Uri.parse(url));
+                        }
+                        //删除临时文件
+                        if (isDelete) {
+                            new File(filePath).delete();
+                        }
+                    }
+
+                    @Override
+                    protected void onFailure() {
+                        if (uploader != null) {
+                            uploader.error();
+                        }
+                    }
+
+                    @Override
+                    public void onUploadCancel() {
+                        super.onUploadCancel();
+                        if (uploader != null) {
+                            uploader.cancel();
+                        }
+                    }
+
+
+                    @Override
+                    public void onUploadProgress(double v) {
+                        super.onUploadProgress(v);
+                        LogUtils.e("onProgress" + v);
+                        uploader.update((int) v);
+                    }
+                });
+                File file = new File(filePath);
+                uploadHelper.uploadFile(file);
+
 //                BaseObserver baseObserver = new BaseObserver<FileUploadBean>() {
 //                    @Override
 //                    protected void onStart() {
@@ -559,13 +604,7 @@ public class IMCenter {
 //
 //                    @Override
 //                    protected void onSuccess(FileUploadBean data) {
-//                        uploader.update(100);
-//                        uploader.success(Uri.parse(data.getUrl()));
-//                        //删除临时文件
-//                        if (isDelete) {
-//                            new File(filePath).delete();
-//                        }
-//                        LOG.e("onSuccess");
+//
 //                    }
 //
 //                    @Override

student/src/main/java/com/cooleshow/student/presenter/course/PracticeCourseDetailPresenter.java

@@ -2,6 +2,7 @@ package com.cooleshow.student.presenter.course;
 
 import android.app.Activity;
 
+import com.cooleshow.base.constanst.UploadConstants;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
@@ -72,7 +73,7 @@ public class PracticeCourseDetailPresenter extends BasePresenter<PracticeCourseD
     }
 
     public void upLoadVideo(Activity activity, String filePath) {
-        UploadHelper uploadHelper = new UploadHelper(activity);
+        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_HOMEWORK);
         uploadHelper.uploadFile(new File(filePath));
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override

student/src/main/java/com/cooleshow/student/presenter/homework/HomeWorkADetailPresenter.java

@@ -3,6 +3,7 @@ package com.cooleshow.student.presenter.homework;
 import android.app.Activity;
 
 import com.cooleshow.base.constanst.Constants;
+import com.cooleshow.base.constanst.UploadConstants;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
@@ -53,7 +54,7 @@ public class HomeWorkADetailPresenter extends BasePresenter<HomeWorkDetailContra
 
 
     public void upLoadVideo(Activity activity, String filePath) {
-        UploadHelper uploadHelper = new UploadHelper(activity);
+        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_HOMEWORK);
         uploadHelper.uploadFile(new File(filePath));
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override

student/src/main/java/com/cooleshow/student/presenter/mine/PersonalSettingPresenter.java

@@ -2,6 +2,7 @@ package com.cooleshow.student.presenter.mine;
 
 import android.app.Activity;
 
+import com.cooleshow.base.constanst.UploadConstants;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
@@ -67,7 +68,7 @@ public class PersonalSettingPresenter extends BasePresenter<PersonalSettingContr
     }
 
     public void upLoadImage(Activity activity, String filePath) {
-        UploadHelper uploadHelper = new UploadHelper(activity);
+        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_OTHER);
         uploadHelper.uploadFile(new File(filePath));
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override

student/src/main/java/com/cooleshow/student/ui/web/AccompanyActivity.java

@@ -19,6 +19,7 @@ import com.cooleshow.base.service.PlayMusicService;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
+import com.cooleshow.base.utils.helper.WebParamsHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.student.R;
 import com.cooleshow.student.databinding.ActivityAccompanyBinding;
@@ -194,7 +195,8 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
                     ToastUtil.getInstance().showShort("未找到该视频，请重试");
                     FileUtils.deleteFile(recordVideFilePath);
                 }
-                UploadHelper uploadHelper = new UploadHelper(AccompanyActivity.this);
+                String bucket = WebParamsHelper.getParams(jsonObject, "bucket");
+                UploadHelper uploadHelper = new UploadHelper(AccompanyActivity.this,bucket);
                 uploadHelper.uploadFile(file);
                 uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
                     @Override

student/src/main/java/com/cooleshow/student/ui/web/HtmlActivity.java

@@ -713,12 +713,14 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
     }
 
     private JSONObject baseJsonObject;
+    private String buckName;
 
     private void showFileChooser() {
         JSONObject content = (JSONObject) baseJsonObject.opt("content");
         String type = "";
         try {
             type = content.getString("type");
+            buckName =content.optString("bucket");
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -1112,7 +1114,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
             if (result != null) {
                 File file = UriUtils.uri2File(result);
                 if (file != null && file.exists()) {
-                    UploadHelper uploadHelper = new UploadHelper(HtmlActivity.this);
+                    UploadHelper uploadHelper = new UploadHelper(HtmlActivity.this,buckName);
                     uploadHelper.uploadFile(file);
                     uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
                         @Override

student/src/main/java/com/cooleshow/student/ui/web/HtmlHorizontalScreenActivity.java

@@ -123,6 +123,7 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
     private IWXAPI api;
     private static final int SDK_PAY_FLAG = 1;
     private static final int SDK_AUTH_FLAG = 2;
+    private String buckName;
 
 
     ConstraintLayout headerBbarView;
@@ -674,11 +675,13 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
 
     private JSONObject baseJsonObject;
 
+
     private void showFileChooser() {
         JSONObject content = (JSONObject) baseJsonObject.opt("content");
         String type = "";
         try {
             type = content.getString("type");
+            buckName =content.optString("bucket");
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -1072,7 +1075,7 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
             if (result != null) {
                 File file = UriUtils.uri2File(result);
                 if (file != null && file.exists()) {
-                    UploadHelper uploadHelper = new UploadHelper(HtmlHorizontalScreenActivity.this);
+                    UploadHelper uploadHelper = new UploadHelper(HtmlHorizontalScreenActivity.this,buckName);
                     uploadHelper.uploadFile(file);
                     uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
                         @Override

student/src/main/java/com/cooleshow/student/ui/web/WebActivity.java

@@ -71,6 +71,7 @@ public class WebActivity extends BaseActivity<ActivityHtmlBinding> implements Js
     private JsInterfaceHelper mInterfaceUtils;
     private WebClient mWebClient;
     private ValueCallback mUploadCallbackAboveL;
+    private String buckName;
 
 
     @Override
@@ -532,7 +533,7 @@ public class WebActivity extends BaseActivity<ActivityHtmlBinding> implements Js
                 File file = UriUtils.uri2File(result);
                 if (file != null && file.exists()) {
                     Log.e("asdfasdfsdf", "onActivityResult: =============");
-                    UploadHelper uploadHelper = new UploadHelper(WebActivity.this);
+                    UploadHelper uploadHelper = new UploadHelper(WebActivity.this,buckName);
                     uploadHelper.uploadFile(file);
                 }
             }

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/PersonalSettingPresenter.java

@@ -2,6 +2,7 @@ package com.cooleshow.teacher.presenter.mine;
 
 import android.app.Activity;
 
+import com.cooleshow.base.constanst.UploadConstants;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
@@ -63,7 +64,7 @@ public class PersonalSettingPresenter extends BasePresenter<PersonalSettingContr
     }
 
     public void upLoadImage(Activity activity, String filePath) {
-        UploadHelper uploadHelper = new UploadHelper(activity);
+        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_OTHER);
         uploadHelper.uploadFile(new File(filePath));
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override

teacher/src/main/java/com/cooleshow/teacher/presenter/minestyle/MineStylePagePresenter.java

@@ -3,6 +3,7 @@ package com.cooleshow.teacher.presenter.minestyle;
 import android.app.Activity;
 import android.util.Log;
 
+import com.cooleshow.base.constanst.UploadConstants;
 import com.cooleshow.base.data.net.BaseResponse;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
@@ -76,7 +77,7 @@ public class MineStylePagePresenter extends BasePresenter<MineStylePageContract.
     }
 
     public void upLoadVideo(Activity activity, String filePath) {
-        UploadHelper uploadHelper = new UploadHelper(activity);
+        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_OTHER);
         uploadHelper.uploadFile(new File(filePath));
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override

teacher/src/main/java/com/cooleshow/teacher/ui/web/AccompanyActivity.java

@@ -21,6 +21,7 @@ import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.ToastUtils;
+import com.cooleshow.base.utils.helper.WebParamsHelper;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.databinding.ActivityAccompanyBinding;
@@ -198,7 +199,8 @@ public class AccompanyActivity extends BaseMVPActivity<ActivityAccompanyBinding,
                     ToastUtil.getInstance().showShort("未找到该视频，请重试");
                     FileUtils.deleteFile(recordVideFilePath);
                 }
-                UploadHelper uploadHelper = new UploadHelper(AccompanyActivity.this);
+                String bucket = WebParamsHelper.getParams(jsonObject, "bucket");
+                UploadHelper uploadHelper = new UploadHelper(AccompanyActivity.this,bucket);
                 uploadHelper.uploadFile(file);
                 uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
                     @Override

teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlActivity.java

@@ -121,6 +121,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
     private IWXAPI api;
     private static final int SDK_PAY_FLAG = 1;
     private static final int SDK_AUTH_FLAG = 2;
+    private String buckName;
 
     ConstraintLayout headerBbarView;
     View view;
@@ -717,6 +718,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
         String type = "";
         try {
             type = content.getString("type");
+            buckName = content.optString("bucket");
         } catch (JSONException e) {
             e.printStackTrace();
         }
@@ -1107,7 +1109,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
             if (result != null) {
                 File file = UriUtils.uri2File(result);
                 if (file != null && file.exists()) {
-                    UploadHelper uploadHelper = new UploadHelper(HtmlActivity.this);
+                    UploadHelper uploadHelper = new UploadHelper(HtmlActivity.this,buckName);
                     uploadHelper.uploadFile(file);
                     uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
                         @Override

teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlHorizontalScreenActivity.java

@@ -123,6 +123,7 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
     private IWXAPI api;
     private static final int SDK_PAY_FLAG = 1;
     private static final int SDK_AUTH_FLAG = 2;
+    private String buckName;
 
     ConstraintLayout headerBbarView;
     View view;
@@ -677,8 +678,9 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
         JSONObject content = (JSONObject) baseJsonObject.opt("content");
         String type = "";
         try {
-            type = content.getString("type");
-        } catch (JSONException e) {
+            type = content.optString("type");
+            buckName = content.optString("bucket");
+        } catch (Exception e) {
             e.printStackTrace();
         }
         Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
@@ -1070,7 +1072,7 @@ public class HtmlHorizontalScreenActivity extends BaseActivity<ActivityHtml1Bind
             if (result != null) {
                 File file = UriUtils.uri2File(result);
                 if (file != null && file.exists()) {
-                    UploadHelper uploadHelper = new UploadHelper(HtmlHorizontalScreenActivity.this);
+                    UploadHelper uploadHelper = new UploadHelper(HtmlHorizontalScreenActivity.this,buckName);
                     uploadHelper.uploadFile(file);
                     uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
                         @Override

teacher/src/main/java/com/cooleshow/teacher/ui/web/WebActivity.java

@@ -526,7 +526,7 @@ public class WebActivity extends BaseActivity<ActivityHtmlBinding> implements Js
             if (result != null) {
                 File file = UriUtils.uri2File(result);
                 if (file != null && file.exists()) {
-                    UploadHelper uploadHelper = new UploadHelper(WebActivity.this);
+                    UploadHelper uploadHelper = new UploadHelper(WebActivity.this, "");
                     uploadHelper.uploadFile(file);
                     uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
                         @Override