CNLive Android Team / newModuleStrike · Commits

Commit 2d5217e1a56f1ef06ae9c1cdbd5321acffce72cf

Authored by YangShuai
1 parent 657f0a5a

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

Inline Side-by-side
Showing 11 changed files with 18 additions and 16 deletions
core/base/src/main/java/com/cnlive/core/libs/base/frame/activity/BaseActivity.java
  View file @2d5217e
... ... @@ -87,9 +87,9 @@ public abstract class BaseActivity<V extends BaseView, P extends BasePresenter<V
87 87 public BaseActivity me;//本类
88 88 private Bundle savedInstanceState;
89 89 private OnPermissionResponseListener onPermissionResponseListener; //权限申请回调
90   - private int DEFAULT_REQUEST_CODE_PERMISSION = 0x00099;//默认权限请求码
  90 + private final int DEFAULT_REQUEST_CODE_PERMISSION = 0x00099;//默认权限请求码
91 91 private int USER_SET_REQUEST_CODE_PERMISSION = -0x00099;//用户设置的权限请求码
92   - private String defaultDefinePermissionTip = "需要必要的权限才可以正常使用该功能，您已拒绝获得该权限。\n如果需要重新授权，您可以点击“设置”按钮进入系统设置进行授权";//默认拒绝的权限提示语
  92 + private final String defaultDefinePermissionTip = "需要必要的权限才可以正常使用该功能，您已拒绝获得该权限。\n如果需要重新授权，您可以点击“设置”按钮进入系统设置进行授权";//默认拒绝的权限提示语
93 93 private String userSetDefinePermissionTip = "";//用户设置的权限提示语
94 94 // private SwipeBackActivityHelper mHelper;//侧滑返回
95 95 private boolean isOpenSwipBack = false;
... ... @@ -941,6 +941,8 @@ public abstract class BaseActivity<V extends BaseView, P extends BasePresenter<V
941 941 USER_SET_REQUEST_CODE_PERMISSION = -0x00099;//默认用户没有自己设置权限请求码
942 942 userSetDefinePermissionTip = "";//默认没有设置提示语
943 943 isDefinePermissionCloseActivity = false;//默认不允许关闭当前窗口
  944 + userSetPermission = null;//重置用户设置权限
  945 + onPermissionResponseListener = null;
