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

# Conflicts: # build.gradle

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/newModuleStrike
# Conflicts: # build.gradle
YangShuai
1 parent 13e5ab8e
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
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/frame/view/GenerateQRView.java
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/frame/view/ScanNewView.java
core/app_qr/src/main/java/com/cnlive/strike/moudle/qr/ui/activity/ScanZarBarActivity.java
core/imageload/build.gradle
core/imageload/src/main/java/com/cnlive/core/imageload/preview/PreviewImageViewActivity.java
@@ -7,6 +7,8 @@ import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
 import com.cnlive.strike.moudle.qr.frame.view.ScanNewView;
 import com.cnlive.strike.moudle.qr.ui.activity.ScanZarBarActivity;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+import com.top.zibin.luban.Luban;
+import com.top.zibin.luban.OnCompressListener;
 import java.io.File;
@@ -17,8 +19,6 @@ import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
-import top.zibin.luban.Luban;
-import top.zibin.luban.OnCompressListener;
 /**
  * 创建：wukuiqing
@@ -102,7 +102,7 @@ public class GenerateQRView extends BaseView {
             showMessage("SD卡不存在");
             return;
         }
-        mContext.requestPermission(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, String.valueOf(R.string.dialog_imagepicker_permission_sdcard_message),new OnPermissionResponseListener() {
+        mContext.requestPermission(String.valueOf(R.string.dialog_imagepicker_permission_sdcard_message),new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, new OnPermissionResponseListener() {
             @Override
             public void onSuccess(String[] permissions) {
@@ -227,7 +227,7 @@ public class GenerateQRView extends BaseView {
             showMessage("SD卡不存在");
             return;
         }
-        mContext.requestPermission(new String[]{Manifest.permission.CAMERA}, String.valueOf(R.string.dialog_imagepicker_permission_camera_nerver_ask_message),new OnPermissionResponseListener() {
+        mContext.requestPermission( String.valueOf(R.string.dialog_imagepicker_permission_camera_nerver_ask_message),new String[]{Manifest.permission.CAMERA},new OnPermissionResponseListener() {
             @Override
             public void onSuccess(String[] permissions) {
@@ -199,7 +199,7 @@ public class ScanNewView extends BaseView {
         }
         if(checkOnly){
-            mContext.requestPermission(showAumPermission, String.valueOf(R.string.dialog_imagepicker_permission_sdcard_message), new OnPermissionResponseListener() {
+            mContext.requestPermission(String.valueOf(R.string.dialog_imagepicker_permission_sdcard_message),showAumPermission,  new OnPermissionResponseListener() {
                 @Override
                 public void onSuccess(String[] permissions) {
                     new ImagePicker.Builder()
@@ -112,7 +112,7 @@ public class ScanZarBarActivity extends BaseActivity&lt;ScanNewView, ScanNewPresent
         QRCodeReceiptObservable.getInstance().addObserver(this);
         getMvpView().initView();
-        requestPermission(new String[]{Manifest.permission.CAMERA}, String.valueOf(R.string.CAMERA), new OnPermissionResponseListener() {
+        requestPermission(String.valueOf(R.string.CAMERA),new String[]{Manifest.permission.CAMERA}, new OnPermissionResponseListener() {
             @Override
             public void onSuccess(String[] permissions) {
                 getMvpView().startScan();
@@ -5,22 +5,22 @@ android {
     buildToolsVersion "29.0.2"
-    defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+//    defaultConfig {
+//        minSdkVersion 16
+//        targetSdkVersion 29
+//        versionCode 1
+//        versionName "1.0"
+//
+//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+//        consumerProguardFiles 'consumer-rules.pro'
+//    }
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
+//    buildTypes {
+//        release {
+//            minifyEnabled false
+//            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+//        }
+//    }
 }
@@ -83,7 +83,7 @@ public class PreviewImageViewActivity extends BaseActivity&lt;PreviewImageView, Pre
     //弹出处理图片的工具页面
     public void showProcessDialog(ImagePreviewShowInfo info){
         previewInfo=info;
-        requestPermission(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, String.valueOf(R.string.dialog_imagepicker_permission_save_pic),new OnPermissionResponseListener() {
+        requestPermission(String.valueOf(R.string.dialog_imagepicker_permission_save_pic),new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, new OnPermissionResponseListener() {
             @Override
             public void onSuccess(String[] permissions) {
                 if(getMvpView() != null) {