许愿排行榜UI调整

app/src/main/res/layout/box_ranking_list_item.xml

@@ -14,6 +14,30 @@
         android:paddingEnd="@dimen/dp_15"
         >
 
+        <FrameLayout
+            android:layout_width="0dp"
+            android:layout_weight="0.2"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:paddingStart="@dimen/dp_8"
+            >
+            <ImageView
+                android:id="@+id/iv_position"
+                android:layout_width="@dimen/dp_20"
+                android:layout_height="@dimen/dp_20"
+                android:layout_gravity="center"
+                />
+            <TextView
+                android:id="@+id/tv_position"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/dp_13"
+                android:textColor="@color/color_666666"
+                android:layout_gravity="center_vertical"
+                tools:text="4"
+                android:gravity="center"
+                />
+        </FrameLayout>
 
     <com.yizhuan.erban.ui.widget.NobleAvatarView
         android:id="@+id/noble_avatar_view"

app/src/module_room_chat/res/layout/activity_room_box_ranking.xml

@@ -9,58 +9,51 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/room_msg_height"
+        android:layout_height="360dp"
         android:layout_gravity="bottom"
         android:background="@drawable/shape_white_top_14dp"
         android:orientation="vertical">
 
+
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
             >
-
-            <LinearLayout
+            <com.flyco.tablayout.SlidingTabLayout
+                android:id="@+id/view_indicator"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:gravity="center"
-                android:layout_gravity="center_horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/find_new"
-                    android:textColor="@color/color_333333"
-                    android:textSize="@dimen/dp_18"
-                    android:layout_marginTop="@dimen/dp_15"
-                    />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="每日更新推荐"
-                    android:textColor="@color/color_999999"
-                    android:textSize="@dimen/dp_13"
-                    />
-            </LinearLayout>
+                android:layout_height="46dp"
+                android:background="@drawable/shape_white_top_14dp"
+                app:tl_indicator_color="@color/appColor"
+                app:tl_indicator_corner_radius="2dp"
+                app:tl_indicator_height="@dimen/dp_3"
+                app:tl_indicator_width="@dimen/dp_9"
+                app:tl_tab_space_equal="true"
+                app:tl_textSelectColor="@color/color_333333"
+                app:tl_textUnselectColor="@color/text_tertiary"
+                app:tl_textsize="@dimen/dp_16" />
 
             <ImageView
-                android:id="@+id/iv_back"
+                android:id="@+id/iv_refresh"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/arrow_left"
-                android:layout_marginStart="@dimen/dp_15"
-                android:layout_gravity="center_vertical"
+                android:layout_height="match_parent"
+                android:src="@drawable/refresh"
+                android:layout_gravity="end"
+                android:paddingStart="@dimen/dp_15"
+                android:paddingEnd="@dimen/dp_15"
                 />
-
-
         </FrameLayout>
 
-        <FrameLayout
-            android:id="@+id/recent_container"
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/color_f5f5f5" />
+
+        <androidx.viewpager.widget.ViewPager
+            android:id="@+id/viewpager"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
-
     </LinearLayout>
 
 </FrameLayout>

app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxRankingActivity.java

@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.text.TextUtils;
+import android.widget.ImageView;
 
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
@@ -14,15 +14,9 @@ import com.yizhuan.erban.R;
 import com.yizhuan.erban.base.BaseActivity;
 import com.yizhuan.erban.common.ViewPagerAdapter;
 import com.yizhuan.erban.decoration.view.widgets.CarMagicIndicator;
-import com.yizhuan.erban.friend.action.AbstractSelectFriendAction;
+import com.yizhuan.erban.treasure_box.event.RefreshBoxRankingEvent;
 import com.yizhuan.erban.treasure_box.fragment.BoxRankingFragment;
-import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity;
 import com.yizhuan.tutu.room_chat.event.ClickRootViewEvent;
-import com.yizhuan.tutu.room_chat.fragment.RoomMsgAttentionFragment;
-import com.yizhuan.tutu.room_chat.fragment.RoomMsgFansListFragment;
-import com.yizhuan.tutu.room_chat.fragment.RoomMsgFriendListFragment;
-import com.yizhuan.tutu.room_chat.fragment.RoomMsgRecentListFragment;
-import com.yizhuan.tutu.room_chat.fragment.RoomNewbieListFragment;
 import com.yizhuan.xchat_android_core.home.bean.TabInfo;
 import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
 import com.yizhuan.xchat_android_core.manager.RoomEvent;
@@ -46,6 +40,8 @@ public class BoxRankingActivity extends BaseActivity implements CarMagicIndicato
     SlidingTabLayout viewIndicator;
     @BindView(R.id.viewpager)
     ViewPager viewpager;
+    @BindView(R.id.iv_refresh)
+    ImageView ivRefresh;
     private String[] titles = {"今日榜单", "昨日榜单"};
     public static final int TYPE_TODAY = 1;//今日
     public static final int TYPE_YESTERDAY = 2;//今日
