1 修改文件上传功能类位置

YangShuai
1 parent 657f0a5a
Showing 11 changed files with 18 additions and 16 deletions
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/BaseActivity.java
core/network/build.gradle
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/UploadLogic.java → core/network/src/main/java/com/cnlive/core/network/upload/UploadLogic.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/UploadProvider.java → core/network/src/main/java/com/cnlive/core/network/upload/UploadProvider.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/interfaces/ProgressCallback.java → core/network/src/main/java/com/cnlive/core/network/upload/interfaces/ProgressCallback.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/utils/FileUtil.java → core/network/src/main/java/com/cnlive/core/network/upload/utils/FileUtil.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/utils/IDUtils.java → core/network/src/main/java/com/cnlive/core/network/upload/utils/IDUtils.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/utils/MD5.java → core/network/src/main/java/com/cnlive/core/network/upload/utils/MD5.java
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/utils/MD5Utils.java → core/network/src/main/java/com/cnlive/core/network/upload/utils/MD5Utils.java
module/pedometer/build.gradle
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningFinishFragmentView.java
@@ -87,9 +87,9 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
     public BaseActivity me;//本类
     private Bundle savedInstanceState;
     private OnPermissionResponseListener onPermissionResponseListener;      //权限申请回调
-    private int DEFAULT_REQUEST_CODE_PERMISSION = 0x00099;//默认权限请求码
+    private final int DEFAULT_REQUEST_CODE_PERMISSION = 0x00099;//默认权限请求码
     private int USER_SET_REQUEST_CODE_PERMISSION = -0x00099;//用户设置的权限请求码
-    private String defaultDefinePermissionTip = "需要必要的权限才可以正常使用该功能，您已拒绝获得该权限。\n如果需要重新授权，您可以点击“设置”按钮进入系统设置进行授权";//默认拒绝的权限提示语
+    private final String defaultDefinePermissionTip = "需要必要的权限才可以正常使用该功能，您已拒绝获得该权限。\n如果需要重新授权，您可以点击“设置”按钮进入系统设置进行授权";//默认拒绝的权限提示语
     private String userSetDefinePermissionTip = "";//用户设置的权限提示语
     //    private SwipeBackActivityHelper mHelper;//侧滑返回
     private boolean isOpenSwipBack = false;
@@ -941,6 +941,8 @@ public abstract class BaseActivity&lt;V extends BaseView, P extends BasePresenter&lt;V
         USER_SET_REQUEST_CODE_PERMISSION = -0x00099;//默认用户没有自己设置权限请求码
         userSetDefinePermissionTip = "";//默认没有设置提示语
         isDefinePermissionCloseActivity = false;//默认不允许关闭当前窗口
+        userSetPermission = null;//重置用户设置权限
+        onPermissionResponseListener = null;
     }
     /**
@@ -31,4 +31,6 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    //七牛上传
+    implementation "com.qiniu:qiniu-android-sdk:$rootProject.qiniuAndroidSdk"
 }
-package com.cnlive.moudle.pedometer.upload;
+package com.cnlive.core.network.upload;
 import android.content.Context;
 import android.media.MediaMetadataRetriever;
-package com.cnlive.moudle.pedometer.upload;
+package com.cnlive.core.network.upload;
 import android.app.Activity;
 import android.content.Context;
@@ -8,17 +8,17 @@ import android.text.TextUtils;
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.util.AlertUtil;
+import com.cnlive.core.libs.base.util.FileTypeUtil;
 import com.cnlive.core.libs.base.util.StringUtils;
 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.request.BaseRequest;
-import com.cnlive.media.picker.utils.FileTypeUtil;
 import com.cnlive.core.network.model.UploadAuthData;
-import com.cnlive.moudle.pedometer.upload.interfaces.ProgressCallback;
-import com.cnlive.moudle.pedometer.utils.FileUtil;
-import com.cnlive.moudle.pedometer.utils.IDUtils;
+import com.cnlive.core.network.upload.interfaces.ProgressCallback;
+import com.cnlive.core.network.upload.utils.FileUtil;
+import com.cnlive.core.network.upload.utils.IDUtils;
 import com.qiniu.android.http.ResponseInfo;
 import com.qiniu.android.storage.UpCompletionHandler;
 import com.qiniu.android.storage.UpProgressHandler;
-package com.cnlive.moudle.pedometer.upload.interfaces;
+package com.cnlive.core.network.upload.interfaces;
 public interface ProgressCallback {
     void onProgress(double var1);
-package com.cnlive.moudle.pedometer.upload.utils;
+package com.cnlive.core.network.upload.utils;
 import android.content.ContentValues;
 import android.content.Context;
-package com.cnlive.moudle.pedometer.upload.utils;
+package com.cnlive.core.network.upload.utils;
 public class IDUtils {
     private static byte[] lock = new byte[0];  
-package com.cnlive.moudle.pedometer.upload.utils;
+package com.cnlive.core.network.upload.utils;
 import android.app.Activity;
 import android.os.Bundle;
-package com.cnlive.moudle.pedometer.upload.utils;
+package com.cnlive.core.network.upload.utils;
 /**
  * Created by xiansong on 2018/3/28.
@@ -81,8 +81,6 @@ dependencies {
     //加载动画
     implementation "com.wang.avi:library:$rootProject.avi"
 //    implementation "com.cnlive.libs:video_qiniu:$rootProject.libVideoQiniu"
-    //七牛上传
-    implementation "com.qiniu:qiniu-android-sdk:$rootProject.qiniuAndroidSdk"
     implementation("com.cnlive:lib_upload:$rootProject.libUpload") {
         exclude group: 'com.android.support'
         exclude group: 'com.cnlive'
@@ -41,7 +41,7 @@ import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunningFinishFragment;
 import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
-import com.cnlive.moudle.pedometer.upload.UploadLogic;
+import com.cnlive.core.network.upload.UploadLogic;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;