From 5c47f96b72649abcaec5042c8a26df4eb6e61743 Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Tue, 14 Jan 2025 18:21:23 +0800 Subject: [PATCH] =?UTF-8?q?feat=20:=20=20=20=E9=99=84=E5=B8=A6=E7=A4=BC?= =?UTF-8?q?=E7=89=A9=20UI=20=E5=88=9D=E6=AC=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/avroom/dialog/RoomLuckyBagDialog.kt | 58 +++ .../avroom/dialog/RoomLuckyBagOpenDialog.kt | 104 +++++ .../com/chwl/app/avroom/widget/LuckyBagBtn.kt | 27 ++ app/src/main/res/drawable/bg_black_a30_r4.xml | 5 + .../res/drawable/bg_lucky_bag_gift_item.xml | 9 + .../res/drawable/shape_f5d2b1_r12_9f6f41.xml | 13 + .../main/res/layout/dialog_room_lucky_bag.xml | 400 ++++++++++++++++++ .../res/layout/dialog_room_lucky_bag_open.xml | 191 +++++++++ .../res/layout/item_room_lucky_bag_gift.xml | 113 +++++ .../res/layout/item_room_lucky_bag_time.xml | 16 + .../item_room_lucky_bag_view_others.xml | 87 ++++ .../main/res/layout/view_lucky_bag_btn.xml | 46 ++ .../res/layout/view_room_lucky_bag_notify.xml | 48 +++ app/src/main/res/values/colors.xml | 2 + app/src/main/res/values/strings.xml | 24 ++ .../com/chwl/core/gift/bean/LuckyBagGift.java | 4 + .../com/chwl/core/gift/bean/LuckyBagTime.java | 4 + .../core/gift/bean/LuckyBagViewOthers.java | 9 + ...ent.java => BaseCommonDialogFragment.java} | 3 +- .../ui/draggablebubbles/BubbleView.java | 9 + 20 files changed, 1171 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt create mode 100644 app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagOpenDialog.kt create mode 100644 app/src/main/java/com/chwl/app/avroom/widget/LuckyBagBtn.kt create mode 100644 app/src/main/res/drawable/bg_black_a30_r4.xml create mode 100644 app/src/main/res/drawable/bg_lucky_bag_gift_item.xml create mode 100644 app/src/main/res/drawable/shape_f5d2b1_r12_9f6f41.xml create mode 100644 app/src/main/res/layout/dialog_room_lucky_bag.xml create mode 100644 app/src/main/res/layout/dialog_room_lucky_bag_open.xml create mode 100644 app/src/main/res/layout/item_room_lucky_bag_gift.xml create mode 100644 app/src/main/res/layout/item_room_lucky_bag_time.xml create mode 100644 app/src/main/res/layout/item_room_lucky_bag_view_others.xml create mode 100644 app/src/main/res/layout/view_lucky_bag_btn.xml create mode 100644 app/src/main/res/layout/view_room_lucky_bag_notify.xml create mode 100644 core/src/main/java/com/chwl/core/gift/bean/LuckyBagGift.java create mode 100644 core/src/main/java/com/chwl/core/gift/bean/LuckyBagTime.java create mode 100644 core/src/main/java/com/chwl/core/gift/bean/LuckyBagViewOthers.java rename library/src/module_common/java/com/chwl/library/common/base/{BaseDialogFragment.java => BaseCommonDialogFragment.java} (98%) diff --git a/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt new file mode 100644 index 000000000..96db3963e --- /dev/null +++ b/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt @@ -0,0 +1,58 @@ +package com.chwl.app.avroom.dialog + +import android.view.Gravity +import android.view.WindowManager +import com.chwl.app.R +import com.chwl.app.base.BaseDialogFragment +import com.chwl.app.bindadapter.BaseBindingAdapter +import com.chwl.app.bindadapter.BaseBindingViewHolder +import com.chwl.app.databinding.DialogRoomLuckyBagBinding +import com.chwl.app.databinding.ItemRoomLuckyBagGiftBinding +import com.chwl.app.databinding.ItemRoomLuckyBagTimeBinding +import com.chwl.app.databinding.ItemRoomLuckyBagViewOthersBinding +import com.chwl.core.gift.bean.LuckyBagGift +import com.chwl.core.gift.bean.LuckyBagTime +import com.chwl.core.gift.bean.LuckyBagViewOthers +import com.example.lib_utils.ktx.getDimension + +class RoomLuckyBagDialog : BaseDialogFragment() { + + + override var width = WindowManager.LayoutParams.MATCH_PARENT + override var height = R.dimen.dp_323.getDimension().toInt() + override var dimAmount = 0f + override var gravity = Gravity.BOTTOM + + + + override fun init() { + + + } + + + + private class GiftAdapter : BaseBindingAdapter() { + + override fun convert( + helper: BaseBindingViewHolder, + item: LuckyBagGift + ) { + + } + } + + + + private class TimeAdapter : BaseBindingAdapter() { + + override fun convert( + helper: BaseBindingViewHolder, + item: LuckyBagTime + ) { + + } + } + + +} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagOpenDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagOpenDialog.kt new file mode 100644 index 000000000..ee01f5c04 --- /dev/null +++ b/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagOpenDialog.kt @@ -0,0 +1,104 @@ +package com.chwl.app.avroom.dialog + +import android.view.Gravity +import android.view.View +import android.view.WindowManager +import com.chwl.app.base.BaseDialogFragment +import com.chwl.app.bindadapter.BaseBindingAdapter +import com.chwl.app.bindadapter.BaseBindingViewHolder +import com.chwl.app.databinding.DialogRoomLuckyBagOpenBinding +import com.chwl.app.databinding.ItemRoomLuckyBagViewOthersBinding +import com.chwl.core.gift.bean.LuckyBagViewOthers +import com.chwl.library.common.util.setViewWH +import com.chwl.library.common.util.setVis + +class RoomLuckyBagOpenDialog : BaseDialogFragment() { + + + override var width = WindowManager.LayoutParams.MATCH_PARENT + override var height = WindowManager.LayoutParams.WRAP_CONTENT + override var dimAmount = 0f + override var gravity = Gravity.CENTER + + private var mAdapter : ViewOtherAdapter ? = null + + + override fun init() { + + + } + + private fun viewOthers() { + def() + binding.viewOthersHint.setVis(true) + binding.rvListViewOthers.setVis(true) + + binding.bg.setViewWH(height = 414) +// binding.bg.setImageResource() + + mAdapter = ViewOtherAdapter() + binding.rvListViewOthers.adapter = mAdapter + + + } + + + private fun open() { + def() + binding.viewOthers.setVis(true) + + binding.giftImg.setVis(true) + binding.giftName.setVis(true) + binding.giftName.setVis(true) + + + binding.gold.setVis(true) + + } + + private fun ready() { + def() + binding.bagImg.setVis(true) + + } + + private fun timeDown() { + def() + binding.viewOthers.setVis(true) + binding.bagImg.setVis(true) + binding.time.setVis(true) + } + + private fun showEmpty() { + def() + binding.viewOthers.setVis(true) + binding.bagImg.setVis(true) + binding.comingHint.setVis(true) + } + + private fun def() { + binding.viewOthers.visibility = View.INVISIBLE + binding.time.visibility = View.INVISIBLE + binding.giftName.visibility = View.INVISIBLE + binding.giftNum.visibility = View.INVISIBLE + binding.giftImg.visibility = View.INVISIBLE + binding.gold.visibility = View.INVISIBLE + binding.bagImg.visibility = View.INVISIBLE + binding.comingHint.visibility = View.INVISIBLE + + binding.rvListViewOthers.visibility = View.INVISIBLE + binding.viewOthersHint.visibility = View.INVISIBLE + } + + + private class ViewOtherAdapter : BaseBindingAdapter() { + + override fun convert( + helper: BaseBindingViewHolder, + item: LuckyBagViewOthers + ) { + + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/avroom/widget/LuckyBagBtn.kt b/app/src/main/java/com/chwl/app/avroom/widget/LuckyBagBtn.kt new file mode 100644 index 000000000..c00605d4d --- /dev/null +++ b/app/src/main/java/com/chwl/app/avroom/widget/LuckyBagBtn.kt @@ -0,0 +1,27 @@ +package com.chwl.app.avroom.widget + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.widget.FrameLayout +import com.chwl.app.databinding.ViewLuckyBagBtnBinding +import com.chwl.library.common.util.setVis + +class LuckyBagBtn : FrameLayout{ + constructor(context: Context) : super(context){initView(context)} + constructor(context: Context, attrs: AttributeSet?) : super(context, attrs){initView(context)} + + + lateinit var mBinding : ViewLuckyBagBtnBinding + + private fun initView(context: Context) { + mBinding = ViewLuckyBagBtnBinding.inflate(LayoutInflater.from(context),this,true) + + mBinding.number.text = 11.toString() + mBinding.number.setVis(true) + mBinding.number.setBgColor("#f33a49") + + } + + +} \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_black_a30_r4.xml b/app/src/main/res/drawable/bg_black_a30_r4.xml new file mode 100644 index 000000000..2b9acd960 --- /dev/null +++ b/app/src/main/res/drawable/bg_black_a30_r4.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_lucky_bag_gift_item.xml b/app/src/main/res/drawable/bg_lucky_bag_gift_item.xml new file mode 100644 index 000000000..91151dc6e --- /dev/null +++ b/app/src/main/res/drawable/bg_lucky_bag_gift_item.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_f5d2b1_r12_9f6f41.xml b/app/src/main/res/drawable/shape_f5d2b1_r12_9f6f41.xml new file mode 100644 index 000000000..2796888f3 --- /dev/null +++ b/app/src/main/res/drawable/shape_f5d2b1_r12_9f6f41.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_room_lucky_bag.xml b/app/src/main/res/layout/dialog_room_lucky_bag.xml new file mode 100644 index 000000000..76c7db8cf --- /dev/null +++ b/app/src/main/res/layout/dialog_room_lucky_bag.xml @@ -0,0 +1,400 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_room_lucky_bag_open.xml b/app/src/main/res/layout/dialog_room_lucky_bag_open.xml new file mode 100644 index 000000000..94b9c08e5 --- /dev/null +++ b/app/src/main/res/layout/dialog_room_lucky_bag_open.xml @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_room_lucky_bag_gift.xml b/app/src/main/res/layout/item_room_lucky_bag_gift.xml new file mode 100644 index 000000000..f9fc47b0d --- /dev/null +++ b/app/src/main/res/layout/item_room_lucky_bag_gift.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_room_lucky_bag_time.xml b/app/src/main/res/layout/item_room_lucky_bag_time.xml new file mode 100644 index 000000000..7fff002a3 --- /dev/null +++ b/app/src/main/res/layout/item_room_lucky_bag_time.xml @@ -0,0 +1,16 @@ + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_room_lucky_bag_view_others.xml b/app/src/main/res/layout/item_room_lucky_bag_view_others.xml new file mode 100644 index 000000000..85c7600e9 --- /dev/null +++ b/app/src/main/res/layout/item_room_lucky_bag_view_others.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/view_lucky_bag_btn.xml b/app/src/main/res/layout/view_lucky_bag_btn.xml new file mode 100644 index 000000000..8f6eb9024 --- /dev/null +++ b/app/src/main/res/layout/view_lucky_bag_btn.xml @@ -0,0 +1,46 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/view_room_lucky_bag_notify.xml b/app/src/main/res/layout/view_room_lucky_bag_notify.xml new file mode 100644 index 000000000..18c307b6d --- /dev/null +++ b/app/src/main/res/layout/view_room_lucky_bag_notify.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 642a3b223..300a1c847 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -348,6 +348,7 @@ #FF8D46 #FF6645 #FFA957 + #ffea5c #8461FE #CC81EF #589DE7 @@ -519,6 +520,7 @@ #A49EFE #AFAFB3 #529EF2 + #292601 #9E9E9E #E5E5E5 #535353 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c29a3fee4..e792564b7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5403,6 +5403,30 @@ You cannot join again within 24 hours after leaving You can use the speaker to speak again after %s~ + + 成功将 %s 设置为管理员 + + 开奖弹窗标题 + 没开到奖品 + Click Open + coming soon + View_Others + View_Others 24小时提示 + Choose Gift + Waiting time + Send %s gifts , %s coins + Send Coin Lucky Bag + Send Gift Lucky Bag + Gift Lucky Bag + Coin Lucky Bag + Waiting time %s minutes + Lucky Bag Numbers + Total spend %s coins + Modify + + + + diff --git a/core/src/main/java/com/chwl/core/gift/bean/LuckyBagGift.java b/core/src/main/java/com/chwl/core/gift/bean/LuckyBagGift.java new file mode 100644 index 000000000..3389e99c8 --- /dev/null +++ b/core/src/main/java/com/chwl/core/gift/bean/LuckyBagGift.java @@ -0,0 +1,4 @@ +package com.chwl.core.gift.bean; + +public class LuckyBagGift { +} diff --git a/core/src/main/java/com/chwl/core/gift/bean/LuckyBagTime.java b/core/src/main/java/com/chwl/core/gift/bean/LuckyBagTime.java new file mode 100644 index 000000000..d3dee595d --- /dev/null +++ b/core/src/main/java/com/chwl/core/gift/bean/LuckyBagTime.java @@ -0,0 +1,4 @@ +package com.chwl.core.gift.bean; + +public class LuckyBagTime { +} diff --git a/core/src/main/java/com/chwl/core/gift/bean/LuckyBagViewOthers.java b/core/src/main/java/com/chwl/core/gift/bean/LuckyBagViewOthers.java new file mode 100644 index 000000000..ea6f2324e --- /dev/null +++ b/core/src/main/java/com/chwl/core/gift/bean/LuckyBagViewOthers.java @@ -0,0 +1,9 @@ +package com.chwl.core.gift.bean; + +public class LuckyBagViewOthers { + public String avatar; + public String nick; + public long time; + public String giftName; + public int giftNum; +} diff --git a/library/src/module_common/java/com/chwl/library/common/base/BaseDialogFragment.java b/library/src/module_common/java/com/chwl/library/common/base/BaseCommonDialogFragment.java similarity index 98% rename from library/src/module_common/java/com/chwl/library/common/base/BaseDialogFragment.java rename to library/src/module_common/java/com/chwl/library/common/base/BaseCommonDialogFragment.java index 806c41467..2b56e5d8a 100644 --- a/library/src/module_common/java/com/chwl/library/common/base/BaseDialogFragment.java +++ b/library/src/module_common/java/com/chwl/library/common/base/BaseCommonDialogFragment.java @@ -14,6 +14,7 @@ import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; import androidx.viewbinding.ViewBinding; + import com.chwl.library.common.fragmentation.ISupportActivity; import com.chwl.library.common.fragmentation.ISupportFragment; import com.chwl.library.common.fragmentation.SupportFragmentDelegate; @@ -22,7 +23,7 @@ import com.chwl.library.common.util.ActivityHelper; import com.chwl.library.common.util.LibLogger; import com.chwl.library.common.util.ViewBindingUtil; -public abstract class BaseDialogFragment extends DialogFragment implements ISupportFragment { +public abstract class BaseCommonDialogFragment extends DialogFragment implements ISupportFragment { private final String TAG = getClass().getSimpleName(); private final SupportFragmentDelegate mFragmentDelegate = new SupportFragmentDelegate(this); private View mContentView; diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java index c01b653cd..f455964ae 100644 --- a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java +++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java @@ -108,4 +108,13 @@ public class BubbleView extends AppCompatTextView { } + + public void setBgColor(String color) { + GradientDrawable gradientDrawable = new GradientDrawable(); + gradientDrawable.setShape(GradientDrawable.RECTANGLE); +// gradientDrawable.setShape(GradientDrawable.RECTANGLE); + gradientDrawable.setCornerRadius(ScreenUtil.dip2px(25)); + gradientDrawable.setColor(Color.parseColor(color)); + setBackground(gradientDrawable); + } }