From 520bc8e1bbc157ea5565b648741f40d0eeeaa82b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Mon, 3 Nov 2025 18:34:07 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/AndroidProjectSystem.xml                |   6 ++
 .idea/deploymentTargetSelector.xml            |  10 +++
 .idea/runConfigurations.xml                   |  17 ++++
 .idea/vcs.xml                                 |   6 ++
 .../xscm/moduleutil/rtc/VolumeManager.java    |  77 ++++++++++++++++++
 .../main/res/mipmap-hdpi/accompany_off.webp   | Bin 0 -> 858 bytes
 .../main/res/mipmap-hdpi/accompany_on.webp    | Bin 0 -> 822 bytes
 .../src/main/res/mipmap-hdpi/icon_liang.webp  | Bin 0 -> 1282 bytes
 .../main/res/mipmap-hdpi/muisc_reward.webp    | Bin 0 -> 738 bytes
 .../main/res/mipmap-hdpi/muisc_switch.webp    | Bin 0 -> 556 bytes
 .../src/main/res/mipmap-hdpi/muisc_tyt.webp   | Bin 0 -> 692 bytes
 .../main/res/mipmap-xhdpi/accompany_off.webp  | Bin 0 -> 1218 bytes
 .../main/res/mipmap-xhdpi/accompany_on.webp   | Bin 0 -> 1186 bytes
 .../src/main/res/mipmap-xhdpi/icon_liang.webp | Bin 0 -> 1610 bytes
 .../main/res/mipmap-xhdpi/muisc_reward.webp   | Bin 0 -> 988 bytes
 .../main/res/mipmap-xhdpi/muisc_switch.webp   | Bin 0 -> 646 bytes
 .../src/main/res/mipmap-xhdpi/muisc_tyt.webp  | Bin 0 -> 754 bytes
 .../main/res/mipmap-xxhdpi/accompany_off.webp | Bin 0 -> 1988 bytes
 .../main/res/mipmap-xxhdpi/accompany_on.webp  | Bin 0 -> 1932 bytes
 .../main/res/mipmap-xxhdpi/icon_liang.webp    | Bin 0 -> 2912 bytes
 .../main/res/mipmap-xxhdpi/muisc_reward.webp  | Bin 0 -> 1618 bytes
 .../main/res/mipmap-xxhdpi/muisc_switch.webp  | Bin 0 -> 1086 bytes
 .../src/main/res/mipmap-xxhdpi/muisc_tyt.webp | Bin 0 -> 1250 bytes
 .../ExampleInstrumentedTest.java              |  26 ++++++
 .../moduletablayout/ExampleUnitTest.java      |  17 ++++
 25 files changed, 159 insertions(+)
 create mode 100644 .idea/AndroidProjectSystem.xml
 create mode 100644 .idea/deploymentTargetSelector.xml
 create mode 100644 .idea/runConfigurations.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/rtc/VolumeManager.java
 create mode 100644 moduleUtil/src/main/res/mipmap-hdpi/accompany_off.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-hdpi/accompany_on.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-hdpi/icon_liang.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-hdpi/muisc_reward.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-hdpi/muisc_switch.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-hdpi/muisc_tyt.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-xhdpi/accompany_off.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-xhdpi/accompany_on.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-xhdpi/icon_liang.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-xhdpi/muisc_reward.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-xhdpi/muisc_switch.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-xhdpi/muisc_tyt.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-xxhdpi/accompany_off.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-xxhdpi/accompany_on.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-xxhdpi/icon_liang.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-xxhdpi/muisc_reward.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-xxhdpi/muisc_switch.webp
 create mode 100644 moduleUtil/src/main/res/mipmap-xxhdpi/muisc_tyt.webp
 create mode 100644 moduletablayout/src/androidTest/java/com/example/moduletablayout/ExampleInstrumentedTest.java
 create mode 100644 moduletablayout/src/test/java/com/example/moduletablayout/ExampleUnitTest.java

diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml
new file mode 100644
index 00000000..4a53bee8
--- /dev/null
+++ b/.idea/AndroidProjectSystem.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 00000000..b268ef36
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 00000000..16660f1d
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..94a25f7f
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/VolumeManager.java b/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/VolumeManager.java
new file mode 100644
index 00000000..113e269a
--- /dev/null
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/VolumeManager.java
@@ -0,0 +1,77 @@
+package com.xscm.moduleutil.rtc;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * com.xscm.moduleutil.rtc
+ * qx
+ * 2025/11/3
+ * 声网声音管理类
+ */
+public class VolumeManager {
+    private static VolumeManager instance;
+    private Map<String, Integer> userMusicVolumeMap = new HashMap<>();
+    private Map<String, Integer> userPlayoutVolumeMap = new HashMap<>();
+    private Map<String, Boolean> userPlayoutBzMap = new HashMap<>();
+    private String currentUserId;
+
+    private VolumeManager() {}
+
+    public static VolumeManager getInstance() {
+        if (instance == null) {
+            synchronized (VolumeManager.class) {
+                if (instance == null) {
+                    instance = new VolumeManager();
+                }
+            }
+        }
+        return instance;
+    }
+
+    public void setCurrentUserId(String userId) {
+        this.currentUserId = userId;
+    }
+
+    public void saveCurrentVolumes(int musicVolume, int playoutVolume) {
+        if (currentUserId != null) {
+            userMusicVolumeMap.put(currentUserId, musicVolume);
+            userPlayoutVolumeMap.put(currentUserId, playoutVolume);
+        }
+    }
+    public void clearCurrentVolumes() {
+        if (currentUserId != null) {
+            userMusicVolumeMap.remove(currentUserId);
+            userPlayoutVolumeMap.remove(currentUserId);
+        }
+        userPlayoutBzMap.clear();
+    }
+
+    public void saveBz(String userId, boolean bz){
+        userPlayoutBzMap.clear();
+        userPlayoutBzMap.put(userId, bz);
+    }
+
+    public boolean getBz(String userId){
+        Boolean bz = userPlayoutBzMap.get(userId);
+        if (bz == null) {
+            bz = true; // 默认值原唱 false 伴奏
+        }
+        return bz;
+    }
+
+    public int[] getUserVolumes(String userId) {
+        Integer musicVolume = userMusicVolumeMap.get(userId);
+        Integer playoutVolume = userPlayoutVolumeMap.get(userId);
+
+        if (musicVolume == null) {
+            musicVolume = 100; // 默认值
+        }
+        if (playoutVolume == null) {
+            playoutVolume = 50; // 默认值
+        }
+
+        return new int[]{musicVolume, playoutVolume};
+    }
+}
+
diff --git a/moduleUtil/src/main/res/mipmap-hdpi/accompany_off.webp b/moduleUtil/src/main/res/mipmap-hdpi/accompany_off.webp
new file mode 100644
index 0000000000000000000000000000000000000000..9c75fd1d3abca472f946fed0ae093f1fdb095ab4
GIT binary patch
literal 858
zcmV-g1Eu^@Nk&Fe0{{S5MM6+kP&il$0000G0000T0012T06|PpNLc{@00EF2$+l`c
z=f3ZX(PIdJl>jrv!OSe1l>%C5F}ln$^=z>oeV8%!x#uf{h?sy>+nBugz@1M&zkj)N
zVBw@j8fG<X_luSaVC(7rSykEQ_dOIOJMeB*$>@_xl&s+4Q8lA4cgTu{*f}>ccd`o#
zN>)TV$3nGMKu{1Q3WLk5l;(T@l>hl=M(R5}5HO<{6zT15On!z6C<=%QD32#CZb1gj
zqeT5Z|9~oLffR1PD}Y#x3gY#zAh8T2zWNRzSWZ^H{S+jYP~ZHd4o?t-S2rbEMpU@I
zm*{W<=$3`8074zL{+>7KDJW4;i3<8~Vq<rYD1b;5(B8Hx&3p$E&68DMO-ZTRFo<G-
zIR;l%DW!C*L$)s8I*_s>&vr6U)H*XFmqs2Q1grxX+&dx_u6o-eE3x}>Nh+?U?RxY(
zApE(vdwNxtQe)!0T{qq~o3E~HpF5$EY5@RNP&gpc0RR9H3jmz~DjonH06u*%l1HSY
zA)z<u0FV!fYyh1ygUwCDtzVEJz-@r@0s6tzPtXJXS5U`3cd<9_cces8I`Z%XN^3ij
z;AXn=b@&Rn%ZWN>`h5TvHU#XU1%9O_+YNaD0RHZe-{1^UE2}+IyMGw=%UrSiP6yqP
z<qlT|(!#4iI&{}jvrV4eDk!{q-G;yd6~~}^-J%*I{de)n()wkFl^^rtcS}?JJM?Lm
zD028e$QH&^XnFsk=hrS~O9PkPNFyb2X;*D2bg+--BWb43()-KKeBWp`A1z4~@jcre
zek#FolHU_R&W?U0paFHUzOJF1@NxpxOuNL@qt5&lp!nQWOMB$k$CAd08dYtd;;6rW
zYN5&IKZHJVv2Fsb{#Rm$hT+x0{<uA{V|d@ccD4g!_BC|zcS8(}^vK7<l^tuQF>kx{
z^fDA0!}_uy->q1QsP{=1Jx2)<(z(e=_Q6q;##)#9&RYQEv+rp8ghz7~u$z}#^Mzw}
zB{*cgLu>ps3&|z31ScbgKks53oyp10<p7f*YIx{iuz?}C1^AMJykkN&m5ui7wk$`S
kctGL1*IwkC$Hq`0%E4*8E;I0{&YUEdlSRE52NeJS09)ddIRF3v

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-hdpi/accompany_on.webp b/moduleUtil/src/main/res/mipmap-hdpi/accompany_on.webp
new file mode 100644
index 0000000000000000000000000000000000000000..8d12720b059812e095608bd30deb6b5960015ba4
GIT binary patch
literal 822
zcmV-61IheSNk&F40{{S5MM6+kP&il$0000G0000T0012T06|PpNH_ri00EF=TidZc
z_lNekTK^O91Z)M<u$?NMGYGr0Q`sr=*VgBA70>f(1`#m<7MN}sJpTCi>hj;m$NQVp
z7BSU%=-sv?0ByfM)|m>o_@jUX!dv=25vJyXge$xPovIF~xsk(_7k}<@mG43xBoq=M
za%Y{?v;d*dASjQf%({Q#M8*BuZkbahKrtc;hte%?5F#2#ylfua2E_`}dhc;b#3F!w
zPXuuZ-TVhAX5jNOKwRSgsz7m}mETJCfq(>#kWBwJKzz-wL9tgzA1VMu1C;-`X&v7|
z5Cw!jAKI|gTp0-wtvs=J!_3a+@P+}<`u)dwGpo9k^WXs_<To>`I#mV)0we_G73Z~M
zHu0^1UvB=>P{+lmkM`I4QmqGHtUGdx$J<gCG2PU2@Yc7brQfT$H;Y*d1XfTuAkYB-
z0I&)GodGHy03HB7eJ+wmq@tmrH|PM64~c95oic=i&!Ag}Y5>4(mglPT%=Dn@0O!m0
zGySstxAvK=DALO+d#LZ?2NIDIHKJVJ0yzdmcD#S4@9fo<Lf1)(C4c|`{`tf?kd-rW
z4H=m4chc`0lnRC1@mRw9W7z>y6v-|7L4#nX40vN|?`d4IwfW00hY+i@Y$Ix&&Uwjw
zzIqfNf6XfI7{4{jFT}t=3G-g9JOBL;E6Gov2E4uLUiE+F*6;1SZZ*CAMmQ9mHm3hk
z4sI_4C{dceuj?^=+w!RzGn;`jl>WjVQ8^jgxt0oz$nETN%{*sGJju2KG_RRKBezW)
zVVGn3GpM@`$GH0hFo=h<vwA2=MhZpii{ksA$pvS`i1THjgq6YbR-$sw)`=a57K5S!
zhjL+A?@FY;vR-E^#9SO{4BQq+Z^OU*#h5aVFRZ*$U;t9>$-PRM)4qP;vi!nv-t`&d
zzmEh1@(L<uL|DH_Ei`_NpPjQFYFqi0zPtS|;M{<B{<ZPDMHqCsx`-g6+C%f1lrQ}x
z+8X=tt7HnU^q9F5LUdOkXSq#L$kOy&z}-i6h0;crKGkSo%D(CQvCTT9f4r%102I}e
A5dZ)H

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-hdpi/icon_liang.webp b/moduleUtil/src/main/res/mipmap-hdpi/icon_liang.webp
new file mode 100644
index 0000000000000000000000000000000000000000..f429f26dd0c3a8a129e955b0c75726caeb30ad8b
GIT binary patch
literal 1282
zcmV+d1^xO`Nk&Hc1ONb6MM6+kP&il$0000G0000q001-q06|PpNaz9p00HnLZQHc9
z*|we6<&Y|hh)|3{hFGPc+->aMo`f`koA_2?l|2siQbfpIIP3ck-Kdr|IFIwZ&<rAC
z0;b)!`$u;^JA3urYp=h4`S9brNBi69t#5C?e|GVIYp*ZP-h1~gZH~XZyh0Ko{q@y@
zlkLrI5AXj58CMDU_1@t-H+1m#bF!Spi1U9R+{oVP&sJvMium<(Z@10SBQ&Utl5z3u
z)@Fyz$rDs$Wrhjy<Ycq%=*gRqS%Zud32&a<TDA8yLWaq>MCS2mZ^gl>T~`@Z=BEb>
z@BI6h+JPDkvsgd>eLFflR}GRf4^?Ddiu1$4_MUOb5~Vq0`Tk~h@+%b-L^B$N6!F{f
z>;a4@4H5>;2;$4_G#!5>2&I*1OhL0QZ%^Czu1b>mx|Xd>SMP84Keya2VWAoYXZuJ0
zn?-0WgVs_(TpZoKZWa_}USUl^O4oNjwuTx+wM#`(pFNyKvy6;dPY|8GqL~P*VpUeY
z`o=tpDySJ%7|kWVeJ!g;s*J*bP`tLbAsW&`DvRNDNH=397MkJeJF_g&vIZI?5x#yk
zo0rTZVw9R0HhX#2k}PLDgNQQh^Ut7UIYnBCGEc<EcdpG7T0@I6&pce;J-U!cA&adv
z%t9`X_Rq372x+YbqJ*>k?fX|~HV&;*S$*~1X1aZ;Xpo{E4WrTJ@ic9}h@jGLG#IA*
zcbcZ@__qZT?P$4>em$9O?wd#RT?|Xc-P_Kl!*imrljahdogYra?caa4nE8@IQ5pX7
zukC0$IBfw%mP0bme-5VQy+@&e1PPM0&-SLZM~~lBqESJ!wQnBZnpSU)AEQ}8RwjhU
z$D4K2=I9w2XI{v#<k79owDaESFA*&$^9+AJ-J5Rm;9uuuUS!wvza30ByFI-3t7s4j
z(eL*Ux6_SpPaa(Ug@OjTy8PmJGris8_s%Y^lf~<cv-fXrr?<Y@Kf3$z!&hIwcJ<xM
zv(N4v?Qf>t0aj2rAnXAE0FVm+odGH}05t$Ukvy45rK2JtDjA$uuo4Mo0Kz;b5#EOe
z-byyuUAb>QmHHd`hmacxZ?7Li4zddiy7Ao5)BIhDU2C|dZqG<NoA(fgvFrFs)M^7?
ztD&;#qjl&Yjlr}18UO(P{(COpkC_SIO*xGXPhO+GNLj>IdvT)4#&zq-cDW#urmxWb
zuQFnK@9pCoez3MWEp|8b*DYl5*fS??)od+3BfELNq~HJj=nsAM|KiYleUkkZQP~s?
z`mJ-in-&}ppJDG{)2P7ZSP19iSx0B`)!v8B<rj)mzIb8D<{i>-W<7ou4F&0)&9bXa
zKc7-e<5*xW4M}bgZi@9B%!0%t8;8v}^^z#ZM&_}Qbj><qu>AyLo15^-GEFJAna|E_
ziRjpYPdRCR!krO7H06FqCGkKd{A2EF|Mrjo5S5e{GXvF=6WwkiyR#-?y2PUkO%v?(
zwPw&1K0M1V%erjjT-tD6bhYOCK$FY9&qwDHaCRpR0(H9h>XhE%ORG2Iv3u5`<iiUD
zq&reqE1jDM)6*8bAvbwZv50T+0X!qPng!1jW?ZyG;F#_|j(`96f1-_it;m?*;}sWE
s$1l8BtnABQ0!s@7CfGNLK+uRyxpOM)=hSwxAHX1jAOAzfK;QrX0JfBi!T<mO

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-hdpi/muisc_reward.webp b/moduleUtil/src/main/res/mipmap-hdpi/muisc_reward.webp
new file mode 100644
index 0000000000000000000000000000000000000000..b24e1b2c56a8cd03f1f203b050d1c8e29dcb9611
GIT binary patch
literal 738
zcmV<80v-KQNk&H60ssJ4MM6+kP&il$0000G0000T0012T06|PpNNxcD00E$5ZQHTE
zx??-(Y+JRRl(y}pG6tauIH_&hN#||b`#g*1d7n%nA|@cJYt)G5+dh2Q)I4g`h)=E2
zY4QH;(+>O%e;%H^egES2HOhM5|Be5D_y^&i@BZVrJAI03Uz1d_!p+(x-N=e2Y1fjr
zC@5JG+m^)X|3E<y;NK%r-0?i+|DEenHs(!E5%~Yj$dbC#{{Te+QTcm%-HO_Cz9p{!
z3Vb`ecCPOm)C{F>`)2B215p$}L4}JAk`+{{6(F!GB3eEHK|oPKvQL{wjQs|wR20d7
zGbUo?pHiZNAo$0Mh@GT@g{1ob_K01H<(PoGA~yd+DpXMY&z6Wezo4WQ3JU%@FJi<O
zq*jm$;OE05n%o6RO91gklZaRdiWL^HG$NwbE%FJaSL-A(<V6l7FYt13WNS_OGBGEq
zUrwr(i|BvvH$L%?+k>LC&5E->m;8KYUF#^X*}C8QqpyGB|DRu;Slh2vt;hpbP&gn)
z0RRAS2LPP`DjonH06vjIn@T04q9LdV0I(7XYyh1ygn0M5ZzVgRKn{HW)(?YHBBRfl
z%=L)q!$rKN;%6X76IqqIF`57X{{6ddfSWY5I>4gna?Rv>hNtG-ix9vy&iIea1LbtI
z{r|=<{%c?H0qKf|_P^WB{L}Z5sJQcbe<MF*!$xc`NtF|oEkpF<lLw1O{S-;lsBq`4
z%Ma+fVMsA)s^MUpUB$ga<yE=*^!+9&RH<oQg1=rH4^sidnUp9A-cBAZ(S}<7+b_S{
zx2g?nI8_mNdf)BUS3lm8I__qo9cJf3zVc0FM7jK@-I+J%o2LzH`2Vxiku-7^1g;jC
zAJqMH6(@^>irSC%&RvTQq2ZSuO)O&>^>nc3ac@$Wa48T93MrGze-%6nTJ%<jnMqDy
U$N$5A#Es(nY@XA4wpsuH0P{j?EdT%j

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-hdpi/muisc_switch.webp b/moduleUtil/src/main/res/mipmap-hdpi/muisc_switch.webp
new file mode 100644
index 0000000000000000000000000000000000000000..8885a78d05ea60cae4154753e0766fde15d94ca1
GIT binary patch
literal 556
zcmV+{0@M9cNk&E_0ssJ4MM6+kP&il$0000G0000T0012T06|PpNErbD00EG@{ht9g
z7u&hm95ZIJYwHiNw@$Xr$(Y=3N$qxXyS20Je!j)s)tw_^0?hwrc5OmPd3MAPG+cYI
zE7KKOe~ovC`sPLjr0f?=aur|x41730t1i-GPXIeyV?H4SAMUTVo>M}*T=NkiAw3yu
zBOC<m5?<*;&wwan>`B1W3z8hbqfO~Qa1Dfn|7d|drGQ)f=;wv@WXK%^0t6Cp+nyxg
zy6_7?x9zErbNuM@vG$|_jsyBmfb?=^f;|QDYzKW0NFVMEHpZR=Jj(!t^WlmL^CL4P
zz84?&)+LzlPAQ<}Js>_kI@u9roc1IEnFl`sx7YWHGhW+^*yf7Jo6&P%L~*<cOxX5W
zABVVpYSG%0(-VHdzaIcrP&gpu0000G2LPP`DjonH06vjCmq(?eq9HIC3;?ha32XqJ
zGSqrK`z``x19+qN1JVE^02qIrU(XDxQvJMIC;y*E$8a5h0RH@XjFmt=K+|v{FPuIt
z+*7ZBE9W-q_UDhS`Ptv+fB*O6GWP%QZ@?_T6FcS<lwR-KqJ%G_D8%Oy4oMt)g1EqY
zF<8KClydBI)dke(m>2Aa{|5W`gW~}ouxWQ>Kx-OlFa7WSC;vyAg%8B<!M>JFEt?<B
uJoK{1%KA?iAG~sr@l^4CTdj;rY;fHXNTxXQy~iUBu&mtrAHAEzqd)+Q-TxW@

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-hdpi/muisc_tyt.webp b/moduleUtil/src/main/res/mipmap-hdpi/muisc_tyt.webp
new file mode 100644
index 0000000000000000000000000000000000000000..726606da07385d871570a079f526e9114a617735
GIT binary patch
literal 692
zcmV;l0!#f;Nk&Gj0ssJ4MM6+kP&il$0000G0000T0012T06|PpNJRkv00EF|+t#sX
z?;G2;lgjCAv$AmosZu3nZosyanw42PzinIljPX6^eg97v5D^UAHd5qe-h)?2MjqtK
z^?X_I9vbl$Op15fWhL8lOxg-npFUR#cGI}DQ*ye&yuHx$^-H6WculWzWUWQL0pVGK
z7QTFG(ijH-Oey%^qjguFeHBhY1Ulvdb^&ZVsAatb0R3DS0YEqFW<rks;@?>ew+|4}
zo*F593y-2rxHS#XvPR<<zLEVr-8e~H;Tr(2Q?zDY{T3G)GV`^GnS%<+=>~JkufWY~
z#ir-yuO4fb(SOVfou7cu9ol3hc>V+tzPf4CE#v_pAW2&x0wI8Hq|KDEU!WfY+Hd4G
z{`=>k3wNvLmXz=LQ<bEJ8>pz%;w#u)V#-da{rsVV{r;0USNYrJrtM-A!FR0BlU*c#
zqf(ZPJ4gUlP&gn!0RRB-2mqY{DjonH06vjAm`A0fqM<Md0I(7XYyh1ygm5>m@PxP=
z06A5CKyya)8TEjFF#dP!0s4XIDf;Q~P5xW`AEi+;@aXUcUMj*T2@n7P{_L}fzTNt2
zk>Td$R2~oiXqLXo#keMp`xjAsZDiE0Wt^QdNCAdQ^#x=(R907kb?_Apw<6HrRui?0
z1wBKm<wU;F3RhA}1IpUmFCXk3MpIDLG58(S%SyX**3=M}p;PGJXJtS?0Q-MHfSFbU
zZkU8@s!d%$>qO*pQ|v=U8|O#wrHMSjd4kJ6E>@8{eMP-bSd;0mRBd0=eOd+6b8f#z
zbpNw%Uhq`X)jCuh4y=xv1Ha4@e9b6GN9KPxb7#^cp$Uk1AFdZJC)9i*;^g5Y_1Dej
a;s~I|gP;y+C(h<Ivu-jGyAp5Q0002vE<vXN

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-xhdpi/accompany_off.webp b/moduleUtil/src/main/res/mipmap-xhdpi/accompany_off.webp
new file mode 100644
index 0000000000000000000000000000000000000000..8065c9be74e5a2d54f807827eaef2fa403a26721
GIT binary patch
literal 1218
zcmV;z1U>swNk&Gx1ONb6MM6+kP&il$0000G0000d001Wd06|PpNXY>J00EF}+qP*t
zJ9cu5vGobIlTWa1+ct_u@qIv4G>SHhy2aqOHb!CZea_7vM8pJyk^`4rzWc8F{nOpc
z%ld};SGK(}Mp0j_tJJ5mtE#9ZMSmY^S%<0L6csRv_0z~w`&2-XtO9N;*0ez+p`w!a
zdeb5eA{kJ?7{$v4_9>`{N?H&^cV)&(1gL<35fRjeCR%<IFilBGzH1qsk_2gUiiqg0
z5JJb_ITN5LNkySr31O3n0w{<8f{LKRx)9z0ra&-_qKGI@!$1)Q6)=woAS(7;riv(n
zg#pPr>#~9%mIhT&<lIBZASDD55WVpURRFOZC?Y)jE+7JyCzj|_RRKws0VM6GccMm?
z6A(mrcGsBypa|YLFA!M=K)~qSq6iS{NLHQJH>Uzc00dJ#!z)o@1t|uSco@Pu0Yzeg
z2oO|IT@^y58UaWwNLpgG+A@T&OF#e-OacmEyefnc+I})7X;G4j?^;G-VhtioP@pz4
zq<1OVLgqJx{AG;<$z|bKDA@F}lFgC8Q=#~_nt%cY0BY+(*^!@=q)66RgF^Y1o2nYc
z0$SbHGSs!Q>Y<9L=+i}&Q2(Cu&fR(S>C>|tr)GBzB>@0dP&gpU0ssIo4*;D3DkuOb
z06vjEm`Nq0A|WR&u&@#dYyh1ygnzt<so&pxS@DS(>fQRC+X3bS^>@{;{Fmqly8Yvy
zKo8YlO&?@W+TTYH|Lq`Ff`dbLBeP@BHPrbJBHhPN^v|)?m6t-jqdorqKR0EYnkY|;
zFfe5^hl!1Oziz9CxfrHU0092j>+}+@bR$Ze;)En#QjCHwoGq&Ni)kD?i2MtUQ8(P8
z7aq2p^xN2KpW0z`M)MV_W>B801rX{$OOh)k1DF2Yc%@BynuqT)#b7h+-jY{WwJj1L
zZ}O;I?<ewi;dZ4fE38N80q<l5d!0(z6rsuTF&<IoYvs~?46YC)q?p%{V2vCH^M+Gh
z`RN}zi-vjU@P_c>VhGKv9R%QLpq(RbIx}d^LErm|L3ZX`t*pKbyz}Y&-~Ir2-n+&k
zviZz^FIr#!bxC5P`DzFY`GqAF4LLoP!B?AGY1FkT!kR>PmJ9_7=ddan`0Byw{Q&jF
z2m3BGNu)b!c9m3ojgerZm&k3lTl(KP_1{13+_qlA&eCWHp_M`4JlU@qksm^Uxvv^g
zVxb#C>tB6}t<S2=@|?~ywZ;T*IZ`t5yM*6X#*X<JkHKO12VK65%YX3RBCA+?c!0%!
zY*b0667vu#$AHvAk5wGQ6BH))Ta~6C`2M{=59*+!fNfrhnX2&b9u<TSqWim~%VPWQ
zV69X5Jzz;`av(c*-xFMV7;$oE7?0rItm8tbBcP2Nau~zm>A+#>m&gw64#^@<2VSmR
zO2^)P(1_6&KuO!hag#~5=f<3BGtD~;r?dYd^-W~yG{3^?HOBdVKN2+)xa1z|Y;S^8
z&Ep7Pa)eYHnfyE~XKVS_<8iJl*n(&LW;z|gXeXUzsQKC<MOZJ`=-Tb7e|g*S$Vcy;
gG==jG%J6m&H3~bWmVa-gTk$CND&&F&hQ(L_0KMfv?f?J)

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-xhdpi/accompany_on.webp b/moduleUtil/src/main/res/mipmap-xhdpi/accompany_on.webp
new file mode 100644
index 0000000000000000000000000000000000000000..fe7e84d7e62fb6b0187da1237f2b28bbbb432ac6
GIT binary patch
literal 1186
zcmV;T1YP@5Nk&GR1ONb6MM6+kP&il$0000G0000d001Wd06|PpNQ(gg00E$6ZQC(P
z`pT|~VcA-O?W#rCw#}h!+s4os+P2k<bMAZa|9`|Ev4V)0fRJbN5nC@k{{H#-rL7|x
zhx9Wu?i)o>?@!32lbQ2fQHd4(XG!@KdcRgwz(`b|x6f;V3J8*@fHQI{eNZGuMJ3st
zrE@tb5|ao<QQVrt0tFRw2SIdBLT8D9c@u$b>zMMd1x%UP$K@kSB{n4yofAT+{!fgl
zqwqZw!W0oDEl^=X2#*0VeMGqxnu}OaRIEQj6$%oy&sK#3DYEh!fQ3c$>~j<fBf{;^
zLZOH}|E@&<zJDwh=OtB&VWWT)!H@{W(70&AeNiY78YT!>P}Hm;^F0D-0m%2WhA>A!
zNCyNRbJP$jKR22VagWPKLia2vNLtzUAtuaG;`0GPKkuD$D<*8!h>!%JU~)|9txBRI
z5%Y`*VMbO!0Ra^SvhU;eCWQ9Sl~}=eyx*ewf@|-epX^gQDU_e`T_a%P_Zj6ws+lp@
zR80C^JEUKKz{-pFpFh8S>v#74+WH}909H^qAm{=B05A{$odGH+04M-Hkv^A5C8MGt
zCob5q5(#Vooig#ZkEnT(RoGH}3uC9$2P&_rA21)Tp0gj<e_%bpZwq<=d1iYbe%b!f
z`%GNTk$|)qm@+bngToBTdLS6cIY+tB$9y|U(9QqcOf)Ueq3dh&M1xWBAom_$94JR~
z<^g4GlL4BsL}C?;TjsC;{^+%3shU6;bw7{OI4w%;b9M&HT*%R|;?ABYB>E8)esQLt
zKlodZ-i9(-91_K>2YAd+EDw4ybVp$tlJ4PSOf>##zGwJtxcf0j{<`WMNTSxPlsj1z
zj97Wwc#nzS4(VrJ<b7dJv=P@a6m*dQ%rp^4(CVlCd9&p{Tn~~(InXzQ<kAcaTLk_3
z56>yO{!6E<$gkSvz^&DaI}mybK`4LERzCML?9zt<>sb2}mT_?(Y0g)hZ}M*@x77%{
zno-_tFdANef0#`}ze`!xfF{vq)I9I@J<54H-hf=<{HXz09pzQXhHn*wPPE#x{DVV;
z&d#0jxc6HWnGP$$Y?9X=|KwS13?eCR^Y`;38gmUl&sQuGv$vSDlqcO$45JJV^~rYY
z7!cm~W1*AXv*@+l&>bl6icWT$0W!mHt<(#2B3gUcG3j@!+nkw;f}eoyI45_MO5<&o
z$kt&Zk!Z~zFG{#X4ZAR8CT3mycPk#-7x9ltW_X3*NqUofvF+J<rCeq#LDeZ?)@QYY
zrG3;WzBhZZ6+il81JYUiP;Ff9-;Z>)F+Xx5m!liHWeqGa@j=bb4s_Kl8g8^2qHbd6
zi-`&>$K+sHx^B&^eGllX>Xx8m?k|Bej(KyILrlP{giY32c{`IBL|VVvvFGg5C(D=a
z7<d(dj5K6PA&sZ%zcJPa%FVlv`9r)G^J1BtiIHlkr>lj)i*c|d6X8g$H7*n?fxUW*
zgOA~QH4TNl8~imP{M>*pI>?sw_JFzRdeSX)zD7|-w8`|jj7lJN$@hj3pCMF00D=H9
A&;S4c

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-xhdpi/icon_liang.webp b/moduleUtil/src/main/res/mipmap-xhdpi/icon_liang.webp
new file mode 100644
index 0000000000000000000000000000000000000000..9a6378a07152ecb6177e9fc0062301417fff3f2f
GIT binary patch
literal 1610
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
I2T%Y20Clbm4*&oF

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-xhdpi/muisc_reward.webp b/moduleUtil/src/main/res/mipmap-xhdpi/muisc_reward.webp
new file mode 100644
index 0000000000000000000000000000000000000000..58eeb34e8462ef5433aab5c27f68f0d8e9901d7c
GIT binary patch
literal 988
zcmV<210(!WNk&H00{{S5MM6+kP&il$0000G0000d001Wd06|PpNX!8M00E$DTida{
zdSctQZ5!WV#8zpuOzCXf=v>-1Vs!Re#r?eR`|mS|hzUs5d!D{_?ReMp|2Aov(vZu7
z=f<SevS}SP-T6J9J9b{;xufUc=Pga^pu;zS3P{N>I#zp80YM5Cc(qawB%`8I+_TCY
zDF6kG=!_~oQ4y8AAlS1?dQU(F1Ps8NsdCSMj8ycGzSUCC8)Pj~t`AJrC!EI&C`$I9
zF_mgJ00j|1Q1MQ!LhUYDK|w)Lyi+SR<}Rp2l_&yuV@!#*e}hs0U;qLBZd>#sAgU+=
zsGtfySuh0y5+ny80?x^OOjdG&=0K5;Ga~>5L{Lx#Bnl1*djZJ{DnS6r?hWs&L9$8)
z1qAW^a9N3hidle+BIg1ipn&B80p&pfAXY{SHQdapfD(`>2yi3(j1m>ZVxq)9!kd61
zfaO7hz8iK10D%Isl9jDt0)PM_lu!V}gphtmm8^MCvf=BLT>=DiC{ir2CfD$1rO-%8
zLBDC5OH=M*5JV{!gu4?`@e+_iMFfn<id1&P1EK-~2m<(ELn^=EQpjfVa=w<Tb~$zj
z4bh+vPPa{U*!Ae&<VA$P5B5oQJz>j}U!1=ycP@YO?1l-cJXTORAmRZ40MH8nodGH+
z04M-HkwlwIC8MGtql*Br5(#Vooio+FkFa@@(%-^vFdVo*ZMX9Q<hA<&*5%Y^=mGkx
z>6h$b`<O=VK%vP@ZGCv5z}dHcSF~qhi$|L<lkd}hm9QkA#=lS3!?1{e0RH$G|F2>$
zA_06{PAno<d6XvBC;FahU&X^sBrE>Yo!6#PEq4GHWqm3qQoOynxax8cs1Q5X@-S96
z@$K0TpjyTs4QfXVqW^_|{dqloFNcr()U}P59oP?#BHb(5cmEzN9=ltw_j0AD>J=?u
z&VgrAmCH7Na9dI3u8{!Q8_ERfqOk1ejze#&p?s0-)mz~T{4DAMs6NtcidPI){41Mh
z^&QmmgZNj}T&DOFBcJ+TG6d}67^aHH^00wr4484$oFV2*{3Hjp$5WOLhkD#e(^UAR
zcG>u6xuaRdqZ*Lwm0tKkyCE6@gLl60i=l)QVF~>KFR|rdWoBfwznp(sRHNTHunKT3
zPiDaC$tcbthrk4VH_`rqq!3b?!H9@ML)z93k>^s(t$}cOU<F<6{q}5tZ#-ckdh;<I
zsXy4queR`VNMxjyotyGA5SCA%qoS@TjAYz_uk|lBJt|$Fzl@P*1|7Vu!k^bfk=)AW
K#PLI<H~;|ghRY!U

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-xhdpi/muisc_switch.webp b/moduleUtil/src/main/res/mipmap-xhdpi/muisc_switch.webp
new file mode 100644
index 0000000000000000000000000000000000000000..80eb4425ecb3ebbd2b7a5d962e437a282aa08297
GIT binary patch
literal 646
zcmV;10(t#XNk&F~0ssJ4MM6+kP&il$0000G0000d001Wd06|PpNKF9%00EGK?Z0VD
zYrNxa6K%$cM!azp8EvgW)I}Z7M0=X;XxlcvFRZ=Sx$(w`n1ImQIAnZ}TKe`aTBKQw
zS)=aYhlU}wjYD8q#<(AtUZ^i>SW3FKs(4BDlbJ<UM5Li=6rf1@VrG$}XvP#2KtX&l
zK8L(DQUZd)l_3>~WNcJWNmcj}i!#KFLx55NAlLhp0U0L}Q~@OQXMG4!!Hg>=NFrtY
z85$x288=7;5d;O;nuvJ<A_!P^Gekf#t{~+CNGf+j6v#PYBH4lsAtIQuk5o_-6}Vg^
zO2$qBB^5#BP+bU7z>Ee!OaWAW&J7`iNSd)UQ7Kn1^a&Ma&5%?<kPlPZhYHE6N0C(c
z5$i%_w1yrCAi$S~&LK0BW`yGiAa7$`$c|uMmxl_RnA|?pxUghtMkuE2I<}@qsC~d6
z<VV+>mLGNI?S)aHbrS$qP&gn80RRBd2LPP`DkuOb06vjAnMpsRBB3rc3p4N%32Xqi
zJpKDlEHq#J7#@ngpc~0PQ!l^5W|!+vJ}m0{K$W-P=^Gbzq$uYCD}Vt0>c;>5n*aZE
zPyhdOFUHdss*RqUzmfz${r(K4H{$pdeKmiiYxeiYahs1n1<TkDVOigGw!loeo(a<F
z=%zWJZF77h&z0Pvnd&$iRE^&4^{510|3(C2SBQ34-W!HviJ>w~^t@Tmi{lNL!SdxY
zAOg|wo|{S6r_Q&XL$7z<|3`dp{YAmL;}zp6gFn9Zk0zUY6tVQPpY|MK@819a*cYk3
gYW4YC#vfp}qw@ydg-`!HwD0xT^SX-lo&rDs02D(bF#rGn

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-xhdpi/muisc_tyt.webp b/moduleUtil/src/main/res/mipmap-xhdpi/muisc_tyt.webp
new file mode 100644
index 0000000000000000000000000000000000000000..47611afc71d31c024802ed4a36211c92d7a8e605
GIT binary patch
literal 754
zcmV<O0uB9ANk&HM0ssJ4MM6+kP&il$0000G0000d001Wd06|PpNNE8800EGrZQHRq
z@5Ihu#^1MtNtbjiZKJe}C8V@%+sSyQn+>F7Y2&(!|9PG_t|MXs(*N?<+pD~RM~)Bj
zHZ?8G==%{3b55Wm&ItHgi4};6PMuWeOp+*bPyilVMH^yIw@?|AGw>-08aqV_6oEQp
z52AWe41U5(gb;TkBak+ElJyZJq`JVmZvu`uV6_Q>w8I-Js#ugWRYK@vt#?2IN$r-L
zwCyA4?bzhk0TOy^;iZK@Z3<qfLVA)nQKF2@RTbK9Jch^4Br?(s0JV2B>Y&b<h!pFz
zO>m%RG9RM|#8L@NOm>|J=+_WIIYngETl8sJKzXt@ArPx9L6$HoA3+kYDh634k}(xa
zV;p6HF%txWv6jdYGD-kR462%>Jith21cD=}dLrZ$@_OA7=t?(F8KvZ;)Q0XP`xn*0
zm0ti6MFbgzLPStb<*OLsTtR!B;o?&zmS*1Hl-%OPfqqU}b!Tk)Uj_hHP&go30RRAS
z2>_h|DkuOb06vjGm`SCkq9H1^TBy(x32XqJG#EG7*Y+9vE~Mix#~7eIz<DEns`dbX
zVE+N?SLy-iGy3W2o%=`dL;lbMezXswBga-~D$W1^{_X&ePU5m?Mc+C?j1^8-n!RuO
zRCDt3pMum<$>*PO<=urc_V<$8&n?;@x?TID+Yt&`llpa0iwOQEL|tYg6qWyj^u9d}
zoc>zJ^?|6b!Ib)m6J($1HfF6GgMUuR^bh`Q?qWbdaJCE6TEC1)UZ?eL<EuKuU24Le
zq<;$Ae?bS`%ZqD5KSAb?;F}0wD!V<?T^6yphsT1SsHjPuCf_@^kG?48k_$gBH)dL$
z9>P+>PfH$s9WyOtsF2E4k$J{=Nx*c?ayQh5aHl_v={EyFeeXQV5wA<%cG-0-7(Gku
k+uxeZuUuaiY0T33>m=#IixX*YbU4{`_I6HB>=gh206GX(cK`qY

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/accompany_off.webp b/moduleUtil/src/main/res/mipmap-xxhdpi/accompany_off.webp
new file mode 100644
index 0000000000000000000000000000000000000000..f90eea1d6caa49278e6440861e5f7ebf35fddf7d
GIT binary patch
literal 1988
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
W>F6V*4=i@6S?QWTaJ5UufB*oJ2+2$U

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/accompany_on.webp b/moduleUtil/src/main/res/mipmap-xxhdpi/accompany_on.webp
new file mode 100644
index 0000000000000000000000000000000000000000..fdf2c3590b1444bf0914538ef3c0674f0664c796
GIT binary patch
literal 1932
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
S)}&(Lm@<Gyg}c0l0002|70g=z

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/icon_liang.webp b/moduleUtil/src/main/res/mipmap-xxhdpi/icon_liang.webp
new file mode 100644
index 0000000000000000000000000000000000000000..3602e0dc3b5817b018bdcfbeca6d26455f394bfd
GIT binary patch
literal 2912
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
K|Ix?50000s`^uXD

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/muisc_reward.webp b/moduleUtil/src/main/res/mipmap-xxhdpi/muisc_reward.webp
new file mode 100644
index 0000000000000000000000000000000000000000..c563f6d703af4b4ad281c1ef13c03c468179a639
GIT binary patch
literal 1618
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
Qhx|Ru3My1u6pf`I06@VGivR!s

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/muisc_switch.webp b/moduleUtil/src/main/res/mipmap-xxhdpi/muisc_switch.webp
new file mode 100644
index 0000000000000000000000000000000000000000..46f8d797c2fc1514950313fb36a81dbafc47ed13
GIT binary patch
literal 1086
zcmV-E1i|}KNk&FC1ONb6MM6+kP&il$0000G0000x0027x06|PpNOS@K00E#wZM$jP
znb(eOyR==|wr$(CZ5y3!CkJJ0J2`mYV*Yc@d2_p4MZ^T8=}5=SHve4Xr<GZce5&uY
zYgTBp>Sn9XF_rH8OSNZ(x+!~puKs<;@^g-Ax3eJ+%uqAsihnTw{ncYvYW5_7zbscV
z<<0>t4t#Up3ZvV6q#&|xw-G!1Mn;DI`_!5<jcCw=qPju1Nw*q=fc*354pSPaP&e-f
zSjLdw-rjU{i?Cv$PgM~NF??p_@ijn$CI842rITM>x_m{kVnsy(6>|cIzB*z`1r4^g
zD}qI2;L&AAmr$uY7$rkRQB=(PkC>}qM%6hYSOf(r_}9Y=MgUrMHPWRkfqu8j=**m|
zo79X5AP_<I>&-?+VAaEliUo5}KomZhuSC^jDs%|32&x-IVGSq>WMm?Npx&4v4IVWH
zV^oO{@YPI3Y90nfMZ_FY0#IL%5UIGy7|VbnsHol;+2HDo00;~*z~7fo>EnVGCyGK~
z3|WzXju~B&nxj-Kf}#i!{(HepDW#ssnmrU_6f_V;{c`&WDMG2*07b<jh#?NVyLt*g
zmL@9$Vs|9)i?ioVagU->v(&#@LIMomTYYTm018wr{*x+-Iho4vCnruy9eY#}E9UPn
z<Y3HKSFb!OHLzyh_c25wbl{F<C#3E{UNO^SiexG%KfSnas_vo9sAK;#1arQ;X2bER
z2|`s`=5sQlKQCE!LTcHAaZTFpr%d6ukB*;|8ov)J4y{m=Hh%P1b*TTct!GNjuLD#+
zp08@eOiS#0$*CJIFg8uaW&RLx;EXX<|IfAG|K*>*zq@@(nl|U!eE+@H7?-Ad1y)cv
zAe;dJ05A&xodGI506YLbkvy45C8H}LDi&?YU=j&z0KY63uRp+W?-?j=;XQg7=sfjA
z-ZcXQ@4z&@VmUGZlgEdST-TNUg0F8TA5_hxm2)4WA6E@-g-C)vOj#cus@NP~x?O+(
z{^du1{zz9oYF<Y_$7jUow9a!%Me9^ySzwk~^^3=%)cnM&%N6*^yH%tdX28-7OT~ZZ
z?RW%|pjJq5So*d0M%`V~I6h-QmHA&jhyI`7u9IrMxd#B!k1Os4N;rs-h(cTRX(cgU
zf5Y5!Pt;f|r;4tCuXYSw{EYqB-a<P8q`i?g<Y~f^L;=3R9LG}=-~|X)oZPH6Juknh
zV_w_|{oD#8ECzN^!JPn!$vus|ifB7-;cUW$0eZQ*&!%<MyC3v6MbT(+Y5yMyGUs}6
zST}htN{D&@H>Cr@e`yD^tr>0v(57%@1oqt)NRMV-kv41oK+o;#s?Lm_ke~1;$-jN@
z8g){(Nm9FaX74V)_-Bv$R>bkdH52wfbd+LpX$A1@A6P-XN30(I=l*U#<t8%hj(`9F
E07bL-KL7v#

literal 0
HcmV?d00001

diff --git a/moduleUtil/src/main/res/mipmap-xxhdpi/muisc_tyt.webp b/moduleUtil/src/main/res/mipmap-xxhdpi/muisc_tyt.webp
new file mode 100644
index 0000000000000000000000000000000000000000..b1bb8034a87d659c2e850f1f928b5dd3b0e8b96f
GIT binary patch
literal 1250
zcmV<81ReWQNk&H61ONb6MM6+kP&il$0000G0000x0027x06|PpNSy)z00E#wZQC(P
z`Wl0^ZCk1Bjcj`}qj5(6+Pn3yZQHhO+s1fm?mMXZ-~X$MHjIb~NdLq4uQ_I5*;wC-
z14FCz#a0}5(FUXQZ2mpIx@c(i&-AkuLMwlWfA89pW0s3%qQ`}XMF&HJiWiK^G22xr
zMW|FQLno<THCrCl&dhxS%3X73q8`!+%zOPL(2371n8$h&nfqR`?FXympjIO``fQap
z+%#tfYn7m7#cE%o3gX}E<e`pIb-*MQMRiObYp6CVj&Ir))Uwu^FSR_ma<-$U)23~m
zSr4D62p??`!?I$Bzf}R117m#${%0%t+j=2wR4n~*OZ)FujxF@OD4@PLDppqX?A{KY
ze%36p?T!AnMT9^~WBvw}sdvti;^R<S&?$#jG{n#>d%dOl<#BVQnxzP~Z622^^_>oI
z!|bW<IHYRwK^3JEONHuHv(?&shPI&oyk0~ap_5cHEb@w|s6IWaqCuCW-To9>_+r6S
zS*q4E$LK>o7G>H)8>a|bh6<4!sdtqJRj!@CCqk{0RI{Ynu0kzRv{Y&oD!EkZAhDBF
zbCJP1MMsFuw&Rzozid5gS6rzYm~G5|f;w@`tW_s<;Hnx&OhiPPxKmZ3bb_i`ei7T^
zd$R<{hg!9ZNE>yVij%ZEE*5N$!vXS1<T6naf$;(DiX&CA75DB6Ba5L}u}oK>6Drc>
z%?g_5q{@O$s72NCk2P)Ed}#5ilaNjj=vn?1MZIsio{*g|kW#u$^}G}<pnDpigLUYd
zQe_}?66QlPI2bDIfI=-C2%V(n11H3&RjA|{bpgs?=uC0uA)yl#E}A7r&rUzXM=OWc
z`%2zgCA8?P`u*l9>!@{4A6PMk`_>pfak;)wT6S>En*DkH?*;%?P&gnK0ssIo4FH`1
zDm(x@06vX4mq)*~KcOxeEmQCjiEIXNV}L-p`T+g_br@jjfT<lP@*|#Wb>iOn?qBC&
zwgb!u>rbQy>j$_GH%_5%Ko8&_>b#8p3_p1NFalv&d<5Em6Bc2fAX(`V$3TT_0h}n)
zM<5Esm;nCognc#r&g_slgs~0#jlhy1fX{*>+!k$5J-X+q6XAEH%!2B93pM=&0zwlE
z{?!~HYRv3$F&5jvY1p46p)V=e?+G9F)jg{oE3Kt`KB>4V+YeLsxN>X<Ofj6ZyQmkO
z=sV(kaqwHpg!TZUPk)3c8EG7N=xRz#|7V_})K%RDRLXbG3#(mPZZMG>kzpJY3g^7}
z`eXtCu40!b-GWKp-hM0~oP4K#0Irv3|8ZIP93|y;=LrseBF5;)_U(76wf2)Jhzmvj
z%4$1Peh#(^=NmspuhqXb-(M@v@NaL+pV#T6-%AKx9)zn&j~l?tB@a;u@VhP9`p4BM
z(4=H(K@}53)(I0Rcj*lNv8f+&MIL#`n8)dOEOmSm@)X1?1B=OjT-o%3^%5jED}XJ@
zOv^+CWa``q$*buRU(JzeU=IeR?wn626j(L?eyI%k#<+Ta=6yT~=$?Hqt<?a(R2zbe
z6_r+z@mh`#0ATLYi@UYMD=jY#ns*9&H%zk~lO{vUz~Z3br}|Pt`xW*;J}?yj1L^bi
MqZ`#41|R?c03@zdIRF3v

literal 0
HcmV?d00001

diff --git a/moduletablayout/src/androidTest/java/com/example/moduletablayout/ExampleInstrumentedTest.java b/moduletablayout/src/androidTest/java/com/example/moduletablayout/ExampleInstrumentedTest.java
new file mode 100644
index 00000000..b9144cc5
--- /dev/null
+++ b/moduletablayout/src/androidTest/java/com/example/moduletablayout/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.example.moduletablayout;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("com.example.moduletablayout", appContext.getPackageName());
+    }
+}
\ No newline at end of file
diff --git a/moduletablayout/src/test/java/com/example/moduletablayout/ExampleUnitTest.java b/moduletablayout/src/test/java/com/example/moduletablayout/ExampleUnitTest.java
new file mode 100644
index 00000000..2f7018d9
--- /dev/null
+++ b/moduletablayout/src/test/java/com/example/moduletablayout/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.example.moduletablayout;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file

From 771138d34c8917f74b7fd8dddeadc497f2dcdde1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Mon, 3 Nov 2025 18:37:58 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=83=E6=AD=8C?=
 =?UTF-8?q?=E6=88=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties                             |   4 +-
 .../moduleutil/bean/room/RoomSettingBean.java |   3 +
 .../com/xscm/moduleutil/rtc/AgoraManager.java |  24 +-
 .../utils/config/EnvironmentEnum.java         |   2 +-
 .../utils/config/EnvironmentPrefs.java        |  20 -
 moduleUtil/src/main/res/values/colors.xml     |   1 +
 .../moduleroom/activity/RoomActivity.kt       |  12 +-
 .../adapter/RoomSettingAdapter.java           |   2 +
 .../contacts/RoomSettingContacts.java         |   2 +
 .../dialog/RoomSettingFragment.java           |  43 +-
 .../dialog/TunerDialogFragment.java           |  91 ++--
 .../fragment/RankingChildFragment.java        |  10 +-
 .../moduleroom/fragment/RoomKtvFragment.java  | 407 +++---------------
 .../presenter/RoomSettingPresenter.java       |  18 +
 .../src/main/res/layout/fragment_room_ktv.xml |  30 +-
 15 files changed, 235 insertions(+), 434 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index ebe357fb..702f92b9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,8 +28,8 @@ isBuildModule=false
 #org.gradle.deamon=false
 android.injected.testOnly=false
 
-APP_VERSION_NAME=1.0.5.7
-APP_VERSION_CODE=47
+APP_VERSION_NAME=1.0.5.8
+APP_VERSION_CODE=48
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java
index 868bd095..36e0d529 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java
@@ -18,7 +18,10 @@ public class RoomSettingBean implements MultiItemEntity {
     public static final int QXRoomSettingTypeRoomTypeGirl = 13;
     ///交友 房
     public static final int QXRoomSettingTypeRoomTypeJiaoy = 27;
+    //互娱
     public static final int QXRoomSettingTypeRoomTypeHUYU = 28;
+    //练歌房
+    public static final int QXRoomSettingTypeRoomTypeLianG = 31;
 
     /// 常用工具
     /// 房间补贴
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java b/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java
index d946711d..ca5cbc83 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java
@@ -1118,7 +1118,7 @@ public class AgoraManager {
                 case PLAYER_STATE_OPEN_COMPLETED:
                     LogUtils.e("lxj", "播放");
                     musicPlayer.play();
-                    musicPlayer.selectAudioTrack(0);//播放原生
+//                    musicPlayer.selectAudioTrack(0);//播放原生
                     break;
                 case PLAYER_STATE_PAUSING_INTERNAL:
                     LogUtils.e("lxj", "关闭");
@@ -1257,7 +1257,7 @@ public class AgoraManager {
                 case PLAYER_STATE_OPEN_COMPLETED:
                     LogUtils.e("lxj", "播放");
                     musicPlayer.play();
-                    musicPlayer.selectAudioTrack(0);
+//                    musicPlayer.selectAudioTrack(0);
                     break;
                 case PLAYER_STATE_PAUSING_INTERNAL:
                     LogUtils.e("lxj", "关闭");
@@ -1354,21 +1354,31 @@ public class AgoraManager {
      */
     public void setMusicVolume(int volume) {
         if (rtcEngine != null) {
-            rtcEngine.adjustRecordingSignalVolume(volume);
+            rtcEngine.adjustRecordingSignalVolume(volume);//调整采集信号音量
+
+//            musicPlayer.adjustPublishSignalVolume(volume);//调节远端用户听到的音量。 参数是0-400
         }
     }
 
     /**
-     * 设置伴奏阴凉
+     * 设置伴奏音量
      *
      * @param volume
      */
-    public void settPlayoutVolume(int volume) {
+    public void setPlayoutVolume(int volume) {
         if (musicPlayer != null) {
-            musicPlayer.adjustPlayoutVolume(volume);
-            musicPlayer.adjustPublishSignalVolume(volume);
+            musicPlayer.adjustPlayoutVolume(volume);//调节本地播放音量。 参数是0-100
+            musicPlayer.adjustPublishSignalVolume(volume*2);//调节远端用户听到的音量。 参数是0-400
+
         }
     }
+    /**
+     * 伴奏音量
+     * @param volume
+     */
+    public void setAdjustPublishSignalVolume(int volume){
+        musicPlayer.adjustPublishSignalVolume(volume);//调节远端用户听到的音量。 参数是0-400
+    }
 
     /**
      * 设置音效
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
index 23120b9b..7d578c4c 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
@@ -15,7 +15,7 @@ public enum EnvironmentEnum {
             "3e8f3add448d4692bc1d04c75ffe801b",
             "tcp://81.70.45.221",
             "https://vespa.qxyushen.top/h5",
-        1),
+        0),
     TEST(//测试环境
             "https://test.vespa.qxyushen.top/",
             "6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=",
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java
index a1d591a3..6c124b81 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java
@@ -30,26 +30,6 @@ public class EnvironmentPrefs {
 
     // 获取当前选择的环境，默认根据构建变体决定
     public EnvironmentEnum getSelectedEnvironment() {
-//        // 检查是否是debug版本（开发版本）
-//        if (BuildConfig.DEBUG) {
-//            return EnvironmentEnum.TEST;
-//        }
-//
-//        // 检查flavor类型
-//        if ("dev".equals(BuildConfig.FLAVOR)) {
-//            return EnvironmentEnum.TEST;
-//        }
-//
-//        // 检查包名判断是否为开发版本
-//        try {
-//            String packageName = CommonAppContext.getInstance().getPackageName();
-//            if (packageName.contains(".test") || packageName.contains(".dev")) {
-//                return EnvironmentEnum.TEST;
-//            }
-//        } catch (Exception e) {
-//            // 忽略异常
-//        }
-        
         // 默认使用生产环境
         String envName = sharedPreferences.getString(KEY_ENV, EnvironmentEnum.PRODUCTION.name());
         try {
diff --git a/moduleUtil/src/main/res/values/colors.xml b/moduleUtil/src/main/res/values/colors.xml
index 7d3df463..1bdcabeb 100644
--- a/moduleUtil/src/main/res/values/colors.xml
+++ b/moduleUtil/src/main/res/values/colors.xml
@@ -178,6 +178,7 @@
     <color name="color_DFFFFE">#DFFFFE</color>
     <color name="color_F9FAFA">#F9FAFA</color>
     <color name="color_528AFF">#528AFF</color>
+    <color name="color_EFEFEF">#EFEFEF</color>
     <color name="color_FF666666">#FF666666</color>
     <color name="color_FF576FFF">#FF576FFF</color>
     <color name="color_FF7685D6">#FF7685D6</color>
diff --git a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
index 5ccd87b8..76bfe92b 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
+++ b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
@@ -2655,10 +2655,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                 addActiveDialogFragment(fragment) // 添加到管理列表
             }
         } else if (id == R.id.rl_misc) { //设置点歌
-            if (mRoomInfoResp!!.room_info.label_id == "1") {
-                queren()
-            } else {
-//                RequestDialogFragment.show(roomId, mRoomInfoResp, 1, getSupportFragmentManager());
+//            if (mRoomInfoResp!!.room_info.label_id == "1") {
+//                queren()
+//            } else {
                 val fragment = RequestDialogFragment.show(
                     roomId, mRoomInfoResp, 1,
                     supportFragmentManager
@@ -2666,7 +2665,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                 if (fragment != null) {
                     addActiveDialogFragment(fragment) // 添加到管理列表
                 }
-            }
+//            }
         } else if (id == R.id.rl_gift) { //礼物
 //            RoomGiftDialogFragment.show(mRoomInfoResp, null, roomId, 0, "", getSupportFragmentManager());
             val fragment = RoomGiftDialogFragment.show(
@@ -3103,6 +3102,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         if ("1" != typeId) {
             rl_more?.visibility = View.GONE
         }
+        if ("1"==typeId && "2" == labelId){
+            rl_misc?.visibility = View.VISIBLE
+        }
     }
 
     fun isMute(is_mute: Int) {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomSettingAdapter.java b/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomSettingAdapter.java
index 16b476da..7a2fdfd4 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomSettingAdapter.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomSettingAdapter.java
@@ -57,6 +57,8 @@ public class RoomSettingAdapter extends BaseMultiItemQuickAdapter<RoomSettingBea
                 return com.xscm.moduleutil.R.mipmap.ic_jiaoy;
             case RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU:
                 return com.xscm.moduleutil.R.mipmap.huyu;
+            case RoomSettingBean.QXRoomSettingTypeRoomTypeLianG:
+                return com.xscm.moduleutil.R.mipmap.icon_liang;
             // 常用工具
             case RoomSettingBean.QXRoomSettingTypeRoomSubsidy:
                 return com.xscm.moduleutil.R.mipmap.ic_subsidy;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomSettingContacts.java b/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomSettingContacts.java
index ae9b191e..9e76a14a 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomSettingContacts.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomSettingContacts.java
@@ -18,5 +18,7 @@ public class RoomSettingContacts {
         void changeRoom(String roomId, String userId, int position, RoomSettingBean bean);
 
         void changeRoomType(String roomId,String type);//修改房间类型 type：1点唱、2拍卖、3男神、4女神
+
+        void agreeSong(String roomId, String type);
     }
 }
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
index 465ef88e..767560d6 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
@@ -149,8 +149,9 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
         dataList.add(new RoomSettingBean("拍卖", "ic_auction", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeAuction, read, isSelected, false, false));
 //        dataList.add(new RoomSettingBean("男神", "ic_boy", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeBoy, read, isSelected, false, false));
 //        dataList.add(new RoomSettingBean("女神", "ic_girl", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeGirl, read, isSelected, false, false));
-        dataList.add(new RoomSettingBean(" 交友", "jiao_y", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU, read, isSelected, false, false));// 添加的新的房间类型 ，交友 ，是原来的男神女神类型
-        dataList.add(new RoomSettingBean(" 互娱", "ic_jiaoy", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy, read, isSelected, false, false)); //原交友，更改互娱 2025年9月19日11:18:01
+        dataList.add(new RoomSettingBean("交友", "jiao_y", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU, read, isSelected, false, false));// 添加的新的房间类型 ，交友 ，是原来的男神女神类型
+        dataList.add(new RoomSettingBean("互娱", "ic_jiaoy", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy, read, isSelected, false, false)); //原交友，更改互娱 2025年9月19日11:18:01
+        dataList.add(new RoomSettingBean("练歌房", "ic_liang", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeLianG, read, isSelected, false, false)); //练歌房，原点歌房，同意的时候，走同意点歌的逻辑
 
 
         dataList.add(new RoomSettingBean("常用工具", null, null, null, -1, read, isSelected, false, false));
@@ -165,7 +166,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
         dataList.add(new RoomSettingBean("发红包", "ic_red", null, null, RoomSettingBean.QXRoomSettingTypeRoomFloatingRed, read, isSelected, false, false));
 //        dataList.add(new RoomSettingBean("离开房间", "ic_leave", null, null, RoomSettingBean.QXRoomSettingTypeRoomLeave, read, isSelected, false, false));
 //        dataList.add(new RoomSettingBean("分享房间", "ic_share", null, null, RoomSettingBean.QXRoomSettingTypeRoomShare, read, isSelected, false, false));
-        dataList.add(new RoomSettingBean("调音台", "ic_my_dress", null, null, RoomSettingBean.QXRoomSettingTypeRoomMyDress, read, isSelected, false, false));
+//        dataList.add(new RoomSettingBean("调音台", "ic_my_dress", null, null, RoomSettingBean.QXRoomSettingTypeRoomMyDress, read, isSelected, false, false));
         dataList.add(new RoomSettingBean("房间设置", "ic_room_setting", null, null, RoomSettingBean.QXRoomSettingTypeRoomSetting, read, isSelected, false, false));
 //        dataList.add(new RoomSettingBean("房间欢迎语", "ic_welcome", null, null, RoomSettingBean.QXRoomSettingTypeRoomWelcome,read,isSelected, false));
         dataList.add(new RoomSettingBean("关闭特效", "ic_close_effects", null, null, RoomSettingBean.QXRoomSettingTypeRoomCloseEffects, read, isSelected, false, effectOn));
@@ -236,9 +237,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
                         ((RoomActivity) getActivity()).clearData();
                     }
 
-                } else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomMyDress) {
-                    TunerDialogFragment.show(roomId, getChildFragmentManager());
-                } else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomCompere) {//主持设置
+                }
+//                else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomMyDress) {
+//                    TunerDialogFragment.show(roomId, getChildFragmentManager());
+//                }
+                else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomCompere) {//主持设置
                     RoomHostFragment.newInstance(roomId).show(getChildFragmentManager(), "RoomHostFragment");
                 } else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomBgImage) {//背景图片
                     RoomBackgroundDialogFragment.newInstance(roomId).show(getChildFragmentManager(), "RoomBackgroundDialogFragment");
@@ -287,7 +290,10 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
                     queren("7");
                 } else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU) {
                     queren("8");
-                } else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomSetting) {
+                }else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG){
+                    queren("-1");
+                }
+                else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomSetting) {
                     if (roomInfoResp != null) {
                         ARouter.getInstance().build(ARouteConstants.CREATED_ROOM).withSerializable("roomInfoResp", roomInfoResp).navigation();
                     } else {
@@ -341,12 +347,16 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
         // 创建并显示确认对话框
         new ConfirmDialog(getActivity(),
                 "提示",
-                "即将修改房间类型为" + (type.equals("1") ? "点唱" : (type.equals("2") ? "拍卖" : (type.equals("3") ? "男神" : (type.equals("4") ? "女神" : (type.equals("7") ? "互娱" : (type.equals("8") ? "交友" : "")))))),
+                "即将修改房间类型为" + (type.equals("1") ? "点唱" : (type.equals("2") ? "拍卖" : (type.equals("3") ? "男神" : (type.equals("4") ? "女神" : (type.equals("7") ? "互娱" : (type.equals("8") ? "交友" :(type.equals("-1") ? "练歌房" : ""))))))),
                 "确认",
                 "取消",
                 v -> {
-                    // 点击“确认”按钮时执行删除操作
-                    MvpPre.changeRoomType(roomId, type);
+                    if (type.equals("-1")) {
+                        MvpPre.agreeSong(roomId,"1");
+                    } else
+                        // 点击“确认”按钮时执行删除操作
+                        MvpPre.changeRoomType(roomId, type);
+
                 },
                 v -> {
                     // 点击“取消”按钮时什么都不做
@@ -370,11 +380,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
         // 房主显示全部
         if (roleLevel == 1) {
             if (onMic) {
-                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy) {
+                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
                     return false;
                 }
             } else {
-                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy) {
+                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
                     return false;
                 }
             }
@@ -383,14 +393,15 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
             if (type == RoomSettingBean.QXRoomSettingTypeRoomTypeSing || type == RoomSettingBean.QXRoomSettingTypeRoomTypeAuction ||
                     type == RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU ||
                     type == RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy ||
+                    type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG ||
                     type == RoomSettingBean.QXRoomSettingTypeRoomClearMessage || type == QXRoomSettingTypeRoomOrderMic || type == RoomSettingBean.QXRoomSettingTypeRoomFloatingScreen
                     || type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomBgImage || type == -1) {
                 if (onMic) {
-                    if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy) {
+                    if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy ||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
                         return false;
                     }
                 } else {
-                    if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy) {
+                    if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy ||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
                         return false;
                     }
                 }
@@ -401,7 +412,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
             ) {
                 return true;
             } else {
-                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy) {
+                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy ||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
                     return false;
                 }
             }
@@ -427,7 +438,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
         else {  // 普通用户只显示更多操作中的特定条目
             return type == RoomSettingBean.QXRoomSettingTypeRoomLeave ||
                     type == RoomSettingBean.QXRoomSettingTypeRoomShare ||
-                    type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ||
+
                     type == RoomSettingBean.QXRoomSettingTypeRoomCloseEffects ||
                     type == RoomSettingBean.QXRoomSettingTypeRoomReport ||
                     type == RoomSettingBean.QXRoomSettingTypeRoomFloatingRed||
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/TunerDialogFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/TunerDialogFragment.java
index fd649cc4..5398b93d 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/TunerDialogFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/TunerDialogFragment.java
@@ -25,6 +25,7 @@ import com.xscm.moduleutil.bean.MixerResp;
 import com.xscm.moduleutil.bean.room.RoomApplyListBean;
 import com.xscm.moduleutil.rtc.AgoraManager;
 import com.xscm.moduleutil.rtc.RtcConstants;
+import com.xscm.moduleutil.rtc.VolumeManager;
 import com.xscm.moduleutil.utils.SpUtil;
 
 import java.util.ArrayList;
@@ -94,6 +95,12 @@ public class TunerDialogFragment extends BaseMvpDialogFragment<WheatPresenter, R
 //                RtcManager.getInstance().setTone(item.getId());
 //            }
 //        });
+
+        // 初始化音量管理器
+        VolumeManager volumeManager = VolumeManager.getInstance();
+        String currentUserId = SpUtil.getUserId() + "";
+        volumeManager.setCurrentUserId(currentUserId);
+
         mBinding.swMonitoring.setChecked(SpUtil.getAuricularBack() == 1 ? true : false);//设置耳返开启还是关闭
         mBinding.swMonitoring.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
@@ -103,51 +110,68 @@ public class TunerDialogFragment extends BaseMvpDialogFragment<WheatPresenter, R
                 SpUtil.setAuricularBack(b ? 1 : 0);
             }
         });
-        int progress = SpUtil.getMusicVolume();
-        if (progress == 0) {
-            progress = 100;
-        }
-        mBinding.seekBar1.setProgress(progress);
-        // 设置 seekBar1 的默认进度为 100
-//        mBinding.seekBar1.setProgress(100);
-        // 更新对应的 TextView 显示内容
-        mBinding.tvSeekbarValue.setText("人声" + progress + "%");
 
+//        volumeManager.getUserVolumes(currentUserId);
+//        int progress = SpUtil.getMusicVolume();
+//        if (progress == 0) {
+//            progress = 100; // 默认值改为100
+//        }
+//        mBinding.seekBar1.setMax(200); // 设置最大值为200
+//        mBinding.seekBar1.setProgress(progress);
+//        // 转换为百分比显示 (200代表100%，100代表50%)
+//        int percentage = (int) ((progress / 200.0) * 100);
+//        mBinding.tvSeekbarValue.setText("人声" + percentage + "%");
+
+
+        // 获取新演唱者的音量设置
+        int[] volumes = volumeManager.getUserVolumes(currentUserId);
+        int musicVolume = volumes[0];
+        int playoutVolume = volumes[1];
+        updateVolumeUI(musicVolume, playoutVolume);
 
         mBinding.seekBar1.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                mBinding.tvSeekbarValue.setText("人声" + progress + "%");
-                SpUtil.setMusicVolume(progress);
-               AgoraManager.getInstance(getContext()).setMusicVolume(progress);
+                // 转换为百分比显示 (200代表100%，100代表50%)
+                int percentage = (int) ((progress / 200.0) * 100);
+                mBinding.tvSeekbarValue.setText("人声" + percentage + "%");
+                SpUtil.setMusicVolume(progress); // 保存原始值(0-200)
+                AgoraManager.getInstance(getContext()).setMusicVolume(progress); // 使用原始值(0-200)
+                // 保存当前用户的音量设置
+                volumeManager.saveCurrentVolumes(
+                        mBinding.seekBar1.getProgress(),
+                        mBinding.seekBar2.getProgress()
+                );
             }
 
             @Override
             public void onStartTrackingTouch(SeekBar seekBar) {
-
             }
 
             @Override
             public void onStopTrackingTouch(SeekBar seekBar) {
-
             }
         });
-        int progress2 = SpUtil.gettPlayoutVolume();
-        if (progress2 == 0) {
-            progress2 = 100;
-        }
-        // 设置 seekBar1 的默认进度为 100
-        mBinding.seekBar2.setProgress(progress2);
-        // 更新对应的 TextView 显示内容
-        mBinding.tvSeekbarValue2.setText("伴奏" + progress2 + "%");
+//        int progress2 = SpUtil.gettPlayoutVolume();
+//        if (progress2 == 0) {
+//            progress2 = 100;
+//        }
+//        // 设置 seekBar1 的默认进度为 100
+//        mBinding.seekBar2.setProgress(progress2);
+//        // 更新对应的 TextView 显示内容
+//        mBinding.tvSeekbarValue2.setText("伴奏" + progress2 + "%");
 
         mBinding.seekBar2.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
                 mBinding.tvSeekbarValue2.setText("伴奏" + progress + "%");
                 SpUtil.settPlayoutVolume(progress);
-                AgoraManager.getInstance(getContext()).settPlayoutVolume(progress);
+                AgoraManager.getInstance(getContext()).setPlayoutVolume(progress);
+                // 保存当前用户的音量设置
+                volumeManager.saveCurrentVolumes(
+                        mBinding.seekBar1.getProgress(),
+                        mBinding.seekBar2.getProgress()
+                );
             }
 
             @Override
@@ -208,7 +232,24 @@ public class TunerDialogFragment extends BaseMvpDialogFragment<WheatPresenter, R
 
 
     }
-
+    /**
+     * 更新音量UI显示
+     * @param musicVolume 人声音量
+     * @param playoutVolume 伴奏音量
+     */
+    public void updateVolumeUI(int musicVolume, int playoutVolume) {
+        // 更新人声音量
+        int musicPercentage = (int) ((musicVolume / 200.0) * 100);
+        mBinding.seekBar1.setMax(200);
+        mBinding.seekBar1.setProgress(musicVolume);
+        mBinding.tvSeekbarValue.setText("人声" + musicPercentage + "%");
+        AgoraManager.getInstance(getContext()).setMusicVolume(musicVolume); // 使用原始值(0-200)
+        // 更新伴奏音量
+        mBinding.seekBar2.setProgress(playoutVolume);
+//        int playoutPercentage = (int) ((playoutVolume / 200.0) * 100);
+        mBinding.tvSeekbarValue2.setText("伴奏" + playoutVolume + "%");
+        AgoraManager.getInstance(getContext()).setPlayoutVolume(playoutVolume);
+    }
 
     @Override
     protected WheatPresenter bindPresenter() {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RankingChildFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/RankingChildFragment.java
index 4d18422e..cde33055 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RankingChildFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RankingChildFragment.java
@@ -123,7 +123,7 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
                     if (view.getId() == R.id.room_item_head) {
                         CharmRankingResp item = cAdapter.getItem(position);
 
-                        RoomUserInfoFragment.show(roomId,item.getUser_id(), "", getHostUser(), true, 3, 0, getChildFragmentManager());
+                        RoomUserInfoFragment.show(roomId,item.getUser_id(), "", getHostUser(), false, 3, 0, getChildFragmentManager());
 
 //                        ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", item.getUser_id()).withBoolean("returnRoom", true).navigation();
                     }
@@ -136,7 +136,7 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
                     if (view.getId() == R.id.room_item_head) {
                         CharmRankingResp item = wAdapter.getItem(position);
 
-                        RoomUserInfoFragment.show(roomId,item.getUser_id(), "", getHostUser(), true, 3, 0, getChildFragmentManager());
+                        RoomUserInfoFragment.show(roomId,item.getUser_id(), "", getHostUser(), false, 3, 0, getChildFragmentManager());
 //                        WealthRankingResp.ListsBean item = wAdapter.getItem(position);
 //                        ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", item.getUser_id()).withBoolean("returnRoom", true).navigation();
                     }
@@ -193,7 +193,7 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
         mBinding.roomRankTop1HeadIcon.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                RoomUserInfoFragment.show(roomId,listsBean.getUser_id(), "", getHostUser(), true, 3, 0, getChildFragmentManager());
+                RoomUserInfoFragment.show(roomId,listsBean.getUser_id(), "", getHostUser(), false, 3, 0, getChildFragmentManager());
 
 //                ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", listsBean.getUser_id()).withBoolean("returnRoom", true).navigation();
             }
@@ -209,7 +209,7 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
         mBinding.roomRankTop2HeadIcon.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                RoomUserInfoFragment.show(roomId,listsBean.getUser_id(), "", getHostUser(), true, 3, 0, getChildFragmentManager());
+                RoomUserInfoFragment.show(roomId,listsBean.getUser_id(), "", getHostUser(), false, 3, 0, getChildFragmentManager());
 
 //                ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", listsBean.getUser_id()).withBoolean("returnRoom", true).navigation();
             }
@@ -247,7 +247,7 @@ public class RankingChildFragment extends BaseMvpFragment<DataListPresenter, Roo
         mBinding.roomRankTop3HeadIcon.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                RoomUserInfoFragment.show(roomId,listsBean.getUser_id(), "", getHostUser(), true, 3, 0, getChildFragmentManager());
+                RoomUserInfoFragment.show(roomId,listsBean.getUser_id(), "", getHostUser(), false, 3, 0, getChildFragmentManager());
 
 //                ARouter.getInstance().build(ARouteConstants.NEW_HOME_PAGE).withString("userId", listsBean.getUser_id()).withBoolean("returnRoom", true).navigation();
             }
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java
index 9aa11a82..e857fd50 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java
@@ -14,6 +14,7 @@ import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.view.animation.LinearInterpolator;
 
+import app.dinus.com.loadingdrawable.render.scenery.ElectricFanLoadingRenderer;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -22,19 +23,18 @@ import com.example.moduleroom.R;
 import com.example.moduleroom.activity.RoomActivity;
 import com.example.moduleroom.contacts.RoomContacts;
 import com.example.moduleroom.databinding.FragmentRoomKtvBinding;
-import com.example.moduleroom.dialog.RoomCharmDialog;
-import com.example.moduleroom.dialog.RoomGiftDialogFragment;
-import com.example.moduleroom.dialog.RoomOnlineDialogFragment;
-import com.example.moduleroom.dialog.RoomUserInfoFragment;
+import com.example.moduleroom.dialog.*;
 import com.example.moduleroom.presenter.RoomPresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.bean.*;
 import com.xscm.moduleutil.bean.room.RoomInfoResp;
 import com.xscm.moduleutil.bean.room.RoomOnline;
 import com.xscm.moduleutil.bean.room.RoomPitBean;
+import com.xscm.moduleutil.bean.room.RoomUserBean;
 import com.xscm.moduleutil.rtc.AgoraManager;
 import com.xscm.moduleutil.rtc.MusicFileBean;
 import com.xscm.moduleutil.rtc.MusicPlayBean;
+import com.xscm.moduleutil.rtc.VolumeManager;
 import com.xscm.moduleutil.utils.ClickUtils;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.SpUtil;
@@ -66,6 +66,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
     private MusicSongBean musicSongBean;
     RoomFragment parentFragment;
     BaseQuickAdapter<RoomPitBean, BaseViewHolder> adapter;
+    VolumeManager volumeManager ;
     private RoomOnline online;
 
     public RoomKtvFragment() {}
@@ -89,36 +90,12 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        // 设置触摸委托以扩大点击区域
-//        view.post(() -> {
-//            View muZc = view.findViewById(R.id.mu_zc);
-//            ViewGroup parent = (ViewGroup) muZc.getParent();
-//
-//            Rect bounds = new Rect();
-//            muZc.getHitRect(bounds);
-//            // 扩展点击区域
-//            bounds.top -=55;
-//            bounds.bottom += 50;
-//            bounds.left -= 30;
-//            bounds.right += 30;
-//
-//            parent.setTouchDelegate(new TouchDelegate(bounds, muZc));
-//        });
     }
     private SharedViewModel sharedViewModel;
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-//        sharedViewModel = new ViewModelProvider(requireActivity()).get(SharedViewModel.class);
-//
-//        // 观察专门给子Fragment的数据
-//        sharedViewModel.getChildFragmentData().observe(getViewLifecycleOwner(), data -> {
-//            if (data != null) {
-//                // 处理数据
-//                roomInfoUpdate(data);
-//            }
-//        });
         return super.onCreateView(inflater, container, savedInstanceState);
     }
 
@@ -172,8 +149,9 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
                 }
             }
 //            AgoraManager.getInstance(getActivity()).stopMuisc()
+            did = roomInfoResp.getSong_user_info().getDid();
             if (roomInfoResp.getSong_user_info().getUser_id().equals(SpUtil.getUserId() + "")) {
-                did = roomInfoResp.getSong_user_info().getDid();
+                setBz();
                 AgoraManager.getInstance(getActivity()).isPreload(Long.parseLong(roomInfoResp.getSong_user_info().getSong_code()), 1);
             } else {
                 if (AgoraManager.getInstance(getActivity()).isOnJoin()) {
@@ -195,6 +173,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
             pitBean.setCharm(roomInfoResp.getSong_user_info().getCharm());
             pitBean.setDress(roomInfoResp.getSong_user_info().getDress());
             roomDefaultWheatView.setData(pitBean);
+
         } else {
             RoomKtvWheatView roomDefaultWheatView = mBinding.muYc;
             RoomPitBean pitBean = new RoomPitBean();
@@ -248,16 +227,31 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
 
     }
 
-//    @Subscribe(threadMode = ThreadMode.MAIN)
-//    public void roomAgoraIsOPen(AgoraIsOPen isOPen) {
-//        if (isOPen.isOpen()) {
-//            mKaraokeView.reset();
-//            AgoraManager.getInstance(getActivity()).stopMusicPlayer();
-//            AgoraManager.getInstance(getActivity()).setmSongCode(0);
-//            AgoraManager.getInstance(getActivity()).loadLrc(Long.parseLong(roomInfoResp.getSong_user_info().getSong_code()));
-//        }
-//    }
+    private void setBz(){
+        if (volumeManager.getBz(SpUtil.getUserId()+"")){
+            AgoraManager.getInstance(getActivity()).selectAudioTrack(0);
+            mBinding.imBz.setImageResource(com.xscm.moduleutil.R.mipmap.accompany_on);
+            mBinding.tvBz.setText("原唱");
+            isRotate = false;
+        }else {
+            AgoraManager.getInstance(getActivity()).selectAudioTrack(1);
+            mBinding.imBz.setImageResource(com.xscm.moduleutil.R.mipmap.accompany_off);
+            mBinding.tvBz.setText("伴奏");
+            isRotate = true;
+        }
+    }
 
+    // TODO: 2025/11/3 设置音量和伴奏
+    private void setAgorVolumes(){
+        // 获取新演唱者的音量设置
+        int[] volumes = volumeManager.getUserVolumes(SpUtil.getUserId()+"");
+        int musicVolume = volumes[0];
+        int playoutVolume = volumes[1];
+        AgoraManager.getInstance(getContext()).setMusicVolume(musicVolume); // 使用原始值(0-200
+        AgoraManager.getInstance(getContext()).setPlayoutVolume(playoutVolume);
+
+
+    }
 
     @Override
     public void onStart() {
@@ -281,6 +275,8 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
 
     @Override
     protected void initData() {
+        volumeManager=VolumeManager.getInstance();
+        setAgorVolumes();
         upData();
     }
 
@@ -313,33 +309,42 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
 
     private void sv() {
         RoomKtvWheatView roomDefaultWheatView = mBinding.muZc;
-        if (roomInfoResp.getSong_user_info() != null) {
-            if (roomInfoResp.getUser_info().getIs_host() == 1 && roomInfoResp.getUser_info().getPit_number() == 9) {
+
+// 缓存 userId 字符串，避免重复拼接
+        String userIdStr = SpUtil.getUserId() + "";
+
+// 提前获取相关对象引用，避免多次调用 getter
+        MusicSongBean songUserInfo = roomInfoResp.getSong_user_info();
+        RoomUserBean userInfo = roomInfoResp.getUser_info();
+
+        if (songUserInfo != null) {
+            if (userInfo != null && userInfo.getIs_host() == 1 && userInfo.getPit_number() == 9) {
                 setVisibilityView(1);
-            } else if (roomInfoResp.getSong_user_info().getIs_hot() == 1) {
+            } else if (songUserInfo.getIs_hot() == 1) {
                 setVisibilityView(1);
-            } else if (roomInfoResp.getSong_user_info().getUser_id().equals(SpUtil.getUserId() + "") && roomDefaultWheatView.getUserId().equals(SpUtil.getUserId() + "")) {
+            } else if (songUserInfo.getUser_id().equals(userIdStr) && roomDefaultWheatView.getUserId().equals(userIdStr)) {
                 setVisibilityView(4);
-            } else if (roomInfoResp.getSong_user_info().getUser_id().equals(SpUtil.getUserId() + "")) {
+            } else if (songUserInfo.getUser_id().equals(userIdStr)) {
                 setVisibilityView(2);
             } else {
                 setVisibilityView(3);
             }
         } else {
-            if (roomInfoResp.getUser_info().getIs_host() == 1 && roomInfoResp.getUser_info().getPit_number() == 9) {
+            if (userInfo != null && userInfo.getIs_host() == 1 && userInfo.getPit_number() == 9) {
                 setVisibilityView(1);
             } else {
                 setVisibilityView(3);
             }
         }
 
-        if (roomDefaultWheatView.getUserId().equals(SpUtil.getUserId() + "")) {
-            if (mBinding.muYc.getUserId().equals(SpUtil.getUserId() + "")) {
+        if (roomDefaultWheatView.getUserId().equals(userIdStr)) {
+            if (mBinding.muYc.getUserId().equals(userIdStr)) {
                 setVisibilityView(4);
             } else {
                 setVisibilityView(1);
             }
         }
+
     }
 
     @Override
@@ -357,7 +362,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
         startRotateAnimation();
         mBinding.llBz.setOnClickListener(this::onClick);
         mBinding.llDs.setOnClickListener(this::onClick);
-        mBinding.llJs.setOnClickListener(this::onClick);
+        mBinding.llTiaoyt.setOnClickListener(this::onClick);
         mBinding.llQg.setOnClickListener(this::onClick);
         mBinding.llSz.setOnClickListener(this::onClick);
         adapter = new BaseQuickAdapter<RoomPitBean, BaseViewHolder>(R.layout.item_room_charm_rank) {
@@ -535,25 +540,25 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
         if (type == 1) {
             mBinding.llBz.setVisibility(View.GONE);
             mBinding.llDs.setVisibility(View.VISIBLE);
-            mBinding.llJs.setVisibility(View.VISIBLE);
+            mBinding.llTiaoyt.setVisibility(View.GONE);
             mBinding.llQg.setVisibility(View.VISIBLE);
             mBinding.llSz.setVisibility(View.GONE);
         } else if (type == 2) {
             mBinding.llBz.setVisibility(View.VISIBLE);
             mBinding.llDs.setVisibility(View.GONE);
-            mBinding.llJs.setVisibility(View.GONE);
+            mBinding.llTiaoyt.setVisibility(View.VISIBLE);
             mBinding.llQg.setVisibility(View.VISIBLE);
             mBinding.llSz.setVisibility(View.GONE);
         } else if (type == 3) {
             mBinding.llBz.setVisibility(View.GONE);
             mBinding.llDs.setVisibility(View.VISIBLE);
-            mBinding.llJs.setVisibility(View.GONE);
+            mBinding.llTiaoyt.setVisibility(View.GONE);
             mBinding.llQg.setVisibility(View.GONE);
             mBinding.llSz.setVisibility(View.GONE);
         } else if (type == 4) {
             mBinding.llBz.setVisibility(View.VISIBLE);
             mBinding.llDs.setVisibility(View.GONE);
-            mBinding.llJs.setVisibility(View.VISIBLE);
+            mBinding.llTiaoyt.setVisibility(View.VISIBLE);
             mBinding.llQg.setVisibility(View.VISIBLE);
             mBinding.llSz.setVisibility(View.GONE);
 
@@ -562,8 +567,9 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
 
     private void onClick(View view) {
         int id = view.getId();
-        if (id == R.id.ll_js) {
-            MvpPre.endSong(roomInfoResp.getRoom_info().getRoom_id());
+        if (id == R.id.ll_tiaoyt) {
+//            MvpPre.endSong(roomInfoResp.getRoom_info().getRoom_id());
+            TunerDialogFragment.show(roomInfoResp.getRoom_info().getRoom_id(), getChildFragmentManager());
         } else if (id == R.id.ll_sz) {
 
         } else if (id == R.id.ll_qg) {
@@ -590,11 +596,13 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
                 mBinding.imBz.setImageResource(com.xscm.moduleutil.R.mipmap.accompany_on);
                 mBinding.tvBz.setText("原唱");
                 isRotate = false;
+                volumeManager.saveBz(SpUtil.getUserId()+"",true);
             } else {
                 AgoraManager.getInstance(getActivity()).selectAudioTrack(1);
                 mBinding.imBz.setImageResource(com.xscm.moduleutil.R.mipmap.accompany_off);
                 mBinding.tvBz.setText("伴奏");
                 isRotate = true;
+                volumeManager.saveBz(SpUtil.getUserId()+"",false);
             }
         }
     }
@@ -636,8 +644,10 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void roomInfoEvent(MusicFileBean messageEvent) {
         LogUtils.e("roomInfoEvent", messageEvent.getFileData());
+
         LyricsModel mLyricsModel = KaraokeView.parseLyricsData(messageEvent.getFileData());
         if (mLyricsModel != null) {
+            setBz();
             mKaraokeView.setLyricsData(mLyricsModel);
             mBinding.lyricsView.setVisibility(View.VISIBLE);
             mBinding.tvJz.setVisibility(View.GONE);
@@ -690,6 +700,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
             }
         } else if (messageEvent.getText().getAction() == 2) {//切歌
             if (messageEvent.getText().getSongInfo() != null) {
+
                 musicSongBean = messageEvent.getText().getSongInfo();
                 did = messageEvent.getText().getSongInfo().getDid();
                 duration = messageEvent.getText().getSongInfo().getDuration();
@@ -712,12 +723,16 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
 //                AgoraManager.getInstance(getActivity()).setmSongCode(0);
 
                 if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) {
+
                     AgoraManager.getInstance(getActivity());
                     AgoraManager.stopMuisc();
                     LogUtils.e("推送过来的code", messageEvent.getText().getSongInfo().getSong_code());
                     AgoraManager.getInstance(getActivity()).isPreload(Long.parseLong(messageEvent.getText().getSongInfo().getSong_code()), 1);
+                    setAgorVolumes();
 
                 } else {
+                    volumeManager.saveBz(SpUtil.getUserId()+"",true);
+                    volumeManager.clearCurrentVolumes();
 //                    AgoraManager.getInstance(getActivity()).stopMuisc();
                     if (AgoraManager.getInstance(getActivity()).isOnJoin()) {
 
@@ -735,15 +750,8 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
                         if (roomInfoResp.getUser_info().getPit_number() > 0) {
 
                         } else {
-//                            if (mBinding.muZc.pitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
-//                                ((RoomActivity) getActivity()).setRoleType(2, -1);
-//                                ((RoomActivity) getActivity()).switchMic(2);
-//                            } else {
                             ((RoomActivity) getActivity()).setRoleType(0, 0);
                             ((RoomActivity) getActivity()).switchMic(2);
-//                            }
-
-
                         }
                     }
                 }
@@ -760,6 +768,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
                 ((RoomActivity) getActivity()).setRoleType(0, 0);
                 did = "";
                 mBinding.muName.setText("无");
+                volumeManager.clearCurrentVolumes();
             }
             if (messageEvent.getText().getNextInfo() != null) {
                 mBinding.muXName.setText(messageEvent.getText().getNextInfo().getSong_name());
@@ -899,29 +908,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
         // 更新麦位列表数据
         adapter.setNewData(roomInfoResp.getSong_pit_list());
 
-
-//        RoomPitBean pitBean = mBinding.muYc.pitBean;
-//        if ((messageEvent.getText().getToUserInfo().getUser_id() + "").equals(pitBean.getUser_id())) {
-//            pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
-//            mBinding.muYc.setCharm(pitBean.getCharm());
-//        }
-//
-//        if ((messageEvent.getText().getToUserInfo().getUser_id() + "").equals(mBinding.muZc.pitBean.getUser_id())) {
-//            mBinding.muZc.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
-//            mBinding.muZc.setCharm(mBinding.muZc.pitBean.getCharm());
-//            return;
-//        }
-//        if ((messageEvent.getText().getToUserInfo().getUser_id() + "").equals(mBinding.muJb.pitBean.getUser_id())) {
-//            mBinding.muJb.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
-//            mBinding.muJb.setCharm(mBinding.muJb.pitBean.getCharm());
-//            return;
-//        }
-//        for (int i = 0; i < roomInfoResp.getSong_pit_list().size(); i++) {
-//            if (roomInfoResp.getSong_pit_list().get(i).getUser_id().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
-//                roomInfoResp.getSong_pit_list().get(i).setCharm(messageEvent.getText().getToUserInfo().getCharm());
-//            }
-//        }
-//        adapter.setNewData(roomInfoResp.getSong_pit_list());
     }
 
     /**
@@ -1063,261 +1049,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
         adapter.setNewData(roomInfoResp.getSong_pit_list());
     }
 
-//    public void roomInfoEvent(RoomMessageEvent messageEvent) {
-//        boolean b = false;
-//        RoomFragment parentFragment = (RoomFragment) getParentFragment();
-//        if (messageEvent.getMsgType() == 1013) {
-//            LogUtils.e("@@", messageEvent);
-//            if (messageEvent.getText().getAction() == 3) {//下一首变化
-//                if (messageEvent.getText().getNextInfo() != null) {
-//                    mBinding.muXName.setText(messageEvent.getText().getNextInfo().getSong_name());
-//                } else {
-//                    mBinding.muXName.setText("暂无歌曲");
-//                }
-//            } else if (messageEvent.getText().getAction() == 2) {//切歌
-//                if (messageEvent.getText().getSongInfo() != null) {
-//                    musicSongBean = messageEvent.getText().getSongInfo();
-//                    did = messageEvent.getText().getSongInfo().getDid();
-//                    duration = messageEvent.getText().getSongInfo().getDuration();
-//                    mBinding.muName.setText(messageEvent.getText().getSongInfo().getSong_name());
-//                    ImageUtils.loadHeadCC(messageEvent.getText().getSongInfo().getPoster(), mBinding.musicPoster);
-//                    ImageUtils.loadHeadCC(messageEvent.getText().getSongInfo().getPoster(), mBinding.muBj);
-//                    RoomKtvWheatView roomDefaultWheatView = mBinding.muYc;
-//                    RoomPitBean pitBean = new RoomPitBean();
-//                    pitBean.setPit_number("-1");
-//                    pitBean.setAvatar(messageEvent.getText().getSongInfo().getAvatar());
-//                    pitBean.setNickname(messageEvent.getText().getSongInfo().getNickname());
-//                    pitBean.setUser_id(messageEvent.getText().getSongInfo().getUser_id());
-//                    pitBean.setCharm(messageEvent.getText().getSongInfo().getCharm());
-//                    roomDefaultWheatView.setData(pitBean);
-//                    roomInfoResp.setSong_user_info(musicSongBean);
-//
-//                    if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) {
-//                        AgoraManager.getInstance(getActivity()).stopMuisc();
-//                        LogUtils.e("推送过来的code", messageEvent.getText().getSongInfo().getSong_code());
-//                        AgoraManager.getInstance(getActivity()).isPreload(Long.parseLong(messageEvent.getText().getSongInfo().getSong_code()), 1);
-//
-//                    } else {
-//                        AgoraManager.getInstance(getActivity()).stopMuisc();
-//                        AgoraManager.getInstance(getActivity()).isPreload(Long.parseLong(messageEvent.getText().getSongInfo().getSong_code()), 2);
-//                    }
-//                    if (getActivity() instanceof RoomActivity) {
-////                    if (parentFragment != null) {
-//                        if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) {
-////                            parentFragment.setRoleType(3, -1);
-////                            parentFragment.switchMic(1);
-//
-//                            ((RoomActivity) getActivity()).setRoleType(3, -1);
-//                            ((RoomActivity) getActivity()).switchMic(1);
-//
-//                        } else {
-//                            if (mBinding.muZc.pitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
-////                                parentFragment.setRoleType(2, -1);
-////                                parentFragment.switchMic(2);
-//                                ((RoomActivity) getActivity()).setRoleType(2, -1);
-//                                ((RoomActivity) getActivity()).switchMic(2);
-//                            } else {
-////                                parentFragment.setRoleType(0, 0);
-////                                parentFragment.switchMic(2);
-//                                ((RoomActivity) getActivity()).setRoleType(0, 0);
-//                                ((RoomActivity) getActivity()).switchMic(2);
-//                            }
-//                        }
-//                    }
-//
-////                    if (roomInfoResp.getUser_info().getIs_host() == 1 && roomInfoResp.getUser_info().getPit_number() == 9) {
-////                        setVisibilityView(1);
-////                    } else if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "") && roomInfoResp.getUser_info().getIs_host() == 1 && roomInfoResp.getUser_info().getPit_number() == 9) {
-////                        setVisibilityView(1);
-////                    } else if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) {
-////                        setVisibilityView(2);
-////                    } else if (roomInfoResp.getUser_info().getIs_host() == 1 && roomInfoResp.getUser_info().getPit_number() == 9) {
-////                        setVisibilityView(1);
-////                    } else {
-////                        setVisibilityView(3);
-////                    }
-//
-//                } else {
-//                    did = "";
-//                    mBinding.muName.setText("无");
-//                }
-//                if (messageEvent.getText().getNextInfo() != null) {
-//                    mBinding.muXName.setText(messageEvent.getText().getNextInfo().getSong_name());
-//                } else {
-//                    mBinding.muXName.setText("无");
-//                }
-////                if (parentFragment != null) {
-////                    parentFragment.mus();
-////                }
-//            }
-//            sv();
-//        } else if (messageEvent.getMsgType() == 1003) {
-//
-//            if (messageEvent.getText().getPit_number().equals("9") || messageEvent.getText().getPit_number().equals("10")) {
-//
-//                RoomPitBean pitBean = new RoomPitBean();
-//                pitBean.setPit_number(messageEvent.getText().getPit_number());
-//                pitBean.setUser_id(messageEvent.getText().getFromUserInfo().getUser_id() + "");
-//                pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
-//                pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
-//                pitBean.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
-//                pitBean.setCharm(messageEvent.getText().getFromUserInfo().getCharm());
-//                pitBean.setDress(messageEvent.getText().getFromUserInfo().getDress());
-//
-//                if (pitBean.getPit_number().equals("9")) {
-//                    RoomKtvWheatView roomDefaultWheatView = mBinding.muZc;
-//                    roomDefaultWheatView.setData(pitBean);
-//                } else if (pitBean.getPit_number().equals("10")) {
-//                    RoomKtvWheatView roomDefaultWheatView = mBinding.muJb;
-//                    roomDefaultWheatView.setData(pitBean);
-//                }
-//                if (SpUtil.getUserId() == messageEvent.getText().getFromUserInfo().getUser_id()) {
-//                    b = true;
-//                    AgoraManager.getInstance(getActivity()).ClientRole(true);
-//                    AgoraManager.getInstance(getActivity()).muteLocalAudioStream(false);
-//                } else {
-//                    b = false;
-//                }
-//                if (parentFragment != null) {
-//                    parentFragment.updateWheatStatus(pitBean, Integer.parseInt(pitBean.getPit_number()), true, b);
-//                }
-//            } else {
-//                RoomPitBean pitBean = new RoomPitBean();
-//                pitBean.setPit_number(messageEvent.getText().getPit_number());
-//                pitBean.setUser_id(messageEvent.getText().getFromUserInfo().getUser_id() + "");
-//                pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
-//                pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
-//                pitBean.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
-//                pitBean.setCharm(messageEvent.getText().getFromUserInfo().getCharm());
-//                pitBean.setDress(messageEvent.getText().getFromUserInfo().getDress());
-//                roomInfoResp.getSong_pit_list().add(pitBean);
-//            }
-//            adapter.setNewData(roomInfoResp.getSong_pit_list());
-//            sv();
-//        } else if (messageEvent.getMsgType() == 1004) {
-//
-//            if (messageEvent.getText().getPit_number().equals("9") || messageEvent.getText().getPit_number().equals("10")) {
-//                RoomPitBean pitBean = new RoomPitBean();
-//                pitBean.setPit_number(messageEvent.getText().getPit_number());
-//                pitBean.setUser_id("");
-//                pitBean.setAvatar("");
-//                pitBean.setNickname("");
-//                pitBean.setSex("");
-//                pitBean.setCharm("");
-//                if (pitBean.getPit_number().equals("9")) {
-//                    RoomKtvWheatView roomDefaultWheatView = mBinding.muZc;
-//                    roomDefaultWheatView.setData(pitBean);
-//                } else if (pitBean.getPit_number().equals("10")) {
-//                    RoomKtvWheatView roomDefaultWheatView = mBinding.muJb;
-//                    roomDefaultWheatView.setData(pitBean);
-//                }
-//                if (SpUtil.getUserId() == messageEvent.getText().getFromUserInfo().getUser_id()) {
-//                    b = true;
-//                    AgoraManager.getInstance(getActivity()).ClientRole(false);
-//                    AgoraManager.getInstance(getActivity()).muteLocalAudioStream(true);
-//                } else {
-//                    b = false;
-//                }
-////            AgoraManager.getInstance(getActivity()).setEnableAudio(b);
-//                if (parentFragment != null) {
-//                    parentFragment.updateWheatStatus(pitBean, Integer.parseInt(messageEvent.getText().getPit_number()), false, b);
-//                }
-//            } else {
-//                for (int i = 0; i < roomInfoResp.getSong_pit_list().size(); i++) {
-//                    if (roomInfoResp.getSong_pit_list().get(i).getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
-//                        roomInfoResp.getSong_pit_list().remove(i);
-//                        break;
-//                    }
-//                }
-//                adapter.setNewData(roomInfoResp.getSong_pit_list());
-//            }
-//            sv();
-//        } else if (messageEvent.getMsgType() == 1019) {
-////            RoomCharmRankBean charmRankBean=messageEvent.getText().getUserCharmList().get(0);
-////            RoomPitBean pitBean=mBinding.muYc.pitBean;
-////            pitBean.setCharm(charmRankBean.getCharm());
-////            mBinding.muYc.setData(pitBean);
-//            LogUtils.e("1019", messageEvent);
-////            adapter.setNewData(messageEvent.getText().getUserCharmList());
-//        } else if (messageEvent.getMsgType() == 1021) {
-//            RoomPitBean pitBean = mBinding.muYc.pitBean;
-//            pitBean.setCharm("0");
-//            mBinding.muYc.setData(pitBean);
-//            pitBean = mBinding.muZc.pitBean;
-//            pitBean.setCharm("0");
-//            mBinding.muZc.setData(pitBean);
-//            pitBean = mBinding.muJb.pitBean;
-//            pitBean.setCharm("0");
-//            mBinding.muJb.setData(pitBean);
-//
-//            for (int i = 0; i < roomInfoResp.getSong_pit_list().size(); i++) {
-//                roomInfoResp.getSong_pit_list().get(i).setCharm("0");
-//            }
-//            adapter.setNewData(roomInfoResp.getSong_pit_list());
-//
-//        } else if (messageEvent.getMsgType() == 1005) {
-//            RoomPitBean pitBean = mBinding.muYc.pitBean;
-//            if ((messageEvent.getText().getToUserInfo().getUser_id() + "").equals(pitBean.getUser_id())) {
-//                pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
-//                mBinding.muYc.setData(pitBean);
-//            }
-//
-//            if ((messageEvent.getText().getToUserInfo().getUser_id() + "").equals(mBinding.muZc.pitBean.getUser_id())) {
-//                mBinding.muZc.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
-//                mBinding.muZc.setData(mBinding.muZc.pitBean);
-//                return;
-//            }
-//            if ((messageEvent.getText().getToUserInfo().getUser_id() + "").equals(mBinding.muJb.pitBean.getUser_id())) {
-//                mBinding.muJb.pitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
-//                mBinding.muJb.setData(mBinding.muJb.pitBean);
-//                return;
-//            }
-//            for (int i = 0; i < roomInfoResp.getSong_pit_list().size(); i++) {
-//                if (roomInfoResp.getSong_pit_list().get(i).getUser_id().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
-//                    roomInfoResp.getSong_pit_list().get(i).setCharm(messageEvent.getText().getToUserInfo().getCharm());
-//                }
-//            }
-//            adapter.setNewData(roomInfoResp.getSong_pit_list());
-//        } else if (messageEvent.getMsgType() == 1035) {
-//            RoomPitBean pitBean = mBinding.muZc.pitBean;
-//            if (pitBean.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
-//                pitBean.setCharm(messageEvent.getText().getFromUserInfo().getCharm());
-//                pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
-//                pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
-//                pitBean.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
-//                pitBean.setDress(messageEvent.getText().getFromUserInfo().getDress());
-//                mBinding.muZc.setData(pitBean);
-//            }
-//            RoomPitBean pitBean1 = mBinding.muJb.pitBean;
-//            if (pitBean1.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
-//                pitBean1.setCharm(messageEvent.getText().getFromUserInfo().getCharm());
-//                pitBean1.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
-//                pitBean1.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
-//                pitBean1.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
-//                pitBean1.setDress(messageEvent.getText().getFromUserInfo().getDress());
-//                mBinding.muJb.setData(pitBean1);
-//            }
-//            RoomPitBean pitBean2 = mBinding.muYc.pitBean;
-//            if (pitBean2.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
-//                pitBean2.setCharm(messageEvent.getText().getFromUserInfo().getCharm());
-//                pitBean2.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
-//                pitBean2.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
-//                pitBean2.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
-//                pitBean2.setDress(messageEvent.getText().getFromUserInfo().getDress());
-//                mBinding.muYc.setData(pitBean2);
-//            }
-//            for (int i = 0; i < roomInfoResp.getSong_pit_list().size(); i++) {
-//                if (roomInfoResp.getSong_pit_list().get(i).getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
-//                    roomInfoResp.getSong_pit_list().get(i).setCharm(messageEvent.getText().getFromUserInfo().getCharm());
-//                    roomInfoResp.getSong_pit_list().get(i).setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
-//                    roomInfoResp.getSong_pit_list().get(i).setNickname(messageEvent.getText().getFromUserInfo().getNickname());
-//                    roomInfoResp.getSong_pit_list().get(i).setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
-//                    roomInfoResp.getSong_pit_list().get(i).setDress(messageEvent.getText().getFromUserInfo().getDress());
-//                }
-//            }
-//            adapter.setNewData(roomInfoResp.getSong_pit_list());
-//        }
-//    }
 
     @Override
     public void roomInfo(RoomInfoResp resp) {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomSettingPresenter.java b/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomSettingPresenter.java
index 6373b4de..57652d4c 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomSettingPresenter.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomSettingPresenter.java
@@ -11,6 +11,7 @@ import com.xscm.moduleutil.presenter.BasePresenter;
 import java.lang.ref.WeakReference;
 
 import io.reactivex.disposables.Disposable;
+import org.jetbrains.annotations.NotNull;
 
 public class RoomSettingPresenter extends BasePresenter<RoomSettingContacts.View> implements RoomSettingContacts.IRoomPre{
     RoomSettingContacts.View mView;
@@ -70,4 +71,21 @@ public class RoomSettingPresenter extends BasePresenter<RoomSettingContacts.View
             }
         });
     }
+
+    @Override
+    public void agreeSong(String roomId, String type) {
+        if (api== null){
+            api = RetrofitClient.getInstance();
+        }
+        api.agreeSong(roomId, type, new BaseObserver<String>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+                addDisposable(d);
+            }
+
+            @Override
+            public void onNext(String s) {
+            }
+        });
+    }
 }
diff --git a/moduleroom/src/main/res/layout/fragment_room_ktv.xml b/moduleroom/src/main/res/layout/fragment_room_ktv.xml
index 81501cda..8adf03c9 100644
--- a/moduleroom/src/main/res/layout/fragment_room_ktv.xml
+++ b/moduleroom/src/main/res/layout/fragment_room_ktv.xml
@@ -192,10 +192,10 @@
 
                     <ImageView
                             android:id="@+id/im_bz"
-                            android:layout_width="@dimen/dp_13"
-                            android:layout_height="@dimen/dp_16"
+                            android:layout_width="@dimen/dp_20"
+                            android:layout_height="@dimen/dp_20"
                             android:layout_gravity="center"
-                            android:src="@mipmap/accompany_on"/>
+                            android:src="@mipmap/accompany_off"/>
 
                     <TextView
                             android:id="@+id/tv_bz"
@@ -217,8 +217,8 @@
                         android:orientation="vertical">
 
                     <ImageView
-                            android:layout_width="@dimen/dp_13"
-                            android:layout_height="@dimen/dp_16"
+                            android:layout_width="@dimen/dp_20"
+                            android:layout_height="@dimen/dp_20"
                             android:layout_gravity="center"
                             android:src="@mipmap/muisc_reward"/>
 
@@ -228,7 +228,7 @@
                             android:layout_gravity="center"
                             android:gravity="center"
                             android:text="打赏"
-                            android:textColor="@color/colorPrimary"
+                            android:textColor="@color/color_EFEFEF"
                             android:textSize="@dimen/sp_10"/>
                 </LinearLayout>
 
@@ -241,8 +241,8 @@
                         android:orientation="vertical">
 
                     <ImageView
-                            android:layout_width="@dimen/dp_13"
-                            android:layout_height="@dimen/dp_16"
+                            android:layout_width="@dimen/dp_20"
+                            android:layout_height="@dimen/dp_20"
                             android:layout_gravity="center"
                             android:src="@mipmap/muisc_switch"/>
 
@@ -252,12 +252,12 @@
                             android:layout_gravity="center"
                             android:gravity="center"
                             android:text="切歌"
-                            android:textColor="@color/colorPrimary"
+                            android:textColor="@color/color_EFEFEF"
                             android:textSize="@dimen/sp_10"/>
                 </LinearLayout>
 
                 <LinearLayout
-                        android:id="@+id/ll_js"
+                        android:id="@+id/ll_tiaoyt"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
@@ -265,18 +265,18 @@
                         android:orientation="vertical">
 
                     <ImageView
-                            android:layout_width="@dimen/dp_13"
-                            android:layout_height="@dimen/dp_16"
+                            android:layout_width="@dimen/dp_20"
+                            android:layout_height="@dimen/dp_20"
                             android:layout_gravity="center"
-                            android:src="@mipmap/muisc_end"/>
+                            android:src="@mipmap/muisc_tyt"/>
 
                     <TextView
                             android:layout_width="@dimen/dp_20"
                             android:layout_height="@dimen/dp_14"
                             android:layout_gravity="center"
                             android:gravity="center"
-                            android:text="结束"
-                            android:textColor="@color/colorPrimary"
+                            android:text="调音台"
+                            android:textColor="@color/color_EFEFEF"
                             android:textSize="@dimen/sp_10"/>
                 </LinearLayout>
 

From 877ef5ea0538f46388946d2c43f061832b3fb5c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Mon, 3 Nov 2025 18:38:48 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=81=9C=E6=AD=A2=E8=B7=9F=E8=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore       | 15 ---------------
 .idea/.gitignore |  3 ---
 .idea/.name      |  1 -
 3 files changed, 19 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/.name

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index aa724b77..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
-local.properties
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d33521..00000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 1e71aa94..00000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-秘地
\ No newline at end of file

From 6b9490ccebe129ddfdfcb0768346bb0a9515819d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Mon, 3 Nov 2025 20:29:52 +0800
Subject: [PATCH 4/5] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E4=BA=A4=E5=8F=8B?=
 =?UTF-8?q?=E6=88=BF=E5=87=BA=E7=8E=B0=E5=98=89=E5=AE=BE=E4=BC=9A=E9=97=AD?=
 =?UTF-8?q?=E9=BA=A6=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..e4019f40
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+.idea/
+*.iml
+build/
+local.properties
+.gradle/
+.externalNativeBuild/
+.DS_Store
+*.dm
+*.log
\ No newline at end of file

From d0337a723c8b9f6a8d92d58202d69aa50818a96e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Wed, 5 Nov 2025 11:13:18 +0800
Subject: [PATCH 5/5] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/vcs.xml                                 |   2 +-
 app/build.gradle                              |  26 +++++++++---------
 .../qxcm/qxlive/PasswordLoginActivity.java    |  10 +++----
 gradle.properties                             |   4 +--
 .../main/res/layout/activity_improve_info.xml |  22 +++++++++++++++
 .../utils/config/EnvironmentEnum.java         |   4 +--
 .../src/main/res/mipmap-mdpi/muisc_reward.png | Bin 1251 -> 0 bytes
 .../src/main/res/mipmap-mdpi/muisc_switch.png | Bin 730 -> 0 bytes
 .../contacts/RoomSettingContacts.java         |   2 ++
 .../dialog/RoomSettingFragment.java           |  16 +++++++----
 .../moduleroom/fragment/SingSongFragment.java |   2 +-
 .../presenter/RoomSettingPresenter.java       |   4 +++
 settings.gradle                               |   1 +
 .../classicui/page/TUIC2CChatFragment.java    |   2 +-
 14 files changed, 65 insertions(+), 30 deletions(-)
 delete mode 100644 moduleUtil/src/main/res/mipmap-mdpi/muisc_reward.png
 delete mode 100644 moduleUtil/src/main/res/mipmap-mdpi/muisc_switch.png

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f..73354269 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/yusheng-android" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 22d00d55..7f38f5ff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -66,19 +66,19 @@ android {
 
 //        // 测试版配置
         beta {
-            dimension "environment"
-            // 测试版包名：基础包名 + .beta（com.example.myapp.beta）
-            applicationIdSuffix ".beta"
-            // 测试版版本名：1.0-beta
-            versionNameSuffix "-beta"
-
-            // 【测试版应用名称】动态生成带标识的名称
-            resValue "string", "app_name", "羽声-测试版"
-
-            // 【测试版图标】替换为测试专用图标
-            manifestPlaceholders = [
-                    appIcon: "@mipmap/ic_launcher_app_bat"  // 需在main/res/mipmap放置该图标
-            ]
+//            dimension "environment"
+//            // 测试版包名：基础包名 + .beta（com.example.myapp.beta）
+//            applicationIdSuffix ".beta"
+//            // 测试版版本名：1.0-beta
+//            versionNameSuffix "-beta"
+//
+//            // 【测试版应用名称】动态生成带标识的名称
+//            resValue "string", "app_name", "羽声-测试版"
+//
+//            // 【测试版图标】替换为测试专用图标
+//            manifestPlaceholders = [
+//                    appIcon: "@mipmap/ic_launcher_app_bat"  // 需在main/res/mipmap放置该图标
+//            ]
         }
     }
 
diff --git a/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java b/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
index 6d105f8d..efe8ab33 100644
--- a/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
+++ b/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
@@ -406,7 +406,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
                 .setPrivacyTextSize(11)
                 .setPrivacyAlertContentVerticalMargin(20)
                 .setPrivacyMargin(39)
-                .setPrivacyState(true)
+                .setPrivacyState(false)
                 .setCheckboxHidden(false)
                 .setCheckedImgPath("ic_agreement_selected")
                 .setUncheckedImgPath("ic_agreement_unselect")
@@ -485,20 +485,20 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
             }
             String phone = mBinding.edPhone.getText().toString().trim();
             if (TextUtils.isEmpty(phone)) {
-                com.blankj.utilcode.util.ToastUtils.showShort("请输入手机号");
+                ToastUtils.show("请输入手机号");
                 return;
             }
             if (type==1) {
                 String code = mBinding.edPassword.getText().toString().trim();
                 if (TextUtils.isEmpty(code)) {
-                    com.blankj.utilcode.util.ToastUtils.showShort("请输入验证码");
+                    ToastUtils.show("请输入验证码");
                     return;
                 }
                 MvpPre.login(phone, "", code, 1);
             }else if (type==2) {
                 String password = mBinding.edPasswordCode.getText().toString().trim();
                 if (TextUtils.isEmpty(password)) {
-                    com.blankj.utilcode.util.ToastUtils.showShort("请输入密码");
+                    ToastUtils.show("请输入密码");
                     return;
                 }
                 MvpPre.login(phone, password, "", 2);
@@ -525,7 +525,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
         } else if (id == R.id.tv_send_code) {
             String phone = mBinding.edPhone.getText().toString().trim();
             if (TextUtils.isEmpty(phone)) {
-                com.blankj.utilcode.util.ToastUtils.showShort("请输入手机号");
+                ToastUtils.show("请输入手机号");
                 return;
             }
             sendCodeSuccess(phone);
diff --git a/gradle.properties b/gradle.properties
index 702f92b9..11db06a7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,8 +28,8 @@ isBuildModule=false
 #org.gradle.deamon=false
 android.injected.testOnly=false
 
-APP_VERSION_NAME=1.0.5.8
-APP_VERSION_CODE=48
+APP_VERSION_NAME=1.0.5.9
+APP_VERSION_CODE=49
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15
diff --git a/moduleLogin/src/main/res/layout/activity_improve_info.xml b/moduleLogin/src/main/res/layout/activity_improve_info.xml
index c1f1a6f3..47a31b8e 100644
--- a/moduleLogin/src/main/res/layout/activity_improve_info.xml
+++ b/moduleLogin/src/main/res/layout/activity_improve_info.xml
@@ -286,7 +286,29 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_40"
+                    android:layout_marginTop="@dimen/dp_24"
+                    android:orientation="horizontal">
 
+                <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="邀请码"
+                        android:textColor="#73000000"
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
+
+                <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text=" (非必填)"
+                        android:textColor="#33000000"
+                        android:textSize="12sp" />
+
+            </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
index 7d578c4c..a5afa0f2 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
@@ -15,7 +15,7 @@ public enum EnvironmentEnum {
             "3e8f3add448d4692bc1d04c75ffe801b",
             "tcp://81.70.45.221",
             "https://vespa.qxyushen.top/h5",
-        0),
+        1),
     TEST(//测试环境
             "https://test.vespa.qxyushen.top/",
             "6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=",
@@ -49,7 +49,7 @@ public enum EnvironmentEnum {
     private final String mqttUrl;//MQTT服务器地址
 
     private final String H5Url;//h5地址
-    private final int shelf;//是否上架，0：平台更新，1：上架，发布到对应的应用商城
+    private final int shelf;//是否上架，0：平台更新，1：上架，发布到对应的应用商城，上架的初始是没有趣味的，需要点击6次才可以打开趣味
 
     EnvironmentEnum(String serverUrl, String ALI_AUTH_KEY, String ossEndPoint, String ossaAcessKeyId,
                     String ossAccessKeySecret, String ossBucketName, String ossBaseUrl, String wxAppId,
diff --git a/moduleUtil/src/main/res/mipmap-mdpi/muisc_reward.png b/moduleUtil/src/main/res/mipmap-mdpi/muisc_reward.png
deleted file mode 100644
index d4a32b6e3fba06b1f6109fcf4bf9f781802763a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1251
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVB?gjXSxB_W~^#uz1fv7=oZ?(eq
z3Wfa@3R_DRb^%e9!u~2%Ai1kjVP7RkYIlXo_6n8VKt{R3?rMd7)e1Yy6!ugq@2P~6
zyQ-9TRVeH#R|29vKvbo)qfBXcB~YWn-U_AN6-q#IXO+_KDzFKaN;}Jyb^}qR(%x#2
z;$0O=yQ-A-Q~=qEyDCBAyMf#)<=vIayQ`Feg1ajeLF`JPERdlHl!dVOR4M`0gES&^
z0i`aLo74k+=vflv7tA0aARw=xU;qO4_6|Vc@9!TF5D*`qkdO}q1qJm$(9qBi1{3B3
z!GiT*uz&yl^FVMP1m3@YFClat7@o}8o-U3d5r^N-$gZAcAaZ;sPg?Ztt;M;Kb2rZ}
z^Lw5WTCRDaN;_lUe{m^)r-qi6IUDxg+Wgs#^W$^Ra}S@?8}!s4@^gF5?DTr)@A86c
zGJ(I1mpp#JZ|>Hb8~sCnQ*=~b?<LnoCyehfYeiq$^egaJ<%N=OGj?t570mwWP_*)3
zapjphqc7!mB(e@R+PvR9lkZmWy-4m;uRra{nWN6P@IXg`mEF&~$IcvkYb(iNmHbE2
zsqsg7-LI!y?`KcHzvJ+qvR}GKTr>py-#v`+>2xeS9JkbFPP4Pk^H#G92G+UHu4T5b
zna`j*SK)g81!h0j7n9z9e6wqRxo5$G1N)3L-8y=w9rCDBS$D{hMPIPI%S73K5`X=d
zO+0emdFM-HO?vpBsL#(b6R5qiD*lP5LtxC-(r*q~(_VXRe3Y{|ddq&ThGN?}(uz}a
zOV2gTW)6xj;(m7aQ}3)Fp|hXdwr11&-nsG*lXQlzwfzFK+)_S<j-QNL#r>s5fwHy7
zBQ3tI@+#WOEU3vpVH;nIN9pn8eKD`++*MsYJO1|lsV-9e)tf`uCw+R9KcmYq)aBSB
zn{^Yac-Gfk<9(%ir001c=R-rAFS~@^q{i~<+}{#7bH>LRhjuAAZ~xSg;}f{6QdMqt
zfVPTteI4iLr3zh@Ce=<eAMKiAD-@Ek|FQZWr$@@BX)Uu?2%X>)DsuU>Yk~F+2gbk(
zgS9TZ6xK~-YOadgmT~RqI+xW;cwMr%clG}`HA!aT-c@P2-rnZP$s4;9U02(z+G6H3
zsiSSrpEq64eN_*1t*AV_{-@&__um2honl;;Q{#9$_X>St3YMAXbYWh|Vi#3Y!yxlt
zPab(_1;$@G&0W~T9qgx|w>S0YBCVHml9h$;P38`)-FCA*RpWJ%*an*=fj<td_&0ag
z^TpRDccjF#vOHH5;W+0kXEBvQRgbNW%VNs6NcRIaI#Lm?w;VoSNVxoL*4fX;I_J9I
zPyD=x@x!dy2bL{8(<t>|&h0G$SO2~fnd^5(G^0pp-qntS4=f8pqJvJAyT4a$PdWPb
z)WU*m6P}07-oNhIYNd(mzG&^fS8~zb<!+{0rPE*YzA%+_5+VB4v-WgH1YP<hocH?R
zUKM?H)mo30Pw%<iSNLYUF8}yc-#vBJ_PHk}Z*TRxz#x9*s^{Y?_p>j4`)YAWMz1-&
i!&X;4_wtYY{fsj2#pS;2N>2vnWd=`IKbLh*2~7YG*-PyJ

diff --git a/moduleUtil/src/main/res/mipmap-mdpi/muisc_switch.png b/moduleUtil/src/main/res/mipmap-mdpi/muisc_switch.png
deleted file mode 100644
index 1694e3c142ac5890599b0ffa7ad9f6b50f7e8904..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 730
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVB<^=eJxB_W~^#uz1fv7=YdxgUO
z3WZ&z3j3>6cU39ussxGbu29(xB&!v6mMQP4RM=CgybGwNTxn00(vC8v-IYKE3VSP*
zc2_6?$(>b7yQ>s-mn-b91WJL_?5a@ORRv;zL_iG1-4%+vE0uRwD(<QTG8A`Lff#!#
zm39HugLQ$G0o7kkh$;cP&$uMWFPK3<KtMskz`(%X!NI{lARs;=Kfj=$9tav5`uqDQ
z%%4Ah{rdI$_wPS{{``F)c>n(WtEqFAFfcIg@^o<wi8%cBMr?SKg8<tDL9wkt!ou3R
zs@i`%0%!dHe}7lN&8Hf>jZMO3pB1$}KV!M)j2@H8)sWyhpVD5-d`>;ESO3q9?fGlj
z*=?>)d9EuUcwCIX@O<W`?v9R^U-`XFvV7R({mWz4{*G8By7S})rZ-a^@9_WUn0I}@
ziD%6nJ^`i0C#yLHLROtz$-?oWXAXm)L)>H$fj>LNwl^|x2)t73cLvJ(@Cb;qa2N-j
zda1BN{_d0A>I|2djxcF5K5A@H+o@o)<eTA1HgCpXJS+!-POWDSVQ1O8%CAyaz$<x^
zF5@glt8J<d#tzl~EGDyRCNh4V;nR8`iAi>;Lw@0|EM=B5z2oyE*yf1#M|w6K-1R|C
z$g<}X_w-(tdm@YXx^V6}-Ms4CtH$XY6dt*8o;f_vPJ6$nPtM(Y@B9+{Ik)ZFJMF-_
z^p;eG4f@fCg1CEh5?3---QTw1gQI)Ijs?%TxP{-y#3Vj!tP)<w!_BVJ+RAw8kQ3Wp
zQ(c`DgZ;M8vm5Syy1rIhC-1^}pYxJphwfBgjd9C6&-UwRphl+Qp3n8%olkXanc`eK
vcI=+Z@m1uwFzcP5zjfTRvR1A9AGW{8;`dz{XS2D$M8M$b>gTe~DWM4f8eTRt

diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomSettingContacts.java b/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomSettingContacts.java
index 9e76a14a..748be4a0 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomSettingContacts.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomSettingContacts.java
@@ -11,6 +11,8 @@ public class RoomSettingContacts {
         void changeRoomSuccess(String s,int position,RoomSettingBean bean);
 
         void changeRoomType(String s);
+
+        void agreeSong(String s);
     }
 
     public interface IRoomPre extends IPresenter {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
index 767560d6..bd400ae4 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
@@ -380,11 +380,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
         // 房主显示全部
         if (roleLevel == 1) {
             if (onMic) {
-                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
+                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress || type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG ) {
                     return false;
                 }
             } else {
-                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
+                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress || type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG) {
                     return false;
                 }
             }
@@ -397,11 +397,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
                     type == RoomSettingBean.QXRoomSettingTypeRoomClearMessage || type == QXRoomSettingTypeRoomOrderMic || type == RoomSettingBean.QXRoomSettingTypeRoomFloatingScreen
                     || type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomBgImage || type == -1) {
                 if (onMic) {
-                    if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy ||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
+                    if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy ||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress || type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG) {
                         return false;
                     }
                 } else {
-                    if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy ||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
+                    if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy ||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress || type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG) {
                         return false;
                     }
                 }
@@ -412,7 +412,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
             ) {
                 return true;
             } else {
-                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy ||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress ) {
+                if (type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomSubsidy ||   type == RoomSettingBean.QXRoomSettingTypeRoomMyDress || type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG) {
                     return false;
                 }
             }
@@ -508,4 +508,10 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
         ToastUtils.show(s);
         dismiss();
     }
+
+    @Override
+    public void agreeSong(String s) {
+        ToastUtils.show(s);
+        dismiss();
+    }
 }
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java
index 595a49e2..4d9098c1 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java
@@ -1257,7 +1257,7 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
     }
 
     public void event1021(RoomMessageEvent message) {
-        if (roomInfoRespPk != null || roomInfoRespPk.getPk_info() != null) {
+        if (roomInfoRespPk != null && roomInfoRespPk.getPk_info() != null) {
             for (RoomPitBean pitBean : roomInfoResp.getRoom_info().getPit_list()){
                 pitBean.setCharm("0");
                 if (pitBean.getUser_id()!=null && !pitBean.getUser_id().isEmpty() && !pitBean.getUser_id().equals("0")) {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomSettingPresenter.java b/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomSettingPresenter.java
index 57652d4c..2591c6d8 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomSettingPresenter.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomSettingPresenter.java
@@ -85,6 +85,10 @@ public class RoomSettingPresenter extends BasePresenter<RoomSettingContacts.View
 
             @Override
             public void onNext(String s) {
+                if (MvpRef==null){
+                    MvpRef = new WeakReference<>(mView);
+                }
+                MvpRef.get().agreeSong(s);
             }
         });
     }
diff --git a/settings.gradle b/settings.gradle
index 7999babb..4bd88b77 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -63,3 +63,4 @@ include ':tuicore'
 include ':moduleroom'
 include ':Loadinglibrary'
 
+
diff --git a/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java b/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java
index da0c3499..0f107959 100644
--- a/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java
+++ b/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java
@@ -119,7 +119,7 @@ public class TUIC2CChatFragment extends TUIBaseChatFragment {
             @Override
             public boolean onMenuItemClick(android.view.MenuItem item) {
                 if ("举报".equals(item.getTitle())) {
-                    ARouter.getInstance().build("/moduleUtil/WebViewActivity").withString("url", "https://vespa.qxyushen.top/h5/web/index.html#/pages/feedback/report?id=?id="+getToken()+"&fromType=1&fromId="+ getUserInfo().getUser_id()).navigation();
+                    ARouter.getInstance().build("/moduleUtil/WebViewActivity").withString("url", "https://vespa.qxyushen.top/h5/web/index.html#/pages/feedback/report?id="+getToken()+"&fromType=1&fromId="+ getUserInfo().getUser_id()).navigation();
                     return true;
                 }
                 return false;