tongmengxiao преди 1 година
родител
ревизия
c081803b69
променени са 2 файла, в които са добавени 18 реда и са изтрити 10 реда
  1. 13 5
      room/src/main/java/com/swago/room/gift/GiftDialog.kt
  2. 5 5
      room/src/main/res/layout/layout_user_header_view.xml

+ 13 - 5
room/src/main/java/com/swago/room/gift/GiftDialog.kt

@@ -376,11 +376,19 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
 
             binding.combo.setOnClick(object : ComboView.OnClick {
                 override fun click() {
-                    val gifModel =
-                        luckyData[GiftConfig.giftSelectedPageIndex * 8 + GiftConfig.giftSelectedPageSelectedPosition]
-                    LogUtil.d("礼物id", "${gifModel.gift_name}")
-                    sendGift(gifModel, 1, GiftConfig.list[GiftConfig.clickCount])
-
+                    SwagoRoomManager.iRoomInfo?.let { iRoomInfo ->
+                        if(iRoomInfo.getRoomType() == 1){
+                            val gifModel =
+                                luckyData[GiftConfig.giftSelectedPageIndex * 8 + GiftConfig.giftSelectedPageSelectedPosition]
+                            LogUtil.d("礼物id", "${gifModel.gift_name}")
+                            sendGift(gifModel, 1, GiftConfig.list[GiftConfig.clickCount])
+                        } else if (iRoomInfo.getRoomType() == 2){
+                            val gifModel =
+                                luckyData[GiftConfig.giftAudioSelectedPageIndex * 8 + GiftConfig.giftAudioSelectedPageSelectedPosition]
+                            LogUtil.d("礼物id", "${gifModel.gift_name}")
+                            sendGift(gifModel, 1, GiftConfig.list[GiftConfig.clickCount])
+                        }
+                    }
                 }
 
                 override fun countFinish() {

+ 5 - 5
room/src/main/res/layout/layout_user_header_view.xml

@@ -169,7 +169,7 @@
     <LinearLayout
         android:id="@+id/clHot"
         app:layout_constraintTop_toBottomOf="@+id/cl"
-        android:layout_marginStart="12dp"
+        android:layout_marginStart="10dp"
         app:layout_constraintStart_toEndOf="@+id/clIncome"
         android:orientation="horizontal"
         android:layout_marginTop="10dp"
@@ -214,7 +214,7 @@
         android:visibility="gone"
         tools:visibility="visible"
         app:layout_constraintTop_toBottomOf="@+id/cl"
-        android:layout_marginStart="12dp"
+        android:layout_marginStart="10dp"
         app:layout_constraintStart_toEndOf="@+id/clHot"
         android:orientation="horizontal"
         android:layout_marginTop="10dp"
@@ -240,7 +240,7 @@
         android:drawableStart="@mipmap/notice"
         android:drawableEnd="@mipmap/more"
         app:layout_constraintTop_toBottomOf="@+id/cl"
-        android:layout_marginStart="12dp"
+        android:layout_marginStart="10dp"
         app:layout_constraintStart_toEndOf="@+id/tvTime"
         android:orientation="horizontal"
         android:layout_marginTop="10dp"
@@ -254,7 +254,7 @@
         android:layout_marginTop="12dp"
         android:visibility="gone"
         tools:visibility="visible"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="8dp"
         android:src="@mipmap/live_icon_report"
         android:layout_width="20dp"
         android:layout_height="20dp"/>
@@ -269,7 +269,7 @@
         android:text="id"
         android:layout_marginEnd="12dp"
         android:textSize="@dimen/sp_12"
-        android:textColor="#66ffffff"
+        android:textColor="#ffffff"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
         android:background="@drawable/shape_20000000_41"/>