diff --git a/photo/src/main/java/com/qmuiteam/photo/activity/QMUIPhotoViewerActivity.kt b/photo/src/main/java/com/qmuiteam/photo/activity/QMUIPhotoViewerActivity.kt index 1fe1df2b..7ef8eda1 100644 --- a/photo/src/main/java/com/qmuiteam/photo/activity/QMUIPhotoViewerActivity.kt +++ b/photo/src/main/java/com/qmuiteam/photo/activity/QMUIPhotoViewerActivity.kt @@ -196,7 +196,7 @@ open class QMUIPhotoViewerActivity : AppCompatActivity() { allowPullExit() }, onLongPress = { - drawableCache.drawable?.let { + drawableCache.photoResult?.let { onLongClick(page, it) } }, @@ -207,7 +207,7 @@ open class QMUIPhotoViewerActivity : AppCompatActivity() { val onPhotoLoad: (PhotoResult) -> Unit = remember(drawableCache, onImageRatioEnsured) { { - drawableCache.drawable = it.drawable + drawableCache.photoResult = it if (it.drawable.intrinsicWidth > 0 && it.drawable.intrinsicHeight > 0) { onImageRatioEnsured(it.drawable.intrinsicWidth.toFloat() / it.drawable.intrinsicHeight) } @@ -345,7 +345,7 @@ open class QMUIPhotoViewerActivity : AppCompatActivity() { return true } - protected open fun onLongClick(page: Int, drawable: Drawable) { + protected open fun onLongClick(page: Int, photoResult: PhotoResult) { } @@ -406,4 +406,4 @@ class QMUIPhotoViewerViewModel(val state: SavedStateHandle) : ViewModel() { } } -class MutableDrawableCache(var drawable: Drawable? = null) +class MutableDrawableCache(var photoResult: PhotoResult? = null) diff --git a/plugin/src/main/java/com/qmuiteam/plugin/Dep.kt b/plugin/src/main/java/com/qmuiteam/plugin/Dep.kt index 3324736a..22e751e9 100644 --- a/plugin/src/main/java/com/qmuiteam/plugin/Dep.kt +++ b/plugin/src/main/java/com/qmuiteam/plugin/Dep.kt @@ -20,7 +20,7 @@ object Dep { // composeMajor.composeMinor.qmuiReleaseNumber const val composeCoreVer = "1.1.1" const val composeVer = "1.1.1.1" - const val photoVer = "1.1.1.7" + const val photoVer = "1.1.1.9" const val editorVer = "1.1.1" }