diff --git a/app/src/main/java/com/nova/brain/glass/ui/InspectionActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/InspectionActivity.kt index e5140b4..c5c1212 100644 --- a/app/src/main/java/com/nova/brain/glass/ui/InspectionActivity.kt +++ b/app/src/main/java/com/nova/brain/glass/ui/InspectionActivity.kt @@ -63,7 +63,7 @@ class InspectionActivity : currentZoomLevel = GlassMediaServiceHelper.getZoomLevel().coerceAtLeast(1) maxZoomLevel = GlassMediaServiceHelper.getMaxZoomLevel().coerceAtLeast(1) runOnUiThread { - binding.cameraPreview.visibility = View.VISIBLE + binding.cameraPreviewContainer.visibility = View.VISIBLE binding.zoomText.visibility = View.VISIBLE updateZoomText() binding.hint.text = "预览中,单击预览或语音输入“拍照”完成拍摄" @@ -73,7 +73,7 @@ class InspectionActivity : override fun onCameraClosed() { isPreviewActive = false runOnUiThread { - binding.cameraPreview.visibility = View.GONE + binding.cameraPreviewContainer.visibility = View.GONE binding.zoomText.visibility = View.GONE } } @@ -81,7 +81,7 @@ class InspectionActivity : override fun onError(code: Int, message: String?) { isPreviewActive = false runOnUiThread { - binding.cameraPreview.visibility = View.GONE + binding.cameraPreviewContainer.visibility = View.GONE binding.zoomText.visibility = View.GONE binding.hint.text = "相机预览失败,请重试" (message ?: "相机预览失败").showMessage() @@ -175,7 +175,7 @@ class InspectionActivity : if (binding.cameraPreview.isAvailable) { startCameraPreview() } else { - binding.cameraPreview.visibility = View.VISIBLE + binding.cameraPreviewContainer.visibility = View.VISIBLE binding.zoomText.visibility = View.VISIBLE } } @@ -187,7 +187,7 @@ class InspectionActivity : GlassMediaServiceHelper.startCameraShare(surface, cameraSurfaceCallback) }.onFailure { isPreviewRequested = false - binding.cameraPreview.visibility = View.GONE + binding.cameraPreviewContainer.visibility = View.GONE binding.zoomText.visibility = View.GONE binding.hint.text = "相机预览启动失败,请重试" (it.message ?: "相机预览启动失败").showMessage() @@ -200,7 +200,7 @@ class InspectionActivity : runCatching { GlassMediaServiceHelper.stopCameraShare(cameraSurfaceCallback) } - binding.cameraPreview.visibility = View.GONE + binding.cameraPreviewContainer.visibility = View.GONE binding.zoomText.visibility = View.GONE } diff --git a/app/src/main/res/layout/activity_inspection.xml b/app/src/main/res/layout/activity_inspection.xml index 4ce5da0..ecbe25e 100644 --- a/app/src/main/res/layout/activity_inspection.xml +++ b/app/src/main/res/layout/activity_inspection.xml @@ -104,8 +104,8 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/baseRecyclerView" /> - + app:layout_constraintTop_toBottomOf="@id/hint"> + + +