Merge remote-tracking branch 'origin/master'

live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java

@@ -145,10 +145,10 @@ public class UserMoreInfoAdapter extends RefreshAdapter<UserBean> {
             title.setVisibility(View.GONE);
             title1.setVisibility(View.GONE);
             Log.i("tag", "" + num);
-            if (position == 0 && type.equals("1")) {
-                title1.setText(R.string.noble);
-                title1.setVisibility(View.VISIBLE);
-            }
+//            if (position == 0 && type.equals("1")) {
+//                title1.setText(R.string.noble);
+//                title1.setVisibility(View.VISIBLE);
+//            }
             if (position == num && type.equals("1")) {
                 title.setText(R.string.live_audience);
                 title.setVisibility(View.VISIBLE);

live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java

@@ -3,6 +3,7 @@ package com.yunbao.live.dialog;
 import android.app.ActionBar;
 import android.graphics.Color;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
@@ -112,7 +113,8 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
         stream = bundle.getString(Constants.STREAM);
         isOnly = bundle.getBoolean("only", false);
         String outRankHideString = bundle.getString("outRankHide");
-        outRankHide = GsonUtils.fromJson(outRankHideString, new TypeToken<List<String>>(){}.getType());
+        outRankHide = GsonUtils.fromJson(outRankHideString, new TypeToken<List<String>>() {
+        }.getType());
         if (userMoreInfoAdapter != null) {
 
             userMoreInfoAdapter.setHide(outRankHide);
@@ -264,9 +266,12 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
             }
 
             private List<LiveUserGiftBean> processUserData(JSONObject json) {
-                List<LiveUserGiftBean> data = JSON.parseArray(json.getString("userlist"), LiveUserGiftBean.class);
-                if (data == null) {
-                    return new ArrayList<>();
+                List<LiveUserGiftBean> userGiftBeans = JSON.parseArray(json.getString("userlist"), LiveUserGiftBean.class);
+                List<LiveUserGiftBean> data = new ArrayList<>();
+                for (LiveUserGiftBean model : userGiftBeans) {
+                    if (TextUtils.equals(model.getNoble_id(), "0")) {
+                        data.add(model);
+                    }
                 }
                 Log.i("tag222", "ssss");
                 if (data.size() > 0 && pg == 1) {

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -1901,7 +1901,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         } else if (i == R.id.btn_prize_pool_level) {
             ((LiveActivity) mContext).openPrizePoolWindow();
         } else if (i == R.id.user_more) {
-            ((LiveActivity) mContext).openUserMoreListWindow(4, false);
+            ((LiveActivity) mContext).openUserMoreListWindow(1, false);
         } else if (i == R.id.hot_btn) {
             ((LiveActivity) mContext).openUserMoreListWindow(1, false);