红包

.idea/misc.xml

@@ -23,11 +23,14 @@
         <entry key="baseswago/src/main/res/drawable/shape_131b23_top_37.xml" value="0.2375" />
         <entry key="baseswago/src/main/res/drawable/shape_161722_20.xml" value="0.2595" />
         <entry key="baseswago/src/main/res/drawable/shape_161722_top_20.xml" value="0.283" />
+        <entry key="baseswago/src/main/res/drawable/shape_1affffff_all_12.xml" value="0.213" />
         <entry key="baseswago/src/main/res/drawable/shape_20000000_14.xml" value="0.283" />
         <entry key="baseswago/src/main/res/drawable/shape_20000000_41.xml" value="0.2745" />
         <entry key="baseswago/src/main/res/drawable/shape_2f3043_37.xml" value="0.283" />
         <entry key="baseswago/src/main/res/drawable/shape_3d7fff_36.xml" value="0.2375" />
+        <entry key="baseswago/src/main/res/drawable/shape_3d8aff_3d7fff_all_15.xml" value="0.2375" />
         <entry key="baseswago/src/main/res/drawable/shape_80000000_20.xml" value="0.13229166666666667" />
+        <entry key="baseswago/src/main/res/drawable/shape_80ff56b7_all_38.xml" value="0.213" />
         <entry key="baseswago/src/main/res/drawable/shape_9ffd88_5_stroke.xml" value="0.3145833333333333" />
         <entry key="baseswago/src/main/res/drawable/shape_9ffd88_63f2df.xml" value="0.39375" />
         <entry key="baseswago/src/main/res/drawable/shape_9ffd88_6ef2df.xml" value="0.3611111111111111" />
@@ -51,6 +54,7 @@
         <entry key="baseswago/src/main/res/drawable/shape_ff56b7_5_stroke.xml" value="0.251" />
         <entry key="baseswago/src/main/res/drawable/shape_ff9300_20.xml" value="0.21927083333333333" />
         <entry key="baseswago/src/main/res/drawable/shape_ff9f00_37.xml" value="0.251" />
+        <entry key="baseswago/src/main/res/drawable/shape_fff_all_38.xml" value="0.213" />
         <entry key="baseswago/src/main/res/drawable/shape_touming.xml" value="0.37333333333333335" />
         <entry key="baseswago/src/main/res/drawable/shape_tranparent.xml" value="0.2415" />
         <entry key="baseswago/src/main/res/drawable/shape_white_20.xml" value="0.35794871794871796" />
@@ -121,6 +125,7 @@
         <entry key="room/src/main/res/layout/dialog_game_play.xml" value="0.3776041666666667" />
         <entry key="room/src/main/res/layout/dialog_gift.xml" value="0.3015625" />
         <entry key="room/src/main/res/layout/dialog_message_list.xml" value="0.3776041666666667" />
+        <entry key="room/src/main/res/layout/dialog_red_envelope.xml" value="0.39166666666666666" />
         <entry key="room/src/main/res/layout/dialog_send_msg.xml" value="0.5" />
         <entry key="room/src/main/res/layout/dialog_share.xml" value="0.27447916666666666" />
         <entry key="room/src/main/res/layout/dialog_user_for_anchor_close.xml" value="0.39166666666666666" />
@@ -149,6 +154,7 @@
         <entry key="room/src/main/res/layout/view_svga.xml" value="0.3619791666666667" />
         <entry key="room/src/main/res/layout/view_waft.xml" value="0.39166666666666666" />
         <entry key="tuikit/src/main/res/drawable/message_send_border.xml" value="0.204" />
+        <entry key="tuikit/src/main/res/drawable/shape_search.xml" value="0.2015" />
         <entry key="tuikit/src/main/res/layout/activity_camera.xml" value="0.303125" />
         <entry key="tuikit/src/main/res/layout/chat_input_layout.xml" value="0.3015625" />
         <entry key="tuikit/src/main/res/layout/chat_inputmore_layout.xml" value="0.2296875" />
