refactor(ui): 将相机预览组件从 TextureView 包装到容器布局中
- 将 activity_inspection.xml 中的 cameraPreview TextureView 移动到新的 FrameLayout 容器内 - 更新所有对 cameraPreview 的可见性控制以使用 cameraPreviewContainer - 保持相机预览功能逻辑不变,仅调整视图层次结构 - 确保相机预览、缩放文本和提示文本的显示/隐藏行为正常工作 - 维持现有的约束布局配置和尺寸比例设置
这个提交包含在:
父节点
760547bdbf
当前提交
10ca6f3a37
@ -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
|
||||
}
|
||||
|
||||
|
||||
@ -104,8 +104,8 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/baseRecyclerView" />
|
||||
|
||||
<TextureView
|
||||
android:id="@+id/cameraPreview"
|
||||
<FrameLayout
|
||||
android:id="@+id/cameraPreviewContainer"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="24dp"
|
||||
@ -118,7 +118,13 @@
|
||||
app:layout_constraintDimensionRatio="3:4"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/hint" />
|
||||
app:layout_constraintTop_toBottomOf="@id/hint">
|
||||
|
||||
<TextureView
|
||||
android:id="@+id/cameraPreview"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
</FrameLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/zoomText"
|
||||
|
||||
正在加载...
在新工单中引用
屏蔽一个用户