From 3e2a454f6d0d5b43d4490b6ac348856f79d7b305 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Sat, 22 Oct 2022 10:28:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=8E=BB=E6=8E=89=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yizhuan/erban/MainActivity.java | 2 +- .../avroom/redpackage/RedPackageSendDialog.kt | 5 +- .../yizhuan/erban/ui/im/RouterHandler.java | 19 ++----- .../erban/ui/setting/SettingActivity.java | 7 +++ app/src/main/res/layout/activity_setting.xml | 52 +++++++++++++++++++ .../AddBankCardAgreementPresenter.java | 2 - .../dynamic/view/DynamicDetailActivity.java | 10 ++-- .../publish/view/PublishActivity.java | 14 ++--- .../PublicChatHallMessageFragment.java | 30 +++++------ 9 files changed, 94 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index 75f16c348..a9dbffc78 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -894,7 +894,7 @@ public class MainActivity extends BaseMvpActivity @Subscribe(threadMode = ThreadMode.MAIN) public void onNeedBindPhoneEvent(NeedBindPhoneEvent event) { - checkBindPhone(); +// checkBindPhone(); } @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt index 1d9da3ba3..26cddb7fc 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt @@ -127,10 +127,7 @@ class RedPackageSendDialog : BaseDialog(), GridPass binding.ivHelp.setOnClickListener { DialogWebViewActivity.start(context, UriProvider.getRedPacketRule()) } binding.ivSend.setOnClickListener { UserModel.get().cacheLoginUserInfo?.let { - if (!it.isBindPhone) { - BindPhoneActivity.start(context) - return@setOnClickListener - } else if (!it.isBindPaymentPwd) { + if (!it.isBindPaymentPwd) { ModifyPwdActivity.start(context, ModifyPwdActivity.PAY_PWD) return@setOnClickListener } diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java index 4fe409294..251d7b8eb 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java @@ -141,15 +141,10 @@ public class RouterHandler { WithdrawModel.get().getWithdrawUserInfo(AuthModel.get().getCurrentUid()) .subscribe(withdrawInfo -> { if (withdrawInfo != null) { - if (UserModel.get().getCacheLoginUserInfo().isBindPhone()) { - Intent intent = new Intent(context, BinderAlipayActivity.class); - Bundle mBundle = new Bundle(); - mBundle.putSerializable("withdrawInfo", withdrawInfo); - intent.putExtras(mBundle); - context.startActivity(intent); - } else { - BindPhoneActivity.start(context); - } + Intent intent = new Intent(context, BinderAlipayActivity.class); + Bundle mBundle = new Bundle(); + mBundle.putSerializable("withdrawInfo", withdrawInfo); + intent.putExtras(mBundle); } }); } @@ -176,11 +171,7 @@ public class RouterHandler { break; case RouterType.SETTING_PAY_PWD: - if (UserModel.get().getCacheLoginUserInfo().isBindPhone()) { - ModifyPwdActivity.start(context, ModifyPwdActivity.PAY_PWD); - } else { - BindPhoneActivity.start(context); - } + ModifyPwdActivity.start(context, ModifyPwdActivity.PAY_PWD); break; //推荐卡仓库 case RouterType.MY_RECOMMEND: 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 9f61a098c..30e3da2ee 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 @@ -99,6 +99,13 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene case R.id.rly_login_pwd: ModifyPwdActivity.start(this, ModifyPwdActivity.LOGIN_PWD); break; + case R.id.rly_pay_pwd: + if (UserModel.get().getCacheLoginUserInfo() == null) { + toast(ResUtil.getString(R.string.ui_setting_settingactivity_06)); + return; + } + ModifyPwdActivity.start(this, ModifyPwdActivity.PAY_PWD); + break; case R.id.btn_login_out://退出登录 LogoutHelper.logout(); finish(); diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index 56a6e83d9..ab70dd228 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -67,6 +67,58 @@ android:layout_marginEnd="15dp" android:background="@color/line_353548" /> + + + + + + + + + + + + + BindPhoneActivity.start(this)); - return false; - } +// if (!userInfo.isBindPhone()) { +// getDialogManager().showOkCancelWithTitleDialog(ResUtil.getString(R.string.dynamic_view_dynamicdetailactivity_027), +// () -> BindPhoneActivity.start(this)); +// return false; +// } return true; } diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java index aab6cf9b9..5c8e23d9a 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java @@ -141,12 +141,14 @@ public class PublishActivity extends BaseMvpActivity BindPhoneActivity.start(manager.getContext())); - return true; - - } else { + } +// else if (!userInfo.isBindPhone()) { +// manager.showOkCancelWithTitleDialog(ResUtil.getString(R.string.publish_view_publishactivity_01), +// () -> BindPhoneActivity.start(manager.getContext())); +// return true; +// +// } + else { return false; } } diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java index 83064945b..e69f52bc1 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java @@ -450,21 +450,21 @@ public class PublicChatHallMessageFragment extends TFragment implements ModulePr @Override public boolean sendMessage(IMMessage msg) { - UserInfo currentUserInfo = UserModel.get().getCacheLoginUserInfo(); - if (currentUserInfo != null && !currentUserInfo.isBindPhone()) { - DialogManager dialogManager = new DialogManager(getActivity()); - String tips = getString(R.string.tips_need_to_bind_phone); - SpannableStringBuilder builder = new SpannableStringBuilder(tips); - builder.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getContext(), R.color.appColor)), - tips.length() - 5, tips.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE); - dialogManager.showTipsDialog(builder, getString(R.string.label_go_to_bind_phone), new DialogManager.AbsOkDialogListener() { - @Override - public void onOk() { - BindPhoneActivity.start(getContext()); - } - }); - return false; - } +// UserInfo currentUserInfo = UserModel.get().getCacheLoginUserInfo(); +// if (currentUserInfo != null && !currentUserInfo.isBindPhone()) { +// DialogManager dialogManager = new DialogManager(getActivity()); +// String tips = getString(R.string.tips_need_to_bind_phone); +// SpannableStringBuilder builder = new SpannableStringBuilder(tips); +// builder.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getContext(), R.color.appColor)), +// tips.length() - 5, tips.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE); +// dialogManager.showTipsDialog(builder, getString(R.string.label_go_to_bind_phone), new DialogManager.AbsOkDialogListener() { +// @Override +// public void onOk() { +// BindPhoneActivity.start(getContext()); +// } +// }); +// return false; +// } ChatRoomMessage message = (ChatRoomMessage) msg; if (aitContractsMap.size() > 0) {