@@ -207,6 +213,7 @@
         <entry key="user/src/main/res/drawable/shape_37393f_444652.xml" value="0.33177083333333335" />
         <entry key="user/src/main/res/drawable/shape_c3a165_ead6a7_top_10.xml" value="0.3333333333333333" />
         <entry key="user/src/main/res/drawable/shape_eff1f4.xml" value="0.4078125" />
+        <entry key="user/src/main/res/drawable/shape_exchange_selected.xml" value="0.2015" />
         <entry key="user/src/main/res/drawable/shape_f4faff_12.xml" value="0.251" />
         <entry key="user/src/main/res/drawable/shape_f7f8fa.xml" value="0.4078125" />
         <entry key="user/src/main/res/drawable/shape_f7f8fa_5.xml" value="0.4078125" />
@@ -217,6 +224,7 @@
         <entry key="user/src/main/res/drawable/shape_white_stroke.xml" value="0.3333333333333333" />
         <entry key="user/src/main/res/layout/activity_country.xml" value="0.3625" />
         <entry key="user/src/main/res/layout/activity_custom_service.xml" value="0.25677083333333334" />
+        <entry key="user/src/main/res/layout/activity_diamond_coin.xml" value="0.33" />
         <entry key="user/src/main/res/layout/activity_level.xml" value="0.315625" />
         <entry key="user/src/main/res/layout/activity_recharge.xml" value="0.36302083333333335" />
         <entry key="user/src/main/res/layout/activity_setting.xml" value="0.36302083333333335" />
@@ -224,6 +232,7 @@
         <entry key="user/src/main/res/layout/activity_task.xml" value="0.3776041666666667" />
         <entry key="user/src/main/res/layout/activity_user_edit.xml" value="0.3638968481375358" />
         <entry key="user/src/main/res/layout/dialog_edit.xml" value="0.39166666666666666" />
+        <entry key="user/src/main/res/layout/dialog_exchange.xml" value="0.3776041666666667" />
         <entry key="user/src/main/res/layout/dialog_sex.xml" value="0.34057971014492755" />
         <entry key="user/src/main/res/layout/fragment_anchor.xml" value="0.3015625" />
         <entry key="user/src/main/res/layout/fragment_anchor_level.xml" value="0.3171875" />
@@ -236,6 +245,7 @@
         <entry key="user/src/main/res/layout/item_black.xml" value="0.34601449275362317" />
         <entry key="user/src/main/res/layout/item_black_room.xml" value="0.3619791666666667" />
         <entry key="user/src/main/res/layout/item_country_large_padding.xml" value="0.3625" />
+        <entry key="user/src/main/res/layout/item_exchange.xml" value="0.3776041666666667" />
         <entry key="user/src/main/res/layout/item_follow_fan.xml" value="0.39166666666666666" />
         <entry key="user/src/main/res/layout/item_letter.xml" value="0.3625" />
         <entry key="user/src/main/res/layout/item_level.xml" value="0.39166666666666666" />

baseswago/src/main/java/com/swago/baseswago/im/ImConstant.kt

@@ -52,4 +52,14 @@ object ImConstant {
     const val cancel_forbid_speak = 102
     const val remove_room = 103
 
+    /**
+     * 直播间内下收到红包 104
+     */
+
+
+    /**
+     * 发送大额红包的大群通知 3
+     */
+
+
 }

baseswago/src/main/java/com/swago/baseswago/model/live/gift/GiftModel.java

