Merge branch 'dev_update_guard_icon_ui'

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

@@ -332,8 +332,11 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
     }
 
     void Up() {
+        userMoreInfoAdapter.clearData();
         bottom_msg.setVisibility(View.VISIBLE);
         title.setVisibility(View.GONE);
+        LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) mRefreshView.getLayoutParams();
+        params.bottomMargin=DpUtil.dp2px(65);
         if (Tips.equals("1")) {
             tags.setText("開通貴族，尊享超多特權！");
             btn.setBackgroundResource(R.mipmap.btn_openvip);
@@ -361,6 +364,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
             type = "fans";
             no_more.setImageResource(R.mipmap.bixin);
         }else if(Tips.equals("4")){
+            params.bottomMargin=DpUtil.dp2px(0);
             userMoreInfoAdapter.type = "4";
             bottom_msg.setVisibility(View.GONE);
             type="dayRank";
@@ -368,6 +372,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
             gz_view.setVisibility(View.GONE);
             no_more.setImageResource(R.drawable.img_rank_empty);
         }else if (Tips.equals("5")){
+            params.bottomMargin=DpUtil.dp2px(0);
             userMoreInfoAdapter.type = "5";
             bottom_msg.setVisibility(View.GONE);
             type="weekRank";
@@ -375,6 +380,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
             no_more.setImageResource(R.drawable.img_rank_empty);
             setTextColor(weekRank,audience_btn,guard_btn,fans_btn,gz_view,dayRank);
         }
+        mRefreshView.setLayoutParams(params);
     }
 
     /**

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

@@ -1478,7 +1478,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         } else if (i == R.id.ft_hot_add) {
             ((LiveActivity) mContext).openHotListWindow(1);
         } else if (i == R.id.user_guard) {
-            ((LiveActivity) mContext).openUserMoreListWindow(2, true);
+           // ((LiveActivity) mContext).openUserMoreListWindow(2, true);
+            ((LiveActivity) mContext).openGuardListWindow();
         }
 
     }

live/src/main/res/layout/dialog_user_more_list.xml

@@ -73,7 +73,7 @@
                 android:text="@string/live_guard"
                 android:textColor="#ff646464"
                 android:textSize="16sp"
-                android:visibility="gone" />
+                android:visibility="visible" />
 
             <TextView
                 android:id="@+id/fans_btn"