diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 2d1f2cf..631ac0b 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output.json b/app/release/output.json index bd004be..1caf134 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.0.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"1.0.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/king/zxing/app/MainActivity.java b/app/src/main/java/com/king/zxing/app/MainActivity.java index f234a7b..a699f88 100644 --- a/app/src/main/java/com/king/zxing/app/MainActivity.java +++ b/app/src/main/java/com/king/zxing/app/MainActivity.java @@ -119,11 +119,6 @@ public class MainActivity extends AppCompatActivity implements EasyPermissions.P @Override public void onPermissionsGranted(int requestCode, List list) { // Some permissions have been granted - switch (requestCode){ - case RC_CAMERA: - startScan(cls,title); - break; - } } @@ -135,13 +130,9 @@ public class MainActivity extends AppCompatActivity implements EasyPermissions.P /** * 检测拍摄权限 - * @param cls - * @param title */ @AfterPermissionGranted(RC_CAMERA) - private void checkCameraPermissions(Class cls,String title){ - this.cls = cls; - this.title = title; + private void checkCameraPermissions(){ String[] perms = {Manifest.permission.CAMERA}; if (EasyPermissions.hasPermissions(this, perms)) {//有权限 startScan(cls,title); @@ -200,13 +191,19 @@ public class MainActivity extends AppCompatActivity implements EasyPermissions.P public void OnClick(View v){ switch (v.getId()){ case R.id.btn1: - checkCameraPermissions(CaptureActivity.class, ((Button)v).getText().toString()); + this.cls = CaptureActivity.class; + this.title = ((Button)v).getText().toString(); + checkCameraPermissions(); break; case R.id.btn2: - checkCameraPermissions(EasyCaptureActivity.class,((Button)v).getText().toString()); + this.cls = EasyCaptureActivity.class; + this.title = ((Button)v).getText().toString(); + checkCameraPermissions(); break; case R.id.btn3: - checkCameraPermissions(CustomCaptureActivity.class,((Button)v).getText().toString()); + this.cls = CustomCaptureActivity.class; + this.title = ((Button)v).getText().toString(); + checkCameraPermissions(); break; case R.id.btn4: startCode(false);