feat: 修复初始化失败，预览页面黑屏的问题

xWenChen · Apr 27, 2023 · 57eebf1 · 57eebf1
1 parent abe67bd
commit 57eebf1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/app/src/main/java/com/mustly/wellmedia/image/Camera2TakePhotoFragment.kt b/app/src/main/java/com/mustly/wellmedia/image/Camera2TakePhotoFragment.kt
@@ -20,10 +20,7 @@ import com.mustly.wellmedia.base.PageRoute
 import com.mustly.wellmedia.databinding.FragmentCamera2TakePhotoBinding
 import com.mustly.wellmedia.lib.annotation.Route
 import com.mustly.wellmedia.lib.commonlib.log.LogUtil
-import com.mustly.wellmedia.lib.commonlib.utils.OrientationLiveData
-import com.mustly.wellmedia.lib.commonlib.utils.computeExifOrientation
-import com.mustly.wellmedia.lib.commonlib.utils.setNoDoubleClickListener
-import com.mustly.wellmedia.utils.*
+import com.mustly.wellmedia.lib.commonlib.utils.*
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -34,7 +31,6 @@ import java.text.SimpleDateFormat
 import java.util.*
 import java.util.concurrent.ArrayBlockingQueue
 import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
 
 /**
@@ -424,12 +420,14 @@ class Camera2TakePhotoFragment : BaseFragment<FragmentCamera2TakePhotoBinding>()
                 ) == CameraCharacteristics.LENS_FACING_FRONT
                 val exifOrientation = computeExifOrientation(rotation, mirrored)
 
-                cont.resume(CaptureResultWrapper(
+                cont.resume(
+                    CaptureResultWrapper(
                     image,
                     result,
                     exifOrientation,
                     imageReader?.imageFormat ?: ImageFormat.JPEG
-                ))
+                )
+                )
             }
         }
     }

diff --git a/commonlib/build.gradle b/commonlib/build.gradle
@@ -36,4 +36,5 @@ dependencies {
     implementation 'com.google.android.material:material:1.6.0'
     implementation "androidx.startup:startup-runtime:1.1.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
+    implementation 'androidx.exifinterface:exifinterface:1.3.2'
 }
diff --git a/commonlib/src/main/java/com/mustly/wellmedia/lib/commonlib/utils/CameraUtil.kt b/commonlib/src/main/java/com/mustly/wellmedia/lib/commonlib/utils/CameraUtil.kt
@@ -1,4 +1,4 @@
-package com.mustly.wellmedia.utils
+package com.mustly.wellmedia.lib.commonlib.utils
 
 import android.annotation.SuppressLint
 import android.graphics.ImageFormat
@@ -11,7 +11,6 @@ import android.util.Size
 import android.view.Display
 import android.view.Surface
 import com.mustly.wellmedia.lib.commonlib.log.LogUtil
-import kotlinx.coroutines.suspendCancellableCoroutine
 import java.io.Closeable
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine