修改意见反馈,我的作品,作业上传,头像上传等上传路径优化

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

@@ -1,18 +1,22 @@
 package com.cooleshow.base.constanst;
 
+import com.cooleshow.base.utils.TimeUtils;
+
 /**
  * Author by pq, Date on 2022/7/7.
  */
 public class UploadConstants {
-    public static final String DEFAULT_TT_REGION="ap-nanjing";
-    public static final String DEFAULT_TT_HOST="oss.dayaedu.com";
+    public static final String DEFAULT_TT_REGION = "ap-nanjing";
+    public static final String DEFAULT_TT_HOST = "oss.dayaedu.com";
 
     //学员上传作业(视频)
     public static final String BUCKET_NAME_HOMEWORK = "homework";
     //聊天上传视频 图片 文件(老师端和学员端)
     public static final String BUCKET_NAME_IM = "i-m";
 
+    public static final String BUCKET_NAME_FEEDBACK = "feedback";
 
+    public static final String BUCKET_PATH_PRODUCTION = "production";
     //默认path
     public static final String DEFAULT_PATH = "user";
 
@@ -27,13 +31,13 @@ public class UploadConstants {
     //3.老师端上传老师风采(视频)
     //老师认证
     public static final String BUCKET_NAME_DEFAULT = "daya";
-    public static final String CLIENT_KEY= "klx/";
+    public static final String CLIENT_KEY = "klx/";
     public static final String BUCKET_NAME_DEFAULT2 = "daya-online-1303457149";
     public static final String PLUGIN_NAME = "tencent";
 
-    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桶
+    public static final int UPLOAD_TYPE_IM = 1;//对应i-m路径,文件名称无需固定
+    public static final int UPLOAD_TYPE_AVATAR = 3;//对应user路径,文件名称固定
+    public static final int UPLOAD_TYPE_OTHER = 2;//对应user路径,文件名称无需固定
 
     /**
      * 获取桶名称
@@ -52,9 +56,21 @@ public class UploadConstants {
         if (type == UPLOAD_TYPE_IM) {
             return BUCKET_NAME_IM;
         }
-        if (type == UPLOAD_TYPE_HOMEWORK) {
-            return BUCKET_NAME_HOMEWORK;
-        }
         return DEFAULT_PATH;
     }
+
+    public static String spliceTimeStamp(String url) {
+        try {
+            long timeStr = TimeUtils.getNowMills();
+            boolean status = url.contains("?");
+            if (status) {
+                url = (url + "&t=" + timeStr);
+            } else {
+                url = (url + "?t=" + timeStr);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return url;
+    }
 }

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

@@ -77,9 +77,11 @@ public class UploadHelper implements View.OnClickListener {
     private CosXmlSimpleService mCosXmlService;
     private COSXMLUploadTask cosxmlUploadTask;
     private boolean isCancel = false;
+    private int businessType = -1;
 
     public UploadHelper(Activity activity, int type) {
         this(activity, UploadConstants.getBucketNameByType(type), UploadConstants.getPathByType(type));
+        this.businessType = type;
     }
 
     public UploadHelper(Activity activity, String path) {
@@ -271,20 +273,48 @@ public class UploadHelper implements View.OnClickListener {
             return;
         }
         String name = FileUtils.getFileName(file);
-        long timeStr = TimeUtils.getNowMills();
-        if (name.contains(".")) {
-            String[] split = name.split("\\.");
-            name = timeStr + "." + split[split.length - 1];
-        } else {
-            name = "" + timeStr;
-        }
-        String lastName = getUserId() + "_" + name;
-        String month = TimeUtils.date2String(TimeUtils.getNowDate(), TimeUtils.getSafeDateFormat("yyyy-MM"));
-        String key = formatPath(path) + "android/" + month + "/" + lastName;
+        String key = getKey(name);
         isCancel = false;
         getUploadToken(name, key, file);
     }
 
+    private String getKey(String name) {
+        String lastName = getLastName(name);
+        String month = TimeUtils.date2String(TimeUtils.getNowDate(), TimeUtils.getSafeDateFormat("yyyy-MM"));
+        String key;
+        if (businessType == UploadConstants.UPLOAD_TYPE_AVATAR) {
+            //头像
+            key = formatPath(path) + "avatar/" + lastName;
+        } else {
+            key = formatPath(path) + "android/" + month + "/" + lastName;
+        }
+        return key;
+    }
+
+    private String getLastName(String name) {
+        String lastName;
+        if (businessType == UploadConstants.UPLOAD_TYPE_AVATAR) {
+            //头像类型需要固定名称
+            if (name.contains(".")) {
+                String[] split = name.split("\\.");
+                lastName = getUserId() + "." + split[split.length - 1];
+            } else {
+                long timeStr = TimeUtils.getNowMills();
+                lastName = getUserId() + "_" + timeStr;
+            }
+        } else {
+            long timeStr = TimeUtils.getNowMills();
+            if (name.contains(".")) {
+                String[] split = name.split("\\.");
+                name = timeStr + "." + split[split.length - 1];
+            } else {
+                name = "" + timeStr;
+            }
+            lastName = getUserId() + "_" + name;
+        }
+        return lastName;
+    }
+
     private String formatPath(String path) {
         if (TextUtils.isEmpty(path)) {
             return "";
@@ -394,7 +424,7 @@ public class UploadHelper implements View.OnClickListener {
     }
 
     private void cancelUpload() {
-        this.isCancel =true;
+        this.isCancel = true;
         if (cosxmlUploadTask != null) {
             cosxmlUploadTask.cancel();
         }

chatModule/src/main/java/com/cooleshow/chatmodule/ui/ImAppealActivity.java

@@ -217,7 +217,7 @@ public class ImAppealActivity extends BaseMVPActivity<TcActivityImAppealBinding,
 
 
     public void upLoadVideo(Activity activity, String filePath, int enableSelectSize) {
-        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_IM);
+        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.BUCKET_NAME_FEEDBACK);
         uploadHelper.uploadFile(new File(filePath));
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override

institution/src/main/java/com/cooleshow/institution/stu/presenter/PersonalSettingPresenter.java

@@ -68,13 +68,13 @@ public class PersonalSettingPresenter extends BasePresenter<PersonalSettingContr
     }
 
     public void upLoadImage(Activity activity, String filePath) {
-        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_OTHER);
+        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_AVATAR);
         uploadHelper.uploadFile(new File(filePath));
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override
             public void onSuccess(String url) {
                 if (getView() != null) {
-                    getView().upLoadImageSuccess(url);
+                    getView().upLoadImageSuccess(UploadConstants.spliceTimeStamp(url));
                 }
             }
 

musicMerge/src/main/java/com/cooleshow/musicmerge/presenter/MusicFileHandlePresenter.java

@@ -121,7 +121,7 @@ public class MusicFileHandlePresenter extends BasePresenter<MusicFileHandleContr
         Observable.create(new ObservableOnSubscribe<String>() {
                     @Override
                     public void subscribe(@NonNull ObservableEmitter<String> emitter) throws Throwable {
-                        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_OTHER);
+                        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.BUCKET_PATH_PRODUCTION);
                         uploadHelper.uploadFile(new File(filePath));
                         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
                             @Override

musicMerge/src/main/java/com/cooleshow/musicmerge/ui/MusicHandleActivity.java

@@ -369,7 +369,7 @@ public class MusicHandleActivity extends BaseMVPActivity<AcMusicHandleLayoutBind
         }
         toSetLoadingCancelable(false);
         toShowLoading(getCurrentProgress(0), getString(R.string.updload_draft_tip));
-        UploadHelper uploadHelper = new UploadHelper(null, UploadConstants.UPLOAD_TYPE_OTHER);
+        UploadHelper uploadHelper = new UploadHelper(null, UploadConstants.BUCKET_PATH_PRODUCTION);
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override
             protected void onSuccess(String url) {
@@ -407,7 +407,7 @@ public class MusicHandleActivity extends BaseMVPActivity<AcMusicHandleLayoutBind
             return;
         }
         toUpdateLoadingText(getCurrentProgress(0), getString(R.string.upload_works_tip));
-        UploadHelper uploadHelper = new UploadHelper(null, UploadConstants.UPLOAD_TYPE_OTHER);
+        UploadHelper uploadHelper = new UploadHelper(null, UploadConstants.BUCKET_PATH_PRODUCTION);
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override
             protected void onSuccess(String url) {

musicMerge/src/main/java/com/cooleshow/musicmerge/ui/MusicHandleActivity_.java

@@ -599,7 +599,7 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
         }
         toSetLoadingCancelable(false);
         toShowLoading(getCurrentProgress(0), getString(R.string.updload_draft_tip));
-        UploadHelper uploadHelper = new UploadHelper(null, UploadConstants.UPLOAD_TYPE_OTHER);
+        UploadHelper uploadHelper = new UploadHelper(null, UploadConstants.BUCKET_PATH_PRODUCTION);
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override
             protected void onSuccess(String url) {
@@ -637,7 +637,7 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
             return;
         }
         toUpdateLoadingText(getCurrentProgress(0), getString(R.string.upload_works_tip));
-        UploadHelper uploadHelper = new UploadHelper(null, UploadConstants.UPLOAD_TYPE_OTHER);
+        UploadHelper uploadHelper = new UploadHelper(null, UploadConstants.BUCKET_PATH_PRODUCTION);
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override
             protected void onSuccess(String url) {

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

@@ -47,6 +47,7 @@ import java.util.List;
  * @author Ryan
  * 类说明：
  */
+@Deprecated
 @Route(path = RouterPath.ChatCenter.CHAT_IM_APPEAL)
 public class ImAppealActivity extends BaseMVPActivity<ActivityImAppealBinding, ImAppealPresenter> implements ImAppealContract.ImAppealView {
 
@@ -133,7 +134,7 @@ public class ImAppealActivity extends BaseMVPActivity<ActivityImAppealBinding, I
 
 
     public void upLoadVideo(Activity activity, String filePath) {
-        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_IM);
+        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.BUCKET_NAME_FEEDBACK);
         uploadHelper.uploadFile(new File(filePath));
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override

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

@@ -60,7 +60,7 @@ public class PianoRoomCourseDetailPresenter extends BasePresenter<PianoRoomCours
     }
 
     public void upLoadVideo(Activity activity, String filePath) {
-        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_HOMEWORK);
+        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.BUCKET_NAME_HOMEWORK);
         uploadHelper.uploadFile(new File(filePath));
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override

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

