From 5dd297adefd7842a05e09acc7bc54205345ed10a Mon Sep 17 00:00:00 2001
From: oujunhui <313127320@qq.com>
Date: Mon, 18 May 2020 20:08:16 +0800
Subject: [PATCH] =?UTF-8?q?bugfix=20=E7=BB=91=E5=AE=9A=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=AE=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/avroom/activity/AVRoomActivity.java |   2 ++
 .../erban/home/adapter/HomePlayAdapter.java   |   2 +-
 .../erban/ui/setting/SettingActivity.java     |   4 ++--
 .../ui/wallet/RedPacketWithdrawActivity.java  |  12 ++++++------
 .../ui/withdraw/BinderAlipayActivity.java     |   4 ++--
 .../erban/ui/withdraw/WithdrawActivity.java   |  12 ++++++------
 .../drawable-xhdpi/icon_show_bind_phone.webp  | Bin 5448 -> 7102 bytes
 .../activity/AddLocalMusicListActivity.java   |   4 ++++
 .../room/bean/RoomInfo.java                   |   4 ++--
 .../withdraw/WithdrawModel.java               |   4 ++--
 .../withdraw/bean/BindAliInfo.java            |   6 +++---
 .../withdraw/bean/WithdrawInfo.java           |   8 ++++----
 12 files changed, 34 insertions(+), 28 deletions(-)

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 505f6dbb93eb012da68e4bf96bf610867380cc60..5d0b5942708a86c6c9bd650a087b7f4590a2a59d 100644
GIT binary patch
literal 7102
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

literal 5448
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

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;