merge：优化合并到test

2023-11-20 10:14:49 +08:00
parent 9462b4a1be 0d488877c8
commit 774965a2ec
18 changed files with 404 additions and 150 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -830,6 +830,10 @@
        <activity
            android:name=".ui.webview.DatingRuleWebViewActivity"
            android:theme="@style/dialog_web_view_activity" />
+        <activity
+            android:name=".ui.webview.room_banner.RoomBannerWebDialogActivity"
+            android:theme="@style/dialog_web_view_activity"
+            android:windowSoftInputMode="adjustPan"  />
        <activity
            android:name=".ui.webview.TarotPayWebViewActivity"
            android:theme="@style/dialog_web_view_activity" />
--- a/app/src/main/java/com/yizhuan/habu/avroom/fragment/BaseRoomFragment.kt
+++ b/app/src/main/java/com/yizhuan/habu/avroom/fragment/BaseRoomFragment.kt
@@ -513,9 +513,6 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
            //設置透明度
            rollPagerView.setAnimationDurtion(500)
            bannerAdapter.notifyDataSetChanged()
-            bannerAdapter.setRoomActClickListener { url ->
-                DialogWebViewActivity.start(mContext, url)
-            }

            // 模擬指示器在viewpager底部效果
            val viewPager = rollPagerView.viewPager
