1、支持条形码下方显示Code。

This commit is contained in:
jenly1314
2018-09-17 14:01:56 +08:00
parent 7fb4a8f286
commit 36d511c64d
3 changed files with 11 additions and 14 deletions

Binary file not shown.

View File

@@ -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":{}}] [{"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":{}}]

View File

@@ -119,11 +119,6 @@ public class MainActivity extends AppCompatActivity implements EasyPermissions.P
@Override @Override
public void onPermissionsGranted(int requestCode, List<String> list) { public void onPermissionsGranted(int requestCode, List<String> list) {
// Some permissions have been granted // 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) @AfterPermissionGranted(RC_CAMERA)
private void checkCameraPermissions(Class<?> cls,String title){ private void checkCameraPermissions(){
this.cls = cls;
this.title = title;
String[] perms = {Manifest.permission.CAMERA}; String[] perms = {Manifest.permission.CAMERA};
if (EasyPermissions.hasPermissions(this, perms)) {//有权限 if (EasyPermissions.hasPermissions(this, perms)) {//有权限
startScan(cls,title); startScan(cls,title);
@@ -200,13 +191,19 @@ public class MainActivity extends AppCompatActivity implements EasyPermissions.P
public void OnClick(View v){ public void OnClick(View v){
switch (v.getId()){ switch (v.getId()){
case R.id.btn1: case R.id.btn1:
checkCameraPermissions(CaptureActivity.class, ((Button)v).getText().toString()); this.cls = CaptureActivity.class;
this.title = ((Button)v).getText().toString();
checkCameraPermissions();
break; break;
case R.id.btn2: case R.id.btn2:
checkCameraPermissions(EasyCaptureActivity.class,((Button)v).getText().toString()); this.cls = EasyCaptureActivity.class;
this.title = ((Button)v).getText().toString();
checkCameraPermissions();
break; break;
case R.id.btn3: case R.id.btn3:
checkCameraPermissions(CustomCaptureActivity.class,((Button)v).getText().toString()); this.cls = CustomCaptureActivity.class;
this.title = ((Button)v).getText().toString();
checkCameraPermissions();
break; break;
case R.id.btn4: case R.id.btn4:
startCode(false); startCode(false);