对焦

app/src/main/java/com/miekir/ocr/PermissionActivity.java

@@ -35,7 +35,7 @@ public class PermissionActivity extends AppCompatActivity {
                         // 打开相机
                         //startActivity(new Intent(PermissionActivity.this, CropImageActivity.class));
 
-                        //startActivity(new Intent(PermissionActivity.this, OperationActivity.class));
+//                        startActivity(new Intent(PermissionActivity.this, OperationActivity.class));
                         startActivity(new Intent(PermissionActivity.this, WechatCameraActivity.class));
                         finish();
                         //photoSelect();

app/src/main/java/com/miekir/ocr/ui/camera/wechat/WechatCameraActivity.java

@@ -2,14 +2,11 @@ package com.miekir.ocr.ui.camera.wechat;
 
 
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.util.Log;
-import android.view.View;
-import android.view.WindowManager;
+import android.view.MotionEvent;
 import android.widget.Toast;
 
 import com.cjt2325.cameralibrary.JCameraView;
@@ -33,8 +30,8 @@ public class WechatCameraActivity extends BaseCameraActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        //getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        //setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         super.onCreate(savedInstanceState);
     }
 
@@ -96,7 +93,7 @@ public class WechatCameraActivity extends BaseCameraActivity {
     protected void onStart() {
         super.onStart();
         //全屏显示
-        if (Build.VERSION.SDK_INT >= 19) {
+        /*if (Build.VERSION.SDK_INT >= 19) {
             View decorView = getWindow().getDecorView();
             decorView.setSystemUiVisibility(
                     View.SYSTEM_UI_FLAG_LAYOUT_STABLE
@@ -109,7 +106,28 @@ public class WechatCameraActivity extends BaseCameraActivity {
             View decorView = getWindow().getDecorView();
             int option = View.SYSTEM_UI_FLAG_FULLSCREEN;
             decorView.setSystemUiVisibility(option);
+        }*/
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                if (event.getPointerCount() == 1) {
+                    //显示对焦指示器
+                    if (jCameraView != null) {
+                        jCameraView.setFocusViewWidthAnimation(event.getX(), event.getY());
+                    }
+                }
+                if (event.getPointerCount() == 2) {
+                    Log.i("CJT", "ACTION_DOWN = " + 2);
+                }
+                break;
+            default:
+                break;
         }
+
+        return super.onTouchEvent(event);
     }
 
     @Override

app/src/main/java/com/miekir/ocr/widget/CropView.java

@@ -423,7 +423,7 @@ public class CropView extends View {
             default:
                 break;
         }
-        return true;
+        return false;
     }
 
     /*从非法状态恢复，这里处理的是达到最小值后能拉伸放大*/

camera/src/main/java/com/cjt2325/cameralibrary/FoucsView.java

@@ -42,6 +42,7 @@ public class FoucsView extends View {
         mPaint.setColor(0xEE16AE16);
         mPaint.setStrokeWidth(4);
         mPaint.setStyle(Paint.Style.STROKE);
+        setVisibility(INVISIBLE);
     }
 
     @Override

camera/src/main/java/com/cjt2325/cameralibrary/JCameraView.java

@@ -10,11 +10,9 @@ import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.os.Build;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.View;
 import android.widget.FrameLayout;
@@ -321,7 +319,7 @@ public class JCameraView extends FrameLayout implements CameraInterface.CameraOp
     }
 
 
-    @Override
+    /*@Override
     public boolean onTouchEvent(MotionEvent event) {
         switch (event.getAction()) {
             case MotionEvent.ACTION_DOWN:
@@ -364,10 +362,10 @@ public class JCameraView extends FrameLayout implements CameraInterface.CameraOp
                 break;
         }
         return true;
-    }
+    }*/
 
     //对焦框指示器动画
-    private void setFocusViewWidthAnimation(float x, float y) {
+    public void setFocusViewWidthAnimation(float x, float y) {
         machine.foucs(x, y, new CameraInterface.FocusCallback() {
             @Override
             public void focusSuccess() {
@@ -548,7 +546,7 @@ public class JCameraView extends FrameLayout implements CameraInterface.CameraOp
         if (y > mCaptureLayout.getTop()) {
             return false;
         }
-        mFoucsView.setVisibility(VISIBLE);
+        //mFoucsView.setVisibility(VISIBLE);
         if (x < mFoucsView.getWidth() / 2) {
             x = mFoucsView.getWidth() / 2;
         }