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 d4a32b6e..00000000
Binary files a/moduleUtil/src/main/res/mipmap-mdpi/muisc_reward.png and /dev/null differ
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 1694e3c1..00000000
Binary files a/moduleUtil/src/main/res/mipmap-mdpi/muisc_switch.png and /dev/null differ
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;