@@ -73,7 +73,7 @@ public class PracticeCourseDetailPresenter extends BasePresenter<PracticeCourseD
     }
 
     public void upLoadVideo(Activity activity, String filePath) {
-        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_HOMEWORK);
+        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.BUCKET_NAME_HOMEWORK);
         uploadHelper.uploadFile(new File(filePath));
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override

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

@@ -183,7 +183,7 @@ public class SparringCourseDetailPresenter extends BasePresenter<SparringCourseD
     }
 
     public void upLoadVideo(Activity activity, String filePath) {
-        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_HOMEWORK);
+        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.BUCKET_NAME_HOMEWORK);
         uploadHelper.uploadFile(new File(filePath));
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override

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

@@ -54,7 +54,7 @@ public class HomeWorkADetailPresenter extends BasePresenter<HomeWorkDetailContra
 
 
     public void upLoadVideo(Activity activity, String filePath) {
-        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_HOMEWORK);
+        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.BUCKET_NAME_HOMEWORK);
         uploadHelper.uploadFile(new File(filePath));
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override

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

@@ -68,13 +68,13 @@ public class PersonalSettingPresenter extends BasePresenter<PersonalSettingContr
     }
 
     public void upLoadImage(Activity activity, String filePath) {
-        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_OTHER);
+        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_AVATAR);
         uploadHelper.uploadFile(new File(filePath));
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override
             public void onSuccess(String url) {
                 if (getView() != null) {
-                    getView().upLoadImageSuccess(url);
+                    getView().upLoadImageSuccess(UploadConstants.spliceTimeStamp(url));
                 }
             }
 

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

