yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix 绑定支付宝

Browse Source
This commit is contained in:
oujunhui
2020-05-18 20:08:16 +08:00
parent 4cac27d7f9
commit 5dd297adef
12 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
View File

@@ -938,6 +938,8 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
limitEnterRoomHelper.release(); limitEnterRoomHelper.release();
} }
dismissLoadingDialog();
} }
@Override @Override

2
app/src/main/java/com/yizhuan/erban/home/adapter/HomePlayAdapter.java
View File

@@ -36,7 +36,7 @@ public class HomePlayAdapter extends BaseQuickAdapter<HomePlayInfo, BaseViewHold
helper.setVisible(R.id.iv_tag,!TextUtils.isEmptyText(item.getTagPict())); helper.setVisible(R.id.iv_tag,!TextUtils.isEmptyText(item.getTagPict()));
ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_tag), 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()); .setText(R.id.tv_title,item.getTitle());
if (!ListUtils.isListEmpty(item.getMicUsers()) && item.getMicUsers().size() < 5){ if (!ListUtils.isListEmpty(item.getMicUsers()) && item.getMicUsers().size() < 5){

4
app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java
View File

@@ -91,8 +91,8 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
.subscribe(withdrawInfo -> { .subscribe(withdrawInfo -> {
withdrawInfos = withdrawInfo; withdrawInfos = withdrawInfo;
if (withdrawInfo != null) { if (withdrawInfo != null) {
if (!TextUtils.isEmpty(withdrawInfo.alipayAccount) && !withdrawInfo.alipayAccount.equals("null")) { if (!TextUtils.isEmpty(withdrawInfo.zxcAccount) && !withdrawInfo.zxcAccount.equals("null")) {
setAlipayUI(withdrawInfo.alipayAccount + "(" + withdrawInfo.alipayAccountName + ")"); setAlipayUI(withdrawInfo.zxcAccount + "(" + withdrawInfo.zxcAccountName + ")");
} else { } else {
setAlipayUI(""); setAlipayUI("");
} }

12
app/src/main/java/com/yizhuan/erban/ui/wallet/RedPacketWithdrawActivity.java
View File

@@ -47,7 +47,7 @@ public class RedPacketWithdrawActivity extends BaseActivity implements View.OnCl
private TextView redNum; private TextView redNum;
private RelativeLayout binder; private RelativeLayout binder;
private RelativeLayout binderSucceed; private RelativeLayout binderSucceed;
private TextView alipayAccount; private TextView zxcAccount;
private TextView alipayName; private TextView alipayName;
private RecyclerView recyclerView; private RecyclerView recyclerView;
private Button btnWithdraw; private Button btnWithdraw;
@@ -73,7 +73,7 @@ public class RedPacketWithdrawActivity extends BaseActivity implements View.OnCl
redNum = (TextView) findViewById(R.id.tv_red_num); redNum = (TextView) findViewById(R.id.tv_red_num);
binder = (RelativeLayout) findViewById(R.id.rly_binder); binder = (RelativeLayout) findViewById(R.id.rly_binder);
binderSucceed = (RelativeLayout) findViewById(R.id.rly_binder_succeed); 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); alipayName = (TextView) findViewById(R.id.tv_user_zhifubao_name);
recyclerView = (RecyclerView) findViewById(R.id.recyclerView); recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
btnWithdraw = (Button) findViewById(R.id.btn_withdraw); btnWithdraw = (Button) findViewById(R.id.btn_withdraw);
@@ -139,14 +139,14 @@ public class RedPacketWithdrawActivity extends BaseActivity implements View.OnCl
public void onGetWithdrawUserInfo(WithdrawInfo withdrawInfo) { public void onGetWithdrawUserInfo(WithdrawInfo withdrawInfo) {
if (withdrawInfo != null) { if (withdrawInfo != null) {
mWithdrawInfo = withdrawInfo; mWithdrawInfo = withdrawInfo;
if (TextUtils.isEmpty(withdrawInfo.alipayAccount) || withdrawInfo.alipayAccount.equals("null")) { if (TextUtils.isEmpty(withdrawInfo.zxcAccount) || withdrawInfo.zxcAccount.equals("null")) {
binder.setVisibility(View.VISIBLE); binder.setVisibility(View.VISIBLE);
binderSucceed.setVisibility(View.GONE); binderSucceed.setVisibility(View.GONE);
} else { } else {
binder.setVisibility(View.GONE); binder.setVisibility(View.GONE);
binderSucceed.setVisibility(View.VISIBLE); binderSucceed.setVisibility(View.VISIBLE);
alipayAccount.setText(withdrawInfo.alipayAccount); zxcAccount.setText(withdrawInfo.zxcAccount);
alipayName.setText(withdrawInfo.alipayAccountName); alipayName.setText(withdrawInfo.zxcAccountName);
} }
} }
} }
@@ -307,7 +307,7 @@ public class RedPacketWithdrawActivity extends BaseActivity implements View.OnCl
} }
private boolean isAlipayValid() { private boolean isAlipayValid() {
return mWithdrawInfo != null && !TextUtils.isEmpty(mWithdrawInfo.alipayAccount); return mWithdrawInfo != null && !TextUtils.isEmpty(mWithdrawInfo.zxcAccount);
} }
private void onGetWithdraw(WithdrawRedSucceedInfo succeedInfo) { private void onGetWithdraw(WithdrawRedSucceedInfo succeedInfo) {

4
app/src/main/java/com/yizhuan/erban/ui/withdraw/BinderAlipayActivity.java
View File

@@ -198,8 +198,8 @@ public class BinderAlipayActivity extends BaseActivity {
WithdrawInfo info = (WithdrawInfo) getIntent().getSerializableExtra("withdrawInfo"); WithdrawInfo info = (WithdrawInfo) getIntent().getSerializableExtra("withdrawInfo");
RedPacketInfo redPacketInfos = (RedPacketInfo) getIntent().getSerializableExtra("redPacketInfo"); RedPacketInfo redPacketInfos = (RedPacketInfo) getIntent().getSerializableExtra("redPacketInfo");
if (info != null && info.isNotBoundPhone != null && !info.isNotBoundPhone) { if (info != null && info.isNotBoundPhone != null && !info.isNotBoundPhone) {
etAlipayAccount.setText(info.alipayAccount); etAlipayAccount.setText(info.zxcAccount);
etAlipayName.setText(info.alipayAccountName); etAlipayName.setText(info.zxcAccountName);
} }
} }

12
app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java
View File

@@ -68,7 +68,7 @@ public class WithdrawActivity extends BaseActivity {
TextView tvIncomeMoney; TextView tvIncomeMoney;
private TitleBar mTitleBar; private TitleBar mTitleBar;
private TextView alipayAccount; private TextView zxcAccount;
private TextView alipayName; private TextView alipayName;
private TextView diamondNumWithdraw; private TextView diamondNumWithdraw;
private FrameLayout binder; private FrameLayout binder;
@@ -309,8 +309,8 @@ public class WithdrawActivity extends BaseActivity {
binder.setVisibility(View.GONE); binder.setVisibility(View.GONE);
binderSucceed.setVisibility(View.VISIBLE); binderSucceed.setVisibility(View.VISIBLE);
zhifubao.setImageResource(R.drawable.icon_zhifubao); zhifubao.setImageResource(R.drawable.icon_zhifubao);
alipayAccount.setText(getString(R.string.withdraw_format_alipay_account, withdrawInfos.alipayAccount)); zxcAccount.setText(getString(R.string.withdraw_format_alipay_account, withdrawInfos.zxcAccount));
alipayName.setText(getString(R.string.withdraw_format_alipay_name, withdrawInfos.alipayAccountName)); alipayName.setText(getString(R.string.withdraw_format_alipay_name, withdrawInfos.zxcAccountName));
//用户点击修改支付宝信息 //用户点击修改支付宝信息
binderSucceed.setOnClickListener(v -> BinderAlipayActivity.start(context, withdrawInfos)); binderSucceed.setOnClickListener(v -> BinderAlipayActivity.start(context, withdrawInfos));
@@ -319,7 +319,7 @@ public class WithdrawActivity extends BaseActivity {
if ((isBigMoneyWithdraw() || withdrawAccountType == WithdrawInfo.ACCOUNT_TYPE_BANK_CARD) if ((isBigMoneyWithdraw() || withdrawAccountType == WithdrawInfo.ACCOUNT_TYPE_BANK_CARD)
&& withdrawInfos.isBindBankCard()) { && withdrawInfos.isBindBankCard()) {
zhifubao.setImageResource(R.drawable.icon_withdraw_bank_card); 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())); alipayName.setText(getString(R.string.withdraw_format_bank_card_name, withdrawInfos.getBankCardName()));
//用户点击修改银行卡信息 //用户点击修改银行卡信息
binderSucceed.setOnClickListener(v -> start(context, BindWithdrawBankCardActivity.class)); binderSucceed.setOnClickListener(v -> start(context, BindWithdrawBankCardActivity.class));
@@ -354,7 +354,7 @@ public class WithdrawActivity extends BaseActivity {
* 是否绑定支付宝 * 是否绑定支付宝
*/ */
private boolean isBindAliAccount() { 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() { private void loadRecyclerViewData() {
@@ -442,7 +442,7 @@ public class WithdrawActivity extends BaseActivity {
diamondNumWithdraw = (TextView) findViewById(R.id.tv_diamondNums); diamondNumWithdraw = (TextView) findViewById(R.id.tv_diamondNums);
binder = (FrameLayout) findViewById(R.id.rly_binder); binder = (FrameLayout) findViewById(R.id.rly_binder);
binderSucceed = (RelativeLayout) findViewById(R.id.rly_binder_succeed); 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); alipayName = (TextView) findViewById(R.id.tv_user_zhifubao_name);
mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView); mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView);
btnWithdraw = (Button) findViewById(R.id.btn_withdraw); btnWithdraw = (Button) findViewById(R.id.btn_withdraw);

BIN
app/src/main/res/drawable-xhdpi/icon_show_bind_phone.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

4
app/src/module_music/java/com/yizhuan/tutu/music/activity/AddLocalMusicListActivity.java
View File

@@ -85,7 +85,11 @@ public class AddLocalMusicListActivity extends BaseMvpActivity<IAddLocalMusicLis
activity.startActivityForResult(intent, requestCode); activity.startActivityForResult(intent, requestCode);
} else if (contextOrFragment instanceof Fragment) { } else if (contextOrFragment instanceof Fragment) {
Fragment fragment = (Fragment) contextOrFragment; Fragment fragment = (Fragment) contextOrFragment;
Intent intent = new Intent(fragment.getContext(), AddLocalMusicListActivity.class); Intent intent = new Intent(fragment.getContext(), AddLocalMusicListActivity.class);
if (!(fragment.getContext() instanceof Activity)) {
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
fragment.startActivityForResult(intent, requestCode); fragment.startActivityForResult(intent, requestCode);
} }
} }

4
core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java
View File

@@ -214,7 +214,7 @@ public class RoomInfo implements Parcelable,Serializable {
onlineNum = in.readInt(); onlineNum = in.readInt();
limitType = in.readString(); limitType = in.readString();
isRecom = in.readByte(); isRecom = in.readByte();
isRoomFans = in.readBoolean(); isRoomFans = in.readByte()!=0;
avatar = in.readString(); avatar = in.readString();
isOpenGame = in.readByte()!=0; isOpenGame = in.readByte()!=0;
isOpenKTV = in.readByte() != 0; isOpenKTV = in.readByte() != 0;
@@ -249,7 +249,7 @@ public class RoomInfo implements Parcelable,Serializable {
dest.writeString(tagPict); dest.writeString(tagPict);
dest.writeInt(onlineNum); dest.writeInt(onlineNum);
dest.writeByte(isRecom); dest.writeByte(isRecom);
dest.writeBoolean(isRoomFans); dest.writeByte((byte) (isRoomFans ? 1 : 0));
dest.writeString(limitType); dest.writeString(limitType);
dest.writeString(avatar); dest.writeString(avatar);
dest.writeByte((byte) (isOpenGame ? 1 : 0)); dest.writeByte((byte) (isOpenGame ? 1 : 0));

4
core/src/main/java/com/yizhuan/xchat_android_core/withdraw/WithdrawModel.java
View File

@@ -249,8 +249,8 @@ public class WithdrawModel extends BaseModel implements IWithdrawModel {
*/ */
@POST("/withDraw/bound") @POST("/withDraw/bound")
Single<ServiceResult<BindAliInfo>> bindAlipay(@Query("uid") String uid, Single<ServiceResult<BindAliInfo>> bindAlipay(@Query("uid") String uid,
@Query("aliPayAccount") String aliPayAccount, @Query("zxcAccount") String aliPayAccount,
@Query("aliPayAccountName") String aliPayAccountName, @Query("zxcAccountName") String aliPayAccountName,
@Query("code") String code, @Query("code") String code,
@Query("ticket") String ticket); @Query("ticket") String ticket);

6
core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/BindAliInfo.java
View File

@@ -9,10 +9,10 @@ import lombok.Data;
@Data @Data
public class BindAliInfo { public class BindAliInfo {
/** /**
* {"uid":297,"hasRegPacket":false,"alipayAccount":"123","alipayAccountName":"007"} * {"uid":297,"hasRegPacket":false,"zxcAccount":"123","zxcAccountName":"007"}
*/ */
private long uid; private long uid;
private boolean hasRegPacket; private boolean hasRegPacket;
private String alipayAccount; private String zxcAccount;
private String alipayAccountName; private String zxcAccountName;
} }

8
core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrawInfo.java
View File

@@ -21,15 +21,15 @@ public class WithdrawInfo implements Serializable{
/* /*
uid:90000 uid:90000
alipayAccount:xxx //支付宝账号 zxcAccount:xxx //支付宝账号
alipayAccountName:xxx //支付宝姓名 zxcAccountName:xxx //支付宝姓名
diamondNum:钻石余额 diamondNum:钻石余额
isNotBoundPhone:true//没有绑定手机，绑定了手机不返回该字段 isNotBoundPhone:true//没有绑定手机，绑定了手机不返回该字段
*/ */
public long uid; public long uid;
public String alipayAccount; public String zxcAccount;
public double diamondNum; public double diamondNum;
public String alipayAccountName; public String zxcAccountName;
public Boolean isNotBoundPhone; public Boolean isNotBoundPhone;
private boolean isBindAlipay; private boolean isBindAlipay;