fix: 全局修复 SharedElementCallback 回调中因为异常提前返回未清空 sharedElements 的隐患

Author: anjiemo

app/src/main/java/cn/cqautotest/sunnybeach/ui/activity/GalleryActivity.kt

@@ -108,6 +108,7 @@ class GalleryActivity : AppActivity() {
         }
         setEnterSharedElementCallback(object : SharedElementCallback() {
             override fun onMapSharedElements(names: MutableList<String>, sharedElements: MutableMap<String, View>) {
+                sharedElements.clear()
                 val currentPhoto = mPhotoList.getOrNull(mBinding.galleryViewPager2.currentItem) ?: return
                 val recyclerView = mBinding.galleryViewPager2.getChildAt(0) as? RecyclerView ?: return
                 val viewHolder = recyclerView.findViewHolderForAdapterPosition(mBinding.galleryViewPager2.currentItem) as? QuickViewHolder ?: return
@@ -118,7 +119,6 @@ class GalleryActivity : AppActivity() {
                     names.clear()
                     names.add(currentPhoto.id)
                 }
-                sharedElements.clear()
                 sharedElements[currentPhoto.id] = sharedView
             }
         })

app/src/main/java/cn/cqautotest/sunnybeach/ui/activity/WallpaperActivity.kt

@@ -29,7 +29,11 @@ class WallpaperActivity : AppActivity() {
         setExitSharedElementCallback(object : SharedElementCallback() {
             override fun onMapSharedElements(names: MutableList<String>, sharedElements: MutableMap<String, View>) {
                 val fragment = supportFragmentManager.findFragmentById(R.id.wallpaper_fragment_container) as? DiscoverFragment
-                fragment?.onMapSharedElements(names, sharedElements)
+                if (fragment == null) {
+                    sharedElements.clear()
+                    return
+                }
+                fragment.onMapSharedElements(names, sharedElements)
             }
         })
     }

app/src/main/java/cn/cqautotest/sunnybeach/ui/fragment/DiscoverFragment.kt

@@ -79,7 +79,10 @@ class DiscoverFragment : PagingTitleBarFragment<AppActivity>() {
      * 由 Activity 委托调用的共享元素映射
      */
     fun onMapSharedElements(names: MutableList<String>, sharedElements: MutableMap<String, View>) {
-        if (isUiInvalid) return
+        if (isUiInvalid) {
+            sharedElements.clear()
+            return
+        }
         // 如果 names 为空，说明没有共享元素
         if (names.isEmpty()) return
         // 关键：从 names 中获取目标 ID（由详情页传回）