@@ -33,6 +33,7 @@ public class PersonalSettingPresenter extends BasePresenter<PersonalSettingContr
                     getView().getSetDetailSuccess(data);
                 }
             }
+
             @Override
             public void onComplete() {
                 super.onComplete();
@@ -40,7 +41,8 @@ public class PersonalSettingPresenter extends BasePresenter<PersonalSettingContr
             }
         });
     }
-    public void submitSetDetail(String jsonStr){
+
+    public void submitSetDetail(String jsonStr) {
         getView().showLoading();
         addSubscribe(create(APIService.class).submitSetDetail(RequestBodyUtil.convertToRequestBodyJson(jsonStr)), new BaseObserver<SetDetailBean>(getView()) {
             @Override
@@ -55,6 +57,7 @@ public class PersonalSettingPresenter extends BasePresenter<PersonalSettingContr
                 super.onComplete();
                 getView().hideLoading();
             }
+
             @Override
             public void onError(Throwable e) {
                 super.onError(e);
@@ -64,13 +67,13 @@ public class PersonalSettingPresenter extends BasePresenter<PersonalSettingContr
     }
 
     public void upLoadImage(Activity activity, String filePath) {
-        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_OTHER);
+        UploadHelper uploadHelper = new UploadHelper(activity, UploadConstants.UPLOAD_TYPE_AVATAR);
         uploadHelper.uploadFile(new File(filePath));
         uploadHelper.setUpLoadCallBack(new UploadHelper.UpLoadCallBack() {
             @Override
             public void onSuccess(String url) {
                 if (getView() != null) {
-                    getView().upLoadImageSuccess(url);
+                    getView().upLoadImageSuccess(UploadConstants.spliceTimeStamp(url));
                 }
             }
 

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/setting/FeedBackActivity.java

@@ -243,7 +243,7 @@ public class FeedBackActivity extends BaseMVPActivity<ActivityFeedbackLayoutBind
     }
 
     public void upLoadVideo(Activity activity, String filePath) {
-        UploadHelper uploadHelper = new UploadHelper(null, UploadConstants.UPLOAD_TYPE_OTHER);
+        UploadHelper uploadHelper = new UploadHelper(null, UploadConstants.BUCKET_NAME_FEEDBACK);
         uploadHelper.uploadFile(new File(filePath));
         setLoadingCancelable(false);
         showUploadLoading(0);