Przeglądaj źródła

fix: 勋章预览 && 魅力等级页面空白

wzq 1 rok temu
rodzic
commit
7fff0fda08

+ 1 - 1
app/src/main/java/com/adealink/weparty/effect/EffectPreviewView.kt

@@ -77,7 +77,7 @@ class EffectPreviewView @JvmOverloads constructor(
                 setImageView(previewUrl)
                 setImageView(previewUrl)
             }
             }
             else -> {
             else -> {
-                setWeAnimView(previewUrl, finalAnimType, animExtraConfig)
+                setWeAnimView(previewUrl, animType, animExtraConfig)
             }
             }
         }
         }
     }
     }

+ 2 - 1
module/level/src/main/java/com/adealink/weparty/level/adapter/itembinder/CharmLevelUserLevelInfoViewBinder.kt

@@ -2,6 +2,7 @@ package com.adealink.weparty.level.adapter.itembinder
 
 
 import android.view.LayoutInflater
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.view.ViewGroup
+import android.view.animation.Animation
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.doOnAttach
 import androidx.core.view.doOnAttach
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updateLayoutParams
@@ -80,7 +81,7 @@ class CharmLevelUserLevelInfoViewBinder :
         if (medalPair.second.isEmpty()) {
         if (medalPair.second.isEmpty()) {
            binding.ivMedal.setImageUrl(medalPair.first)
            binding.ivMedal.setImageUrl(medalPair.first)
         } else {
         } else {
-            binding.wavMedal.setUrl(medalPair.second)
+            binding.wavMedal.setUrl(medalPair.second, extraConfig = AnimExtraConfig(Animation.INFINITE))
         }
         }
     }
     }
 }
 }

+ 1 - 1
module/level/src/main/java/com/adealink/weparty/level/viewmodel/CharmLevelViewModel.kt

@@ -82,7 +82,7 @@ class CharmLevelViewModel : BaseViewModel() {
                 // 过滤掉没有勋章的等级
                 // 过滤掉没有勋章的等级
                 val medal = entry.value.rewards?.firstOrNull { it.rewardResourceType == ProductTypeConstant.MEDAL.type }
                 val medal = entry.value.rewards?.firstOrNull { it.rewardResourceType == ProductTypeConstant.MEDAL.type }
                 if (medal == null) {
                 if (medal == null) {
-                    return@launch
+                    return@forEach
                 }
                 }
 
 
                 dataList.add(
                 dataList.add(