From 2d754c9d613fad3f55e3e0cb90e2dcd62a774ad0 Mon Sep 17 00:00:00 2001 From: oujunhui <313127320@qq.com> Date: Thu, 15 Oct 2020 16:07:14 +0800 Subject: [PATCH] =?UTF-8?q?1.fix=E6=94=AF=E4=BB=98=E4=BC=98=E5=8C=96=202.?= =?UTF-8?q?=E6=99=AE=E9=80=9A=E5=85=AC=E4=BC=9A=E6=88=90=E5=91=98=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/pay/presenter/ChargePresenter.java | 2 +- .../yizhuan/erban/ui/pay/ChargeActivity.java | 39 ++++++++++--------- .../hall/activity/ModuleHallActivity.java | 2 + .../response/result/ChargeListResult.java | 1 + .../xchat_android_core/pay/IPayModel.java | 2 +- .../xchat_android_core/pay/PayModel.java | 7 ++-- gradle.properties | 4 +- 7 files changed, 32 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/pay/presenter/ChargePresenter.java b/app/src/main/java/com/yizhuan/erban/pay/presenter/ChargePresenter.java index 3318c3856..119b817ea 100644 --- a/app/src/main/java/com/yizhuan/erban/pay/presenter/ChargePresenter.java +++ b/app/src/main/java/com/yizhuan/erban/pay/presenter/ChargePresenter.java @@ -38,7 +38,7 @@ public class ChargePresenter extends PayPresenter { */ @SuppressLint("CheckResult") public void getChargeList() { - payModel.getChargeList(1) + payModel.getChargeList(1,0L) .compose(bindToLifecycle()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) 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 9fd2fe8a6..b21844cbc 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 @@ -166,26 +166,27 @@ 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 (selectAliPay){ - if (mList.size() != mListSize)return; - for(ChargeBean bigList:mBigList) { - mList.add(bigList); - } - mChargeAdapter.setNewData(mList); - mChargeAdapter.notifyDataSetChanged(); - } else { - if (mList.size() > mListSize){ - if (ListUtils.isListEmpty(mBigList))return; - if (mSelectChargeBean.equals(mBigList.get(0))) - setItemSelect(0); - for(ChargeBean bigList:mBigList) { + if (!ListUtils.isListEmpty(mBigList)) { + if (selectAliPay) { + if (mList.size() == mListSize){ + for (ChargeBean bigList : mBigList) { + mList.add(bigList); + } + mChargeAdapter.setNewData(mList); + mChargeAdapter.notifyDataSetChanged(); + } + } else { + if (mList.size() > mListSize) { + setItemSelect(0); + } + for (ChargeBean bigList : mBigList) { mList.remove(bigList); } mChargeAdapter.setNewData(mList); mChargeAdapter.notifyDataSetChanged(); - } } + switch (defaultPay){ case ALI_PAY_CLOSE: iv_sel_first.setSelected(selectAliPay); @@ -262,8 +263,8 @@ public class ChargeActivity extends BaseActivity { // ll_type_first.setVisibility(View.VISIBLE); // } }); - onLoadingData(); onRefreshing(); + onLoadingData(); } private void setItemSelect(int position){ @@ -306,13 +307,16 @@ public class ChargeActivity extends BaseActivity { } public void onRefreshing() { - PayModel.get().getChargeList(1).subscribe(new BeanObserver() { + PayModel.get().getChargeList(1,AuthModel.get().getCurrentUid()).subscribe(new BeanObserver() { @Override public void onSuccess(ChargeListResult chargeBeans) { + if (chargeBeans == null)return; mBigList = chargeBeans.getBigList(); mList = chargeBeans.getList(); mListSize = chargeBeans.getList().size(); onGetChargeList(chargeBeans.getList()); + //默认选中 + selectPayChannelDisplay(payChannel,chargeBeans.getDefaultPay()); } @Override @@ -560,8 +564,7 @@ public class ChargeActivity extends BaseActivity { defaultPay(defaultPay); break; } - //默认选中 - selectPayChannelDisplay(payChannel,defaultPay); + } /** diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java index 32d8cc9d6..cd20fbb39 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java @@ -263,8 +263,10 @@ public class ModuleHallActivity extends BaseMvpActivity list; List bigList; + private int defaultPay; } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/IPayModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/pay/IPayModel.java index c1c2c37c9..f24a79f6a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/IPayModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/pay/IPayModel.java @@ -38,7 +38,7 @@ public interface IPayModel extends IModel { 3，苹果充值 */ - Single getChargeList(int channelType); + Single getChargeList(int channelType,long uid); //发起充值u Single requestCharge(Context context, String chargeProdId, String payChannel); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/PayModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/pay/PayModel.java index c662d905a..6e1287b7b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/PayModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/pay/PayModel.java @@ -175,9 +175,9 @@ public class PayModel extends BaseModel implements IPayModel { } @Override - public Single getChargeList(int channelType) { + public Single getChargeList(int channelType,long uid) { return api.getChargeList( - String.valueOf(channelType) + String.valueOf(channelType),uid ) .compose(RxHelper.handleBeanData()) .compose(RxHelper.handleSchedulers()); @@ -452,7 +452,8 @@ public class PayModel extends BaseModel implements IPayModel { * @return */ @GET("/chargeprod/listV2") - Single> getChargeList(@Query("channelType") String channelType); + Single> getChargeList(@Query("channelType") String channelType , + @Query("pub_uid") long pub_uid); /** diff --git a/gradle.properties b/gradle.properties index 80ea55c4c..bc2846e65 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.4.1 -version_code=141 \ No newline at end of file +version_name=1.5.0 +version_code=150 \ No newline at end of file