From 48cfc7c9fd2cca1c7879e414acc94097ebc779df Mon Sep 17 00:00:00 2001
From: memory <547527489@qq.com>
Date: Fri, 16 Sep 2022 00:27:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=B9=85=E5=BC=80=E9=BB=91->=E9=9F=B3?=
 =?UTF-8?q?=E6=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../anotherroompk/RoomPKCreateActivity.kt     |  2 +-
 .../anotherroompk/RoomPKSearchAdapter.kt      |  2 +-
 .../avroom/fragment/BaseRoomFragment.kt       |  2 +-
 .../SingleRoomPKCreateActivity.kt             |  2 +-
 .../singleroompk/SingleRoomPKSearchAdapter.kt |  2 +-
 .../common/widget/dialog/DialogManager.java   |  2 +-
 .../home/adapter/VisitorListAdapter.java      |  2 +-
 .../moshen/home/fragment/HomeFragment.kt      |  2 +-
 .../moshen/home/fragment/LiveFragment.kt      |  2 +-
 .../moshen/home/fragment/PartyFragment.kt     |  2 +-
 .../moshen/home/fragment/RecommendFragment.kt |  2 +-
 .../moshen/radish/signin/SignInActivity.java  |  2 +-
 .../mango/moshen/team/viewmodel/TeamVM.java   |  4 +--
 .../ui/im/friend/FriendListAdapter.java       |  2 +-
 .../ui/user/view/UserInfoInfoFragment.kt      |  2 +-
 .../mango/moshen/ui/widget/ShareDialog.java   |  4 +--
 .../moshen/ui/widget/UserInfoDialog.java      |  2 +-
 .../com/mango/moshen/vip/VipMainActivity.kt   |  2 +-
 app/src/main/res/layout/activity_charge.xml   |  2 +-
 .../res/layout/activity_room_pk_create.xml    |  2 +-
 .../res/layout/activity_room_pk_search.xml    |  2 +-
 .../layout/activity_single_room_pk_create.xml |  2 +-
 .../layout/activity_single_room_pk_search.xml |  2 +-
 .../main/res/layout/activity_verify_phone.xml |  2 +-
 .../main/res/layout/dialog_new_user_hello.xml |  4 +--
 app/src/main/res/layout/fragment_me.xml       |  2 +-
 .../res/layout/fragment_userinfo_info.xml     |  2 +-
 .../res/layout/fragment_userinfo_userinfo.xml |  2 +-
 .../main/res/layout/item_home_concerns.xml    |  2 +-
 .../res/layout/item_home_visitor_list.xml     |  2 +-
 .../main/res/layout/item_room_pk_search.xml   |  2 +-
 .../res/layout/item_single_room_pk_search.xml |  2 +-
 app/src/main/res/layout/newbie_list_item.xml  |  2 +-
 app/src/main/res/layout/red_packet_dialog.xml |  2 +-
 app/src/main/res/values/colors.xml            |  8 ++---
 app/src/main/res/values/strings.xml           | 34 +++++++++----------
 .../module_bank_card/res/values/strings.xml   |  2 +-
 .../hall/activity/HallSearchActivity.java     |  2 +-
 .../hall/activity/ModuleClanActivity.java     |  2 +-
 .../hall/activity/SuperAdminAddActivity.kt    |  4 +--
 .../hall/adapter/ManageSuperAdminAdapter.kt   |  2 +-
 .../module_hall/secretcode/PwdCodeMgr.java    |  2 +-
 .../res/layout/activity_add_member.xml        |  2 +-
 .../res/layout/activity_remove_member.xml     |  2 +-
 .../res/layout/activity_super_admin_add.xml   |  2 +-
 .../res/layout/activity_vip_main.xml          |  2 +-
 .../res/layout/dialog_share_secret_code.xml   |  2 +-
 .../res/layout/include_user_module_hall.xml   |  2 +-
 .../res/layout/item_group_list.xml            |  2 +-
 .../res/layout/item_manage_super_admin.xml    |  2 +-
 .../layout/dialog_grab_apprentices_notify.xml |  2 +-
 .../view_holder_apprentice_mission_four.xml   |  2 +-
 .../view_holder_apprentice_mission_one.xml    |  2 +-
 .../PublicChatHallMessageFragment.java        |  6 ++--
 .../res/layout/act_quick_pass.xml             |  2 +-
 .../adapter/RoomNewbieListAdapter.java        |  2 +-
 .../java/com/mango/core/UriProvider.java      |  2 +-
 .../XChatConstants.java                       |  6 ++--
 .../java/com/mango/core/auth/AuthModel.java   |  2 +-
 .../core/room/model/RoomSettingModel.java     |  4 +--
 .../mango/core/room/pk/bean/PKTeamMember.java |  2 +-
 .../protocol/StatisticsProtocol.java          |  4 +--
 .../java/com/mango/core/user/UserModel.java   |  2 +-
 .../core/utils/OldHttpErrorHandleUtil.java    |  2 +-
 .../bean/GrabApprenticesInfo.java             |  2 +-
 .../bean/SimpleUserVo.java                    |  2 +-
 .../session/fragment/MessageFragment.java     |  4 +--
 68 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e2952bf35..cb2e83075 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -501,7 +501,7 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="大鹅开黑"
+            android:label="音游"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
diff --git a/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKCreateActivity.kt b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKCreateActivity.kt
index 6b8e1a61e..d2ea4fbc5 100644
--- a/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKCreateActivity.kt
+++ b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKCreateActivity.kt
@@ -127,7 +127,7 @@ class RoomPKCreateActivity : BaseViewBindingActivity<ActivityRoomPkCreateBinding
                 binding.llPkRoom.isVisible = true
                 ImageLoadUtils.loadImage(this, it.avatar, binding.ivAvatar)
                 binding.tvRoomTitle.text = it.title.subAndReplaceDot(7)
-                binding.tvRoomId.text = "大鹅号:${it.erbanNo}"
+                binding.tvRoomId.text = "音游号:${it.erbanNo}"
                 checkCommitEnable()
             }
         }