@@ -22,6 +22,7 @@ public class GiftModel implements Parcelable {
     private String gift_coins;
     private String gift_icon_url;
     private String gift_svg_url;
+    private int gift_mode;
     private boolean isSelected;
 
     protected GiftModel(Parcel in) {
@@ -30,6 +31,7 @@ public class GiftModel implements Parcelable {
         gift_coins = in.readString();
         gift_icon_url = in.readString();
         gift_svg_url = in.readString();
+        gift_mode = in.readInt();
     }
 
     public static final Creator<GiftModel> CREATOR = new Creator<GiftModel>() {
@@ -84,6 +86,14 @@ public class GiftModel implements Parcelable {
         this.gift_svg_url = gift_svg_url;
     }
 
+    public int getGift_mode() {
+        return gift_mode;
+    }
+
+    public void setGift_mode(int gift_mode) {
+        this.gift_mode = gift_mode;
+    }
+
     public boolean isSelected() {
         return isSelected;
     }
@@ -104,5 +114,6 @@ public class GiftModel implements Parcelable {
         dest.writeString(gift_coins);
         dest.writeString(gift_icon_url);
         dest.writeString(gift_svg_url);
+        dest.writeInt(gift_mode);
     }
 }

baseswago/src/main/res/drawable/shape_1affffff_all_12.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="12dp"/>
+    <solid android:color="#1Affffff"/>
+</shape>

baseswago/src/main/res/drawable/shape_80ff56b7_all_38.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#80FF56B7"/>
+    <corners android:radius="38dp"/>
+</shape>

baseswago/src/main/res/values/strings.xml

@@ -158,5 +158,7 @@
     <string name="big_prize">How lucky! %s sent %s to win %s times the reward, congratulations to him!</string>
     <string name="update_now">update immediately</string>
 
+    <string name="special">特殊</string>
+
 
 </resources>

room/src/main/java/com/swago/room/gift/GiftAdapter.kt

@@ -16,7 +16,12 @@ class GiftAdapter(private val type: Int, layoutResId: Int, data: ArrayList<GiftM
 
     override fun convert(helper: BaseViewHolder, item: GiftModel) {
         helper.apply {
-            setText(R.id.tvCoin, item.gift_coins)
+            if (item.gift_mode!=1){
+                setText(R.id.tvCoin, item.gift_coins)
+                setVisible(R.id.tvCoin,true)
+            }else{
+                setVisible(R.id.tvCoin,false)
+            }
             setText(R.id.tvName, item.gift_name)
             val ivGift = itemView.findViewById<ImageView>(R.id.ivGift)
             Glide.with(itemView.context).load(item.gift_icon_url)

room/src/main/java/com/swago/room/gift/GiftDialog.kt

@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Gravity
 import android.view.View
+import android.widget.Toast
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.viewpager.widget.ViewPager
@@ -52,16 +53,20 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
     private val titleList = arrayListOf(
         AppContext.getContext().resources.getString(R.string.lucky),
         AppContext.getContext().resources.getString(R.string.hot),
-        AppContext.getContext().resources.getString(R.string.luxury)
+        AppContext.getContext().resources.getString(R.string.luxury),
+        AppContext.getContext().resources.getString(R.string.special)
     )
     private val giftFragmentList = ArrayList<GiftFragment>()
 
     private var luckyFragment: GiftFragment? = null
     private var hotFragment: GiftFragment? = null
     private var luxuryFragment: GiftFragment? = null
+    private var specialFragment:GiftFragment? = null
+
     private var luckyData = ArrayList<GiftModel>()
     private var hotData = ArrayList<GiftModel>()
     private var luxuryData = ArrayList<GiftModel>()
+    private var specialData = ArrayList<GiftModel>()
     private var viewPagerAdapter: SwagoAdapter? = null
 
     private var type = 1
@@ -92,7 +97,6 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
             payVm.getCoins()
             receiveId = it.getString("receiveId", "")
             receiveName = it.getString("receiveName", "")
-
             //先走缓存
             json = SpUtil.readString("giftList")
             if (json.isNullOrEmpty()) {
@@ -121,6 +125,10 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                             GiftConfig.list.clear()
                             GiftConfig.list.addAll(giftAllModel.position)
                         }
+                        4 -> {
+                            specialData.clear()
+                            specialData.addAll(giftAllModel.data)
+                        }
                     }
                 }
                 binding.tvToSend.visibility = View.VISIBLE
@@ -133,10 +141,12 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
             luckyFragment = GiftFragment.newInstance(3, luckyData)
             hotFragment = GiftFragment.newInstance(1, hotData)
             luxuryFragment = GiftFragment.newInstance(2, luxuryData)
+            specialFragment = GiftFragment.newInstance(4, specialData)
 
             giftFragmentList.add(luckyFragment!!)
             giftFragmentList.add(hotFragment!!)
             giftFragmentList.add(luxuryFragment!!)
+            giftFragmentList.add(specialFragment!!)
 
 
             /**
@@ -146,16 +156,25 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                 resetSendState()
                 hotFragment?.reset()
                 luxuryFragment?.reset()
+                specialFragment?.reset()
             }
             hotFragment?.listener = {
                 resetSendState()
                 luckyFragment?.reset()
                 luxuryFragment?.reset()
+                specialFragment?.reset()
             }
             luxuryFragment?.listener = {
                 resetSendState()
                 luckyFragment?.reset()
                 hotFragment?.reset()
+                specialFragment?.reset()
+            }
+            specialFragment?.listener = {
+                resetSendState()
+                luckyFragment?.reset()
+                hotFragment?.reset()
+                luxuryFragment?.reset()
             }
 
             binding.viewPager.offscreenPageLimit = 3
@@ -235,6 +254,9 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                 3 -> {
                     binding.viewPager.currentItem = 0
                 }
+                4 -> {
+                    binding.viewPager.currentItem = 3
+                }
             }
 
             binding.combo.setOnClick(object : ComboView.OnClick {
@@ -286,6 +308,24 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                         sendGift(gifModel, 0)
                         dismissAllowingStateLoss()
                     }
+
+                    4 -> {
+                        //特殊
+                        val gifModel =
+                            specialData[GiftConfig.giftSelectedPageIndex * 8 + GiftConfig.giftSelectedPageSelectedPosition]
+                        LogUtil.d("礼物id", "${gifModel.gift_name}")
+                        when(gifModel.gift_mode){
+                            1 -> {
+                                Toast.makeText(AppContext.getContext(), "红包", Toast.LENGTH_SHORT)
+                                    .show()
+                            }
+                            else -> {
+                                
+                            }
+                        }
+                       
+                        dismissAllowingStateLoss()
+                    }
                 }
 
 

room/src/main/java/com/swago/room/hongbao/RedEnvelopeDialog.kt

@@ -0,0 +1,21 @@
+package com.swago.room.hongbao
+
+import com.swago.baseswago.dialog.BaseXDFragment
+import com.swago.room.databinding.DialogRedEnvelopeBinding
+
+/**
+ *@date 2022/4/9 15:32
+ *description:
+ */
+class RedEnvelopeDialog : BaseXDFragment<DialogRedEnvelopeBinding>() {
+
+
+
+    override fun initOther() {
+
+    }
+
+    override fun initLiveData() {
+
+    }
+}

room/src/main/res/layout/dialog_gift.xml

@@ -6,28 +6,34 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:background="#000000"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_width="match_parent"
-        android:layout_height="268dp">
+        android:layout_height="298dp">
+
+        <View
+            android:id="@+id/view"
+            android:background="#161722"
+            android:layout_marginTop="30dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
 
         <net.lucode.hackware.magicindicator.MagicIndicator
             android:id="@+id/magicIndicator"
-            android:layout_marginEnd="150dp"
             app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="30dp"
             android:layout_width="match_parent"
             android:layout_height="40dp"/>
 
         <TextView
             android:id="@+id/tvSender"
-            android:textColor="#fff"
-            app:layout_constraintTop_toTopOf="@+id/magicIndicator"
-            app:layout_constraintBottom_toBottomOf="@+id/magicIndicator"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
+            android:textColor="#FFE398"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/view"
+            android:layout_marginBottom="4dp"
             android:layout_marginEnd="8dp"
             android:paddingEnd="8dp"
             android:paddingStart="8dp"
+            android:textSize="14dp"
             android:gravity="center"
             app:layout_constraintEnd_toEndOf="parent"
             android:background="@drawable/shape_black_15"

room/src/main/res/layout/dialog_red_envelope.xml

@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        app:layout_constraintTop_toTopOf="parent"
+        android:background="@drawable/shape_161722_top_20"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.swago.baseswago.cusview.MediumTextView
+            android:id="@+id/tvRuleTitle"
+            android:textSize="16dp"
+            android:textColor="#fff"
+            android:text="幸运红包规则"
+            android:layout_marginTop="9dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <ImageView
+            android:id="@+id/ivBack"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="10dp"
+            android:src="@mipmap/back_white"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_width="20dp"
+            android:layout_height="20dp"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:visibility="gone"
+        android:background="@drawable/shape_161722_top_20"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+
+        <com.swago.baseswago.cusview.MediumTextView
+            android:id="@+id/tvTitle"
+            android:textSize="16dp"
+            android:textColor="#fff"
+            android:text="幸运红包"
+            android:layout_marginTop="9dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <ImageView
+            android:id="@+id/ivHelp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginTop="10dp"
+            android:src="@mipmap/icon_help"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_width="20dp"
+            android:layout_height="20dp"/>
+
+        <TextView
+            android:id="@+id/tvSum"
+            android:text="金币总数"
+            android:textColor="#99FFFFFF"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="64dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <androidx.appcompat.widget.AppCompatEditText
+            android:id="@+id/etInputCoin"
+            app:layout_constraintTop_toBottomOf="@+id/tvSum"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="7dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:paddingStart="12dp"
+            android:textSize="14dp"
+            android:textColor="#fff"
+            android:textColorHint="#99FFFFFF"
+            android:hint="不少于1000金币"
+            android:gravity="center_vertical"
+            android:drawablePadding="8dp"
+            android:drawableStart="@mipmap/icon_envelope_num"
+            android:background="@drawable/shape_1affffff_all_12"
+            android:layout_width="0dp"
+            android:layout_height="48dp"/>
+
+        <TextView
+            android:id="@+id/tvEnvelope"
+            android:text="红包个数"
+            android:textColor="#99FFFFFF"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            app:layout_constraintTop_toBottomOf="@+id/etInputCoin"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <androidx.appcompat.widget.AppCompatEditText
+            android:id="@+id/etInputCount"
+            app:layout_constraintTop_toBottomOf="@+id/tvEnvelope"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="7dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:paddingStart="12dp"
+            android:textSize="14dp"
+            android:textColor="#fff"
+            android:textColorHint="#99FFFFFF"
+            android:hint="最少5个红包"
+            android:gravity="center_vertical"
+            android:drawablePadding="8dp"
+            android:drawableStart="@mipmap/icon_person_num"
+            android:background="@drawable/shape_1affffff_all_12"
+            android:layout_width="0dp"
+            android:layout_height="48dp"/>
+
+
+        <TextView
+            android:id="@+id/tvDescribe"
+            android:text="当红包总金额>=20000时，还会全平台广播通知哦"
+            android:textColor="#99FFFFFF"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginTop="16dp"
+            app:layout_constraintTop_toBottomOf="@+id/etInputCount"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/tvNotEnough"
+            app:layout_constraintTop_toBottomOf="@+id/tvDescribe"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="20dp"
+            android:textSize="12dp"
+            android:textColor="#FFD917"
+            android:text="金币总数不满足要求"
+            android:visibility="gone"
+            tools:visibility="visible"
+            android:drawableStart="@mipmap/icon_red_envelope_not_enough_coin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+
+        <com.swago.baseswago.cusview.BoldTextView
+            android:id="@+id/tvSendRedEnvelope"
+            android:text="发红包"
+            android:textColor="#fff"
+            android:textSize="16dp"
+            android:gravity="center"
+            android:layout_marginBottom="25dp"
+            android:background="@drawable/shape_80ff56b7_all_38"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            app:layout_constraintTop_toBottomOf="@+id/etInputCount"
+            android:layout_marginTop="85dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_width="match_parent"
+            android:layout_height="44dp"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>