From 3436b1905774d26bf9ede368aa2afc713ff3aaa1 Mon Sep 17 00:00:00 2001
From: QLH <708937822@qq.com>
Date: Sat, 13 Jun 2020 20:34:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=8D=E7=85=A7=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E8=BF=94=E5=9B=9E=E5=8E=9F=E5=9B=BE=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=80=85=E7=95=8C=E9=9D=A2=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E8=A3=81=E5=89=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qlh/sdk/myview/base/CameraBaseActivity.kt | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/myview/src/main/java/com/qlh/sdk/myview/base/CameraBaseActivity.kt b/myview/src/main/java/com/qlh/sdk/myview/base/CameraBaseActivity.kt
index b2aa57d..6208244 100644
--- a/myview/src/main/java/com/qlh/sdk/myview/base/CameraBaseActivity.kt
+++ b/myview/src/main/java/com/qlh/sdk/myview/base/CameraBaseActivity.kt
@@ -21,7 +21,8 @@ import kotlin.math.abs
 
 /**
  *作者：QLH on 2020-06-06
- *描述：
+ *描述：针对一般的矩形裁剪框：xml包含id为surface_view的SurfaceView控件以及
+ * id为fix_cut_view的一般View控件
  */
 abstract class CameraBaseActivity : AppCompatActivity(), SurfaceHolder.Callback {
 
@@ -314,19 +315,18 @@ abstract class CameraBaseActivity : AppCompatActivity(), SurfaceHolder.Callback
                     Log.e(TAG,
                             originalBitmap.width
                                     .toString() + "----" + originalBitmap.height)
-                    val frameRect = Rect()
-                    val fixCutView = root?.findViewById<View>(R.id.fix_cut_view)
-                    fixCutView?.getGlobalVisibleRect(frameRect)
-                    val cropBitmap = BitmapUtils.getCropPicture(originalBitmap,
-                            ScreenUtils.getScreenWidth(),
-                            ScreenUtils.getScreenHeight(), frameRect)
+                    //将原图回调回去，自由定制裁剪框，不用受到裁剪框的类型制约
+//                    val frameRect = Rect()
+//                    val fixCutView = root?.findViewById<View>(R.id.fix_cut_view)
+//                    fixCutView?.getGlobalVisibleRect(frameRect)
+//                    val cropBitmap = BitmapUtils.getCropPicture(originalBitmap,
+//                            ScreenUtils.getScreenWidth(),
+//                            ScreenUtils.getScreenHeight(), frameRect)
                     //BitmapUtils.saveBitmap(this, originalBitmap)
-                    callBack?.success(cropBitmap)
-                    originalBitmap.recycle()
+                    callBack?.success(originalBitmap)
+                    //originalBitmap.recycle()
 
-                    Log.e(TAG,
-                            cropBitmap!!.width.toString() + "--crop--" + cropBitmap!!.height
-                    )
+                    //Log.e(TAG, cropBitmap!!.width.toString() + "--crop--" + cropBitmap!!.height)
                     mCamera?.startPreview()
                 })
             }