diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 9771dd0..fb2cdaf 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 f72fe2b..7d6c441 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"1.0.3","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":7,"versionName":"1.0.6","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/CustomCaptureActivity.java b/app/src/main/java/com/king/zxing/app/CustomCaptureActivity.java index ec9dc9e..fe51539 100644 --- a/app/src/main/java/com/king/zxing/app/CustomCaptureActivity.java +++ b/app/src/main/java/com/king/zxing/app/CustomCaptureActivity.java @@ -20,6 +20,7 @@ import android.os.Bundle; import android.support.v7.widget.Toolbar; import android.view.View; import android.widget.TextView; +import android.widget.Toast; import com.google.zxing.Result; import com.king.zxing.CaptureActivity; @@ -30,6 +31,7 @@ import com.king.zxing.app.util.StatusBarUtils; */ public class CustomCaptureActivity extends CaptureActivity { + private boolean isContinuousScan; @Override public int getLayoutId() { return R.layout.custom_capture_activity; @@ -43,6 +45,8 @@ public class CustomCaptureActivity extends CaptureActivity { TextView tvTitle = findViewById(R.id.tvTitle); tvTitle.setText(getIntent().getStringExtra(MainActivity.KEY_TITLE)); + isContinuousScan = getIntent().getBooleanExtra(MainActivity.KEY_IS_CONTINUOUS,false); + getBeepManager().setPlayBeep(true); getBeepManager().setVibrate(true); } @@ -76,6 +80,9 @@ public class CustomCaptureActivity extends CaptureActivity { @Override public void onResult(Result result) { super.onResult(result); + if(isContinuousScan){//连续扫码时,直接弹出结果 + Toast.makeText(this,result.getText(),Toast.LENGTH_SHORT).show(); + } } /** @@ -84,7 +91,7 @@ public class CustomCaptureActivity extends CaptureActivity { */ @Override public boolean isContinuousScan() { - return super.isContinuousScan(); + return isContinuousScan; } /** 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 a699f88..f98eb1b 100644 --- a/app/src/main/java/com/king/zxing/app/MainActivity.java +++ b/app/src/main/java/com/king/zxing/app/MainActivity.java @@ -46,6 +46,7 @@ public class MainActivity extends AppCompatActivity implements EasyPermissions.P public static final String KEY_TITLE = "key_title"; public static final String KEY_IS_QR_CODE = "key_code"; + public static final String KEY_IS_CONTINUOUS = "key_continuous_scan"; public static final int REQUEST_CODE_SCAN = 0X01; public static final int REQUEST_CODE_PHOTO = 0X02; @@ -56,6 +57,7 @@ public class MainActivity extends AppCompatActivity implements EasyPermissions.P private Class cls; private String title; + private boolean isContinuousScan; @Override protected void onCreate(Bundle savedInstanceState) { @@ -156,6 +158,7 @@ public class MainActivity extends AppCompatActivity implements EasyPermissions.P ActivityOptionsCompat optionsCompat = ActivityOptionsCompat.makeCustomAnimation(this,R.anim.in,R.anim.out); Intent intent = new Intent(this, cls); intent.putExtra(KEY_TITLE,title); + intent.putExtra(KEY_IS_CONTINUOUS,isContinuousScan); ActivityCompat.startActivityForResult(this,intent,REQUEST_CODE_SCAN,optionsCompat.toBundle()); } @@ -189,7 +192,14 @@ public class MainActivity extends AppCompatActivity implements EasyPermissions.P } public void OnClick(View v){ + isContinuousScan = false; switch (v.getId()){ + case R.id.btn0: + this.cls = CustomCaptureActivity.class; + this.title = ((Button)v).getText().toString(); + isContinuousScan = true; + checkCameraPermissions(); + break; case R.id.btn1: this.cls = CaptureActivity.class; this.title = ((Button)v).getText().toString(); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b2a2a47..0d14fb0 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -33,6 +33,19 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@+id/toolbar" app:layout_constraintGuide_percent="0.2"/> +