diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 774b355..cdafbc2 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 816e1f7..e4901c8 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -24,31 +24,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml
index 9c51dfe..fe56b1e 100644
--- a/.idea/markdown-navigator/profiles_settings.xml
+++ b/.idea/markdown-navigator/profiles_settings.xml
@@ -1,3 +1,3 @@
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c0f68ed..99202cc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -25,7 +25,7 @@
-
+
diff --git a/app/src/main/java/com/king/zxing/app/CaptureFragmentActivity.java b/app/src/main/java/com/king/zxing/app/CaptureFragmentActivity.java
index 6155c18..532ce8a 100644
--- a/app/src/main/java/com/king/zxing/app/CaptureFragmentActivity.java
+++ b/app/src/main/java/com/king/zxing/app/CaptureFragmentActivity.java
@@ -6,6 +6,7 @@ import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
+import android.view.View;
import android.widget.TextView;
import com.king.zxing.CaptureFragment;
@@ -36,4 +37,12 @@ public class CaptureFragmentActivity extends AppCompatActivity {
public void replaceFragment(@IdRes int id, Fragment fragment) {
getSupportFragmentManager().beginTransaction().replace(id, fragment).commit();
}
+
+ public void onClick(View v){
+ switch (v.getId()){
+ case R.id.ivLeft:
+ onBackPressed();
+ break;
+ }
+ }
}
diff --git a/app/src/main/java/com/king/zxing/app/CodeActivity.java b/app/src/main/java/com/king/zxing/app/CodeActivity.java
index 5ab430d..a5c12b9 100644
--- a/app/src/main/java/com/king/zxing/app/CodeActivity.java
+++ b/app/src/main/java/com/king/zxing/app/CodeActivity.java
@@ -75,7 +75,7 @@ public class CodeActivity extends AppCompatActivity {
}
- public void OnClick(View v){
+ public void onClick(View v){
switch (v.getId()){
case R.id.ivLeft:
onBackPressed();
diff --git a/app/src/main/java/com/king/zxing/app/CustomActivity.java b/app/src/main/java/com/king/zxing/app/CustomActivity.java
index 27c6250..04be6ae 100644
--- a/app/src/main/java/com/king/zxing/app/CustomActivity.java
+++ b/app/src/main/java/com/king/zxing/app/CustomActivity.java
@@ -133,7 +133,7 @@ public class CustomActivity extends AppCompatActivity implements OnCaptureCallba
}
- public void OnClick(View v){
+ public void onClick(View v){
switch (v.getId()){
case R.id.ivLeft:
onBackPressed();
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 a2773ec..d4992ee 100644
--- a/app/src/main/java/com/king/zxing/app/CustomCaptureActivity.java
+++ b/app/src/main/java/com/king/zxing/app/CustomCaptureActivity.java
@@ -48,7 +48,7 @@ public class CustomCaptureActivity extends CaptureActivity {
isContinuousScan = getIntent().getBooleanExtra(MainActivity.KEY_IS_CONTINUOUS,false);
//获取CaptureHelper，里面有扫码相关的配置设置
- getCaptureHelper().playBeep(true)//播放音效
+ getCaptureHelper().playBeep(false)//播放音效
.vibrate(true)//震动
.supportVerticalCode(true)//支持扫垂直条码，建议有此需求时才使用。
.continuousScan(isContinuousScan);//是否连扫
@@ -102,7 +102,7 @@ public class CustomCaptureActivity extends CaptureActivity {
}
- public void OnClick(View v){
+ public void onClick(View v){
switch (v.getId()){
case R.id.ivLeft:
onBackPressed();
diff --git a/app/src/main/java/com/king/zxing/app/EasyCaptureActivity.java b/app/src/main/java/com/king/zxing/app/EasyCaptureActivity.java
index 227e7f5..d1701d1 100644
--- a/app/src/main/java/com/king/zxing/app/EasyCaptureActivity.java
+++ b/app/src/main/java/com/king/zxing/app/EasyCaptureActivity.java
@@ -41,10 +41,10 @@ public class EasyCaptureActivity extends CaptureActivity {
StatusBarUtils.immersiveStatusBar(this,toolbar,0.2f);
TextView tvTitle = findViewById(R.id.tvTitle);
tvTitle.setText(getIntent().getStringExtra(MainActivity.KEY_TITLE));
-
+ getCaptureHelper().playBeep(true).vibrate(true);
}
- public void OnClick(View v){
+ public void onClick(View v){
switch (v.getId()){
case R.id.ivLeft:
onBackPressed();
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 4505b4b..0d53511 100644
--- a/app/src/main/java/com/king/zxing/app/MainActivity.java
+++ b/app/src/main/java/com/king/zxing/app/MainActivity.java
@@ -202,7 +202,7 @@ public class MainActivity extends AppCompatActivity implements EasyPermissions.P
}
}
- public void OnClick(View v){
+ public void onClick(View v){
isContinuousScan = false;
switch (v.getId()){
case R.id.btn0:
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c2a564c..7b9e9fc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -12,6 +12,6 @@
diff --git a/lib/src/main/java/com/king/zxing/CaptureHelper.java b/lib/src/main/java/com/king/zxing/CaptureHelper.java
index 9aa5b5a..3aeb53a 100644
--- a/lib/src/main/java/com/king/zxing/CaptureHelper.java
+++ b/lib/src/main/java/com/king/zxing/CaptureHelper.java
@@ -21,6 +21,7 @@ import android.graphics.Bitmap;
import android.graphics.Rect;
import android.graphics.RectF;
import android.hardware.Camera;
+import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.util.Log;
import android.view.MotionEvent;
@@ -129,6 +130,7 @@ public class CaptureHelper implements CaptureLifecycle,CaptureTouchEvent,Capture
}
+
@Override
public void onCreate(){
inactivityTimer = new InactivityTimer(activity);
@@ -166,7 +168,6 @@ public class CaptureHelper implements CaptureLifecycle,CaptureTouchEvent,Capture
public void onHandleDecode(Result result, Bitmap barcode, float scaleFactor) {
inactivityTimer.onActivity();
beepManager.playBeepSoundAndVibrate();
-
onResult(result);
}
@@ -177,9 +178,7 @@ public class CaptureHelper implements CaptureLifecycle,CaptureTouchEvent,Capture
}
- /**
- * {@link Activity#onResume()}
- */
+
@Override
public void onResume(){
beepManager.updatePrefs();
@@ -196,9 +195,7 @@ public class CaptureHelper implements CaptureLifecycle,CaptureTouchEvent,Capture
}
}
- /**
- * {@link Activity#onPause()}
- */
+
@Override
public void onPause(){
if (captureHandler != null) {
@@ -214,9 +211,7 @@ public class CaptureHelper implements CaptureLifecycle,CaptureTouchEvent,Capture
}
}
- /**
- * {@link Activity#onDestroy()}
- */
+
@Override
public void onDestroy(){
inactivityTimer.shutdown();
@@ -414,7 +409,7 @@ public class CaptureHelper implements CaptureLifecycle,CaptureTouchEvent,Capture
* @param result 扫码结果
*/
public void onResult(Result result){
- String text = result.getText();
+ final String text = result.getText();
if(isContinuousScan){
if(onCaptureCallback!=null){
onCaptureCallback.onResultCallback(text);
@@ -422,18 +417,37 @@ public class CaptureHelper implements CaptureLifecycle,CaptureTouchEvent,Capture
if(isAutoRestartPreviewAndDecode){
restartPreviewAndDecode();
}
- }else{
- //如果设置了回调，并且onCallback返回为true，则表示拦截
- if(onCaptureCallback!=null && onCaptureCallback.onResultCallback(text)){
- return;
- }
- Intent intent = new Intent();
- intent.putExtra(Intents.Scan.RESULT,text);
- activity.setResult(Activity.RESULT_OK,intent);
- activity.finish();
+ return;
}
+
+ if(isPlayBeep){//如果播放音效，则稍微延迟一点，给予播放音效时间
+ captureHandler.postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ //如果设置了回调，并且onCallback返回为true，则表示拦截
+ if(onCaptureCallback!=null && onCaptureCallback.onResultCallback(text)){
+ return;
+ }
+ Intent intent = new Intent();
+ intent.putExtra(Intents.Scan.RESULT,text);
+ activity.setResult(Activity.RESULT_OK,intent);
+ activity.finish();
+ }
+ },100);
+ return;
+ }
+
+ //如果设置了回调，并且onCallback返回为true，则表示拦截
+ if(onCaptureCallback!=null && onCaptureCallback.onResultCallback(text)){
+ return;
+ }
+ Intent intent = new Intent();
+ intent.putExtra(Intents.Scan.RESULT,text);
+ activity.setResult(Activity.RESULT_OK,intent);
+ activity.finish();
}
+
/**
* 设置是否连续扫码，如果想支持连续扫码，则将此方法返回{@code true}并重写{@link #onResult(Result)}
*/
diff --git a/lib/src/main/java/com/king/zxing/CaptureLifecycle.java b/lib/src/main/java/com/king/zxing/CaptureLifecycle.java
index 060b8cd..5e990ee 100644
--- a/lib/src/main/java/com/king/zxing/CaptureLifecycle.java
+++ b/lib/src/main/java/com/king/zxing/CaptureLifecycle.java
@@ -24,7 +24,7 @@ import android.os.Bundle;
public interface CaptureLifecycle {
/**
- * {@link android.app.Activity#onCreate(Bundle)}
+ * {@link Activity#onCreate(Bundle)}
*/
void onCreate();
/**
diff --git a/lib/src/main/java/com/king/zxing/DecodeHandler.java b/lib/src/main/java/com/king/zxing/DecodeHandler.java
index ad1acfc..a7fc20e 100644
--- a/lib/src/main/java/com/king/zxing/DecodeHandler.java
+++ b/lib/src/main/java/com/king/zxing/DecodeHandler.java
@@ -216,7 +216,7 @@ final class DecodeHandler extends Handler {
lastZoomTime = System.currentTimeMillis();
return true;
} else {
- Log.i(TAG, "zoom not supported");
+ Log.i(TAG, "Zoom not supported");
}
}