diff --git a/config.gradle b/config.gradle index ddf9b84c6..7c52b7719 100644 --- a/config.gradle +++ b/config.gradle @@ -4,8 +4,8 @@ ext { buildToolsVersion: "28.0.3", minSdkVersion : 21, targetSdkVersion : 31, - versionCode : 229, - versionName : "6.4.3" + versionCode : 301, + versionName : "6.4.4" ] manifestPlaceholders = [ //正式 @@ -25,8 +25,8 @@ ext { baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", // true表示谷歌支付 false - isGooglePlay : false, + isGooglePlay : true, //是否上报异常日志 - isUploadLog : false + isUploadLog : true ] } \ No newline at end of file diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java index 0d09fd5e1..8d764f02b 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java @@ -41,6 +41,8 @@ import com.yunbao.live.bean.LiveUserGiftBean; import com.yunbao.live.http.LiveHttpUtil; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import io.reactivex.android.schedulers.AndroidSchedulers; @@ -279,6 +281,12 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie } } + Collections.sort(data, (o1, o2) -> { + int nobleID1 = Integer.parseInt(o1.getNoble_id()); + int nobleID2 = Integer.parseInt(o2.getNoble_id()); + int i = nobleID1 - nobleID2; + return i; + }); Log.i("tag222", "ssss"); if (data.size() > 0 && pg == 1) { nums = 0;