1.更新权限检测第三方依赖

2.更新apk
yuzhiqiang1993 · Apr 3, 2018 · bec408e · bec408e
1 parent 4361a98
commit bec408e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     implementation "com.android.support:appcompat-v7:$support_version"
     implementation "com.android.support:design:$support_version"
     implementation "com.android.support:support-vector-drawable:$support_version"
-    implementation "com.yanzhenjie:permission:1.1.0"
+    implementation 'com.yanzhenjie:permission:2.0.0-rc4'
     //implementation project(':zxinglibrary')
     implementation 'com.github.yuzhiqiang1993:zxing:2.1.5'
 

diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-release.apk","properties":{"packageId":"com.yzq.zxing","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
diff --git a/app/release/zxing.apk b/app/release/zxing.apk
diff --git a/app/src/main/java/com/yzq/zxing/MainActivity.java b/app/src/main/java/com/yzq/zxing/MainActivity.java
@@ -6,7 +6,6 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
@@ -18,8 +17,9 @@
 import android.widget.Toast;
 
 import com.google.zxing.WriterException;
+import com.yanzhenjie.permission.Action;
 import com.yanzhenjie.permission.AndPermission;
-import com.yanzhenjie.permission.PermissionListener;
+import com.yanzhenjie.permission.Permission;
 import com.yzq.zxinglibrary.android.CaptureActivity;
 import com.yzq.zxinglibrary.bean.ZxingConfig;
 import com.yzq.zxinglibrary.common.Constant;
@@ -54,20 +54,20 @@ protected void onCreate(Bundle savedInstanceState) {
 
     private void initView() {
         /*扫描按钮*/
-        scanBtn =  findViewById(R.id.scanBtn);
+        scanBtn = findViewById(R.id.scanBtn);
         scanBtn.setOnClickListener(this);
         /*扫描结果*/
-        result =  findViewById(R.id.result);
+        result = findViewById(R.id.result);
 
         /*要生成二维码的输入框*/
-        contentEt =  findViewById(R.id.contentEt);
+        contentEt = findViewById(R.id.contentEt);
         /*生成按钮*/
-        encodeBtn =  findViewById(R.id.encodeBtn);
+        encodeBtn = findViewById(R.id.encodeBtn);
         encodeBtn.setOnClickListener(this);
         /*生成的图片*/
         contentIv = findViewById(R.id.contentIv);
 
-        toolbar=findViewById(R.id.toolbar);
+        toolbar = findViewById(R.id.toolbar);
 
         toolbar.setTitle("扫一扫");
         setSupportActionBar(toolbar);
@@ -82,16 +82,16 @@ public void onClick(View v) {
             case R.id.scanBtn:
 
                 AndPermission.with(this)
-                        .permission(Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE)
-                        .callback(new PermissionListener() {
+                        .permission(Permission.CAMERA, Permission.READ_EXTERNAL_STORAGE)
+                        .onGranted(new Action() {
                             @Override
-                            public void onSucceed(int requestCode, @NonNull List<String> grantPermissions) {
+                            public void onAction(List<String> permissions) {
                                 Intent intent = new Intent(MainActivity.this, CaptureActivity.class);
 
                                 /*ZxingConfig是配置类  可以设置是否显示底部布局，闪光灯，相册，是否播放提示音  震动等动能
-                                * 也可以不传这个参数
-                                * 不传的话  默认都为默认不震动  其他都为true
-                                * */
+                                 * 也可以不传这个参数
+                                 * 不传的话  默认都为默认不震动  其他都为true
+                                 * */
 
                                 ZxingConfig config = new ZxingConfig();
                                 config.setPlayBeep(true);
@@ -100,10 +100,10 @@ public void onSucceed(int requestCode, @NonNull List<String> grantPermissions) {
 
                                 startActivityForResult(intent, REQUEST_CODE_SCAN);
                             }
-
+                        })
+                        .onDenied(new Action() {
                             @Override
-                            public void onFailed(int requestCode, @NonNull List<String> deniedPermissions) {
-
+                            public void onAction(List<String> permissions) {
                                 Uri packageURI = Uri.parse("package:" + getPackageName());
                                 Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, packageURI);
                                 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-release.apk","properties":{"packageId":"com.yzq.zxing","split":"","minSdkVersion":"16"}}]
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]