From 558d517094db655dfc30c3d46dcc585ced88e362 Mon Sep 17 00:00:00 2001 From: oujunhui <313127320@qq.com> Date: Thu, 27 Aug 2020 18:04:44 +0800 Subject: [PATCH] =?UTF-8?q?1.3.6=20=E9=BB=98=E8=AE=A4=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yizhuan/erban/ui/pay/ChargeActivity.java | 55 ++++++++++++++----- app/src/main/res/layout/activity_charge.xml | 3 +- gradle.properties | 4 +- 3 files changed, 44 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java index a6f6a4f61..da8ab10b8 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java @@ -106,9 +106,7 @@ public class ChargeActivity extends BaseActivity { } private void setListener() { - - ll_more.setOnClickListener(v -> showMorePayType()); - + ll_more.setOnClickListener(v -> hideMoreButton()); tvCharge.setOnClickListener(v -> { if (mSelectChargeBean == null) return; getDialogManager().showProgressDialog(this, false); @@ -117,14 +115,18 @@ public class ChargeActivity extends BaseActivity { tvAgreement.setOnClickListener(v -> { CommonWebViewActivity.start(this,UriProvider.getRechargeAgreementUrl()); }); - } - private void showMorePayType() { + private void hideMoreButton() { ll_more.setVisibility(View.GONE); ll_type_second.setVisibility(View.VISIBLE); } + private void showMoreButton() { + ll_more.setVisibility(View.VISIBLE); + ll_type_second.setVisibility(View.GONE); + } + private void bindViews() { mTv_gold = findViewById(R.id.tv_gold); ll_type_first = findViewById(R.id.ll_type_first); @@ -144,10 +146,10 @@ public class ChargeActivity extends BaseActivity { this.payChannel = payChannel; boolean selectWeChatPay = (Objects.equals(this.payChannel, Constants.CHARGE_WX)); boolean selectAliPay = (Objects.equals(this.payChannel, Constants.CHARGE_ALIPAY)); - if (defaultPay == 1) { + if (defaultPay == 1 || defaultPay == 3) { iv_sel_first.setSelected(selectAliPay); iv_sel_second.setSelected(selectWeChatPay); - }else { + }else if (defaultPay == 2 || defaultPay == 4){ iv_sel_first.setSelected(selectWeChatPay); iv_sel_second.setSelected(selectAliPay); } @@ -454,18 +456,43 @@ public class ChargeActivity extends BaseActivity { /**defaultPay 1：默认支付宝，2：默认微信 */ private void setWalletData(WalletInfo walletInfo) { if (walletInfo == null)return; + if (walletInfo.getDefaultPay() == 1 || walletInfo.getDefaultPay() == 2){ + showMoreButton(); + } else if (walletInfo.getDefaultPay() == 3 || walletInfo.getDefaultPay() == 4){ + hideMoreButton(); + } mTv_gold.setText(getString(R.string.charge_gold, walletInfo.getDiamondNum())); - iv_type_first.setImageDrawable(walletInfo.getDefaultPay() == 1?getResources().getDrawable(R.drawable.ic_ali_charge):getResources().getDrawable(R.drawable.ic_wechat_charge)); - iv_type_second.setImageDrawable(walletInfo.getDefaultPay() == 1?getResources().getDrawable(R.drawable.ic_wechat_charge):getResources().getDrawable(R.drawable.ic_ali_charge)); - tv_type_first.setText(walletInfo.getDefaultPay() == 1?"支付宝":"微信"); - tv_type_second.setText(walletInfo.getDefaultPay() == 1?"微信":"支付宝"); - payChannel = walletInfo.getDefaultPay() == 1?Constants.CHARGE_ALIPAY:Constants.CHARGE_WX; + if (walletInfo.getDefaultPay() == 1 || walletInfo.getDefaultPay() == 3){ + iv_type_first.setImageDrawable(getResources().getDrawable(R.drawable.ic_ali_charge)); + }else if (walletInfo.getDefaultPay() == 2 || walletInfo.getDefaultPay() == 4){ + iv_type_first.setImageDrawable(getResources().getDrawable(R.drawable.ic_wechat_charge)); + } + + if (walletInfo.getDefaultPay() == 1 || walletInfo.getDefaultPay() == 3){ + iv_type_second.setImageDrawable(getResources().getDrawable(R.drawable.ic_wechat_charge)); + }else if (walletInfo.getDefaultPay() == 2 || walletInfo.getDefaultPay() == 4){ + iv_type_second.setImageDrawable(getResources().getDrawable(R.drawable.ic_ali_charge)); + } + + if (walletInfo.getDefaultPay() == 1 || walletInfo.getDefaultPay() == 3){ + tv_type_first.setText("支付宝"); + }else if (walletInfo.getDefaultPay() == 2 || walletInfo.getDefaultPay() == 4){ + tv_type_first.setText("微信"); + } + + if (walletInfo.getDefaultPay() == 1 || walletInfo.getDefaultPay() == 3){ + tv_type_second.setText("微信"); + }else if (walletInfo.getDefaultPay() == 2 || walletInfo.getDefaultPay() == 4){ + tv_type_second.setText("支付宝"); + } + payChannel = walletInfo.getDefaultPay() == 1 || walletInfo.getDefaultPay() == 3?Constants.CHARGE_ALIPAY:Constants.CHARGE_WX; int defaultPay = walletInfo.getDefaultPay(); selectPayChannelDisplay(payChannel,defaultPay); - if (walletInfo.getDefaultPay() == 1){ + + if (walletInfo.getDefaultPay() == 1 || walletInfo.getDefaultPay() == 3){ ll_type_first.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_ALIPAY,defaultPay)); ll_type_second.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_WX,defaultPay)); - }else { + }else if (walletInfo.getDefaultPay() == 2 || walletInfo.getDefaultPay() == 4){ ll_type_first.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_WX,defaultPay)); ll_type_second.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_ALIPAY,defaultPay)); } diff --git a/app/src/main/res/layout/activity_charge.xml b/app/src/main/res/layout/activity_charge.xml index c68097d93..988d467bf 100644 --- a/app/src/main/res/layout/activity_charge.xml +++ b/app/src/main/res/layout/activity_charge.xml @@ -160,7 +160,6 @@ android:gravity="center_vertical" android:orientation="horizontal" android:focusable="true" - android:visibility="gone" android:clickable="true"> diff --git a/gradle.properties b/gradle.properties index a134262fc..feacf90cd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,5 +21,5 @@ with_jenkins=false #\u6253\u652F\u6301x86\u7684\u6A21\u62DF\u5668\u5305\u4F7F\u7528 ndk_abi_filters=arm -version_name=1.3.0 -version_code=130 \ No newline at end of file +version_name=1.3.6 +version_code=136 \ No newline at end of file