diff --git a/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKSearchAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKSearchAdapter.kt
index c3092aac9..35b8b61d7 100644
--- a/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKSearchAdapter.kt
+++ b/app/src/main/java/com/mango/moshen/avroom/anotherroompk/RoomPKSearchAdapter.kt
@@ -12,7 +12,7 @@ class RoomPKSearchAdapter :
 
     override fun convert(helper: BaseViewHolder, item: SimpleRoomInfo) {
       helper.setText(R.id.tv_room_title,item.title.subAndReplaceDot(7))
-          .setText(R.id.tv_room_id,"大鹅号:${item.erbanNo}")
+          .setText(R.id.tv_room_id,"音游号:${item.erbanNo}")
           .setChecked(R.id.check_box,item.checked)
         ImageLoadUtils.loadImage(mContext,item.avatar,helper.getView(R.id.iv_avatar))
         helper.addOnClickListener(R.id.iv_avatar,R.id.check_box)
diff --git a/app/src/main/java/com/mango/moshen/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/mango/moshen/avroom/fragment/BaseRoomFragment.kt
index 27f48128d..043fcbe97 100644
--- a/app/src/main/java/com/mango/moshen/avroom/fragment/BaseRoomFragment.kt
+++ b/app/src/main/java/com/mango/moshen/avroom/fragment/BaseRoomFragment.kt
@@ -612,7 +612,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onAntiSpamEvent(event: AntiSpamEvent?) {
-        SingleToastUtil.showToast("发送失败，大鹅开黑提醒您文明用语~")
+        SingleToastUtil.showToast("发送失败，音游提醒您文明用语~")
     }
 
     /**
diff --git a/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKCreateActivity.kt b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKCreateActivity.kt
index cea3256b1..7d4a26ea0 100644
--- a/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKCreateActivity.kt
+++ b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKCreateActivity.kt
@@ -127,7 +127,7 @@ class SingleRoomPKCreateActivity : BaseViewBindingActivity<ActivitySingleRoomPkC
                 binding.llPkRoom.isVisible = true
                 ImageLoadUtils.loadImage(this, it.avatar, binding.ivAvatar)
                 binding.tvRoomTitle.text = it.title.subAndReplaceDot(7)
-                binding.tvRoomId.text = "大鹅号:${it.erbanNo}"
+                binding.tvRoomId.text = "音游号:${it.erbanNo}"
                 checkCommitEnable()
             }
         }
diff --git a/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKSearchAdapter.kt b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKSearchAdapter.kt
index acb52dc01..291c8d30a 100644
--- a/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKSearchAdapter.kt
+++ b/app/src/main/java/com/mango/moshen/avroom/singleroompk/SingleRoomPKSearchAdapter.kt
@@ -15,7 +15,7 @@ class SingleRoomPKSearchAdapter :
 
     override fun convert(helper: BaseViewHolder, item: SimpleRoomInfo) {
         helper.setText(R.id.tv_room_title, item.nick.subAndReplaceDot(7))
-            .setText(R.id.tv_room_id, "大鹅号:${item.erbanNo}")
+            .setText(R.id.tv_room_id, "音游号:${item.erbanNo}")
         ImageLoadUtils.loadImage(mContext, item.avatar, helper.getView(R.id.iv_avatar))
         helper.addOnClickListener(R.id.iv_avatar, R.id.tv_select)
         val tvSelect = helper.getView<TextView>(R.id.tv_select)
diff --git a/app/src/main/java/com/mango/moshen/common/widget/dialog/DialogManager.java b/app/src/main/java/com/mango/moshen/common/widget/dialog/DialogManager.java
index 6bc208e34..b44645de2 100644
--- a/app/src/main/java/com/mango/moshen/common/widget/dialog/DialogManager.java
+++ b/app/src/main/java/com/mango/moshen/common/widget/dialog/DialogManager.java
@@ -556,7 +556,7 @@ public class DialogManager {
     }
 
     /**
-     * 1、大鹅开黑通用的dialog设置，以后尽量所有的dialog都引到这个方法，方便以后改版
+     * 1、音游通用的dialog设置，以后尽量所有的dialog都引到这个方法，方便以后改版
      * 2、如果UI要求弹框是完全自定义的，再重新写过
      *
      * @param title                  标题，空则隐藏 (ui说，有些弹框带标题，有些不带，两种情况共存)
diff --git a/app/src/main/java/com/mango/moshen/home/adapter/VisitorListAdapter.java b/app/src/main/java/com/mango/moshen/home/adapter/VisitorListAdapter.java
index 40b72bae1..e4e3c7ec4 100644
--- a/app/src/main/java/com/mango/moshen/home/adapter/VisitorListAdapter.java
+++ b/app/src/main/java/com/mango/moshen/home/adapter/VisitorListAdapter.java
@@ -33,7 +33,7 @@ public class VisitorListAdapter extends BaseQuickAdapter<VisitorInfo, BaseViewHo
                 helper.getView(R.id.iv_avatar)
         );
         helper.setText(R.id.tv_nickname, item.getNick())
-                .setText(R.id.tv_id, "大鹅号：" + item.getErbanNo())
+                .setText(R.id.tv_id, "音游号：" + item.getErbanNo())
                 .setText(R.id.tv_time, item.getVisitTimeDesc())
                 .setImageResource(R.id.iv_gender, item.getGender() == 1 ? R.drawable.ic_gender_male : R.drawable.ic_gender_female);
 
diff --git a/app/src/main/java/com/mango/moshen/home/fragment/HomeFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/HomeFragment.kt
index 5cdd1f2b5..8cc27e6f7 100644
--- a/app/src/main/java/com/mango/moshen/home/fragment/HomeFragment.kt
+++ b/app/src/main/java/com/mango/moshen/home/fragment/HomeFragment.kt
@@ -23,7 +23,7 @@ import com.mango.core.statistic.protocol.StatisticsProtocol
 import java.util.*
 
 /**
- * 大鹅开黑首页
+ * 音游首页
  */
 class HomeFragment : BaseFragment(), View.OnClickListener,
     MainMagicIndicatorAdapter.OnItemSelectListener {
diff --git a/app/src/main/java/com/mango/moshen/home/fragment/LiveFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/LiveFragment.kt
index f89c209bc..b62416f31 100644
--- a/app/src/main/java/com/mango/moshen/home/fragment/LiveFragment.kt
+++ b/app/src/main/java/com/mango/moshen/home/fragment/LiveFragment.kt
@@ -33,7 +33,7 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
 /**
- * 大鹅开黑首页
+ * 音游首页
  */
 class LiveFragment : BaseViewBindingFragment<FragmentLiveBinding>(),
     MainMagicIndicatorAdapter.OnItemSelectListener,
diff --git a/app/src/main/java/com/mango/moshen/home/fragment/PartyFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/PartyFragment.kt
index d012e7612..fac7e8b3f 100644
--- a/app/src/main/java/com/mango/moshen/home/fragment/PartyFragment.kt
+++ b/app/src/main/java/com/mango/moshen/home/fragment/PartyFragment.kt
@@ -23,7 +23,7 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
 /**
- * 大鹅开黑首页
+ * 音游首页
  */
 class PartyFragment : BaseFragment(), PartyMagicIndicatorAdapter.OnItemSelectListener {
     private lateinit var mBinding: FragmentPartyBinding
diff --git a/app/src/main/java/com/mango/moshen/home/fragment/RecommendFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/RecommendFragment.kt
index d6abdb33d..cd7adf42f 100644
--- a/app/src/main/java/com/mango/moshen/home/fragment/RecommendFragment.kt
+++ b/app/src/main/java/com/mango/moshen/home/fragment/RecommendFragment.kt
@@ -35,7 +35,7 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
 /**
- * 大鹅开黑首页
+ * 音游首页
  */
 class RecommendFragment : BaseFragment(),
     MainMagicIndicatorAdapter.OnItemSelectListener {
diff --git a/app/src/main/java/com/mango/moshen/radish/signin/SignInActivity.java b/app/src/main/java/com/mango/moshen/radish/signin/SignInActivity.java
index c70994528..e018dc348 100644
--- a/app/src/main/java/com/mango/moshen/radish/signin/SignInActivity.java
+++ b/app/src/main/java/com/mango/moshen/radish/signin/SignInActivity.java
@@ -205,7 +205,7 @@ public class SignInActivity extends BaseMvpActivity<ISignInView, SignInPresenter
             builder.append("分享好友",
                     new ForegroundColorSpan(getResources().getColor(R.color.appColor)))
                     .append(" 即可获得补签机会\n")
-                    .append("分享后返回大鹅开黑才有效哦~",
+                    .append("分享后返回音游才有效哦~",
                             new ForegroundColorSpan(getResources().getColor(R.color.color_999999)));
             okLabel = "分享好友";
         } else {
diff --git a/app/src/main/java/com/mango/moshen/team/viewmodel/TeamVM.java b/app/src/main/java/com/mango/moshen/team/viewmodel/TeamVM.java
index d4c07f585..8b8ccd068 100644
--- a/app/src/main/java/com/mango/moshen/team/viewmodel/TeamVM.java
+++ b/app/src/main/java/com/mango/moshen/team/viewmodel/TeamVM.java
@@ -81,10 +81,10 @@ public class TeamVM extends BaseVM {
     }
 
     /**
-     * 通过大鹅号搜索群聊成员
+     * 通过音游号搜索群聊成员
      *
      * @param chatId  群组 ID
-     * @param erbanNo 大鹅号
+     * @param erbanNo 音游号
      * @param page    页码
      * @return
      */
diff --git a/app/src/main/java/com/mango/moshen/ui/im/friend/FriendListAdapter.java b/app/src/main/java/com/mango/moshen/ui/im/friend/FriendListAdapter.java
index c737c4e38..c6b33b22b 100644
--- a/app/src/main/java/com/mango/moshen/ui/im/friend/FriendListAdapter.java
+++ b/app/src/main/java/com/mango/moshen/ui/im/friend/FriendListAdapter.java
@@ -160,7 +160,7 @@ public class FriendListAdapter extends BaseQuickAdapter<UserInfo, BaseViewHolder
                     }
                 });
                 TextView tvDesc = helper.getView(R.id.tv_user_desc);
-                tvDesc.setText("大鹅号：" + item.getErbanNo());
+                tvDesc.setText("音游号：" + item.getErbanNo());
                 tvDesc.setTextColor(ContextCompat.getColor(context, R.color.color_999999));
                 tvDesc.setTextSize(12f);
                 break;
diff --git a/app/src/main/java/com/mango/moshen/ui/user/view/UserInfoInfoFragment.kt b/app/src/main/java/com/mango/moshen/ui/user/view/UserInfoInfoFragment.kt
index 993a0c973..6abd79ff5 100644
--- a/app/src/main/java/com/mango/moshen/ui/user/view/UserInfoInfoFragment.kt
+++ b/app/src/main/java/com/mango/moshen/ui/user/view/UserInfoInfoFragment.kt
@@ -68,7 +68,7 @@ class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBin
             binding.tvHallId.text = "房间ID:" + hallInfo.hallId.toString()
             binding.tvHallName.text = hallInfo.hallName
             binding.tvHallMemberNum.text = "房间人数:" + hallInfo.memberCount
-            binding.tvHallErbanId.text = "大鹅号:" + hallInfo.ownerErbanNo
+            binding.tvHallErbanId.text = "音游号:" + hallInfo.ownerErbanNo
             GlideApp.with(this)
                 .load(hallInfo.ownerAvatar)
                 .placeholder(R.drawable.default_avatar)
diff --git a/app/src/main/java/com/mango/moshen/ui/widget/ShareDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/ShareDialog.java
index 2dc9ab57d..0ef53ac09 100644
--- a/app/src/main/java/com/mango/moshen/ui/widget/ShareDialog.java
+++ b/app/src/main/java/com/mango/moshen/ui/widget/ShareDialog.java
@@ -110,8 +110,8 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
                     if (type != TYPE_SHARE_H5) {
                         onShareDialogItemClick.onInAppSharingItemClick();
                     } else {
-//                        Toast.makeText(context, "该内容不能分享给大鹅开黑好友", Toast.LENGTH_SHORT).show();
-                        SingleToastUtil.showToastShort("该内容不能分享给大鹅开黑好友");
+//                        Toast.makeText(context, "该内容不能分享给音游好友", Toast.LENGTH_SHORT).show();
+                        SingleToastUtil.showToastShort("该内容不能分享给音游好友");
                     }
                 }
                 dismiss();
diff --git a/app/src/main/java/com/mango/moshen/ui/widget/UserInfoDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/UserInfoDialog.java
index 4390fe886..71e646691 100644
--- a/app/src/main/java/com/mango/moshen/ui/widget/UserInfoDialog.java
+++ b/app/src/main/java/com/mango/moshen/ui/widget/UserInfoDialog.java
@@ -532,7 +532,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
             // 这个方法能让图片不失真
             ImageLoadUtils.laodUsrInfoAvatar(context, userInfo.getAvatar(), avatar);
             nick.setText(RegexUtil.getPrintableString(userInfo.getNick()));
-            erbanId.setText("大鹅号:" + userInfo.getErbanNo());
+            erbanId.setText("音游号:" + userInfo.getErbanNo());
             ivGender.setImageResource(
                     userInfo.getGender() == 1 ? R.drawable.ic_gender_male : R.drawable.ic_gender_female);
             VipHelper.loadVipIcon(ivVipIcon, userInfo.getUserVipInfoVO());
diff --git a/app/src/main/java/com/mango/moshen/vip/VipMainActivity.kt b/app/src/main/java/com/mango/moshen/vip/VipMainActivity.kt
index a423cdd06..417fb2eb6 100644
--- a/app/src/main/java/com/mango/moshen/vip/VipMainActivity.kt
+++ b/app/src/main/java/com/mango/moshen/vip/VipMainActivity.kt
@@ -263,7 +263,7 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),
                 {
                     val chargeInfo = it.list.getOrNull(0)
                     chargeInfo?.let { chargeBean ->
-                        binding.tvOpenVip.text = "${chargeBean.getMoney()}立刻成为大鹅贵族"
+                        binding.tvOpenVip.text = "${chargeBean.getMoney()}立刻成为音游贵族"
                         binding.tvOpenVip.setOnClickListener {
                             StatisticManager.Instance()
                                 .onEvent(StatisticsProtocol.EVENT_VIP_OPEN_CLICK, "开通贵族点击事件")
diff --git a/app/src/main/res/layout/activity_charge.xml b/app/src/main/res/layout/activity_charge.xml
index d291f79f9..e85cca19f 100644
--- a/app/src/main/res/layout/activity_charge.xml
+++ b/app/src/main/res/layout/activity_charge.xml
@@ -278,7 +278,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="如有任何问题请咨询客服，大鹅号：88001"
+                android:text="如有任何问题请咨询客服，音游号：88001"
                 android:textColor="@color/app_248cfe"
                 android:layout_gravity="center_horizontal"
                 android:textSize="@dimen/sp_12"
diff --git a/app/src/main/res/layout/activity_room_pk_create.xml b/app/src/main/res/layout/activity_room_pk_create.xml
index 3bfebdee0..3adf78ed5 100644
--- a/app/src/main/res/layout/activity_room_pk_create.xml
+++ b/app/src/main/res/layout/activity_room_pk_create.xml
@@ -98,7 +98,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/white"
                     android:textSize="14sp"
-                    tools:text="大鹅号:1234" />
+                    tools:text="音游号:1234" />
             </LinearLayout>
 
             <View
diff --git a/app/src/main/res/layout/activity_room_pk_search.xml b/app/src/main/res/layout/activity_room_pk_search.xml
index 73989b272..e3dfcf6c4 100644
--- a/app/src/main/res/layout/activity_room_pk_search.xml
+++ b/app/src/main/res/layout/activity_room_pk_search.xml
@@ -31,7 +31,7 @@
             android:layout_marginTop="16dp"
             android:layout_marginEnd="12dp"
             android:background="@drawable/bg_room_pk_common_btn"
-            android:hint="请输入大鹅号"
+            android:hint="请输入音游号"
             android:inputType="number"
             android:maxLength="15"
             android:paddingStart="20dp"
diff --git a/app/src/main/res/layout/activity_single_room_pk_create.xml b/app/src/main/res/layout/activity_single_room_pk_create.xml
index 84fd7771e..889078b4c 100644
--- a/app/src/main/res/layout/activity_single_room_pk_create.xml
+++ b/app/src/main/res/layout/activity_single_room_pk_create.xml
@@ -98,7 +98,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/white"
                     android:textSize="14sp"
-                    tools:text="大鹅号:1234" />
+                    tools:text="音游号:1234" />
             </LinearLayout>
 
             <View
diff --git a/app/src/main/res/layout/activity_single_room_pk_search.xml b/app/src/main/res/layout/activity_single_room_pk_search.xml
index c712379e8..974dfc8b2 100644
--- a/app/src/main/res/layout/activity_single_room_pk_search.xml
+++ b/app/src/main/res/layout/activity_single_room_pk_search.xml
@@ -31,7 +31,7 @@
             android:layout_marginTop="16dp"
             android:layout_marginEnd="12dp"
             android:background="@drawable/bg_room_pk_common_btn"
-            android:hint="请输入大鹅号"
+            android:hint="请输入音游号"
             android:inputType="number"
             android:maxLength="15"
             android:paddingStart="20dp"
diff --git a/app/src/main/res/layout/activity_verify_phone.xml b/app/src/main/res/layout/activity_verify_phone.xml
index 3b4dc6252..0eed3b364 100644
--- a/app/src/main/res/layout/activity_verify_phone.xml
+++ b/app/src/main/res/layout/activity_verify_phone.xml
@@ -154,7 +154,7 @@
                 android:id="@+id/text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="如果您的手机号已丢失\n请咨询客服，大鹅号：88001"
+                android:text="如果您的手机号已丢失\n请咨询客服，音游号：88001"
                 android:textColor="@color/text_secondary_4f516a"
                 android:textSize="14sp" />
 
diff --git a/app/src/main/res/layout/dialog_new_user_hello.xml b/app/src/main/res/layout/dialog_new_user_hello.xml
index fa7eaa393..125cce27c 100644
--- a/app/src/main/res/layout/dialog_new_user_hello.xml
+++ b/app/src/main/res/layout/dialog_new_user_hello.xml
@@ -56,7 +56,7 @@
             android:gravity="center"
             android:textColor="@color/white"
             android:textSize="14sp"
-            tools:text="大鹅可可鸭大鹅可..." />
+            tools:text="音游可可鸭音游可..." />
 
         <TextView
             android:id="@+id/tv_id"
@@ -75,7 +75,7 @@
             android:layout_marginTop="15dp"
             android:background="@drawable/new_user_hello_bg_content"
             android:gravity="center"
-            android:text="欢迎来到大鹅开黑，Ta已经等待你很\n久啦，快来一起玩吧~"
+            android:text="欢迎来到音游，Ta已经等待你很\n久啦，快来一起玩吧~"
             android:textColor="#ffa00bbb"
             android:textSize="12sp" />
 
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index bad06e600..dcc245271 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -144,7 +144,7 @@
                             android:textColor="@color/text_secondary_4f516a"
                             android:textSize="@dimen/dp_13"
                             tools:ignore="SpUsage"
-                            tools:text="大鹅号:123456" />
+                            tools:text="音游号:123456" />
 
                     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_userinfo_info.xml b/app/src/main/res/layout/fragment_userinfo_info.xml
index b1b381c56..ef4a58d5c 100644
--- a/app/src/main/res/layout/fragment_userinfo_info.xml
+++ b/app/src/main/res/layout/fragment_userinfo_info.xml
@@ -218,7 +218,7 @@
                                 android:lines="1"
                                 android:textColor="@color/text_normal_c6c6e9"
                                 android:textSize="@dimen/dp_11"
-                                tools:text="大鹅号：1234567" />
+                                tools:text="音游号：1234567" />
 
                             <TextView
                                 android:id="@+id/tv_hall_member_num"
diff --git a/app/src/main/res/layout/fragment_userinfo_userinfo.xml b/app/src/main/res/layout/fragment_userinfo_userinfo.xml
index 8ff2d504f..c19dc34e9 100644
--- a/app/src/main/res/layout/fragment_userinfo_userinfo.xml
+++ b/app/src/main/res/layout/fragment_userinfo_userinfo.xml
@@ -235,7 +235,7 @@
                             android:lines="1"
                             android:textColor="@color/color_999999"
                             android:textSize="@dimen/dp_11"
-                            tools:text="大鹅号：1234567" />
+                            tools:text="音游号：1234567" />
 
                         <TextView
                             android:id="@+id/tv_hall_member_num"
diff --git a/app/src/main/res/layout/item_home_concerns.xml b/app/src/main/res/layout/item_home_concerns.xml
index 7bb47b208..db5cd41bb 100644
--- a/app/src/main/res/layout/item_home_concerns.xml
+++ b/app/src/main/res/layout/item_home_concerns.xml
@@ -65,6 +65,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/fl_room_history_avatar_container"
-        tools:text="大鹅开黑大鹅开黑" />
+        tools:text="音游音游" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_home_visitor_list.xml b/app/src/main/res/layout/item_home_visitor_list.xml
index 1f5ea1faf..8248aacb4 100644
--- a/app/src/main/res/layout/item_home_visitor_list.xml
+++ b/app/src/main/res/layout/item_home_visitor_list.xml
@@ -49,7 +49,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="@id/tv_nickname"
         app:layout_constraintTop_toBottomOf="@id/tv_nickname"
-        tools:text="大鹅号：1234567" />
+        tools:text="音游号：1234567" />
 
     <ImageView
         android:id="@+id/iv_gender"
diff --git a/app/src/main/res/layout/item_room_pk_search.xml b/app/src/main/res/layout/item_room_pk_search.xml
index c25113468..8b31f5212 100644
--- a/app/src/main/res/layout/item_room_pk_search.xml
+++ b/app/src/main/res/layout/item_room_pk_search.xml
@@ -35,7 +35,7 @@
             android:layout_height="wrap_content"
             android:textColor="@color/white"
             android:textSize="14sp"
-            tools:text="大鹅号:1234" />
+            tools:text="音游号:1234" />
     </LinearLayout>
 
     <View
diff --git a/app/src/main/res/layout/item_single_room_pk_search.xml b/app/src/main/res/layout/item_single_room_pk_search.xml
index 642c0e495..768a65bdd 100644
--- a/app/src/main/res/layout/item_single_room_pk_search.xml
+++ b/app/src/main/res/layout/item_single_room_pk_search.xml
@@ -35,7 +35,7 @@
             android:layout_height="wrap_content"
             android:textColor="@color/white"
             android:textSize="14sp"
-            tools:text="大鹅号:1234" />
+            tools:text="音游号:1234" />
     </LinearLayout>
 
     <View
diff --git a/app/src/main/res/layout/newbie_list_item.xml b/app/src/main/res/layout/newbie_list_item.xml
index 541a204ff..daae6e7b0 100644
--- a/app/src/main/res/layout/newbie_list_item.xml
+++ b/app/src/main/res/layout/newbie_list_item.xml
@@ -78,7 +78,7 @@
                 android:textColor="@color/color_666666"
                 android:textSize="14sp"
                 android:fontFamily="sans-serif"
-                tools:text="大鹅号:666666" />
+                tools:text="音游号:666666" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/red_packet_dialog.xml b/app/src/main/res/layout/red_packet_dialog.xml
index c9198f5cd..ff677e0cb 100644
--- a/app/src/main/res/layout/red_packet_dialog.xml
+++ b/app/src/main/res/layout/red_packet_dialog.xml
@@ -37,7 +37,7 @@
                 android:layout_marginBottom="27dp"
                 android:textSize="@dimen/dialog_title_text_fnt"
                 android:textColor="#F9E3AE"
-                tools:text="大鹅开黑送你一个现金红包" />
+                tools:text="音游送你一个现金红包" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 514a89768..389c51c9e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -242,7 +242,7 @@
 
     <!-- 提示框的背景色 -->
 
-    <!--大鹅开黑-->
+    <!--音游-->
 
 
     <!-- Background color for light LeBubbleView. -->
@@ -493,7 +493,7 @@
     <color name="design_color">@color/color_FE4C62</color>
     <color name="color_9af5ef">#9af5ef</color>
 
-    <!-- 大鹅开黑主题色 -->
+    <!-- 音游主题色 -->
     <color name="color_7154EE">#FFA936</color>
 
     <color name="color_39EBDF">#39EBDF</color>
@@ -553,7 +553,7 @@
 
     <color name="color_2D93FF">#2D93FF</color>
 
-    <!-- 大鹅开黑UI规范 start-->
+    <!-- 音游UI规范 start-->
 
     <!-- 主题色 -->
     <color name="app_248cfe">#FFFFBC52</color>
@@ -591,7 +591,7 @@
     <color name="main_tab_normal">#66333333</color>
 
 
-    <!-- 大鹅开黑UI规范 end-->
+    <!-- 音游UI规范 end-->
 
     <!--60透明度-->
     <color name="color_60_FFFFFF">#99FFFFFF</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8c24dd2fa..e0e12afa9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE resources [<!ENTITY app_name "大鹅开黑" >]>
+<!DOCTYPE resources [<!ENTITY app_name "音游" >]>
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name">&app_name;</string>
     <string name="no_list_data">暂无消息</string>
@@ -106,7 +106,7 @@
     <string name="text_chat_limit">仅%s或%s的用于可发起聊天</string>
 
     <string name="room_offline">房主已下线</string>
-    <string name="root_offline_notice">更多好玩的房间在大鹅开黑等您哟！去看看！</string>
+    <string name="root_offline_notice">更多好玩的房间在音游等您哟！去看看！</string>
     <string name="home">主页</string>
     <string name="back">返回</string>
     <string name="fan">粉丝</string>
@@ -118,7 +118,7 @@
     <string name="friend">好友</string>
     <string name="attention">关注</string>
     <string name="no_frenids_text">你还没有添加任何好友哦! \n快去添加好友吧!</string>
-    <string name="no_fan_text">你还没有任何大鹅开黑粉丝哦!</string>
+    <string name="no_fan_text">你还没有任何音游粉丝哦!</string>
     <string name="bind_your_alipay">请先绑定您的支付宝帐号</string>
     <string name="my_jewel">我的钻石余额</string>
     <string name="jewel_withdraw">钻石可以用于提现，兑换比率1元=10钻</string>
@@ -151,11 +151,11 @@
 
 
     <!--我的页面-->
-    <string name="me_user_id">大鹅号:%d</string>
+    <string name="me_user_id">音游号:%d</string>
     <string name="my_attention">我的关注</string>
     <string name="my_fan">我的粉丝</string>
 
-    <string name="no_attention_text">你还没有关注任何大鹅开黑好友哦! \n快去添加关注吧!</string>
+    <string name="no_attention_text">你还没有关注任何音游好友哦! \n快去添加关注吧!</string>
     <string name="search_hint">搜索昵称或ID</string>
     <string name="online">在线中…</string>
     <string name="me_customer_server">客服</string>
@@ -249,7 +249,7 @@
 
     <string name="pk_opponent_result"> 查看对方战绩></string>
     <string name="pk_mine_result"> 查看我的战绩></string>
-    <string name="pk_tip_do_not_give_up">别气馁，大鹅开黑永远支持你哦！</string>
+    <string name="pk_tip_do_not_give_up">别气馁，音游永远支持你哦！</string>
 
 
     <!--密聊-->
@@ -331,7 +331,7 @@
     <string name="car_detail_price_days2">%1$d&#160;&#160;&#160;&#160;有效期%2$d天</string>
     <string name="car_user_info_off_shelf">该车辆已下架，无法购买</string>
     <string name="car_dialog_content_before">开着你的车，驾着你的马</string>
-    <string name="car_dialog_content_after">来大鹅开黑尽情驰骋吧!</string>
+    <string name="car_dialog_content_after">来音游尽情驰骋吧!</string>
     <string name="car_shop_name">座驾商城</string>
     <string name="decoration_status_wrapper">%1$s</string>
     <string name="decoration_remainder">剩余</string>
@@ -351,7 +351,7 @@
 
         5 打爆怪兽的奖励将会随着怪兽的实力（血值）增加而增加，例如：打爆一只血值1000的怪兽将获得总价不少于1000钻石的钻石或者座驾奖励\n
 
-        6 若有疑问，请咨询大鹅开黑客服微信：1213490\n
+        6 若有疑问，请咨询音游客服微信：1213490\n
     </string>
     <string name="text_monster_hunting_introduction">·玩法介绍·</string>
     <string name="text_ok">确定</string>
@@ -360,7 +360,7 @@
     <string name="text_check_damage">查看伤害排行榜</string>
     <string name="title_monster_hunting_reward">获得奖励(%s)</string>
     <string name="currency_unit">钻石</string>
-    <string name="text_user_id">大鹅号:%s</string>
+    <string name="text_user_id">音游号:%s</string>
     <string name="format_monster_hunting_impact">伤害 %s 点/次</string>
     <string name="format_monster_hunting_magic_value">(%s钻石)</string>
     <string name="exchange_gold_tips">钻石可以兑换钻石，兑换比率：1钻石=%s钻石；\n</string>
@@ -415,7 +415,7 @@
     <string name="family_exit_family">退出家族</string>
     <string name="family_exit_family_tip">退出家族后您的家族币将无法使用\n重新加入即可还原,你真的要退出吗?</string>
     <string name="family_invite_friends">邀请好友</string>
-    <string name="family_invite_friends_slogan">【大鹅开黑】 用声音表达心情，用家族传承微笑。</string>
+    <string name="family_invite_friends_slogan">【音游】 用声音表达心情，用家族传承微笑。</string>
     <string name="family_join">加入</string>
     <string name="family_search_member_hint">搜索成员ID/昵称 </string>
     <string name="family_manage_title">家族管理</string>
@@ -435,7 +435,7 @@
     <string name="family_join_valid_hint">加入家族身份验证</string>
     <string name="family_disband">解散家族</string>
     <string name="common_tip">提示</string>
-    <string name="family_disband_tip1">需要联系客服才能解散家族哦~\n大鹅开黑家族客服:%1$s</string>
+    <string name="family_disband_tip1">需要联系客服才能解散家族哦~\n音游家族客服:%1$s</string>
     <string name="family_contact_service">联系客服</string>
     <string name="family_join_tip">确认加入"%1$s"吗?</string>
     <string name="family_join_hint">我希望加入贵家族</string>
@@ -527,7 +527,7 @@
     <string name="tab_title_friends">好友</string>
     <string name="tab_title_attentions">关注</string>
     <string name="tab_title_fans">粉丝</string>
-    <string name="title_share_dialog">每天第一次分享免费领红包（不包含分享至大鹅开黑好友）</string>
+    <string name="title_share_dialog">每天第一次分享免费领红包（不包含分享至音游好友）</string>
     <string name="text_share_erban_friends">好友</string>
     <string name="text_share_wechat_friends">微信好友</string>
     <string name="text_share_qq_friends">QQ好友</string>
@@ -554,7 +554,7 @@
     <string name="tips_bind_alipay_sms_code">验证码将发送至您绑定的手机\"{0}\",请注意查收</string>
     <string name="home_more">更多</string>
     <string name="text_qq_login_erban_member">我是兔兔老用户</string>
-    <string name="text_qq_login_tutu_member">我是大鹅开黑新用户</string>
+    <string name="text_qq_login_tutu_member">我是音游新用户</string>
     <string name="text_login">登录</string>
     <string name="input_text_qq_id">请输入您耳伴绑定 QQ 的 ID</string>
     <string name="input_text_hint_password">请输入您的密码</string>
@@ -565,7 +565,7 @@
     <string name="label_recall_title">亲爱的小孩:</string>
     <string name="label_recall_content">好久不见，翻起曾经一起度过的时光，期待你再次出现在身旁，谢谢你回来！</string>
     <string name="hint_recall_input">请输入邀请码(选填)</string>
-    <string name="tips_recall">输入邀请码，邀请你加入的好友和你都可以获得大鹅开黑回归计划的超级大礼哦！</string>
+    <string name="tips_recall">输入邀请码，邀请你加入的好友和你都可以获得音游回归计划的超级大礼哦！</string>
     <string name="label_recall_accept">收下回归礼</string>
 
     <string name="label_user_info_avatar">头像:</string>
@@ -819,7 +819,7 @@
 
     <string name="label_charge_gold">我的账户</string>
 
-    <string name="old_app_name">大鹅开黑</string>
+    <string name="old_app_name">音游</string>
     <string name="tip_login_how_login">如何登录？</string>
     <string name="tip_login_old_account">%s也可登录%s哦 %s</string>
     <string name="me_mentoring_relationship_title">收个徒弟赢钻石</string>
@@ -857,12 +857,12 @@
 
     <string name="gold_give">钻石转赠</string>
     <string name="donee">受赠人</string>
-    <string name="done_hint_input_phone_or_id">请输入手机号/大鹅号</string>
+    <string name="done_hint_input_phone_or_id">请输入手机号/音游号</string>
     <string name="give_value">转赠金额</string>
     <string name="custom_input">自定义输入</string>
     <string name="give_immediately">立即转赠</string>
     <string name="my_give_record">我的转赠记录</string>
-    <string name="send_gold_confirm_info">%1$s&#160;(大鹅号:&#160;%2$s)</string>
+    <string name="send_gold_confirm_info">%1$s&#160;(音游号:&#160;%2$s)</string>
 
     <string name="back_login_page">返回登录页</string>
     <string name="privacy_setting">隐私设置</string>
diff --git a/app/src/module_bank_card/res/values/strings.xml b/app/src/module_bank_card/res/values/strings.xml
index 8e0cd6355..33dc576cb 100644
--- a/app/src/module_bank_card/res/values/strings.xml
+++ b/app/src/module_bank_card/res/values/strings.xml
@@ -11,7 +11,7 @@
     <string name="toast_unbind_bank_card_success">解除绑定银行卡成功</string>
     <string name="title_add_bank_card_agreement">用户服务协议及隐私政策</string>
     <string name="text_add_bank_card_agreement">
-        尊敬的大鹅开黑用户：\n\u3000\u3000为了更好地保障你的合法权益，
+        尊敬的音游用户：\n\u3000\u3000为了更好地保障你的合法权益，
         让你正常使用%s服务，%s公司依照国家法律法规，对支付账户进行实名制管理、
         履行反洗钱职责并采取风险防控措施。你需要向%s公司以及合作公司（汇聚支付）提交身份信息、
         联系方式、交易信息。\n\u3000\u3000%s公司将严格依据国家法律法规收集、存储、使用你的个人信息，确保信息安全。
diff --git a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/HallSearchActivity.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/HallSearchActivity.java
index 2706f31f9..f807df6e9 100644
--- a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/HallSearchActivity.java
+++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/HallSearchActivity.java
@@ -24,7 +24,7 @@ public class HallSearchActivity extends SearchHallActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        searchEdit.setHint("搜索昵称/大鹅开黑ID");
+        searchEdit.setHint("搜索昵称/音游ID");
     }
 
 }
diff --git a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/ModuleClanActivity.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/ModuleClanActivity.java
index 7a2649695..a0debc569 100644
--- a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/ModuleClanActivity.java
+++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/ModuleClanActivity.java
@@ -131,7 +131,7 @@ public class ModuleClanActivity extends BaseActivity implements View.OnClickList
                     if (clanInfo != null && clanInfo.getId() != 0) {
                         binding.clClan.setVisibility(View.VISIBLE);
                         binding.clClan.setOnClickListener(v -> UserInfoActivity.Companion.start(context, clanInfo.getElderUid()));
-                        binding.tvClanOwnerId.setText("大鹅号:" + clanInfo.getElderErbanNo());
+                        binding.tvClanOwnerId.setText("音游号:" + clanInfo.getElderErbanNo());
                         binding.tvClanOwnerName.setText(clanInfo.getElderName());
                         binding.tvTitle.setText(clanInfo.getName());
                         ImageLoadUtils.loadRectImage(context, clanInfo.getAvatar(), binding.ivClanAvatar, R.drawable.default_avatar, ScreenUtil.dip2px(8));
diff --git a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/SuperAdminAddActivity.kt b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/SuperAdminAddActivity.kt
index ccf635ede..e9daf97c2 100644
--- a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/SuperAdminAddActivity.kt
+++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/activity/SuperAdminAddActivity.kt
@@ -44,7 +44,7 @@ class SuperAdminAddActivity : BaseViewBindingActivity<ActivitySuperAdminAddBindi
             if (view.id == R.id.tv_set) {
                 adminAdapter.getItem(position)?.let {
                     dialogManager.showOkCancelDialog(
-                        "确定要添加用户 ${it.nick} (大鹅开黑ID:${it.erbanNo})为公会超级管理员吗?",
+                        "确定要添加用户 ${it.nick} (音游ID:${it.erbanNo})为公会超级管理员吗?",
                         true
                     ) {
                         SuperAdminRoomSetActivity.start(this, clanId, it.uid)
@@ -57,7 +57,7 @@ class SuperAdminAddActivity : BaseViewBindingActivity<ActivitySuperAdminAddBindi
         binding.tvSearch.setOnClickListener {
             val id = binding.searchEdit.text?.toString()?.toLongOrNull()
             if (id == null) {
-                "请输入大鹅号!".toast()
+                "请输入音游号!".toast()
             } else {
                 searchId = id
                 loadData()
diff --git a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/ManageSuperAdminAdapter.kt b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/ManageSuperAdminAdapter.kt
index 25310ad0c..c1e0ba403 100644
--- a/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/ManageSuperAdminAdapter.kt
+++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/hall/adapter/ManageSuperAdminAdapter.kt
@@ -18,7 +18,7 @@ class ManageSuperAdminAdapter :
         ImageLoadUtils.loadAvatar(item.avatar, helper.getView(R.id.iv_avatar))
 
         helper.setText(R.id.tv_nickname,item.nick)
-            .setText(R.id.tv_id,"大鹅号:${item.erbanNo}")
+            .setText(R.id.tv_id,"音游号:${item.erbanNo}")
             .addOnClickListener(R.id.iv_more)
 
         val rvRoom = helper.getView<RecyclerView>(R.id.rv_room)
diff --git a/app/src/module_labour_union/java/com/mango/moshen/module_hall/secretcode/PwdCodeMgr.java b/app/src/module_labour_union/java/com/mango/moshen/module_hall/secretcode/PwdCodeMgr.java
index 6d00f5a09..e71540a2c 100644
--- a/app/src/module_labour_union/java/com/mango/moshen/module_hall/secretcode/PwdCodeMgr.java
+++ b/app/src/module_labour_union/java/com/mango/moshen/module_hall/secretcode/PwdCodeMgr.java
@@ -267,7 +267,7 @@ public class PwdCodeMgr {
             @Override
             public void onClickTutu() {
                 StatisticManager.Instance().onEvent(
-                        StatisticsProtocol.EVENT_HALL_ADDMEMBERS_USERID_CLICK, "添加成员-大鹅开黑ID");
+                        StatisticsProtocol.EVENT_HALL_ADDMEMBERS_USERID_CLICK, "添加成员-音游ID");
                 dialog.dismiss();
                 HallSearchActivity.start(context, HallModel.get().getHallId(), AbstractSelectFriendAction.TYPE_MODULE_HALL);
             }
diff --git a/app/src/module_labour_union/res/layout/activity_add_member.xml b/app/src/module_labour_union/res/layout/activity_add_member.xml
index 0e0f28102..663a334c0 100644
--- a/app/src/module_labour_union/res/layout/activity_add_member.xml
+++ b/app/src/module_labour_union/res/layout/activity_add_member.xml
@@ -36,7 +36,7 @@
 
             <EditText
                 android:id="@+id/et_search"
-                android:hint="搜索用户昵称/大鹅号"
+                android:hint="搜索用户昵称/音游号"
                 android:textSize="@dimen/sp_13"
                 android:textColor="@color/text_normal_c6c6e9"
                 android:textColorHint="@color/text_hint_555574"
diff --git a/app/src/module_labour_union/res/layout/activity_remove_member.xml b/app/src/module_labour_union/res/layout/activity_remove_member.xml
index e24d20216..5acb23a3f 100644
--- a/app/src/module_labour_union/res/layout/activity_remove_member.xml
+++ b/app/src/module_labour_union/res/layout/activity_remove_member.xml
@@ -36,7 +36,7 @@
 
             <EditText
                 android:id="@+id/et_search"
-                android:hint="搜索用户昵称/大鹅号"
+                android:hint="搜索用户昵称/音游号"
                 android:textSize="@dimen/sp_13"
                 android:textColor="@color/text_normal_c6c6e9"
                 android:textColorHint="@color/text_hint_555574"
diff --git a/app/src/module_labour_union/res/layout/activity_super_admin_add.xml b/app/src/module_labour_union/res/layout/activity_super_admin_add.xml
index bb82126ea..ef6b0c0be 100644
--- a/app/src/module_labour_union/res/layout/activity_super_admin_add.xml
+++ b/app/src/module_labour_union/res/layout/activity_super_admin_add.xml
@@ -45,7 +45,7 @@
                 android:layout_marginStart="15dp"
                 android:layout_weight="1"
                 android:background="@null"
-                android:hint="请输入公会成员大鹅号"
+                android:hint="请输入公会成员音游号"
                 android:inputType="number"
                 android:maxLength="20"
                 android:maxLines="1"
diff --git a/app/src/module_labour_union/res/layout/activity_vip_main.xml b/app/src/module_labour_union/res/layout/activity_vip_main.xml
index c2dffbc93..bb73a1b85 100644
--- a/app/src/module_labour_union/res/layout/activity_vip_main.xml
+++ b/app/src/module_labour_union/res/layout/activity_vip_main.xml
@@ -162,7 +162,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        tools:text="¥6立刻成为大鹅贵族" />
+        tools:text="¥6立刻成为音游贵族" />
 
     <com.mango.moshen.base.TitleBar
         android:id="@+id/title_bar"
diff --git a/app/src/module_labour_union/res/layout/dialog_share_secret_code.xml b/app/src/module_labour_union/res/layout/dialog_share_secret_code.xml
index e961d035a..ea1272b1c 100644
--- a/app/src/module_labour_union/res/layout/dialog_share_secret_code.xml
+++ b/app/src/module_labour_union/res/layout/dialog_share_secret_code.xml
@@ -44,7 +44,7 @@
             android:drawableTop="@drawable/lu_ic_share_tutu"
             android:drawablePadding="9dp"
             android:gravity="center"
-            android:text="大鹅开黑ID添加"
+            android:text="音游ID添加"
             android:textColor="@color/color_333333"
             android:textSize="@dimen/sp_12" />
         <TextView
diff --git a/app/src/module_labour_union/res/layout/include_user_module_hall.xml b/app/src/module_labour_union/res/layout/include_user_module_hall.xml
index 5a893d73f..e8e41d3aa 100644
--- a/app/src/module_labour_union/res/layout/include_user_module_hall.xml
+++ b/app/src/module_labour_union/res/layout/include_user_module_hall.xml
@@ -29,7 +29,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/color_333333"
-            tools:text="大鹅开黑女神厅"
+            tools:text="音游女神厅"
             android:layout_centerVertical="true" />
 
         <com.coorchice.library.SuperTextView
diff --git a/app/src/module_labour_union/res/layout/item_group_list.xml b/app/src/module_labour_union/res/layout/item_group_list.xml
index 0a88feb43..a7cb6f9ed 100644
--- a/app/src/module_labour_union/res/layout/item_group_list.xml
+++ b/app/src/module_labour_union/res/layout/item_group_list.xml
@@ -25,7 +25,7 @@
         app:layout_constraintStart_toEndOf="@id/riv_group_image"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:text="大鹅开黑女神"
+        android:text="音游女神"
         android:textSize="15dp" />
 
     <TextView
diff --git a/app/src/module_labour_union/res/layout/item_manage_super_admin.xml b/app/src/module_labour_union/res/layout/item_manage_super_admin.xml
index f1cd90315..619cf9f42 100644
--- a/app/src/module_labour_union/res/layout/item_manage_super_admin.xml
+++ b/app/src/module_labour_union/res/layout/item_manage_super_admin.xml
@@ -43,7 +43,7 @@
         app:layout_constraintBottom_toTopOf="@id/tv_room_num"
         app:layout_constraintStart_toStartOf="@id/tv_nickname"
         app:layout_constraintTop_toBottomOf="@id/tv_nickname"
-        tools:text="大鹅号:886887" />
+        tools:text="音游号:886887" />
 
     <TextView
         android:id="@+id/tv_room_num"
diff --git a/app/src/module_mentoring_relationship/res/layout/dialog_grab_apprentices_notify.xml b/app/src/module_mentoring_relationship/res/layout/dialog_grab_apprentices_notify.xml
index ac489930c..8c9071fef 100644
--- a/app/src/module_mentoring_relationship/res/layout/dialog_grab_apprentices_notify.xml
+++ b/app/src/module_mentoring_relationship/res/layout/dialog_grab_apprentices_notify.xml
@@ -20,7 +20,7 @@
 
     <TextView
         android:id="@+id/tv_tips"
-        android:text="大鹅开黑：您收到一条收徒消息哦！"
+        android:text="音游：您收到一条收徒消息哦！"
         android:textSize="@dimen/dp_13"
         android:textColor="@color/color_333333"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_four.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_four.xml
index 917b738b6..b80c9df07 100644
--- a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_four.xml
+++ b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_four.xml
@@ -99,7 +99,7 @@
         android:layout_marginStart="@dimen/dp_10"
         android:layout_marginTop="@dimen/dp_20"
         android:layout_marginEnd="@dimen/dp_10"
-        android:text="小哥哥你就从了我吧,做我徒弟,以后我们一起浪迹大鹅开黑,你是风儿我是沙！"
+        android:text="小哥哥你就从了我吧,做我徒弟,以后我们一起浪迹音游,你是风儿我是沙！"
         android:textColor="@color/color_1A1A1A"
         android:textSize="@dimen/dp_14"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_one.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_one.xml
index f58b9877c..b8c5a684f 100644
--- a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_one.xml
+++ b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_one.xml
@@ -101,7 +101,7 @@
         app:layout_constraintStart_toStartOf="@+id/ll_mission_steps"
         app:layout_constraintTop_toBottomOf="@+id/ll_mission_steps"
         tools:ignore="SpUsage"
-        tools:text="大鹅开黑所有问题都可以问Ta哦~" />
+        tools:text="音游所有问题都可以问Ta哦~" />
 
     <TextView
         android:id="@+id/btn_action"
diff --git a/app/src/module_public_chat_hall/java/com/mango/moshen/public_chat_hall/fragment/PublicChatHallMessageFragment.java b/app/src/module_public_chat_hall/java/com/mango/moshen/public_chat_hall/fragment/PublicChatHallMessageFragment.java
index f37cba96c..52176a212 100644
--- a/app/src/module_public_chat_hall/java/com/mango/moshen/public_chat_hall/fragment/PublicChatHallMessageFragment.java
+++ b/app/src/module_public_chat_hall/java/com/mango/moshen/public_chat_hall/fragment/PublicChatHallMessageFragment.java
@@ -241,8 +241,8 @@ public class PublicChatHallMessageFragment extends TFragment implements ModulePr
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onAntiSpamEvent(AntiSpamEvent event) {
-//        Toast.makeText(getContext(), "发送失败，大鹅开黑提醒您文明用语~", Toast.LENGTH_SHORT).show();
-        SingleToastUtil.showToastShort("发送失败，大鹅开黑提醒您文明用语~");
+//        Toast.makeText(getContext(), "发送失败，音游提醒您文明用语~", Toast.LENGTH_SHORT).show();
+        SingleToastUtil.showToastShort("发送失败，音游提醒您文明用语~");
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -489,7 +489,7 @@ public class PublicChatHallMessageFragment extends TFragment implements ModulePr
                             if (throwable != null) {
                                 String throwableMessage = throwable.getMessage();
                                 if (throwable.getMessage().contains("13004")) {
-                                    SingleToastUtil.showToast("你已被禁言，剩余" + PublicChatHallDataManager.get().mOwnerMember.getTempMuteDuration() / 60 + "分钟。大鹅开黑提醒您文明用语");
+                                    SingleToastUtil.showToast("你已被禁言，剩余" + PublicChatHallDataManager.get().mOwnerMember.getTempMuteDuration() / 60 + "分钟。音游提醒您文明用语");
                                 } else {
 //                                    Toast.makeText(NimUIKit.getContext(), throwableMessage, Toast.LENGTH_SHORT).show();
                                     SingleToastUtil.showToastShort(throwableMessage);
diff --git a/app/src/module_quick_pass/res/layout/act_quick_pass.xml b/app/src/module_quick_pass/res/layout/act_quick_pass.xml
index b3c05a2cf..91c0e6a61 100644
--- a/app/src/module_quick_pass/res/layout/act_quick_pass.xml
+++ b/app/src/module_quick_pass/res/layout/act_quick_pass.xml
@@ -36,7 +36,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="10dp"
-        android:text="来大鹅，快乐不止游戏"
+        android:text="来音游，快乐不止游戏"
         android:textColor="@color/text_title_white"
         android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="@id/iv_logo"
diff --git a/app/src/module_room_chat/java/com/mango/moshen/room_chat/adapter/RoomNewbieListAdapter.java b/app/src/module_room_chat/java/com/mango/moshen/room_chat/adapter/RoomNewbieListAdapter.java
index 58ed17276..d5c49746f 100644
--- a/app/src/module_room_chat/java/com/mango/moshen/room_chat/adapter/RoomNewbieListAdapter.java
+++ b/app/src/module_room_chat/java/com/mango/moshen/room_chat/adapter/RoomNewbieListAdapter.java
@@ -44,7 +44,7 @@ public class RoomNewbieListAdapter extends BaseQuickAdapter<RoomNewbieInfo, Base
             attentionBg.setColor(mContext.getResources().getColor(R.color.appColor));
         }
         baseViewHolder.setText(R.id.tv_userName, newbieInfo.getNick())
-                .setText(R.id.tv_erban_id, "大鹅号:" + newbieInfo.getErbanNo())
+                .setText(R.id.tv_erban_id, "音游号:" + newbieInfo.getErbanNo())
                 .setOnClickListener(R.id.attention_img, v -> {
                     if (onItemClickListener != null) {
                         onItemClickListener.onAttentionBtnClick(newbieInfo);
diff --git a/core/src/diff_src_erban/java/com/mango/core/UriProvider.java b/core/src/diff_src_erban/java/com/mango/core/UriProvider.java
index d5c3843b1..4f87f0387 100644
--- a/core/src/diff_src_erban/java/com/mango/core/UriProvider.java
+++ b/core/src/diff_src_erban/java/com/mango/core/UriProvider.java
@@ -190,7 +190,7 @@ public class UriProvider {
     }
 
     /**
-     * 大鹅开黑专属，实名认证页面
+     * 音游专属，实名认证页面
      *
      * @return
      */
diff --git a/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java
index 8fe7ab4ab..8f6a2bbec 100644
--- a/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java
+++ b/core/src/diff_src_erban/java/com/mango/xchat_android_constants/XChatConstants.java
@@ -133,7 +133,7 @@ public class XChatConstants {
     /**
      * 分享房间标题
      */
-    public static final String SHARE_ROOM_TITLE = "来大鹅，开黑交友玩游戏";
+    public static final String SHARE_ROOM_TITLE = "来音游，开黑交友玩游戏";
 
     /**
      * 分享房间 URL
@@ -148,7 +148,7 @@ public class XChatConstants {
     /**
      * 分享家族标题
      */
-    public static final String SHARE_FAMILY_TITLE = "hi,我想邀请您加入我的大鹅开黑家族:";
+    public static final String SHARE_FAMILY_TITLE = "hi,我想邀请您加入我的音游家族:";
 
     /**
      * 分享家族 URL
@@ -163,7 +163,7 @@ public class XChatConstants {
     /**
      * 分享群组标题
      */
-    public static final String SHARE_TEAM_TITLE = "hi,我想邀请您加入我的大鹅开黑群聊:";
+    public static final String SHARE_TEAM_TITLE = "hi,我想邀请您加入我的音游群聊:";
 
     /**
      * 分享群组 URL
diff --git a/core/src/main/java/com/mango/core/auth/AuthModel.java b/core/src/main/java/com/mango/core/auth/AuthModel.java
index 8fea75c3c..30930b440 100644
--- a/core/src/main/java/com/mango/core/auth/AuthModel.java
+++ b/core/src/main/java/com/mango/core/auth/AuthModel.java
@@ -1263,7 +1263,7 @@ public class AuthModel extends BaseModel implements IAuthModel {
                                        @Field("shuMeiDeviceId") String shuMeiDeviceId);
 
         /**
-         * 大鹅开黑上耳伴老用户用 QQ 登录时，判断 QQ 的 open id 是否存在
+         * 音游上耳伴老用户用 QQ 登录时，判断 QQ 的 open id 是否存在
          *
          * @return
          */
diff --git a/core/src/main/java/com/mango/core/room/model/RoomSettingModel.java b/core/src/main/java/com/mango/core/room/model/RoomSettingModel.java
index 98e3849af..6b4e2fccb 100644
--- a/core/src/main/java/com/mango/core/room/model/RoomSettingModel.java
+++ b/core/src/main/java/com/mango/core/room/model/RoomSettingModel.java
@@ -310,7 +310,7 @@ public class RoomSettingModel extends BaseMvpModel {
 
         /**
          * 更新房间设置信息
-         * 大鹅开黑项目-打开关闭房间纯净模式-房主修改
+         * 音游项目-打开关闭房间纯净模式-房主修改
          *
          * @param title
          * @param desc
@@ -334,7 +334,7 @@ public class RoomSettingModel extends BaseMvpModel {
 
         /**
          * 更新房间设置信息
-         * 大鹅开黑项目-打开关闭房间纯净模式
+         * 音游项目-打开关闭房间纯净模式
          *
          * @param title
          * @param desc
diff --git a/core/src/main/java/com/mango/core/room/pk/bean/PKTeamMember.java b/core/src/main/java/com/mango/core/room/pk/bean/PKTeamMember.java
index ce73220f4..5b96e4f98 100644
--- a/core/src/main/java/com/mango/core/room/pk/bean/PKTeamMember.java
+++ b/core/src/main/java/com/mango/core/room/pk/bean/PKTeamMember.java
@@ -10,7 +10,7 @@ import lombok.Data;
 @Data
 public class PKTeamMember {
     private String uid;//用户uid
-    private String erbanNo;//大鹅号
+    private String erbanNo;//音游号
     private String nick;//昵称
     private int gender;//性别
     private String avatar;//头像
diff --git a/core/src/main/java/com/mango/core/statistic/protocol/StatisticsProtocol.java b/core/src/main/java/com/mango/core/statistic/protocol/StatisticsProtocol.java
index d638ce104..a03646715 100644
--- a/core/src/main/java/com/mango/core/statistic/protocol/StatisticsProtocol.java
+++ b/core/src/main/java/com/mango/core/statistic/protocol/StatisticsProtocol.java
@@ -179,7 +179,7 @@ public interface StatisticsProtocol {
 
 
     //模厅暗号
-    String EVENT_HALL_ADDMEMBERS_USERID_CLICK = "hall_addMembers_userid_click";//添加成员-大鹅开黑ID
+    String EVENT_HALL_ADDMEMBERS_USERID_CLICK = "hall_addMembers_userid_click";//添加成员-音游ID
     String EVENT_HALL_ADDMEMBERS_WX_CLICK = "hall_addMembers_wx_click";//添加成员-微信导入
     String EVENT_HALL_ADDMEMBERS_QQ_CLICK = "hall_addMembers_qq_click";//添加成员-QQ导入
     String EVENT_HALL_PASSWORD_SHARE_WX = "hall_password_share_wx";//分享暗号到微信
@@ -507,7 +507,7 @@ public interface StatisticsProtocol {
 
 
     /**
-     * 大鹅开黑1.4.0版本埋点整理
+     * 音游1.4.0版本埋点整理
      */
     String EVENT_APP_LAUNCH = "app_launch";     //app启动
 
diff --git a/core/src/main/java/com/mango/core/user/UserModel.java b/core/src/main/java/com/mango/core/user/UserModel.java
index b9d8e2546..8b8cfe6b4 100644
--- a/core/src/main/java/com/mango/core/user/UserModel.java
+++ b/core/src/main/java/com/mango/core/user/UserModel.java
@@ -995,7 +995,7 @@ public final class UserModel extends BaseModel implements IUserModel {
                                                             @Field("passwd") String password);
 
         /**
-         * @param erbanNo 大鹅号或手机号码
+         * @param erbanNo 音游号或手机号码
          * @return -
          */
         @GET("user/getSimpleUser")
diff --git a/core/src/main/java/com/mango/core/utils/OldHttpErrorHandleUtil.java b/core/src/main/java/com/mango/core/utils/OldHttpErrorHandleUtil.java
index 9df2c7600..562e8f273 100644
--- a/core/src/main/java/com/mango/core/utils/OldHttpErrorHandleUtil.java
+++ b/core/src/main/java/com/mango/core/utils/OldHttpErrorHandleUtil.java
@@ -24,7 +24,7 @@ public class OldHttpErrorHandleUtil {
                 try {
                     result = new Gson().fromJson(new String(bodyByte, Charset.forName("UTF-8")), ServiceResult.class);
                 } catch (Exception e) {
-                    return "大鹅开小差中~请稍后再试";
+                    return "音游开小差中~请稍后再试";
                 }
                 return result.getMessage();
             } else {
diff --git a/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/GrabApprenticesInfo.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/GrabApprenticesInfo.java
index ee2364a1e..133b43df6 100644
--- a/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/GrabApprenticesInfo.java
+++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/GrabApprenticesInfo.java
@@ -10,7 +10,7 @@ public class GrabApprenticesInfo {
     private Long uid;
 
     /**
-     * 大鹅号
+     * 音游号
      */
     private Long erbanNo;
 
diff --git a/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/SimpleUserVo.java b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/SimpleUserVo.java
index 6400ebc19..4f8212a59 100644
--- a/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/SimpleUserVo.java
+++ b/core/src/model_mentoring_relationship/java/com/mango/core/mentoring_relationship/bean/SimpleUserVo.java
@@ -14,7 +14,7 @@ public class SimpleUserVo implements Serializable {
      */
     private Long uid;
     /**
-     * 大鹅号
+     * 音游号
      */
     private Long erbanNo;
     /**
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/fragment/MessageFragment.java b/nim_uikit/src/com/netease/nim/uikit/business/session/fragment/MessageFragment.java
index 6d3115745..903e0544d 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/fragment/MessageFragment.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/fragment/MessageFragment.java
@@ -451,8 +451,8 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onAntiSpamEvent(AntiSpamEvent event) {
-//        Toast.makeText(getContext(), "发送失败，大鹅开黑提醒您文明用语~", Toast.LENGTH_SHORT).show();
-        SingleToastUtil.showToastShort("发送失败，大鹅开黑提醒您文明用语~");
+//        Toast.makeText(getContext(), "发送失败，音游提醒您文明用语~", Toast.LENGTH_SHORT).show();
+        SingleToastUtil.showToastShort("发送失败，音游提醒您文明用语~");
     }
 
     private int moreCustomDrawable;