--- a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.java
+++ b/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.java
@@ -1,95 +0,0 @@
-package com.yizhuan.habu.home.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import com.netease.nim.uikit.support.glide.GlideApp;
-import com.yizhuan.habu.R;
-import com.yizhuan.habu.avroom.firstcharge.FirstChargeDialog;
-import com.yizhuan.habu.shipantics.PullRadishActivity;
-import com.yizhuan.habu.treasure_box.widget.GoldBoxHelper;
-import com.yizhuan.habu.treasurefairy.HomeFairyActivity;
-import com.yizhuan.habu.ui.utils.ImageLoadUtils;
-import com.yizhuan.habu.ui.widget.rollviewpager.adapter.StaticPagerAdapter;
-import com.yizhuan.habu.utils.CommonJumpHelper;
-import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
-import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
-
-import java.util.List;
-
-public class RoomActAdapter extends StaticPagerAdapter {
-
-    private Context mContext;
-    private List<BannerInfo> data;
-    private RoomActClickListener listener;
-
-    public RoomActAdapter(Context context, List<BannerInfo> data) {
-        this.data = data;
-        this.mContext = context;
-    }
-
-    @Override
-    public View getView(ViewGroup container, int position) {
-        View view = LayoutInflater.from(mContext).inflate(R.layout.item_room_act, container, false);
-        ImageView ivCover = view.findViewById(R.id.iv_cover);
-        BannerInfo bannerInfo = data.get(position);
-        String actId = String.valueOf(bannerInfo.getBannerId());
-        ivCover.setScaleType(ImageView.ScaleType.CENTER_CROP);
-        if (bannerInfo.isFairy()) {
-            ivCover.setImageResource(R.drawable.ic_fairy_entrance);
-        } else if (bannerInfo.isFirstCharge()) {
-            ivCover.setImageResource(R.drawable.ic_first_charge_enter);
-        } else if (bannerInfo.isBox()) {
-            GlideApp.with(BasicConfig.INSTANCE.getAppContext())
-                    .load(GoldBoxHelper.getBoxIcon())
-                    .error(R.drawable.icon_room_treasure_box)
-                    .into(ivCover);
-        } else if (bannerInfo.isRadish()) {
-            ivCover.setImageResource(R.drawable.ic_radish_entrance);
-        } else {
-            ImageLoadUtils.loadImage(mContext, bannerInfo.getBannerPic(), ivCover, R.drawable.default_cover);
-        }
-        ivCover.setOnClickListener(v -> {
-            if (bannerInfo.isFairy()) {
-                HomeFairyActivity.start(mContext);
-            } else if (bannerInfo.isFirstCharge()) {
-                FirstChargeDialog.start(mContext);
-            } else if (bannerInfo.isBox()) {
-                GoldBoxHelper.handleBoxClick(mContext);
-            } else if (bannerInfo.isRadish()) {
-                PullRadishActivity.start(mContext);
-            } else {
-                AvRoomModel.get().activityClickLog("2", actId).subscribe();
-                if (bannerInfo.getSkipType() == 3 && bannerInfo.getShowType() != 1) {
-                    if (listener != null) {
-                        listener.onWebClick(bannerInfo.getSkipUri());
-                    }
-                } else {
-                    CommonJumpHelper.bannerJump(mContext, bannerInfo);
-                }
-            }
-        });
-        return view;
-    }
-
-    @Override
-    public int getCount() {
-        if (data != null) {
-            return data.size();
-        } else {
-            return 0;
-        }
-    }
-
-    public void setRoomActClickListener(RoomActClickListener listener) {
-        this.listener = listener;
-    }
-
-    public interface RoomActClickListener {
-        void onWebClick(String url);
-    }
-}
--- a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.kt
+++ b/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.kt
@@ -0,0 +1,77 @@
+package com.yizhuan.habu.home.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import com.netease.nim.uikit.support.glide.GlideApp
+import com.yizhuan.habu.R
+import com.yizhuan.habu.avroom.firstcharge.FirstChargeDialog
+import com.yizhuan.habu.shipantics.PullRadishActivity
+import com.yizhuan.habu.treasure_box.widget.GoldBoxHelper
+import com.yizhuan.habu.treasurefairy.HomeFairyActivity
+import com.yizhuan.habu.ui.utils.ImageLoadUtils
+import com.yizhuan.habu.ui.webview.room_banner.RoomBannerWebDialogActivity
+import com.yizhuan.habu.ui.widget.rollviewpager.adapter.StaticPagerAdapter
+import com.yizhuan.habu.utils.CommonJumpHelper
+import com.yizhuan.xchat_android_core.home.bean.BannerInfo
+import com.yizhuan.xchat_android_core.room.model.AvRoomModel
+import com.yizhuan.xchat_android_library.utils.config.BasicConfig
+import okhttp3.internal.filterList
+
+class RoomActAdapter(private val mContext: Context, private val data: List<BannerInfo>) :
+    StaticPagerAdapter() {
+    override fun getView(container: ViewGroup, position: Int): View {
+        val view = LayoutInflater.from(mContext).inflate(R.layout.item_room_act, container, false)
+        val ivCover = view.findViewById<ImageView>(R.id.iv_cover)
+        val bannerInfo = data[position]
+        val actId = bannerInfo.bannerId.toString()
+        ivCover.scaleType = ImageView.ScaleType.CENTER_CROP
+        if (bannerInfo.isFairy) {
+            ivCover.setImageResource(R.drawable.ic_fairy_entrance)
+        } else if (bannerInfo.isFirstCharge) {
+            ivCover.setImageResource(R.drawable.ic_first_charge_enter)
+        } else if (bannerInfo.isBox) {
+            GlideApp.with(BasicConfig.INSTANCE.appContext)
+                .load(GoldBoxHelper.getBoxIcon())
+                .error(R.drawable.icon_room_treasure_box)
+                .into(ivCover)
+        } else if (bannerInfo.isRadish) {
+            ivCover.setImageResource(R.drawable.ic_radish_entrance)
+        } else {
+            ImageLoadUtils.loadImage(
+                mContext,
+                bannerInfo.bannerPic,
+                ivCover,
+                R.drawable.default_cover
+            )
+        }
+        ivCover.setOnClickListener { v: View? ->
+            if (bannerInfo.isFairy) {
+                HomeFairyActivity.start(mContext)
+            } else if (bannerInfo.isFirstCharge) {
+                FirstChargeDialog.start(mContext)
+            } else if (bannerInfo.isBox) {
+                GoldBoxHelper.handleBoxClick(mContext)
+            } else if (bannerInfo.isRadish) {
+                PullRadishActivity.start(mContext)
+            } else {
+                AvRoomModel.get().activityClickLog("2", actId).subscribe()
+                if (bannerInfo.skipType == 3) {
+                    val list = data.filterList {
+                        skipType == 3
+                    }
+                    RoomBannerWebDialogActivity.start(mContext, position, list)
+                } else {
+                    CommonJumpHelper.bannerJump(mContext, bannerInfo)
+                }
+            }
+        }
+        return view
+    }
+
+    override fun getCount(): Int {
+        return data.size
+    }
+}
--- a/app/src/main/java/com/yizhuan/habu/ui/setting/SettingActivity.kt
+++ b/app/src/main/java/com/yizhuan/habu/ui/setting/SettingActivity.kt
@@ -221,9 +221,8 @@ class SettingActivity : BaseViewBindingActivity<ActivitySettingBinding>(), View.
 //        val json = "{\"first\":3,\"second\":32,\"data\":{\"recvUserUid\":2735,\"recvUserAvatar\":\"https://img.pekolive.com/default_avatar.png\",\"recvUserNick\":\"66丢丢丢丢丢多多多的hhhh\",\"sendUserNick\":\"11的ass\",\"sendUserAvatar\":\"http://beta.img.pekolive.com/Fk7aur-1RBqKXC-qqBwMTjivZ3lV?imageslim\",\"sendUserUid\":2737,\"giftUrl\":\"http://beta.img.pekolive.com/Fn6h_gPFD5MwA-Ql_kcWqNpKp0JM?imageslim\",\"giftName\":\"幽靈糖果\",\"giftId\":2075,\"giftNum\":${Random.nextInt(1,1000)},\"giftGolds\":33440,\"notifyStaySecond\":5,\"isHomeShow\":true,\"isSkipRoom\":true,\"isFullScreen\":false,\"isSendMsg\":false,\"roomUid\":2737,\"roomErbanNo\":11,\"roomTitle\":\"11的工会\",\"levelNum\":${Random.nextInt(1,4)}}}"
 //        onReceivedNimBroadcastMessage(json)
 //        CommonWebViewActivity.start(this,"http://192.168.0.19:5500/#/Rank")
