From 4086f9c0b7e59db85736838be48e91a1bcb2ac13 Mon Sep 17 00:00:00 2001
From: zxj <275873859@qq.com>
Date: Fri, 8 Aug 2025 10:25:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E8=BF=BD=E8=B8=AA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SecondaryScreenPresentation.kt            | 40 ++++++++++++-------
 .../layout/presentation_secondary_screen.xml  |  5 +--
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/sw/dualscreen/presentation/SecondaryScreenPresentation.kt b/app/src/main/java/com/sw/dualscreen/presentation/SecondaryScreenPresentation.kt
index e4e7dca..e24f8cf 100644
--- a/app/src/main/java/com/sw/dualscreen/presentation/SecondaryScreenPresentation.kt
+++ b/app/src/main/java/com/sw/dualscreen/presentation/SecondaryScreenPresentation.kt
@@ -468,11 +468,11 @@ class SecondaryScreenPresentation(
     }
 
     /**
-     * 调整View的宽高，使预览显示正常且采集框固定为380x380
+     * 调整View的宽高，使预览显示正常且采集框固定为
      *
      * @param rgbPreview         RGB预览View
      * @param previewView        显示预览数据的view
-     * @param faceRectView       画框的view (380x380)
+     * @param faceRectView       画框的view
      * @param previewSize        预览大小
      * @param displayOrientation 相机旋转角度
      * @param scale              缩放比例
@@ -536,7 +536,7 @@ class SecondaryScreenPresentation(
                 displayOrientation: Int,
                 isMirror: Boolean
             ) {
-                Timber.d("Rgb onCameraOpened: cameraId = $cameraId, displayOrientation = $displayOrientation")
+                Timber.d("initRgbCamera Rgb onCameraOpened: cameraId = $cameraId, displayOrientation = $displayOrientation")
                 activity.runOnUiThread({
                     val previewSizeRgb = camera.getParameters().getPreviewSize()
                     val layoutParams = adjustPreviewViewSize(
@@ -546,16 +546,28 @@ class SecondaryScreenPresentation(
                     )
                     Timber.d("initRgbCamera previewSizeRgb = ${previewSizeRgb.width}-${previewSizeRgb.height}")
                     Timber.d("initRgbCamera layoutParams = ${layoutParams.width}-${layoutParams.height}")
+                    Timber.d(
+                        "initRgbCamera isMirror = ${isMirror}, isDrawRgbRectHorizontalMirror = ${
+                            ConfigUtil.isDrawRgbRectHorizontalMirror(
+                                context
+                            )
+                        }, isDrawRgbRectVerticalMirror = ${
+                            ConfigUtil.isDrawRgbRectVerticalMirror(
+                                context
+                            )
+                        }"
+                    )
+                    // 调整识别窗口位置
                     rgbFaceRectTransformer = FaceRectTransformer(
                         previewSizeRgb.width,
                         previewSizeRgb.height,
                         layoutParams.width,
                         layoutParams.height,
-                        displayOrientation,
+                        90,
                         cameraId,
                         isMirror,
-                        ConfigUtil.isDrawRgbRectHorizontalMirror(context),
-                        ConfigUtil.isDrawRgbRectVerticalMirror(context)
+                        true,
+                        true
                     )
 
                     recognizeViewModel.onRgbCameraOpened(camera)
@@ -578,20 +590,20 @@ class SecondaryScreenPresentation(
             }
 
             override fun onCameraClosed() {
-                Timber.i("onCameraClosed: ")
+                Timber.i("initRgbCamera onCameraClosed: ")
             }
 
             override fun onCameraError(e: java.lang.Exception) {
-                Timber.i("onCameraError: %s", e.message)
+                Timber.i("initRgbCamera onCameraError: %s", e.message)
                 e.printStackTrace()
             }
 
             override fun onCameraConfigurationChanged(cameraID: Int, displayOrientation: Int) {
-                Timber.i("onCameraConfigurationChanged: threadName = ${Thread.currentThread().name}")
+                Timber.i("initRgbCamera onCameraConfigurationChanged: threadName = ${Thread.currentThread().name}")
                 if (rgbFaceRectTransformer != null) {
                     rgbFaceRectTransformer!!.cameraDisplayOrientation = displayOrientation
                 }
-                Timber.i("onCameraConfigurationChanged: $cameraID  $displayOrientation")
+                Timber.i("initRgbCamera onCameraConfigurationChanged: $cameraID  $displayOrientation")
             }
         }
 
@@ -630,7 +642,7 @@ class SecondaryScreenPresentation(
                 displayOrientation: Int,
                 isMirror: Boolean
             ) {
-                Timber.d("IR onCameraOpened: cameraId = $cameraId, displayOrientation = $displayOrientation")
+                Timber.d("initIrCamera IR onCameraOpened: cameraId = $cameraId, displayOrientation = $displayOrientation")
                 val previewSizeIr = camera.getParameters().getPreviewSize()
                 val layoutParams = adjustPreviewViewSize(
                     binding.dualCameraTexturePreviewRgb,
@@ -655,11 +667,11 @@ class SecondaryScreenPresentation(
             }
 
             override fun onCameraClosed() {
-                Timber.i("onCameraClosed: ")
+                Timber.i("initIrCamera onCameraClosed: ")
             }
 
             override fun onCameraError(e: java.lang.Exception) {
-                Timber.i("onCameraError: ${e.message}")
+                Timber.i("initIrCamera onCameraError: ${e.message}")
                 e.printStackTrace()
             }
 
@@ -670,7 +682,7 @@ class SecondaryScreenPresentation(
                 if (irFaceRectTransformer != null) {
                     irFaceRectTransformer!!.cameraDisplayOrientation = displayOrientation
                 }
-                Timber.i("onCameraConfigurationChanged: cameraID = $cameraID, displayOrientation = $displayOrientation")
+                Timber.i("initIrCamera onCameraConfigurationChanged: cameraID = $cameraID, displayOrientation = $displayOrientation")
             }
         }
 
diff --git a/app/src/main/res/layout/presentation_secondary_screen.xml b/app/src/main/res/layout/presentation_secondary_screen.xml
index fabd76a..aad5750 100644
--- a/app/src/main/res/layout/presentation_secondary_screen.xml
+++ b/app/src/main/res/layout/presentation_secondary_screen.xml
@@ -12,7 +12,7 @@
     <!--人脸识别-->
     <FrameLayout
         android:id="@+id/fl_face"
-        android:layout_width="376dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:paddingTop="1dp"
@@ -21,8 +21,7 @@
         <TextureView
             android:id="@+id/dual_camera_texture_preview_rgb"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
+            android:layout_height="match_parent"
             android:visibility="visible" />
 
         <com.sw.plate.utils.arcface.FaceRectView