Merge commit '1aa17774ac64251ca3b10bbb8e3fdcb067a6abe4' into dev_2.0.8_pk

MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/LineSearch/MOPkTopUsersView.swift

@@ -78,6 +78,7 @@ class MOPkTopUsersView: UIView {
         }
 
         itemView.borderImgView.image = UIImage(named: "icon_pk_top_1")
+        itemView.borderImgView.isHidden = true
         stackView.addArrangedSubview(itemView)
         itemViewArray.append(itemView)
     }
@@ -102,6 +103,7 @@ class MOPkTopUsersView: UIView {
             }
             
             itemView.borderImgView.image = UIImage(named: "icon_pk_top_\(i + 1)")
+            itemView.borderImgView.isHidden = false
             stackView.addArrangedSubview(itemView)
             if !itemViewArray.contains(itemView) {
                 itemViewArray.append(itemView)

MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/NewPK/MOLinePkView.swift

@@ -82,13 +82,18 @@ extension MOLinePkView: MOLinePKViewModelDelegate {
     func onLinePkCampInfoChanged(viewModel: MOLinePKViewModel) {
         if let ownerInfo = viewModel.curOwnerCampInfo {
             let avatars = ownerInfo.topUsers.compactMap({ $0.avatar })
-            ownerTopUsersView.setupAvatars(with: avatars)
-            ownerTopUsersView.haveMvp = !avatars.isEmpty
+            if avatars.count > 0 {
+                ownerTopUsersView.setupAvatars(with: avatars)
+                ownerTopUsersView.haveMvp = !avatars.isEmpty
+            }
             curOwnerCampInfo = ownerInfo
         }
         
         if let peerInfo = viewModel.curPeerCampInfo {
-            peerTopUsersView.setupAvatars(with: peerInfo.topUsers.compactMap({ $0.avatar }))
+            let avatars = peerInfo.topUsers.compactMap({ $0.avatar })
+            if avatars.count > 0 {
+                peerTopUsersView.setupAvatars(with: avatars)
+            }
             curPeerCampInfo = peerInfo
         }
     }