From 382eeb3a89540ffc8186c8e3ceff4ae6dd5909c8 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 17 Nov 2023 14:07:20 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat:=E5=88=9D=E6=AD=A5=E6=90=AD=E5=BB=BA?= =?UTF-8?q?=E6=88=BF=E9=97=B4banner-Web=E5=B1=95=E7=A4=BA=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../habu/ui/setting/SettingActivity.kt | 11 +- .../webview/room_banner/BannerTabAdapter.kt | 43 +++++++ .../RoomBannerWebDialogActivity.kt | 46 +++++++ .../main/res/layout/room_banner_dialog.xml | 118 ++++++++++++++++++ .../main/res/layout/room_banner_item_tab.xml | 25 ++++ .../module_mini_world/res/values/colors.xml | 1 + 6 files changed, 239 insertions(+), 5 deletions(-) create mode 100644 app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/BannerTabAdapter.kt create mode 100644 app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerWebDialogActivity.kt create mode 100644 app/src/main/res/layout/room_banner_dialog.xml create mode 100644 app/src/main/res/layout/room_banner_item_tab.xml diff --git a/app/src/main/java/com/yizhuan/habu/ui/setting/SettingActivity.kt b/app/src/main/java/com/yizhuan/habu/ui/setting/SettingActivity.kt index e59cf48b6..805bced3a 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/setting/SettingActivity.kt +++ b/app/src/main/java/com/yizhuan/habu/ui/setting/SettingActivity.kt @@ -78,11 +78,11 @@ class SettingActivity : BaseViewBindingActivity(), View. binding.rlyPermission.setOnClickListener(this) binding.rlyCheck.setOnClickListener(this) - if (BuildConfig.DEBUG) { +// if (BuildConfig.DEBUG) { binding.titleBar.setOnTitleClickListener { debug() } - } +// } } @SuppressLint("CheckResult") @@ -220,8 +220,9 @@ class SettingActivity : BaseViewBindingActivity(), View. // RedPackageOpenDialog2().show(this) // 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) - 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) + CommonWebViewActivity.start(this,"https://api.anan.chat/anan_vestBag/modules/rank/index.html#/rank") + CommonWebViewActivity.start(this,"https://api.anan.chat/anan_vestBag/modules/myincome/index.html#/DiamondLog") } } \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/BannerTabAdapter.kt b/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/BannerTabAdapter.kt new file mode 100644 index 000000000..0222a0e45 --- /dev/null +++ b/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/BannerTabAdapter.kt @@ -0,0 +1,43 @@ +package com.yizhuan.habu.ui.webview.room_banner + +import android.view.View +import android.widget.ImageView +import androidx.core.view.isVisible +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 BannerTabAdapter : + BaseQuickAdapter(R.layout.room_banner_item_tab) { + + private var selectedPosition = -1 + override fun convert(helper: BaseViewHolder, item: BannerInfo?) { + helper.getView(R.id.iv_content).load(item?.bannerPic) + convertState(helper, item) + } + + override fun convertPayloads( + helper: BaseViewHolder, + item: BannerInfo?, + payloads: MutableList + ) { + super.convertPayloads(helper, item, payloads) + convertState(helper, item) + } + + private fun convertState(helper: BaseViewHolder, item: BannerInfo?) { + helper.getView(R.id.v_selector).isVisible = + helper.absoluteAdapterPosition == selectedPosition + } + + fun select(position: Int) { + this.selectedPosition = position + notifyItemRangeChanged(0, itemCount, true) + } +} \ No newline at end of file diff --git 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 new file mode 100644 index 000000000..c98209a00 --- /dev/null +++ b/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerWebDialogActivity.kt @@ -0,0 +1,46 @@ +package com.yizhuan.habu.ui.webview.room_banner + +import android.content.Context +import android.content.Intent +import android.os.Bundle +import androidx.core.view.isVisible +import androidx.recyclerview.widget.RecyclerView +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: BannerTabAdapter? = null + + companion object { + @JvmOverloads + fun start(context: Context, url: String?, list: ArrayList) { + val intent = Intent(context, RoomBannerWebDialogActivity::class.java) + intent.putExtra("url", url) + intent.putExtra("list", list) + context.startActivity(intent) + } + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + recyclerView = findViewById(R.id.recyclerView) + val list = intent.getSerializableExtra("list") as? ArrayList + if ((list?.size ?: 0) <= 1) { + recyclerView?.isVisible = false + } else { + adapter = BannerTabAdapter() + recyclerView?.adapter = adapter + } + } + + override fun getLayoutId(): Int { + return R.layout.room_banner_dialog + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/room_banner_dialog.xml b/app/src/main/res/layout/room_banner_dialog.xml new file mode 100644 index 000000000..e7b29229d --- /dev/null +++ b/app/src/main/res/layout/room_banner_dialog.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/room_banner_item_tab.xml b/app/src/main/res/layout/room_banner_item_tab.xml new file mode 100644 index 000000000..b739f5f13 --- /dev/null +++ b/app/src/main/res/layout/room_banner_item_tab.xml @@ -0,0 +1,25 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/module_mini_world/res/values/colors.xml b/app/src/module_mini_world/res/values/colors.xml index 981adc365..b758d067d 100644 --- a/app/src/module_mini_world/res/values/colors.xml +++ b/app/src/module_mini_world/res/values/colors.xml @@ -7,4 +7,5 @@ #FF9C7E #FE6974 #45C21A + #262629 \ No newline at end of file From 995278f44fa4e3a5ffd5fcb08e1c1d8f420ca889 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 17 Nov 2023 15:34:56 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat:=E5=AE=8C=E5=96=84=E6=88=BF=E9=97=B4Ba?= =?UTF-8?q?nner=E5=B1=95=E7=A4=BA=E5=BC=B9=E7=AA=97=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../habu/avroom/fragment/BaseRoomFragment.kt | 3 -- .../habu/home/adapter/RoomActAdapter.java | 16 ++-------- .../habu/ui/setting/SettingActivity.kt | 4 +-- .../webview/room_banner/BannerTabAdapter.kt | 6 ++-- .../RoomBannerWebDialogActivity.kt | 31 ++++++++++++++++--- .../main/res/layout/room_banner_dialog.xml | 1 + .../main/res/layout/room_banner_item_tab.xml | 11 ++++--- 7 files changed, 42 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/com/yizhuan/habu/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/yizhuan/habu/avroom/fragment/BaseRoomFragment.kt index df450b0f4..d30d745cd 100644 --- 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?> : //設置透明度 rollPagerView.setAnimationDurtion(500) bannerAdapter.notifyDataSetChanged() - bannerAdapter.setRoomActClickListener { url -> - DialogWebViewActivity.start(mContext, url) - } // 模擬指示器在viewpager底部效果 val viewPager = rollPagerView.viewPager diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.java b/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.java index d9abf60b7..1c31de57d 100644 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.java +++ b/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.java @@ -13,6 +13,7 @@ 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; @@ -25,7 +26,6 @@ public class RoomActAdapter extends StaticPagerAdapter { private Context mContext; private List data; - private RoomActClickListener listener; public RoomActAdapter(Context context, List data) { this.data = data; @@ -64,10 +64,8 @@ public class RoomActAdapter extends StaticPagerAdapter { PullRadishActivity.start(mContext); } else { AvRoomModel.get().activityClickLog("2", actId).subscribe(); - if (bannerInfo.getSkipType() == 3 && bannerInfo.getShowType() != 1) { - if (listener != null) { - listener.onWebClick(bannerInfo.getSkipUri()); - } + if (bannerInfo.getSkipType() == 3) { + RoomBannerWebDialogActivity.start(mContext, position, data); } else { CommonJumpHelper.bannerJump(mContext, bannerInfo); } @@ -84,12 +82,4 @@ public class RoomActAdapter extends StaticPagerAdapter { return 0; } } - - public void setRoomActClickListener(RoomActClickListener listener) { - this.listener = listener; - } - - public interface RoomActClickListener { - void onWebClick(String url); - } } diff --git a/app/src/main/java/com/yizhuan/habu/ui/setting/SettingActivity.kt b/app/src/main/java/com/yizhuan/habu/ui/setting/SettingActivity.kt index 805bced3a..48542b418 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/setting/SettingActivity.kt +++ b/app/src/main/java/com/yizhuan/habu/ui/setting/SettingActivity.kt @@ -78,11 +78,11 @@ class SettingActivity : BaseViewBindingActivity(), View. binding.rlyPermission.setOnClickListener(this) binding.rlyCheck.setOnClickListener(this) -// if (BuildConfig.DEBUG) { + if (BuildConfig.DEBUG) { binding.titleBar.setOnTitleClickListener { debug() } -// } + } } @SuppressLint("CheckResult") diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/BannerTabAdapter.kt b/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/BannerTabAdapter.kt index 0222a0e45..7fa98b5c0 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/BannerTabAdapter.kt +++ b/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/BannerTabAdapter.kt @@ -2,7 +2,7 @@ package com.yizhuan.habu.ui.webview.room_banner import android.view.View import android.widget.ImageView -import androidx.core.view.isVisible +import androidx.core.view.isInvisible import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.habu.R @@ -32,8 +32,8 @@ class BannerTabAdapter : } private fun convertState(helper: BaseViewHolder, item: BannerInfo?) { - helper.getView(R.id.v_selector).isVisible = - helper.absoluteAdapterPosition == selectedPosition + helper.getView(R.id.v_selector).isInvisible = + helper.absoluteAdapterPosition != selectedPosition } fun select(position: Int) { diff --git 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 index c98209a00..96fcf677c 100644 --- 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 @@ -19,11 +19,13 @@ class RoomBannerWebDialogActivity : CommonWebViewActivity() { private var adapter: BannerTabAdapter? = null companion object { - @JvmOverloads - fun start(context: Context, url: String?, list: ArrayList) { + @JvmStatic + fun start(context: Context, position: Int, list: List) { + val newList = ArrayList() + newList.addAll(list) val intent = Intent(context, RoomBannerWebDialogActivity::class.java) - intent.putExtra("url", url) - intent.putExtra("list", list) + intent.putExtra("position", position) + intent.putExtra("list", newList) context.startActivity(intent) } } @@ -31,13 +33,34 @@ class RoomBannerWebDialogActivity : CommonWebViewActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) recyclerView = findViewById(R.id.recyclerView) + val position = intent.getIntExtra("position", 0) val list = intent.getSerializableExtra("list") as? ArrayList if ((list?.size ?: 0) <= 1) { recyclerView?.isVisible = false } else { + recyclerView?.isVisible = true adapter = BannerTabAdapter() recyclerView?.adapter = adapter + adapter?.setOnItemClickListener { adapter, view, position -> + val item = adapter.getItem(position) as? BannerInfo ?: return@setOnItemClickListener + val url = item.skipUri + if (url.isNullOrEmpty()) { + return@setOnItemClickListener + } + this.adapter?.select(position) + showWebView(url) + } + adapter?.select(position) } + val url = list?.getOrNull(position)?.skipUri + showWebView(url) + } + + override fun showWebView(url: String?) { + if (url.isNullOrEmpty()) { + return + } + super.showWebView(url) } override fun getLayoutId(): Int { diff --git a/app/src/main/res/layout/room_banner_dialog.xml b/app/src/main/res/layout/room_banner_dialog.xml index e7b29229d..edd401fa9 100644 --- a/app/src/main/res/layout/room_banner_dialog.xml +++ b/app/src/main/res/layout/room_banner_dialog.xml @@ -88,6 +88,7 @@ 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" /> diff --git a/app/src/main/res/layout/room_banner_item_tab.xml b/app/src/main/res/layout/room_banner_item_tab.xml index b739f5f13..8929279e9 100644 --- a/app/src/main/res/layout/room_banner_item_tab.xml +++ b/app/src/main/res/layout/room_banner_item_tab.xml @@ -3,15 +3,16 @@ 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_height="match_parent" + android:layout_marginEnd="5dp"> + android:background="#9168FA" + app:riv_corner_radius="4dp" /> Date: Fri, 17 Nov 2023 17:18:19 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=A9=BA=E5=80=BC=E8=AF=B7=E6=B1=82=E5=A4=B4=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E5=BC=82=E5=B8=B8=EF=BC=88pub=5Fticket=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yizhuan/xchat_android_core/auth/AuthModel.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java index 9fe6482da..d685cf249 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java @@ -194,7 +194,10 @@ public class AuthModel extends BaseModel implements IAuthModel { @Override public String getTicket() { if (ticketInfo != null && ticketInfo.getTickets() != null && ticketInfo.getTickets().size() > 0) { - return ticketInfo.getTickets().get(0).getTicket(); + String value = ticketInfo.getTickets().get(0).getTicket(); + if (value != null) { + return value; + } } return ""; } From fe3347fd0013cacaaad9dbee1fcb1402c697c578 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 17 Nov 2023 17:39:01 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feat:ticket=E4=B8=BA=E7=A9=BA=E7=9A=84?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=A7=BB=E5=88=B0=E5=8F=82=E6=95=B0=E6=8B=A6?= =?UTF-8?q?=E6=88=AA=E5=99=A8=E4=B8=AD=EF=BC=88=E6=80=95=E5=BD=B1=E5=93=8D?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=8E=9F=E6=9C=89=E4=B8=9A=E5=8A=A1=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yizhuan/xchat_android_core/auth/AuthModel.java | 5 +---- .../xchat_android_core/interceptor/ParamsInterceptor.java | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java index d685cf249..9fe6482da 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java @@ -194,10 +194,7 @@ public class AuthModel extends BaseModel implements IAuthModel { @Override public String getTicket() { if (ticketInfo != null && ticketInfo.getTickets() != null && ticketInfo.getTickets().size() > 0) { - String value = ticketInfo.getTickets().get(0).getTicket(); - if (value != null) { - return value; - } + return ticketInfo.getTickets().get(0).getTicket(); } return ""; } diff --git 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 index 372d95e59..250722154 100644 --- 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); From a3f2f1324c207392fe9c767bfaf0eef3ea9b90ed Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 17 Nov 2023 17:39:35 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9Ebanner-Tab?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/webview/room_banner/BannerTabAdapter.kt | 2 +- .../xchat_android_core/home/bean/BannerInfo.java | 3 +++ .../net/rxnet/manager/RxNetManager.java | 15 ++++++++------- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/BannerTabAdapter.kt b/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/BannerTabAdapter.kt index 7fa98b5c0..7f2ef3b4d 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/BannerTabAdapter.kt +++ b/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/BannerTabAdapter.kt @@ -18,7 +18,7 @@ class BannerTabAdapter : private var selectedPosition = -1 override fun convert(helper: BaseViewHolder, item: BannerInfo?) { - helper.getView(R.id.iv_content).load(item?.bannerPic) + helper.getView(R.id.iv_content).load(item?.bannerUrl) convertState(helper, item) } diff --git 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 index ee45c7f8f..b834ddf6c 100644 --- 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 diff --git 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 index bcb5187d1..afc9b6c5e 100644 --- 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()); From b647785244257eb50ee7517461431b36e256973f Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 17 Nov 2023 20:15:26 +0800 Subject: [PATCH 6/7] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E6=88=BF=E9=97=B4Ba?= =?UTF-8?q?nner=E5=B1=95=E7=A4=BA=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 + .../habu/home/adapter/RoomActAdapter.java | 85 --------- .../habu/home/adapter/RoomActAdapter.kt | 77 ++++++++ .../ui/webview/CommonWebViewActivity.java | 46 ++--- ...rTabAdapter.kt => RoomBannerTabAdapter.kt} | 6 +- .../RoomBannerWebDialogActivity.kt | 50 +++-- .../progress_drawable_room_banner.xml | 17 ++ app/src/main/res/drawable/shape_9168fa_4.xml | 6 + .../main/res/layout/room_banner_dialog.xml | 179 ++++++++---------- .../main/res/layout/room_banner_item_tab.xml | 5 +- app/src/main/res/values/colors.xml | 1 + .../treasure_box/widget/GoldBoxHelper.java | 9 +- 12 files changed, 244 insertions(+), 241 deletions(-) delete mode 100644 app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.java create mode 100644 app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.kt rename app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/{BannerTabAdapter.kt => RoomBannerTabAdapter.kt} (92%) create mode 100644 app/src/main/res/drawable/progress_drawable_room_banner.xml create mode 100644 app/src/main/res/drawable/shape_9168fa_4.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 323629a85..ec12e090a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -830,6 +830,10 @@ + diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.java b/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.java deleted file mode 100644 index 1c31de57d..000000000 --- a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.java +++ /dev/null @@ -1,85 +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.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 java.util.List; - -public class RoomActAdapter extends StaticPagerAdapter { - - private Context mContext; - private List data; - - public RoomActAdapter(Context context, List 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) { - RoomBannerWebDialogActivity.start(mContext, position, data); - } else { - CommonJumpHelper.bannerJump(mContext, bannerInfo); - } - } - }); - return view; - } - - @Override - public int getCount() { - if (data != null) { - return data.size(); - } else { - return 0; - } - } -} diff --git a/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.kt b/app/src/main/java/com/yizhuan/habu/home/adapter/RoomActAdapter.kt new file mode 100644 index 000000000..c9c9b5cc2 --- /dev/null +++ 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) : + 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(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 + } +} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/CommonWebViewActivity.java b/app/src/main/java/com/yizhuan/habu/ui/webview/CommonWebViewActivity.java index 20db68aef..36d75dde9 100644 --- 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 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) { diff --git a/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/BannerTabAdapter.kt b/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerTabAdapter.kt similarity index 92% rename from app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/BannerTabAdapter.kt rename to app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerTabAdapter.kt index 7f2ef3b4d..a1d9e3c42 100644 --- a/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/BannerTabAdapter.kt +++ b/app/src/main/java/com/yizhuan/habu/ui/webview/room_banner/RoomBannerTabAdapter.kt @@ -13,7 +13,7 @@ import com.yizhuan.xchat_android_core.home.bean.BannerInfo * Created by Max on 2023/11/17 12:30 * Desc: **/ -class BannerTabAdapter : +class RoomBannerTabAdapter : BaseQuickAdapter(R.layout.room_banner_item_tab) { private var selectedPosition = -1 @@ -36,6 +36,10 @@ class BannerTabAdapter : helper.absoluteAdapterPosition != selectedPosition } + fun getSelectedPosition(): Int { + return selectedPosition + } + fun select(position: Int) { this.selectedPosition = position notifyItemRangeChanged(0, itemCount, true) diff --git 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 index 96fcf677c..7da1c5500 100644 --- 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 @@ -2,13 +2,19 @@ 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展示页面 @@ -16,7 +22,7 @@ import com.yizhuan.xchat_android_core.home.bean.BannerInfo class RoomBannerWebDialogActivity : CommonWebViewActivity() { private var recyclerView: RecyclerView? = null - private var adapter: BannerTabAdapter? = null + private var adapter: RoomBannerTabAdapter? = null companion object { @JvmStatic @@ -30,30 +36,44 @@ class RoomBannerWebDialogActivity : CommonWebViewActivity() { } } + 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 if ((list?.size ?: 0) <= 1) { recyclerView?.isVisible = false - } else { - recyclerView?.isVisible = true - adapter = BannerTabAdapter() - recyclerView?.adapter = adapter - adapter?.setOnItemClickListener { adapter, view, position -> - val item = adapter.getItem(position) as? BannerInfo ?: return@setOnItemClickListener - val url = item.skipUri - if (url.isNullOrEmpty()) { + } + adapter = RoomBannerTabAdapter().apply { + setOnItemClickListener { adapter, view, position -> + if (this@RoomBannerWebDialogActivity.adapter?.getSelectedPosition() == position) { return@setOnItemClickListener } - this.adapter?.select(position) - showWebView(url) + switchTab(position) } - adapter?.select(position) } - val url = list?.getOrNull(position)?.skipUri + 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?) { @@ -62,8 +82,4 @@ class RoomBannerWebDialogActivity : CommonWebViewActivity() { } super.showWebView(url) } - - override fun getLayoutId(): Int { - return R.layout.room_banner_dialog - } } \ No newline at end of file diff --git a/app/src/main/res/drawable/progress_drawable_room_banner.xml b/app/src/main/res/drawable/progress_drawable_room_banner.xml new file mode 100644 index 000000000..9207b8757 --- /dev/null +++ b/app/src/main/res/drawable/progress_drawable_room_banner.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_9168fa_4.xml b/app/src/main/res/drawable/shape_9168fa_4.xml new file mode 100644 index 000000000..6bdec73c8 --- /dev/null +++ b/app/src/main/res/drawable/shape_9168fa_4.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/room_banner_dialog.xml b/app/src/main/res/layout/room_banner_dialog.xml index edd401fa9..150d59e5f 100644 --- a/app/src/main/res/layout/room_banner_dialog.xml +++ b/app/src/main/res/layout/room_banner_dialog.xml @@ -1,119 +1,108 @@ - + app:cardBackgroundColor="@color/color_262629" + app:cardCornerRadius="8dp" + app:cardElevation="0dp"> - - - + android:orientation="vertical"> - + - - - - - - - - - - - + + android:id="@+id/iv_back" + android:layout_width="45dp" + android:layout_height="45dp" + android:scaleType="center" + android:src="@drawable/arrow_left" /> - - + - + + + + + + + + + + + + + + + android:layout_height="match_parent" /> + android:progressDrawable="@drawable/progress_drawable_room_banner" /> + - - - - - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/room_banner_item_tab.xml b/app/src/main/res/layout/room_banner_item_tab.xml index 8929279e9..34f8cfaf4 100644 --- a/app/src/main/res/layout/room_banner_item_tab.xml +++ b/app/src/main/res/layout/room_banner_item_tab.xml @@ -6,13 +6,12 @@ android:layout_height="match_parent" android:layout_marginEnd="5dp"> - + android:background="@drawable/shape_9168fa_4" /> #FFFFF87A #4CFFFFFF #FFFFE468 + #C9CBD1 diff --git 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 index f607e67f6..d5afdabec 100644 --- 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(); } } From 0d488877c86636096b264072a2e5e217e724c167 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 20 Nov 2023 10:10:29 +0800 Subject: [PATCH 7/7] =?UTF-8?q?feat=EF=BC=9A=E5=8F=96=E6=B6=88Tab=E4=B8=BA?= =?UTF-8?q?1=E6=97=B6=E7=9A=84=E8=87=AA=E5=8A=A8=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/webview/room_banner/RoomBannerWebDialogActivity.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git 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 index 7da1c5500..0a03f4f6a 100644 --- 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 @@ -51,9 +51,9 @@ class RoomBannerWebDialogActivity : CommonWebViewActivity() { recyclerView = findViewById(R.id.recyclerView) val position = intent.getIntExtra("position", 0) val list = intent.getSerializableExtra("list") as? ArrayList - if ((list?.size ?: 0) <= 1) { - recyclerView?.isVisible = false - } +// if ((list?.size ?: 0) <= 1) { +// recyclerView?.isVisible = false +// } adapter = RoomBannerTabAdapter().apply { setOnItemClickListener { adapter, view, position -> if (this@RoomBannerWebDialogActivity.adapter?.getSelectedPosition() == position) {