honghengqiang 2 жил өмнө
parent
commit
efa4002853

+ 1 - 1
.idea/misc.xml

@@ -71,7 +71,7 @@
         <entry key="baseswago/src/main/res/layout/dialog_off_line.xml" value="0.17654508611955422" />
         <entry key="baseswago/src/main/res/layout/dialog_order_lost.xml" value="0.3015625" />
         <entry key="baseswago/src/main/res/layout/dialog_pay.xml" value="0.335" />
-        <entry key="baseswago/src/main/res/layout/dialog_person_data.xml" value="0.36302083333333335" />
+        <entry key="baseswago/src/main/res/layout/dialog_person_data.xml" value="0.7170596393897365" />
         <entry key="baseswago/src/main/res/layout/dialog_report.xml" value="0.3015625" />
         <entry key="baseswago/src/main/res/layout/dialog_report_block.xml" value="0.3776041666666667" />
         <entry key="baseswago/src/main/res/layout/dialog_update.xml" value="0.5" />

+ 2 - 4
baseswago/src/main/java/com/swago/baseswago/agora/AgoraManager.kt

@@ -258,9 +258,7 @@ object AgoraManager {
     /**
      * 打开或者关闭本地音频流
      */
-    private var mMuted = false
-    fun setMute(){
-        mMuted = !mMuted
-        mRtcEngine?.muteLocalAudioStream(mMuted)
+    fun setMute(mute:Boolean){
+        mRtcEngine?.muteLocalAudioStream(mute)
     }
 }

+ 18 - 1
baseswago/src/main/res/layout/dialog_person_data.xml

@@ -87,12 +87,29 @@
                 android:layout_marginStart="5dp"
                 android:src="@mipmap/vip"
                 android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/tvAgent"
                 app:layout_constraintStart_toEndOf="@+id/tvLevelView"
                 app:layout_constraintTop_toTopOf="@+id/tvLevelView"
                 app:layout_constraintBottom_toBottomOf="@+id/tvLevelView"
                 tools:visibility="visible" />
 
+            <TextView
+                android:id="@+id/tvAgent"
+                android:textSize="10dp"
+                android:text="Agent"
+                android:textColor="#fff"
+                android:paddingStart="16dp"
+                android:paddingEnd="5dp"
+                android:visibility="gone"
+                android:background="@mipmap/icon_agent_bg"
+                app:layout_constraintBottom_toBottomOf="@+id/tvLevelView"
+                app:layout_constraintTop_toTopOf="@+id/tvLevelView"
+                app:layout_constraintStart_toEndOf="@+id/ivVip"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+
 
             <LinearLayout
                 android:id="@+id/llFollow"

BIN
baseswago/src/main/res/mipmap-ar-xxhdpi/icon_agent_bg.webp


BIN
baseswago/src/main/res/mipmap-xxhdpi/icon_agent_bg.webp


+ 2 - 0
room/src/main/java/com/swago/room/giftdandao/GiftDanDaoManager.kt

@@ -51,6 +51,8 @@ class GiftDanDaoManager  : IRoomActiveListener {
         giftDanDaoViewList.forEach {
             it.clear()
         }
+        loopJob?.cancel()
+        loopJob = null
         SwagoRoomManager.removeListener(this)
     }
 

+ 16 - 0
room/src/main/java/com/swago/room/widget/AnchorFooterView.kt

@@ -11,6 +11,7 @@ import com.swago.baseswago.baseroom.IRoomInfo
 import com.swago.baseswago.baseroom.SwagoRoomManager
 import com.swago.baseswago.util.NoDoubleClickListener
 import com.swago.baseswago.util.UserInfo
+import com.swago.room.R
 import com.swago.room.databinding.LayoutAnchorFooterViewBinding
 import com.swago.room.inter.IFooter
 import com.swago.room.pk.PKStateManager
@@ -28,6 +29,8 @@ class AnchorFooterView : ConstraintLayout, IFooter, IRoomActiveListener {
     var openGameFun:(()->Unit)? = null
     var openPKFun:(()->Unit)? = null
 
+    private var isMute = false
+
     constructor(context: Context) : this(context, null)
     constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
     constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(
@@ -81,6 +84,19 @@ class AnchorFooterView : ConstraintLayout, IFooter, IRoomActiveListener {
                 }
             }
         })
+
+        binding.ivMute.setOnClickListener(object : NoDoubleClickListener() {
+            override fun onClick() {
+                if (isMute){
+                    AgoraManager.setMute(false)
+                    binding.ivMute.setImageResource(R.mipmap.live_unmute)
+                }else{
+                    AgoraManager.setMute(true)
+                    binding.ivMute.setImageResource(R.mipmap.live_mute)
+                }
+                isMute = !isMute
+            }
+        })
     }
 
     override fun getFooterView(): View {

+ 11 - 0
room/src/main/res/layout/layout_anchor_footer_view.xml

@@ -51,6 +51,17 @@
         android:layout_width="40dp"
         android:layout_height="40dp"/>
 
+    <ImageView
+        android:id="@+id/ivMute"
+        android:layout_marginEnd="10dp"
+        android:background="@drawable/shape_80000000_20"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/ivMessage"
+        android:src="@mipmap/live_unmute"
+        android:padding="7dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"/>
+
     <ImageView
         android:id="@+id/ivMessage"
         android:layout_marginEnd="10dp"

BIN
room/src/main/res/mipmap-xxhdpi/live_mute.webp


BIN
room/src/main/res/mipmap-xxhdpi/live_unmute.webp