diff --git a/main/src/main/java/com/yunbao/main/fragment/BattlePassRewardFragment.java b/main/src/main/java/com/yunbao/main/fragment/BattlePassRewardFragment.java index 11ee058cc..3ca10a16e 100644 --- a/main/src/main/java/com/yunbao/main/fragment/BattlePassRewardFragment.java +++ b/main/src/main/java/com/yunbao/main/fragment/BattlePassRewardFragment.java @@ -4,12 +4,15 @@ import static com.yunbao.common.utils.RouteUtil.PATH_COIN; import android.app.Activity; import android.app.Dialog; +import android.os.Build; import android.os.Bundle; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import androidx.annotation.RequiresApi; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -37,8 +40,12 @@ import com.yunbao.main.interfaces.BattlePassUserInfoListener; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.Map; +import java.util.TreeMap; +import java.util.stream.Collectors; public class BattlePassRewardFragment extends BaseFragment { ImageView tab1; @@ -175,6 +182,7 @@ public class BattlePassRewardFragment extends BaseFragment { LiveNetManager.get(getContext()) .getLiveBattlePassRewards(new HttpCallback() { + @RequiresApi(api = Build.VERSION_CODES.N) @Override public void onSuccess(LiveBattlePassRewardsBean data) { @@ -195,8 +203,14 @@ public class BattlePassRewardFragment extends BaseFragment { }else{ Bus.get().post(new BattlePassTypeEvent(2).setBean(data)); } - Collection> values = data.getLive_battle_pass_rewards().values(); + + // data.getLive_battle_pass_rewards()返回的Map排序,不能转为集合 + Map> liveBattlePassRewards = data.getLive_battle_pass_rewards(); + // 使用TreeMap来自动按键排序 + Map> sortedMap = new TreeMap<>(liveBattlePassRewards); + Collection> values = sortedMap.values(); List> list = new ArrayList<>(values); + /* list.get(1).get(1).setReceived(2); list.get(0).get(2).setLock(2); list.get(1).get(2).setLock(2);