[fix] fix one camera demo can't recovery

jiangdongguo · Jul 25, 2022 · 24c7b7d · 24c7b7d
1 parent 3099d11
commit 24c7b7d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/src/main/java/com/jiangdg/demo/DemoFragment.kt b/app/src/main/java/com/jiangdg/demo/DemoFragment.kt
@@ -602,10 +602,9 @@ class DemoFragment : CameraFragment(), View.OnClickListener, CaptureMediaView.On
                 }
             }
         })
-        mMultiCameraDialog?.show(childFragmentManager, "")
+        mMultiCameraDialog?.show(childFragmentManager, "multiRoadCameras")
         val currentCamera = getCurrentCameraStrategy()
         if (currentCamera is CameraUvcStrategy) {
-            closeCamera()
             currentCamera.unRegister()
         }
     }

diff --git a/libausbc/src/main/java/com/jiangdg/ausbc/camera/CameraUvcStrategy.kt b/libausbc/src/main/java/com/jiangdg/ausbc/camera/CameraUvcStrategy.kt
@@ -452,7 +452,11 @@ class CameraUvcStrategy(ctx: Context) : ICameraStrategy(ctx) {
                 mDevSettableFuture = SettableFuture()
                 mCtrlBlockSettableFuture = SettableFuture()
                 getRequest()?.apply {
-                    startPreview(this, getSurfaceTexture())
+                    if (getSurfaceTexture() != null) {
+                        startPreview(this, getSurfaceTexture())
+                    } else {
+                        startPreview(this, getSurfaceHolder())
+                    }
                 }
                 mDevSettableFuture?.set(device)
                 mCtrlBlockSettableFuture?.set(ctrlBlock)