-        val json =
-            "{\"first\":85,\"second\":855,\"data\":{\"nick\":\"66丢丢丢丢丢多多多的hhhh\",\"preVipName\":\"子爵\",\"floatPic\":\"https://image.hfighting.com/Fq3JtbK2acO3FN-3vWZo8ldtHfse\",\"uid\":2735,\"currVipName\":\"侯爵\",\"erbanNo\":66,\"roomUid\":2734,\"avatar\":\"https://img.pekolive.com/default_avatar.png\",\"currVipLevel\":5}}"
-        onReceivedNimBroadcastMessage(json)
-//        CommonWebViewActivity.start(this,"https://api.anan.chat/anan_vestBag/modules/myincome/index.html#/DiamondLog")
+//        val json =
+//            "{\"first\":85,\"second\":855,\"data\":{\"nick\":\"66丢丢丢丢丢多多多的hhhh\",\"preVipName\":\"子爵\",\"floatPic\":\"https://image.hfighting.com/Fq3JtbK2acO3FN-3vWZo8ldtHfse\",\"uid\":2735,\"currVipName\":\"侯爵\",\"erbanNo\":66,\"roomUid\":2734,\"avatar\":\"https://img.pekolive.com/default_avatar.png\",\"currVipLevel\":5}}"
+//        onReceivedNimBroadcastMessage(json)
    }
 }
--- a/app/src/main/java/com/yizhuan/habu/ui/webview/CommonWebViewActivity.java
+++ b/app/src/main/java/com/yizhuan/habu/ui/webview/CommonWebViewActivity.java
@@ -9,11 +9,11 @@ import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.Bitmap;
 import android.net.Uri;
 import android.net.http.SslError;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
 import android.text.TextUtils;
 import android.view.View;
 import android.webkit.SslErrorHandler;
@@ -59,7 +59,6 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;

-import java.lang.ref.WeakReference;
 import java.util.HashMap;
 import java.util.Map;

@@ -99,32 +98,6 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O
    private static final String POSITION = "position";
    private int mPosition;

