fix 修复礼物墙测试问题

common/src/main/java/com/yunbao/common/adapter/GiftWallTab2GiftInfoListItemAdapter.java

@@ -60,7 +60,7 @@ public class GiftWallTab2GiftInfoListItemAdapter extends RecyclerView.Adapter<Gi
         }
 
         public void setData(GiftWallMainTab2ClassicInfoBean.GiftData data, int position) {
-            tv_rank.setText(String.format(Locale.getDefault(), "%d", (position + 1)));
+            tv_rank.setText(String.format(Locale.getDefault(), "%d", (position + 4)));
             tv_rank.setTextColor(Color.parseColor("#FCC755"));
             tv_rank.setTextSize(20);
             tv_rename.setText(String.format(Locale.getDefault(), "%d", (data.getGiftHallSendNum())));

common/src/main/java/com/yunbao/common/bean/GiftWallInfoBean.java

@@ -86,6 +86,16 @@ public class GiftWallInfoBean extends BaseModel {
         private String gift_hall_start; // 使用Java 8的LocalDate来处理日期
         @SerializedName("gift_hall_end_date")
         private String gift_hall_end;
+        @SerializedName("user_gift_hall_send_num")
+        private int user_gift_hall_send_num;
+
+        public int getUser_gift_hall_send_num() {
+            return user_gift_hall_send_num;
+        }
+
+        public void setUser_gift_hall_send_num(int user_gift_hall_send_num) {
+            this.user_gift_hall_send_num = user_gift_hall_send_num;
+        }
 
         @JSONField(name = "gift_hall_start_date")
         public void setGift_hall_start(String gift_hall_start) {

common/src/main/java/com/yunbao/common/dialog/GiftWallGiftInfoDialog.java

@@ -247,6 +247,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
         ViewClicksAntiShake.clicksAntiShake(mIvBack, this::dismiss);
         resetWindows();
     }
+
     private void resetWindows() {
         if (isFullWindows) {
             ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) findViewById(R.id.gift_name).getLayoutParams();
@@ -325,7 +326,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
                 gift_progress.setVisibility(View.GONE);
             }
         }
-        if (!isLiveRoom) {
+        if (!isLiveRoom || (IMLoginManager.get(mContext).getUserInfo().getId() + "").equals(toUserId) && isAnchor) {
             gift_btn.setEnabled(false);
             btn_one.setEnabled(false);
             gift_btn.setBackgroundResource(R.drawable.gift_wall_gift_info_btn_un);
@@ -335,7 +336,7 @@ public class GiftWallGiftInfoDialog extends AbsDialogPopupWindow {
         time = (WordUtil.isNewZh() ? "榜單結算時間" : "Settlement time") + giftBean.getGift_info().getGift_hall_start() + " - " + giftBean.getGift_info().getGift_hall_end();
         ImgLoader.display(mContext, IMLoginManager.get(mContext).getUserInfo().getAvatar(), avatar);
         user_name.setText(IMLoginManager.get(mContext).getUserInfo().getUserNicename());
-        send_num.setText(String.format(Locale.getDefault(), "%s", giftBean.getGift_info().getGift_hall_send_num()));
+        send_num.setText(String.format(Locale.getDefault(), "%s", giftBean.getGift_info().getUser_gift_hall_send_num()));
 
         String tmp = "";
         if (giftBean.getGift_info().getIlluminate_status() == 0) {//未點亮

common/src/main/java/com/yunbao/common/dialog/GiftWallMainTab2ClassicInfoDialog.java

@@ -32,6 +32,7 @@ import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.ScreenDimenUtil;
+import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.CustomEllipsizeTextView;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
@@ -116,7 +117,10 @@ public class GiftWallMainTab2ClassicInfoDialog extends AbsDialogPopupWindow {
         gift_name.setText(WordUtil.isNewZh() ? data.getGiftInfo().getGiftName() : data.getGiftInfo().getGiftNameEn());
         mTvUserName.setText(data.getGiftInfo().getNamingLiveNicename());
         star_value.setText(String.format(Locale.getDefault(), "%d", data.getGiftInfo().getNeedcoinTotal()));
-        adapter.setData(data.getData());
+        int max = data.getData().size() > 3 ? 3 : 0;
+        if (max != 0) {
+            adapter.setData(data.getData().subList(max, data.getData().size()));
+        }
         for (int i = 0; i < data.getData().size() && i < 3; i++) {
             switch (i) {
                 case 0:
@@ -165,7 +169,7 @@ public class GiftWallMainTab2ClassicInfoDialog extends AbsDialogPopupWindow {
         recyclerView = findViewById(R.id.recycler_view);
         adapter = new GiftWallTab2GiftInfoListItemAdapter();
         recyclerView.setAdapter(adapter);
-        recyclerView.addItemDecoration(new ItemDecoration(mContext, 0x000, 0, 2));
+        recyclerView.addItemDecoration(new ItemDecoration(mContext, 0x000, 0, DpUtil.dp2px(2)));
 
         ViewClicksAntiShake.clicksAntiShake(mIvBack, new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
@@ -177,6 +181,7 @@ public class GiftWallMainTab2ClassicInfoDialog extends AbsDialogPopupWindow {
         initData();
         resetWindows();
     }
+
     private void resetWindows() {
         if (isFullWindows) {
             ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) findViewById(R.id.iv_back).getLayoutParams();
@@ -187,6 +192,7 @@ public class GiftWallMainTab2ClassicInfoDialog extends AbsDialogPopupWindow {
             findViewById(R.id.scrollView).setLayoutParams(params);
         }
     }
+
     @Override
     protected void onCreate() {
         super.onCreate();

common/src/main/res/layout/dialog_gift_wall_tab2_classic_info.xml

@@ -20,16 +20,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0" />
 
-    <ImageView
+
-        android:id="@+id/iv_back"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
-        android:layout_marginTop="21dp"
-        android:src="@mipmap/icon_sud_rule_close_bottom"
-        android:visibility="visible"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/scrollView"
@@ -483,6 +474,15 @@
             </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-
+    <ImageView
+        android:id="@+id/iv_back"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="15dp"
+        android:layout_marginTop="21dp"
+        android:src="@mipmap/icon_sud_rule_close_bottom"
+        android:visibility="visible"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

common/src/main/res/layout/item_gift_wall_man_tab2_list_2.xml

@@ -118,7 +118,7 @@
         android:layout_marginStart="20dp"
         android:layout_marginEnd="20dp"
         android:gravity="center"
-        android:text="@string/dialog_gift_wall_tab2_list_wait"
+        android:text="@string/dialog_gift_wall_classic_wait"
         android:textColor="#A2A2A2"
         android:textSize="14sp"
         android:visibility="gone"