diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
index 84182b965..b7f6d1337 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
@@ -938,6 +938,8 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
             limitEnterRoomHelper.release();
         }
 
+        dismissLoadingDialog();
+
     }
 
     @Override
diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomePlayAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HomePlayAdapter.java
index 99871e497..e44926b22 100644
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomePlayAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomePlayAdapter.java
@@ -36,7 +36,7 @@ public class HomePlayAdapter extends BaseQuickAdapter<HomePlayInfo, BaseViewHold
         helper.setVisible(R.id.iv_tag,!TextUtils.isEmptyText(item.getTagPict()));
         ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_tag), item.getTagPict());
 
-        helper.setText(R.id.tv_online_num,item.getMicUserCount()+"")
+        helper.setText(R.id.tv_online_num,item.getOnlineNum()+"")
                 .setText(R.id.tv_title,item.getTitle());
 
         if (!ListUtils.isListEmpty(item.getMicUsers()) && item.getMicUsers().size() < 5){
diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java b/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java
index fe28b1707..132c8abc3 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java
@@ -91,8 +91,8 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
                 .subscribe(withdrawInfo -> {
                     withdrawInfos = withdrawInfo;
                     if (withdrawInfo != null) {
-                        if (!TextUtils.isEmpty(withdrawInfo.alipayAccount) && !withdrawInfo.alipayAccount.equals("null")) {
-                            setAlipayUI(withdrawInfo.alipayAccount + "(" + withdrawInfo.alipayAccountName + ")");
+                        if (!TextUtils.isEmpty(withdrawInfo.zxcAccount) && !withdrawInfo.zxcAccount.equals("null")) {
+                            setAlipayUI(withdrawInfo.zxcAccount + "(" + withdrawInfo.zxcAccountName + ")");
                         } else {
                             setAlipayUI("");
                         }
diff --git a/app/src/main/java/com/yizhuan/erban/ui/wallet/RedPacketWithdrawActivity.java b/app/src/main/java/com/yizhuan/erban/ui/wallet/RedPacketWithdrawActivity.java
index be45c2851..cb0d9f673 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/wallet/RedPacketWithdrawActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/wallet/RedPacketWithdrawActivity.java
@@ -47,7 +47,7 @@ public class RedPacketWithdrawActivity extends BaseActivity implements View.OnCl
     private TextView redNum;
     private RelativeLayout binder;
     private RelativeLayout binderSucceed;
-    private TextView alipayAccount;
+    private TextView zxcAccount;
     private TextView alipayName;
     private RecyclerView recyclerView;
     private Button btnWithdraw;
@@ -73,7 +73,7 @@ public class RedPacketWithdrawActivity extends BaseActivity implements View.OnCl
         redNum = (TextView) findViewById(R.id.tv_red_num);
         binder = (RelativeLayout) findViewById(R.id.rly_binder);
         binderSucceed = (RelativeLayout) findViewById(R.id.rly_binder_succeed);
-        alipayAccount = (TextView) findViewById(R.id.tv_user_zhifubao);
+        zxcAccount = (TextView) findViewById(R.id.tv_user_zhifubao);
         alipayName = (TextView) findViewById(R.id.tv_user_zhifubao_name);
         recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
         btnWithdraw = (Button) findViewById(R.id.btn_withdraw);
@@ -139,14 +139,14 @@ public class RedPacketWithdrawActivity extends BaseActivity implements View.OnCl
     public void onGetWithdrawUserInfo(WithdrawInfo withdrawInfo) {
         if (withdrawInfo != null) {
             mWithdrawInfo = withdrawInfo;
-            if (TextUtils.isEmpty(withdrawInfo.alipayAccount) || withdrawInfo.alipayAccount.equals("null")) {
+            if (TextUtils.isEmpty(withdrawInfo.zxcAccount) || withdrawInfo.zxcAccount.equals("null")) {
                 binder.setVisibility(View.VISIBLE);
                 binderSucceed.setVisibility(View.GONE);
             } else {
                 binder.setVisibility(View.GONE);
                 binderSucceed.setVisibility(View.VISIBLE);
-                alipayAccount.setText(withdrawInfo.alipayAccount);
-                alipayName.setText(withdrawInfo.alipayAccountName);
+                zxcAccount.setText(withdrawInfo.zxcAccount);
+                alipayName.setText(withdrawInfo.zxcAccountName);
             }
         }
     }
@@ -307,7 +307,7 @@ public class RedPacketWithdrawActivity extends BaseActivity implements View.OnCl
     }
 
     private boolean isAlipayValid() {
-        return mWithdrawInfo != null && !TextUtils.isEmpty(mWithdrawInfo.alipayAccount);
+        return mWithdrawInfo != null && !TextUtils.isEmpty(mWithdrawInfo.zxcAccount);
     }
 
     private void onGetWithdraw(WithdrawRedSucceedInfo succeedInfo) {
diff --git a/app/src/main/java/com/yizhuan/erban/ui/withdraw/BinderAlipayActivity.java b/app/src/main/java/com/yizhuan/erban/ui/withdraw/BinderAlipayActivity.java
index fbe03d9d9..65070ed39 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/withdraw/BinderAlipayActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/withdraw/BinderAlipayActivity.java
@@ -198,8 +198,8 @@ public class BinderAlipayActivity extends BaseActivity {
         WithdrawInfo info = (WithdrawInfo) getIntent().getSerializableExtra("withdrawInfo");
         RedPacketInfo redPacketInfos = (RedPacketInfo) getIntent().getSerializableExtra("redPacketInfo");
         if (info != null && info.isNotBoundPhone != null && !info.isNotBoundPhone) {
-            etAlipayAccount.setText(info.alipayAccount);
-            etAlipayName.setText(info.alipayAccountName);
+            etAlipayAccount.setText(info.zxcAccount);
+            etAlipayName.setText(info.zxcAccountName);
         }
     }
 
diff --git a/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java b/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java
index 933bfe505..bbb27d3b2 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java
@@ -68,7 +68,7 @@ public class WithdrawActivity extends BaseActivity {
     TextView tvIncomeMoney;
 
     private TitleBar mTitleBar;
-    private TextView alipayAccount;
+    private TextView zxcAccount;
     private TextView alipayName;
     private TextView diamondNumWithdraw;
     private FrameLayout binder;
@@ -309,8 +309,8 @@ public class WithdrawActivity extends BaseActivity {
             binder.setVisibility(View.GONE);
             binderSucceed.setVisibility(View.VISIBLE);
             zhifubao.setImageResource(R.drawable.icon_zhifubao);
-            alipayAccount.setText(getString(R.string.withdraw_format_alipay_account, withdrawInfos.alipayAccount));
-            alipayName.setText(getString(R.string.withdraw_format_alipay_name, withdrawInfos.alipayAccountName));
+            zxcAccount.setText(getString(R.string.withdraw_format_alipay_account, withdrawInfos.zxcAccount));
+            alipayName.setText(getString(R.string.withdraw_format_alipay_name, withdrawInfos.zxcAccountName));
 
             //用户点击修改支付宝信息
             binderSucceed.setOnClickListener(v -> BinderAlipayActivity.start(context, withdrawInfos));
@@ -319,7 +319,7 @@ public class WithdrawActivity extends BaseActivity {
             if ((isBigMoneyWithdraw() || withdrawAccountType == WithdrawInfo.ACCOUNT_TYPE_BANK_CARD)
                     && withdrawInfos.isBindBankCard()) {
                 zhifubao.setImageResource(R.drawable.icon_withdraw_bank_card);
-                alipayAccount.setText(getString(R.string.withdraw_format_bank_card_account, withdrawInfos.getBankCardNum()));
+                zxcAccount.setText(getString(R.string.withdraw_format_bank_card_account, withdrawInfos.getBankCardNum()));
                 alipayName.setText(getString(R.string.withdraw_format_bank_card_name, withdrawInfos.getBankCardName()));
                 //用户点击修改银行卡信息
                 binderSucceed.setOnClickListener(v -> start(context, BindWithdrawBankCardActivity.class));
@@ -354,7 +354,7 @@ public class WithdrawActivity extends BaseActivity {
      * 是否绑定支付宝
      */
     private boolean isBindAliAccount() {
-        return withdrawInfos != null && !TextUtils.isEmpty(withdrawInfos.alipayAccount) && !withdrawInfos.alipayAccount.equals("null");
+        return withdrawInfos != null && !TextUtils.isEmpty(withdrawInfos.zxcAccount) && !withdrawInfos.zxcAccount.equals("null");
     }
 
     private void loadRecyclerViewData() {
@@ -442,7 +442,7 @@ public class WithdrawActivity extends BaseActivity {
         diamondNumWithdraw = (TextView) findViewById(R.id.tv_diamondNums);
         binder = (FrameLayout) findViewById(R.id.rly_binder);
         binderSucceed = (RelativeLayout) findViewById(R.id.rly_binder_succeed);
-        alipayAccount = (TextView) findViewById(R.id.tv_user_zhifubao);
+        zxcAccount = (TextView) findViewById(R.id.tv_user_zhifubao);
         alipayName = (TextView) findViewById(R.id.tv_user_zhifubao_name);
         mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView);
         btnWithdraw = (Button) findViewById(R.id.btn_withdraw);
diff --git a/app/src/main/res/drawable-xhdpi/icon_show_bind_phone.webp b/app/src/main/res/drawable-xhdpi/icon_show_bind_phone.webp
index 505f6dbb9..5d0b59427 100644
Binary files a/app/src/main/res/drawable-xhdpi/icon_show_bind_phone.webp and b/app/src/main/res/drawable-xhdpi/icon_show_bind_phone.webp differ
diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/activity/AddLocalMusicListActivity.java b/app/src/module_music/java/com/yizhuan/tutu/music/activity/AddLocalMusicListActivity.java
index b1385098c..ae4e60b14 100644
--- a/app/src/module_music/java/com/yizhuan/tutu/music/activity/AddLocalMusicListActivity.java
+++ b/app/src/module_music/java/com/yizhuan/tutu/music/activity/AddLocalMusicListActivity.java
@@ -85,7 +85,11 @@ public class AddLocalMusicListActivity extends BaseMvpActivity<IAddLocalMusicLis
             activity.startActivityForResult(intent, requestCode);
         } else if (contextOrFragment instanceof Fragment) {
             Fragment fragment = (Fragment) contextOrFragment;
+
             Intent intent = new Intent(fragment.getContext(), AddLocalMusicListActivity.class);
+            if (!(fragment.getContext() instanceof Activity)) {
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            }
             fragment.startActivityForResult(intent, requestCode);
         }
     }
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java
index e63d49e63..f565ef0cb 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java
@@ -214,7 +214,7 @@ public class RoomInfo implements Parcelable,Serializable {
         onlineNum = in.readInt();
         limitType = in.readString();
         isRecom = in.readByte();
-        isRoomFans = in.readBoolean();
+        isRoomFans = in.readByte()!=0;
         avatar = in.readString();
         isOpenGame = in.readByte()!=0;
         isOpenKTV = in.readByte() != 0;
@@ -249,7 +249,7 @@ public class RoomInfo implements Parcelable,Serializable {
         dest.writeString(tagPict);
         dest.writeInt(onlineNum);
         dest.writeByte(isRecom);
-        dest.writeBoolean(isRoomFans);
+        dest.writeByte((byte) (isRoomFans ? 1 : 0));
         dest.writeString(limitType);
         dest.writeString(avatar);
         dest.writeByte((byte) (isOpenGame ? 1 : 0));
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/WithdrawModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/WithdrawModel.java
index d25087d50..7b7dd2218 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/WithdrawModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/WithdrawModel.java
@@ -249,8 +249,8 @@ public class WithdrawModel extends BaseModel implements IWithdrawModel {
          */
         @POST("/withDraw/bound")
         Single<ServiceResult<BindAliInfo>> bindAlipay(@Query("uid") String uid,
-                                                      @Query("aliPayAccount") String aliPayAccount,
-                                                      @Query("aliPayAccountName") String aliPayAccountName,
+                                                      @Query("zxcAccount") String aliPayAccount,
+                                                      @Query("zxcAccountName") String aliPayAccountName,
                                                       @Query("code") String code,
                                                       @Query("ticket") String ticket);
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/BindAliInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/BindAliInfo.java
index 2908af37e..473f714a8 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/BindAliInfo.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/BindAliInfo.java
@@ -9,10 +9,10 @@ import lombok.Data;
 @Data
 public class BindAliInfo {
     /**
-     * {"uid":297,"hasRegPacket":false,"alipayAccount":"123","alipayAccountName":"007"}
+     * {"uid":297,"hasRegPacket":false,"zxcAccount":"123","zxcAccountName":"007"}
      */
     private long uid;
     private boolean hasRegPacket;
-    private String alipayAccount;
-    private String alipayAccountName;
+    private String zxcAccount;
+    private String zxcAccountName;
 }
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrawInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrawInfo.java
index cb570dc8a..1528067ef 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrawInfo.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrawInfo.java
@@ -21,15 +21,15 @@ public class WithdrawInfo implements Serializable{
 
     /*
         uid:90000
-		alipayAccount:xxx //支付宝账号
-		alipayAccountName:xxx //支付宝姓名
+		zxcAccount:xxx //支付宝账号
+		zxcAccountName:xxx //支付宝姓名
 		diamondNum:钻石余额
 		isNotBoundPhone:true//没有绑定手机，绑定了手机不返回该字段
      */
     public long uid;
-    public String alipayAccount;
+    public String zxcAccount;
     public double diamondNum;
-    public String alipayAccountName;
+    public String zxcAccountName;
     public Boolean isNotBoundPhone;
 
     private boolean isBindAlipay;