扩大识别范围，解决扫码后生成的图片不是正确的方向问题

maning0303 · Nov 13, 2017 · 4a842b8 · 4a842b8
1 parent 36ec7bb
commit 4a842b8
Show file tree

Hide file tree

Showing 7 changed files with 317 additions and 258 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,6 +21,6 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:26.0.0'
-    compile 'com.github.maning0303:MNZXingCode:V1.1.0'
-//    compile project(':libraryzxing')
+//    compile 'com.github.maning0303:MNZXingCode:V1.1.0'
+    compile project(':libraryzxing')
 }
diff --git a/libraryzxing/src/main/java/com/google/zxing/client/android/CaptureActivity.java b/libraryzxing/src/main/java/com/google/zxing/client/android/CaptureActivity.java
@@ -20,6 +20,7 @@
 import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -32,6 +33,8 @@
 import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.OrientationEventListener;
+import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
@@ -95,6 +98,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
     private LinearLayout btn_close;
     private LinearLayout btn_photo;
     private RelativeLayout btn_dialog_bg;
+    private ImageView ivScreenshot;
     //闪光灯是否打开
     private boolean is_light_on = false;
     private boolean beepFlag = true;
@@ -125,6 +129,7 @@ public void onCreate(Bundle icicle) {
         btn_close = (LinearLayout) findViewById(R.id.btn_close);
         btn_photo = (LinearLayout) findViewById(R.id.btn_photo);
         btn_dialog_bg = (RelativeLayout) findViewById(R.id.btn_dialog_bg);
+        ivScreenshot = (ImageView) findViewById(R.id.ivScreenshot);
         btn_dialog_bg.setVisibility(View.GONE);
 
         //初始化相关参数
@@ -213,7 +218,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         //去相册选择图片
         if (requestCode == 1000) {
-            if (data == null){
+            if (data == null) {
                 //隐藏Dialog
                 btn_dialog_bg.setVisibility(View.GONE);
                 return;
@@ -324,6 +329,9 @@ public void handleDecode(Result rawResult, Bitmap barcode, float scaleFactor) {
         beepManager.playBeepSoundAndVibrate();
         //关闭页面
         finishSuccess(lastResult.getText());
+        //图片显示：测试才显示
+        ivScreenshot.setImageBitmap(barcode);
+
     }
 
     private void finishFailed(String errorMsg) {