@@ -71,6 +67,8 @@ public class BoxRankingActivity extends BaseActivity implements CarMagicIndicato
                 .compose(bindToLifecycle())
                 .filter(roomEvent -> roomEvent.getEvent() == RoomEvent.KICK_OUT_ROOM)
                 .subscribe(roomEvent -> finish());
+
+        ivRefresh.setOnClickListener(v -> EventBus.getDefault().post(new RefreshBoxRankingEvent()));
     }
 
     @Override
@@ -81,10 +79,10 @@ public class BoxRankingActivity extends BaseActivity implements CarMagicIndicato
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_room_message);
+        setContentView(R.layout.activity_room_box_ranking);
         ButterKnife.bind(this);
-        init();
         EventBus.getDefault().register(this);
+        init();
     }
 
     @Override

app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/adapter/BoxRankingListAdapter.java

@@ -1,8 +1,10 @@
 package com.yizhuan.erban.treasure_box.adapter;
 
+import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.appcompat.widget.AppCompatImageView;
@@ -27,8 +29,10 @@ import java.util.List;
 
 public class BoxRankingListAdapter extends BaseQuickAdapter<BoxRankingInfo.RankVosBean, BaseViewHolder> {
 
-    public BoxRankingListAdapter() {
+    private Context mContext;
+    public BoxRankingListAdapter(Context context) {
         super(R.layout.box_ranking_list_item);
+        this.mContext = context;
     }
 
     @Override
@@ -39,5 +43,29 @@ public class BoxRankingListAdapter extends BaseQuickAdapter<BoxRankingInfo.RankV
         NobleAvatarView nobleAvatarView = baseViewHolder.getView(R.id.noble_avatar_view);
         nobleAvatarView.setSize(55, 75, 15);
         nobleAvatarView.setData(rankVosBeans.getAvatar(),null);
+        TextView tvPosition = baseViewHolder.getView(R.id.tv_position);
+        ImageView ivPosition = baseViewHolder.getView(R.id.iv_position);
+        switch (baseViewHolder.getLayoutPosition()){
+            case 0:
+                tvPosition.setVisibility(View.GONE);
+                ivPosition.setVisibility(View.VISIBLE);
+                ivPosition.setImageDrawable(mContext.getResources().getDrawable(R.drawable.ic_box_ranking_first));
+                break;
+            case 1:
+                tvPosition.setVisibility(View.GONE);
+                ivPosition.setVisibility(View.VISIBLE);
+                ivPosition.setImageDrawable(mContext.getResources().getDrawable(R.drawable.ic_box_ranking_second));
+                break;
+            case 2:
+                tvPosition.setVisibility(View.GONE);
+                ivPosition.setVisibility(View.VISIBLE);
+                ivPosition.setImageDrawable(mContext.getResources().getDrawable(R.drawable.ic_box_ranking_third));
+                break;
+            default:
+                tvPosition.setVisibility(View.VISIBLE);
+                ivPosition.setVisibility(View.GONE);
+                tvPosition.setText(baseViewHolder.getLayoutPosition()+1+"");
+                break;
+        }
     }
 }

app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/event/RefreshBoxRankingEvent.java

@@ -0,0 +1,4 @@
+package com.yizhuan.erban.treasure_box.event;
+
+public class RefreshBoxRankingEvent {
+}

app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/BoxRankingFragment.java

@@ -13,6 +13,7 @@ import com.yizhuan.erban.R;
 import com.yizhuan.erban.base.BaseMvpFragment;
 import com.yizhuan.erban.treasure_box.adapter.BoxRankingListAdapter;
 import com.yizhuan.erban.treasure_box.bean.BoxRankingInfo;
+import com.yizhuan.erban.treasure_box.event.RefreshBoxRankingEvent;
 import com.yizhuan.erban.treasure_box.module.IBoxRankingView;
 import com.yizhuan.erban.treasure_box.presenter.BoxRankingPresenter;
 import com.yizhuan.tutu.room_chat.event.SendHelloSuccessEvent;
@@ -95,7 +96,7 @@ public class BoxRankingFragment extends BaseMvpFragment<IBoxRankingView, BoxRank
     private void initRecyclerView() {
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         recyclerView.setItemAnimator(null);
-        mAdapter = new BoxRankingListAdapter();
+        mAdapter = new BoxRankingListAdapter(mContext);
         mAdapter.setOnLoadMoreListener(this, recyclerView);
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
         recyclerView.setLayoutManager(linearLayoutManager);
@@ -167,7 +168,7 @@ public class BoxRankingFragment extends BaseMvpFragment<IBoxRankingView, BoxRank
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onSendHelloSuccess(SendHelloSuccessEvent event) {
+    public void onRefreshRanking(RefreshBoxRankingEvent event) {
         loadData(true,datetype);
     }
 }

core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/IndexGiftValue.java

@@ -15,4 +15,6 @@ public class IndexGiftValue implements Serializable {
 
     private long giftValue;
 
+    //
+
 }