CNLive Android Team / newModuleStrike · Commits

Commit c59372f375455c6a359eadf0b021da2df50d5fa8

Authored by YangShuai
1 parent 13e5ab8e

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/newModuleStrike 

# Conflicts:
#	build.gradle
Inline Side-by-side
Showing 6 changed files with 22 additions and 22 deletions
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/frame/presenter/ScanNewPresenter.java
  View file @c59372f
... ... @@ -7,6 +7,8 @@ import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
7 7 import com.cnlive.strike.moudle.qr.frame.view.ScanNewView;
8 8 import com.cnlive.strike.moudle.qr.ui.activity.ScanZarBarActivity;
9 9 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  10 +import com.top.zibin.luban.Luban;
  11 +import com.top.zibin.luban.OnCompressListener;
10 12  
11 13 import java.io.File;
12 14  
... ... @@ -17,8 +19,6 @@ import io.reactivex.Observer;
17 19 import io.reactivex.android.schedulers.AndroidSchedulers;
18 20 import io.reactivex.disposables.Disposable;
19 21 import io.reactivex.schedulers.Schedulers;
20   -import top.zibin.luban.Luban;
21   -import top.zibin.luban.OnCompressListener;
22 22  
23 23 /**
24 24 * 创建：wukuiqing
... ...
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/frame/view/GenerateQRView.java
  View file @c59372f
... ... @@ -102,7 +102,7 @@ public class GenerateQRView extends BaseView {
102 102 showMessage("SD卡不存在");
103 103 return;
104 104 }
105   - mContext.requestPermission(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, String.valueOf(R.string.dialog_imagepicker_permission_sdcard_message),new OnPermissionResponseListener() {
  105 + mContext.requestPermission(String.valueOf(R.string.dialog_imagepicker_permission_sdcard_message),new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, new OnPermissionResponseListener() {
106 106  
107 107 @Override
108 108 public void onSuccess(String[] permissions) {
... ... @@ -227,7 +227,7 @@ public class GenerateQRView extends BaseView {
227 227 showMessage("SD卡不存在");
228 228 return;
229 229 }
230   - mContext.requestPermission(new String[]{Manifest.permission.CAMERA}, String.valueOf(R.string.dialog_imagepicker_permission_camera_nerver_ask_message),new OnPermissionResponseListener() {
  230 + mContext.requestPermission( String.valueOf(R.string.dialog_imagepicker_permission_camera_nerver_ask_message),new String[]{Manifest.permission.CAMERA},new OnPermissionResponseListener() {
231 231  
232 232 @Override
233 233 public void onSuccess(String[] permissions) {
... ...
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/frame/view/ScanNewView.java
  View file @c59372f
... ... @@ -199,7 +199,7 @@ public class ScanNewView extends BaseView {
199 199 }
200 200  
201 201 if(checkOnly){
202   - mContext.requestPermission(showAumPermission, String.valueOf(R.string.dialog_imagepicker_permission_sdcard_message), new OnPermissionResponseListener() {
  202 + mContext.requestPermission(String.valueOf(R.string.dialog_imagepicker_permission_sdcard_message),showAumPermission, new OnPermissionResponseListener() {
203 203 @Override
204 204 public void onSuccess(String[] permissions) {
205 205 new ImagePicker.Builder()
... ...
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/activity/ScanZarBarActivity.java
  View file @c59372f
... ... @@ -112,7 +112,7 @@ public class ScanZarBarActivity extends BaseActivity<ScanNewView, ScanNewPresent
112 112 QRCodeReceiptObservable.getInstance().addObserver(this);
113 113 getMvpView().initView();
114 114  
115   - requestPermission(new String[]{Manifest.permission.CAMERA}, String.valueOf(R.string.CAMERA), new OnPermissionResponseListener() {
  115 + requestPermission(String.valueOf(R.string.CAMERA),new String[]{Manifest.permission.CAMERA}, new OnPermissionResponseListener() {
116 116 @Override
117 117 public void onSuccess(String[] permissions) {
118 118 getMvpView().startScan();
... ...
core/imageload/build.gradle
  View file @c59372f
... ... @@ -5,22 +5,22 @@ android {
5 5 buildToolsVersion "29.0.2"
6 6  
7 7  
8   - defaultConfig {
9   - minSdkVersion 16
10   - targetSdkVersion 29
11   - versionCode 1
12   - versionName "1.0"
  8 +// defaultConfig {
  9 +// minSdkVersion 16
  10 +// targetSdkVersion 29
  11 +// versionCode 1
  12 +// versionName "1.0"
  13 +//
  14 +// testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
  15 +// consumerProguardFiles 'consumer-rules.pro'
  16 +// }
13 17  
14   - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
15   - consumerProguardFiles 'consumer-rules.pro'
16   - }
17   -
18   - buildTypes {
19   - release {
20   - minifyEnabled false
21   - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
22   - }
23   - }
  18 +// buildTypes {
  19 +// release {
  20 +// minifyEnabled false
  21 +// proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
  22 +// }
  23 +// }
24 24  
25 25 }
26 26  
... ...
core/imageload/src/main/java/com/cnlive/core/imageload/preview/PreviewImageViewActivity.java
  View file @c59372f
... ... @@ -83,7 +83,7 @@ public class PreviewImageViewActivity extends BaseActivity<PreviewImageView, Pre
83 83 //弹出处理图片的工具页面
84 84 public void showProcessDialog(ImagePreviewShowInfo info){
85 85 previewInfo=info;
86   - requestPermission(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, String.valueOf(R.string.dialog_imagepicker_permission_save_pic),new OnPermissionResponseListener() {
  86 + requestPermission(String.valueOf(R.string.dialog_imagepicker_permission_save_pic),new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, new OnPermissionResponseListener() {
87 87 @Override
88 88 public void onSuccess(String[] permissions) {
89 89 if(getMvpView() != null) {
... ...