diff --git a/app/src/main/java/com/cheng/blzb/bean/HotWordEntity.kt b/app/src/main/java/com/cheng/blzb/bean/HotWordEntity.kt index 7533bfa..2205f78 100644 --- a/app/src/main/java/com/cheng/blzb/bean/HotWordEntity.kt +++ b/app/src/main/java/com/cheng/blzb/bean/HotWordEntity.kt @@ -19,6 +19,7 @@ data class HotWordEntity( val status: String = "", val type: String = "", val weight: String = "", - var isChecked: Boolean = false + var isChecked: Boolean = false, + var anim: Boolean = true ): Serializable } \ No newline at end of file diff --git a/app/src/main/java/com/cheng/blzb/event/HomeRefreshEvent.kt b/app/src/main/java/com/cheng/blzb/event/HomeRefreshEvent.kt index 7a7e873..a58c797 100644 --- a/app/src/main/java/com/cheng/blzb/event/HomeRefreshEvent.kt +++ b/app/src/main/java/com/cheng/blzb/event/HomeRefreshEvent.kt @@ -1,4 +1,4 @@ package com.cheng.blzb.event -class HomeRefreshEvent { +class HomeRefreshEvent(val refreshData: Boolean = true) { } \ No newline at end of file diff --git a/app/src/main/java/com/cheng/blzb/ui/dialog/SelectCouponDialog.kt b/app/src/main/java/com/cheng/blzb/ui/dialog/SelectCouponDialog.kt index 196f6df..02a4f4e 100644 --- a/app/src/main/java/com/cheng/blzb/ui/dialog/SelectCouponDialog.kt +++ b/app/src/main/java/com/cheng/blzb/ui/dialog/SelectCouponDialog.kt @@ -71,6 +71,7 @@ class SelectCouponDialog : DialogFragment() { binding.mRecyclerView.adapter = mAdapter mEmptyView.setBtnVisible(false) + mEmptyView.setNoDataLogo(R.mipmap.ic_empty_seat) mAdapter.setEmptyView(mEmptyView) mAdapter.setOnItemClickListener { _, _, i -> diff --git a/app/src/main/java/com/cheng/blzb/ui/fragment/guide/adapter/GuideItem3Adapter.kt b/app/src/main/java/com/cheng/blzb/ui/fragment/guide/adapter/GuideItem3Adapter.kt index f414c28..124fc3c 100644 --- a/app/src/main/java/com/cheng/blzb/ui/fragment/guide/adapter/GuideItem3Adapter.kt +++ b/app/src/main/java/com/cheng/blzb/ui/fragment/guide/adapter/GuideItem3Adapter.kt @@ -1,5 +1,6 @@ package com.cheng.blzb.ui.fragment.guide.adapter +import android.animation.ObjectAnimator import android.annotation.SuppressLint import android.content.Context import android.graphics.Color @@ -8,6 +9,7 @@ import android.view.ViewGroup import android.view.animation.RotateAnimation import android.widget.ImageView import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.animation.addListener import androidx.recyclerview.widget.RecyclerView import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.cheng.blzb.R @@ -15,14 +17,13 @@ import com.cheng.blzb.bean.HotWordEntity import com.cheng.blzb.common.Constants import com.example.base.decoration.GridSpaceItemDecoration import com.example.base.extensions.onClick +import com.example.base.extensions.visible import com.example.base.utils.DensityUtils import com.example.base.utils.SpanUtils -import kotlin.math.ceil import kotlin.random.Random class GuideItem3Adapter(val context: Context): RecyclerView.Adapter() { val data: MutableList = mutableListOf() - private var showAnim = true private var mOnKeywordClickListener: ((keyword: HotWordEntity.Child) -> Unit)? = null @@ -61,6 +62,20 @@ class GuideItem3Adapter(val context: Context): RecyclerView.Adapter): BaseAdapter() { + override fun getCount(): Int { + return data.size + } + + override fun getItem(position: Int): HotWordEntity.Child { + return data[position] + } + + override fun getItemId(position: Int): Long { + return position.toLong() + } + + override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View { + val view: View + val viewHolder: ViewHolder + if (convertView == null) { + view = View.inflate(context, R.layout.listitem_guide_item5_industry, null) + viewHolder = ViewHolder(view) + view.tag = viewHolder + } else { + view = convertView + viewHolder = convertView.tag as ViewHolder + } + viewHolder.tvName.typeface = Constants.ysbth + viewHolder.tvName.text = getItem(position).name + return view + } + + inner class ViewHolder(val view: View) { + val tvName: TextView = view.findViewById(R.id.tv_name) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/cheng/blzb/ui/fragment/guide/item/GuideItem3Fragment.kt b/app/src/main/java/com/cheng/blzb/ui/fragment/guide/item/GuideItem3Fragment.kt index c51f3d5..ead4ec0 100644 --- a/app/src/main/java/com/cheng/blzb/ui/fragment/guide/item/GuideItem3Fragment.kt +++ b/app/src/main/java/com/cheng/blzb/ui/fragment/guide/item/GuideItem3Fragment.kt @@ -46,13 +46,13 @@ class GuideItem3Fragment : BaseFragment - if (!canClick) return@setOnKeywordClickListener if (!keyword.isChecked && selectedAdapter.data.size == 5) { toast("最多添加5个关键词") return@setOnKeywordClickListener } - - if (selectedAdapter.data.find { it.name == keyword.name } == null) { - selectedAdapter.addData(keyword) - binding.tvNodata.gone() + if (selectedAdapter.data.find { it.name == keyword.name } != null) { + toast("关键词已存在") + return@setOnKeywordClickListener } + selectedAdapter.addData(keyword) + binding.tvNodata.gone() } binding.btnAddKeyword.onClick { @@ -79,6 +79,10 @@ class GuideItem3Fragment : BaseFragment() { private val cityAdapter by lazy { GuideItem5CityAdapter(requireContext(), cityList) } - private val industryAdapter by lazy { GuideItem5IndustryAdapter(requireContext(), hotWordChildList) } + private val industryAdapter by lazy { GuideItem5IndustryAdapter1(requireContext(), hotWordChildList) } private val hotWordChildList = mutableListOf() private val cityList = mutableListOf() private var totalInfo: GuideTotalBidEntity? = null - private var industryTask: Disposable? = null - override fun initView() { super.initView() binding.tvTitle.typeface = Constants.pmzdbt binding.tvBidCount.typeface = Constants.ysbth binding.tvUnit.typeface = Constants.ysbth - - binding.rvIndustry.adapter = industryAdapter } @SuppressLint("NotifyDataSetChanged") @@ -61,11 +54,10 @@ class GuideItem5Fragment : BaseFragment() { } } - binding.tvCoupon.onClick { + binding.layoutRedpacket.onClick { if (goodsEntity == null) { toast("请先选择要开通的会员套餐") return@onClick @@ -758,6 +759,8 @@ class VipFragment : BaseFragment() { val f = GoodsPromotionDialog.newInstance(goodsAdapter.data) f.show(childFragmentManager, GoodsPromotionDialog::class.java.simpleName) UserConfigManager.hideGoodsCouponAnim() + + RxBus.defaultInstance.post(HomeRefreshEvent(false)) } private fun showRedPacketActivityDialog(isEnter: Boolean) { diff --git a/app/src/main/res/layout/fragment_guide_item1.xml b/app/src/main/res/layout/fragment_guide_item1.xml index cf9442b..21d10de 100644 --- a/app/src/main/res/layout/fragment_guide_item1.xml +++ b/app/src/main/res/layout/fragment_guide_item1.xml @@ -91,9 +91,9 @@ android:id="@+id/layout_desc" android:layout_width="match_parent" android:layout_height="@dimen/dp_26" - android:layout_marginStart="@dimen/dp_32" - android:layout_marginEnd="@dimen/dp_32" - android:layout_marginBottom="@dimen/dp_30" + android:layout_marginStart="@dimen/dp_30" + android:layout_marginEnd="@dimen/dp_30" + android:layout_marginBottom="@dimen/dp_25" android:background="@drawable/shape_guide_item1_desc_bg" android:gravity="center" android:orientation="horizontal" @@ -106,7 +106,7 @@ android:fontFamily="sans-serif-medium" android:text="· 实时更新" android:textColor="@color/white" - android:textSize="@dimen/sp_13" /> + android:textSize="@dimen/sp_12" /> + android:textSize="@dimen/sp_12" /> + + + app:layout_constraintTop_toTopOf="@id/vf_city" /> + + @@ -175,7 +175,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_10" android:text="0条" - android:textSize="@dimen/sp_20" + android:textSize="@dimen/sp_18" app:gradient_endColor="@color/color_6dd9f2" app:gradient_startColor="@color/white" app:layout_constraintBottom_toTopOf="@id/tv_total_info_title1" @@ -208,8 +208,8 @@ @@ -220,7 +220,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_10" android:text="0条" - android:textSize="@dimen/sp_20" + android:textSize="@dimen/sp_18" app:gradient_endColor="@color/color_6dd9f2" app:gradient_startColor="@color/white" app:layout_constraintBottom_toTopOf="@id/tv_total_info_title2" @@ -253,8 +253,8 @@ @@ -263,9 +263,9 @@ android:id="@+id/tv_total_info_count3" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_18" android:text="0亿元" - android:textSize="@dimen/sp_20" + android:textSize="@dimen/sp_18" app:gradient_endColor="@color/color_6dd9f2" app:gradient_startColor="@color/white" app:layout_constraintBottom_toTopOf="@id/tv_total_info_title3" @@ -298,8 +298,8 @@ @@ -310,7 +310,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_10" android:text="0条" - android:textSize="@dimen/sp_20" + android:textSize="@dimen/sp_18" app:gradient_endColor="@color/color_6dd9f2" app:gradient_startColor="@color/white" app:layout_constraintBottom_toTopOf="@id/tv_total_info_title4" diff --git a/app/src/main/res/layout/fragment_vip.xml b/app/src/main/res/layout/fragment_vip.xml index 59bbb9f..bbe9efb 100644 --- a/app/src/main/res/layout/fragment_vip.xml +++ b/app/src/main/res/layout/fragment_vip.xml @@ -324,11 +324,10 @@ + app:layout_constraintTop_toBottomOf="@id/layout_redpacket" /> + android:visibility="invisible" + tool:visibility="visible"> + android:textSize="@dimen/sp_11" /> + android:paddingStart="@dimen/dp_8" + android:paddingEnd="@dimen/dp_8"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" />