-    private int mProgress;
-
-    private Handler mHandler = new Handler();
-
-    private ProgressRunnable mProgressRunnable = new ProgressRunnable(this);
-
-    private static class ProgressRunnable implements Runnable {
-        private WeakReference<CommonWebViewActivity> mWeakReference;
-
-        ProgressRunnable(CommonWebViewActivity activity) {
-            mWeakReference = new WeakReference<>(activity);
-        }
-
-        @Override
-        public void run() {
-            CommonWebViewActivity activity = mWeakReference.get();
-            if (activity == null) return;
-            if (activity.mProgress < 96) {
-                activity.mProgress += 3;
-                activity.mProgressBar.setProgress(activity.mProgress);
-                activity.mHandler.postDelayed(activity.mProgressRunnable, 10);
-            }
-        }
-    }
-
-
    public static void start(Context context, String url) {
        Intent intent = new Intent(context, CommonWebViewActivity.class);
        intent.putExtra("url", url);
@@ -222,7 +195,6 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O

    @SuppressLint("SetJavaScriptEnabled")
    private void initData() {
-        mHandler.post(mProgressRunnable);
        webView.getSettings().setJavaScriptEnabled(true);
        webView.getSettings().setUseWideViewPort(true);
        webView.getSettings().setLoadWithOverviewMode(true);
@@ -290,9 +262,20 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O
                mProgressBar.setVisibility(View.GONE);
                super.onPageFinished(view, url);
            }
+
+            @Override
+            public void onPageStarted(WebView view, String url, Bitmap favicon) {
+                super.onPageStarted(view, url, favicon);
+                mProgressBar.setVisibility(View.VISIBLE);
+            }
        });
        //获取webviewtitle作为titlebar的title
        wvcc = new WebChromeClient() {
+            @Override
+            public void onProgressChanged(WebView view, int newProgress) {
+                super.onProgressChanged(view, newProgress);
+                mProgressBar.setProgress(newProgress);
+            }

            @Override
            public void onReceivedTitle(WebView view, String title) {
@@ -520,11 +503,6 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O

    @Override
    protected void onDestroy() {
-        if (mHandler != null) {
-            mHandler.removeCallbacks(mProgressRunnable);
-            mProgressRunnable = null;
-            mHandler = null;
-        }
        EventBus.getDefault().unregister(this);

        if (webViewCallBack != null) {
--- a/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerTabAdapter.kt
+++ b/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerTabAdapter.kt
@@ -0,0 +1,47 @@
+package com.yizhuan.habu.ui.webview.room_banner
+
+import android.view.View
+import android.widget.ImageView
+import androidx.core.view.isInvisible
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.BaseViewHolder
+import com.yizhuan.habu.R
+import com.yizhuan.habu.ui.utils.load
+import com.yizhuan.xchat_android_core.home.bean.BannerInfo
+
+/**
+ * Created by Max on 2023/11/17 12:30
+ * Desc:
+ **/
+class RoomBannerTabAdapter :
+    BaseQuickAdapter<BannerInfo, BaseViewHolder>(R.layout.room_banner_item_tab) {
+
+    private var selectedPosition = -1
+    override fun convert(helper: BaseViewHolder, item: BannerInfo?) {
+        helper.getView<ImageView>(R.id.iv_content).load(item?.bannerUrl)
+        convertState(helper, item)
+    }
+
+    override fun convertPayloads(
+        helper: BaseViewHolder,
+        item: BannerInfo?,
+        payloads: MutableList<Any>
+    ) {
+        super.convertPayloads(helper, item, payloads)
+        convertState(helper, item)
+    }
+
+    private fun convertState(helper: BaseViewHolder, item: BannerInfo?) {
+        helper.getView<View>(R.id.v_selector).isInvisible =
+            helper.absoluteAdapterPosition != selectedPosition
+    }
+
+    fun getSelectedPosition(): Int {
+        return selectedPosition
+    }
+
+    fun select(position: Int) {
+        this.selectedPosition = position
+        notifyItemRangeChanged(0, itemCount, true)
+    }
+}
--- a/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerWebDialogActivity.kt
+++ b/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerWebDialogActivity.kt
@@ -0,0 +1,85 @@
+package com.yizhuan.habu.ui.webview.room_banner
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.os.Bundle
+import android.view.Gravity
+import android.view.WindowManager
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import com.chuhai.utils.UiUtils
+import com.netease.nim.uikit.common.util.sys.ScreenUtil
+import com.yizhuan.habu.R
+import com.yizhuan.habu.ui.webview.CommonWebViewActivity
+import com.yizhuan.xchat_android_core.home.bean.BannerInfo
+
+
+/**
+ * Created by Max on 2023/11/17 11:38
+ * Desc:房间内-Banner-WEB展示页面
+ **/
+class RoomBannerWebDialogActivity : CommonWebViewActivity() {
+
+    private var recyclerView: RecyclerView? = null
+    private var adapter: RoomBannerTabAdapter? = null
+
+    companion object {
+        @JvmStatic
+        fun start(context: Context, position: Int, list: List<BannerInfo>) {
+            val newList = ArrayList<BannerInfo>()
+            newList.addAll(list)
+            val intent = Intent(context, RoomBannerWebDialogActivity::class.java)
+            intent.putExtra("position", position)
+            intent.putExtra("list", newList)
+            context.startActivity(intent)
+        }
+    }
+
+    override fun getLayoutId(): Int {
+        return R.layout.room_banner_dialog
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        window.setLayout(
+            WindowManager.LayoutParams.MATCH_PARENT,
+            ScreenUtil.screenHeight - UiUtils.dip2px(168f)
+        )
+        window.setGravity(Gravity.BOTTOM)
+        webView.setBackgroundColor(Color.parseColor("#C9CBD1"))
+        recyclerView = findViewById(R.id.recyclerView)
+        val position = intent.getIntExtra("position", 0)
+        val list = intent.getSerializableExtra("list") as? ArrayList<BannerInfo>
+//        if ((list?.size ?: 0) <= 1) {
+//            recyclerView?.isVisible = false
+//        }
+        adapter = RoomBannerTabAdapter().apply {
+            setOnItemClickListener { adapter, view, position ->
+                if (this@RoomBannerWebDialogActivity.adapter?.getSelectedPosition() == position) {
+                    return@setOnItemClickListener
+                }
+                switchTab(position)
+            }
+        }
+        recyclerView?.adapter = adapter
+        adapter?.setNewData(list)
+        switchTab(position)
+    }
+
+    private fun switchTab(position: Int) {
+        val url = adapter?.getItem(position)?.skipUri
+        showWebView(url)
+        adapter?.select(position)
+        recyclerView?.post {
+            recyclerView?.scrollToPosition(position)
+        }
+    }
+
+    override fun showWebView(url: String?) {
+        if (url.isNullOrEmpty()) {
+            return
+        }
+        super.showWebView(url)
+    }
+}
--- a/app/src/main/res/drawable/progress_drawable_room_banner.xml
+++ b/app/src/main/res/drawable/progress_drawable_room_banner.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@android:id/background"
+        android:drawable="@color/transparent" />
+
+    <item android:id="@android:id/progress">
+        <scale android:scaleWidth="100%">
+            <shape>
+                <corners android:radius="2dp" />
+                <solid android:color="@color/white" />
+            </shape>
+        </scale>
+    </item>
+
+</layer-list>
--- a/app/src/main/res/drawable/shape_9168fa_4.xml
+++ b/app/src/main/res/drawable/shape_9168fa_4.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#9168fa" />
+    <corners android:radius="4dp" />
+</shape>
--- a/app/src/main/res/layout/room_banner_dialog.xml
+++ b/app/src/main/res/layout/room_banner_dialog.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:cardBackgroundColor="@color/color_262629"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="0dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:id="@+id/layout_title_bar"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/iv_back"
+                    android:layout_width="45dp"
+                    android:layout_height="45dp"
+                    android:scaleType="center"
+                    android:src="@drawable/arrow_left" />
+
+                <ImageView
+                    android:id="@+id/iv_close"
+                    android:layout_width="45dp"
+                    android:layout_height="45dp"
+                    android:layout_gravity="center_vertical|start"
+                    android:scaleType="center"
+                    android:src="@drawable/ic_close_black" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="200dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:textColor="@color/text_title_color"
+                android:textSize="18sp" />
+
+            <ImageView
+                android:id="@+id/img_share"
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:layout_gravity="center_vertical|end"
+                android:layout_marginEnd="15dp"
+                android:src="@drawable/ic_share_white"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/tv_title_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|end"
+                android:layout_marginEnd="15dp"
+                android:textColor="@color/text_normal_c6c6e9"
+                android:textSize="14sp"
+                android:visibility="gone"
+                tools:text="@string/layout_activity_dialog_web_view_01" />
+        </FrameLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_60"
+            android:orientation="horizontal"
+            android:paddingHorizontal="8dp"
+            android:paddingTop="@dimen/dp_2"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:cardCornerRadius="8dp"
+            app:cardElevation="0dp">
+
+            <WebView
+                android:id="@+id/webview"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <ProgressBar
+                android:id="@+id/progress_bar"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="4dp"
+                android:max="100"
+                android:progress="0"
+                android:progressDrawable="@drawable/progress_drawable_room_banner" />
+        </androidx.cardview.widget.CardView>
+
+    </LinearLayout>
+</androidx.cardview.widget.CardView>
--- a/app/src/main/res/layout/room_banner_item_tab.xml
+++ b/app/src/main/res/layout/room_banner_item_tab.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_marginEnd="5dp">
+
+    <View
+        android:id="@+id/v_selector"
+        android:layout_width="@dimen/dp_93"
+        android:layout_height="@dimen/dp_45"
+        android:layout_gravity="center"
+        android:background="@drawable/shape_9168fa_4" />
+
+    <com.makeramen.roundedimageview.RoundedImageView
+        android:id="@+id/iv_content"
+        android:layout_width="@dimen/dp_90"
+        android:layout_height="@dimen/dp_42"
+        android:layout_gravity="center"
+        android:scaleType="centerCrop"
+        app:riv_corner_radius="4dp"
+        tools:src="@drawable/default_cover" />
+
+</FrameLayout>
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -711,5 +711,6 @@
    <color name="color_FFF87A">#FFFFF87A</color>
    <color name="color_ffffff_30">#4CFFFFFF</color>
    <color name="color_FFE468">#FFFFE468</color>
+    <color name="color_C9CBD1">#C9CBD1</color>

 </resources>
--- a/app/src/module_mini_world/res/values/colors.xml
+++ b/app/src/module_mini_world/res/values/colors.xml
@@ -7,4 +7,5 @@
    <color name="color_FF9C7E">#FF9C7E</color>
    <color name="color_FE6974">#FE6974</color>
    <color name="color_45C21A">#45C21A</color>
+    <color name="color_262629">#262629</color>
 </resources>
--- a/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/GoldBoxHelper.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/habu/treasure_box/widget/GoldBoxHelper.java
@@ -103,12 +103,9 @@ public class GoldBoxHelper {
    }

    public static boolean isShowFairy() {
-        return false;
-//        UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
-//        FairyOpenInfo fairyOpenInfo = InitialModel.get().getFairyOpenInfo();
-//        if (fairyOpenInfo == null || userInfo == null) return false;
-//
-//        return fairyOpenInfo.isOpen() && userInfo.getUserLevelVo().getExperLevelSeq() >= fairyOpenInfo.getLevelLimit();
+        FairyOpenInfo fairyOpenInfo = InitialModel.get().getFairyOpenInfo();
+        if (fairyOpenInfo == null) return false;
+        return fairyOpenInfo.isOpen();
    }

 }
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/BannerInfo.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/BannerInfo.java
@@ -61,6 +61,7 @@ public class BannerInfo implements Parcelable, Serializable {
    private boolean isRadish;
    private boolean isFairy;

+    private String bannerUrl;
    public BannerInfo(){

    }
@@ -71,6 +72,7 @@ public class BannerInfo implements Parcelable, Serializable {
        bannerPic = in.readString();
        skipType = in.readInt();
        skipUri = in.readString();
+        bannerUrl = in.readString();
    }

    @Override
@@ -80,6 +82,7 @@ public class BannerInfo implements Parcelable, Serializable {
        dest.writeString(bannerPic);
        dest.writeInt(skipType);
        dest.writeString(skipUri);
+        dest.writeString(bannerUrl);
    }

    @Override
--- a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/ParamsInterceptor.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/ParamsInterceptor.java
@@ -97,10 +97,13 @@ public class ParamsInterceptor implements Interceptor {
 //        Log.e("ParamsInterceptor", " url: " + oldRequest.url()+ " params Map : " + paramsMap.toString());

        long uid = 0;
-        String ticket = "";
+        String ticket;

        uid = AuthModel.get().getCurrentUid();
        ticket = AuthModel.get().getTicket();
+        if (ticket == null) {
+            ticket = "";
+        }

        String timestamp = String.valueOf(System.currentTimeMillis());
        paramsMap.put("pub_timestamp", timestamp);
--- a/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/manager/RxNetManager.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/net/rxnet/manager/RxNetManager.java
@@ -63,13 +63,14 @@ public final class RxNetManager {

        if (RxNetLog.DEBUG) {
            //正式环境千万不要加这玩意,为了方便日志查看,拦截器里面加了synchronized关键字,接口请求是串行的
-            HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() {
-                @Override
-                public void log(String message) {
-                    RxNetLog.d("OKHttp-------%s", message);
-                }
-            });
-            loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
+//            HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() {
+//                @Override
+//                public void log(String message) {
+//                    RxNetLog.d("OKHttp-------%s", message);
+//                }
+//            });
+            okhttp3.logging.HttpLoggingInterceptor loggingInterceptor = new okhttp3.logging.HttpLoggingInterceptor();
+            loggingInterceptor.setLevel(okhttp3.logging.HttpLoggingInterceptor.Level.BODY);
            mBuilder.addInterceptor(loggingInterceptor);

            mBuilder.addNetworkInterceptor(new StethoInterceptor());