944 946 }
945 947  
946 948 /**
... ...
core/network/build.gradle
  View file @2d5217e
... ... @@ -31,4 +31,6 @@ dependencies {
31 31 testImplementation 'junit:junit:4.12'
32 32 androidTestImplementation 'androidx.test.ext:junit:1.1.1'
33 33 androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
  34 + //七牛上传
  35 + implementation "com.qiniu:qiniu-android-sdk:$rootProject.qiniuAndroidSdk"
34 36 }
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/UploadLogic.java renamed to core/network/src/main/java/com/cnlive/core/network/upload/UploadLogic.java
  View file @2d5217e
1   -package com.cnlive.moudle.pedometer.upload;
  1 +package com.cnlive.core.network.upload;
2 2  
3 3 import android.content.Context;
4 4 import android.media.MediaMetadataRetriever;
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/UploadProvider.java renamed to core/network/src/main/java/com/cnlive/core/network/upload/UploadProvider.java
  View file @2d5217e
1   -package com.cnlive.moudle.pedometer.upload;
  1 +package com.cnlive.core.network.upload;
2 2  
3 3 import android.app.Activity;
4 4 import android.content.Context;
... ... @@ -8,17 +8,17 @@ import android.text.TextUtils;
8 8  
9 9 import com.cnlive.core.libs.base.application.AppConfig;
10 10 import com.cnlive.core.libs.base.util.AlertUtil;
  11 +import com.cnlive.core.libs.base.util.FileTypeUtil;
11 12 import com.cnlive.core.libs.base.util.StringUtils;
12 13 import com.cnlive.core.network.model.BaseResult;
13 14 import com.cnlive.core.network.HttpConn;
14 15 import com.cnlive.core.network.NetCallBack;
15 16 import com.cnlive.core.network.api.ApiBaseServiceOpen;
16 17 import com.cnlive.core.network.request.BaseRequest;
17   -import com.cnlive.media.picker.utils.FileTypeUtil;
18 18 import com.cnlive.core.network.model.UploadAuthData;
19   -import com.cnlive.moudle.pedometer.upload.interfaces.ProgressCallback;
20   -import com.cnlive.moudle.pedometer.utils.FileUtil;
21   -import com.cnlive.moudle.pedometer.utils.IDUtils;
  19 +import com.cnlive.core.network.upload.interfaces.ProgressCallback;
  20 +import com.cnlive.core.network.upload.utils.FileUtil;
  21 +import com.cnlive.core.network.upload.utils.IDUtils;
22 22 import com.qiniu.android.http.ResponseInfo;
23 23 import com.qiniu.android.storage.UpCompletionHandler;
24 24 import com.qiniu.android.storage.UpProgressHandler;
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/interfaces/ProgressCallback.java renamed to core/network/src/main/java/com/cnlive/core/network/upload/interfaces/ProgressCallback.java
  View file @2d5217e
1   -package com.cnlive.moudle.pedometer.upload.interfaces;
  1 +package com.cnlive.core.network.upload.interfaces;
2 2  
3 3 public interface ProgressCallback {
4 4 void onProgress(double var1);
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/utils/FileUtil.java renamed to core/network/src/main/java/com/cnlive/core/network/upload/utils/FileUtil.java
  View file @2d5217e
1   -package com.cnlive.moudle.pedometer.upload.utils;
  1 +package com.cnlive.core.network.upload.utils;
2 2  
3 3 import android.content.ContentValues;
4 4 import android.content.Context;
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/utils/IDUtils.java renamed to core/network/src/main/java/com/cnlive/core/network/upload/utils/IDUtils.java
  View file @2d5217e
1   -package com.cnlive.moudle.pedometer.upload.utils;
  1 +package com.cnlive.core.network.upload.utils;
2 2  
3 3 public class IDUtils {
4 4 private static byte[] lock = new byte[0];
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/utils/MD5.java renamed to core/network/src/main/java/com/cnlive/core/network/upload/utils/MD5.java
  View file @2d5217e
1   -package com.cnlive.moudle.pedometer.upload.utils;
  1 +package com.cnlive.core.network.upload.utils;
2 2  
3 3 import android.app.Activity;
4 4 import android.os.Bundle;
... ...
module/pedometer/src/main/java/com/cnlive/moudle/pedometer/upload/utils/MD5Utils.java renamed to core/network/src/main/java/com/cnlive/core/network/upload/utils/MD5Utils.java
  View file @2d5217e
1   -package com.cnlive.moudle.pedometer.upload.utils;
  1 +package com.cnlive.core.network.upload.utils;
2 2  
3 3 /**
4 4 * Created by xiansong on 2018/3/28.
... ...
module/pedometer/build.gradle
  View file @2d5217e
... ... @@ -81,8 +81,6 @@ dependencies {
81 81 //加载动画
82 82 implementation "com.wang.avi:library:$rootProject.avi"
83 83 // implementation "com.cnlive.libs:video_qiniu:$rootProject.libVideoQiniu"
84   - //七牛上传
85   - implementation "com.qiniu:qiniu-android-sdk:$rootProject.qiniuAndroidSdk"
86 84 implementation("com.cnlive:lib_upload:$rootProject.libUpload") {
87 85 exclude group: 'com.android.support'
88 86 exclude group: 'com.cnlive'
... ...
module/pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningFinishFragmentView.java
  View file @2d5217e
... ... @@ -41,7 +41,7 @@ import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunningFinishFragment;
41 41 import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
42 42 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
43 43 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
44   -import com.cnlive.moudle.pedometer.upload.UploadLogic;
  44 +import com.cnlive.core.network.upload.UploadLogic;
45 45 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
46 46 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
47 47 import com.cnlive.moudle.pedometer.utils.TimeUtil;
... ...