update:调整守护逻辑：守护列表为空的情况下，直接打开购买守护界面

update:调整守护icon

live/src/main/java/com/yunbao/live/activity/LiveActivity.java

@@ -35,6 +35,7 @@ import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.utils.formatBigNum;
 import com.yunbao.live.R;
+import com.yunbao.live.bean.GuardUserBean;
 import com.yunbao.live.bean.LiveBean;
 import com.yunbao.live.bean.LiveBuyGuardMsgBean;
 import com.yunbao.live.bean.LiveChatBean;
@@ -86,6 +87,7 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 
@@ -331,7 +333,6 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
     }
 
 
-
     @Override
     public void onBuyLiangName(LiveReceiveGiftBean bean) {
         if (mLiveRoomViewHolder != null) {
@@ -1261,11 +1262,20 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
         fragment.setArguments(bundle);
         fragment.show(getSupportFragmentManager(), "LiveGuardDialogFragment");
     }
+
     /**
      * 守护列表弹窗
      */
     public void openNewGuardListWindow() {
+        LiveHttpUtil.getGuardList(mLiveUid, 1, new HttpCallback() {
+            @Override
+            public void onSuccess(int code, String msg, String[] info) {
+                List<GuardUserBean> list = JSON.parseArray(Arrays.toString(info), GuardUserBean.class);
+                if(list.isEmpty()){
+                    openNewBuyGuardWindow();
+                }else {
                     LiveNewGuardListDialogFragment fragment = new LiveNewGuardListDialogFragment();
+                    fragment.setList(list);
                     fragment.setLiveGuardInfo(mLiveGuardInfo);
                     Bundle bundle = new Bundle();
                     bundle.putString(Constants.LIVE_UID, mLiveUid);
@@ -1273,6 +1283,10 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
                     fragment.setArguments(bundle);
                     fragment.show(getSupportFragmentManager(), "LiveGuardDialogFragment");
                 }
+            }
+        });
+
+    }
 
     /**
      * 打開粉絲團
@@ -1342,6 +1356,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
         fragment.setArguments(bundle);
         fragment.show(getSupportFragmentManager(), "LiveGuardBuyDialogFragment");
     }
+
     /**
      * 打开购买守护的弹窗
      */

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

@@ -34,6 +34,7 @@ import com.yunbao.live.bean.GuardUserBean;
 import com.yunbao.live.bean.LiveGuardInfo;
 import com.yunbao.live.http.LiveHttpUtil;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -52,6 +53,7 @@ public class LiveNewGuardListDialogFragment extends AbsDialogFragment implements
     private LiveGuardInfo mLiveGuardInfo;
     private String mLiveUid;
     private boolean mIsAnchor;//是否是主播
+    private List<GuardUserBean> list=new ArrayList<>();
 
     @Override
     protected int getLayoutId() {
@@ -112,6 +114,9 @@ public class LiveNewGuardListDialogFragment extends AbsDialogFragment implements
     private void initView() {
         mRefreshView.setEmptyLayoutId(mIsAnchor ? R.layout.view_no_data_guard_anc : R.layout.view_no_data_guard_aud);
         mRefreshView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
+        mGuardAdapter = new GuardAdapter(mContext, true, false);
+        mGuardAdapter.setList(list);
+        setAdapterData();
         mRefreshView.setDataHelper(new CommonRefreshView.DataHelper<GuardUserBean>() {
             @Override
             public RefreshAdapter<GuardUserBean> getAdapter() {
@@ -129,6 +134,50 @@ public class LiveNewGuardListDialogFragment extends AbsDialogFragment implements
             @Override
             public List<GuardUserBean> processData(String[] info) {
                 List<GuardUserBean> list = JSON.parseArray(Arrays.toString(info), GuardUserBean.class);
+                if(!list.isEmpty()){
+                    LiveNewGuardListDialogFragment.this.list=list;
+                    setAdapterData();
+                }
+                return list;
+            }
+
+            @Override
+            public void onRefreshSuccess(List<GuardUserBean> list, int listCount) {
+
+            }
+
+            @Override
+            public void onRefreshFailure() {
+
+            }
+
+            @Override
+            public void onLoadMoreSuccess(List<GuardUserBean> loadItemList, int loadItemCount) {
+
+            }
+
+            @Override
+            public void onLoadMoreFailure() {
+
+            }
+        });
+        mRefreshView.setRecyclerViewAdapter(mGuardAdapter);
+        mGuardAdapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public void onClick(View view) {
+        dismiss();
+        ((LiveActivity) mContext).openNewBuyGuardWindow();
+    }
+
+    @Override
+    public int show(@NonNull FragmentTransaction transaction, @Nullable String tag) {
+        int show = super.show(transaction, tag);
+        initView();
+        return show;
+    }
+    private void setAdapterData(){
         if (list.isEmpty()) {
             userLayout.setVisibility(View.INVISIBLE);
         }else {
@@ -160,42 +209,8 @@ public class LiveNewGuardListDialogFragment extends AbsDialogFragment implements
                 mBtnBuy.setText(R.string.guard_buy_3);
             }
         }
-                return list;
     }
-
+    public void setList(List<GuardUserBean> list) {
-            @Override
+        this.list=list;
-            public void onRefreshSuccess(List<GuardUserBean> list, int listCount) {
-
-            }
-
-            @Override
-            public void onRefreshFailure() {
-
-            }
-
-            @Override
-            public void onLoadMoreSuccess(List<GuardUserBean> loadItemList, int loadItemCount) {
-
-            }
-
-            @Override
-            public void onLoadMoreFailure() {
-
-            }
-        });
-        mRefreshView.initData();
-    }
-
-    @Override
-    public void onClick(View view) {
-        dismiss();
-        ((LiveActivity) mContext).openNewBuyGuardWindow();
-    }
-
-    @Override
-    public int show(@NonNull FragmentTransaction transaction, @Nullable String tag) {
-        int show = super.show(transaction, tag);
-        initView();
-        return show;
     }
 }

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

@@ -245,8 +245,8 @@
             android:id="@+id/guard_imageView"
             android:layout_width="0dp"
             android:layout_height="58dp"
-            android:layout_centerHorizontal="true"
             android:layout_marginTop="30dp"
+            android:layout_marginStart="125dp"
             android:scaleType="centerCrop"
             android:src="@drawable/guardian_img_wings"
             android:visibility="invisible"
@@ -257,7 +257,7 @@
             android:layout_width="65dp"
             android:layout_height="65dp"
             android:layout_centerHorizontal="true"
-            android:layout_marginStart="-5dp"
+            android:layout_marginStart="-6dp"
             android:layout_marginTop="25dp"
             android:layout_toEndOf="@+id/guard_imageView"
             android:scaleType="centerCrop"
@@ -269,9 +269,9 @@
             android:id="@+id/guard_imageView_one"
             android:layout_width="65dp"
             android:layout_height="65dp"
-            android:layout_centerHorizontal="true"
             android:layout_marginTop="25dp"
-            android:layout_toStartOf="@id/guard_imageView"
+
+            android:layout_toStartOf="@id/guard_imageView_two"
             android:scaleType="centerCrop"
             android:src="@drawable/guardian_img_wings"
             android:visibility="invisible"

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

@@ -195,8 +195,8 @@
 
                     <com.makeramen.roundedimageview.RoundedImageView
                         android:id="@+id/user_guard"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_centerInParent="true"
                         android:scaleType="centerCrop"
                         android:src="@mipmap/img_guardian_empty"