diff --git a/app/agconnect-services.json b/app/agconnect-services.json deleted file mode 100644 index 0f1fc44ca..000000000 --- a/app/agconnect-services.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "agcgw":{ - "backurl":"connect-drcn.dbankcloud.cn", - "url":"connect-drcn.hispace.hicloud.com", - "websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.cn", - "websocketurl":"connect-ws-drcn.hispace.dbankcloud.com" - }, - "agcgw_all":{ - "CN":"connect-drcn.hispace.hicloud.com", - "CN_back":"connect-drcn.dbankcloud.cn", - "DE":"connect-dre.hispace.hicloud.com", - "DE_back":"connect-dre.dbankcloud.cn", - "RU":"connect-drru.hispace.hicloud.com", - "RU_back":"connect-drru.dbankcloud.cn", - "SG":"connect-dra.hispace.hicloud.com", - "SG_back":"connect-dra.dbankcloud.cn" - }, - "client":{ - "cp_id":"890086000300337421", - "product_id":"736430079245711652", - "client_id":"625842227532282816", - "client_secret":"B23D0CD85C92ADC6676AF6CC8671628F0F155D29A527E7BDF2A53E26F0B5A720", - "project_id":"736430079245711652", - "app_id":"104321113", - "api_key":"CwEAAAAAZgS4/Nw1+/PybMG5CZXzJmlHHHnj0Tp2FOXQG3RtKUdpAsiQiXttqCXlHWA8GdUzGjtnq6oQh2Ogfe8JOs8ihePgJLg=", - "package_name":"com.mango.yinyou" - }, - "oauth_client":{ - "client_id":"104321113", - "client_type":1 - }, - "app_info":{ - "app_id":"104321113", - "package_name":"com.mango.yinyou" - }, - "service":{ - "analytics":{ - "collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn", - "resource_id":"p1", - "channel_id":"" - }, - "search":{ - "url":"https://search-drcn.cloud.huawei.com" - }, - "cloudstorage":{ - "storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn" - }, - "ml":{ - "mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn" - } - }, - "region":"CN", - "configuration_version":"3.0", - "appInfos":[ - { - "package_name":"com.mango.yinyou", - "client":{ - "app_id":"104321113" - }, - "app_info":{ - "package_name":"com.mango.yinyou", - "app_id":"104321113" - }, - "oauth_client":{ - "client_type":1, - "client_id":"104321113" - } - } - ] -} \ No newline at end of file diff --git a/app/aliyun-libs/MiddleTierSDK-external-release-5.5.72-preInstall.aar b/app/aliyun-libs/MiddleTierSDK-external-release-5.5.72-preInstall.aar deleted file mode 100644 index b9d6f4e09..000000000 Binary files a/app/aliyun-libs/MiddleTierSDK-external-release-5.5.72-preInstall.aar and /dev/null differ diff --git a/app/aliyun-libs/SecurityBodySDK-external-release-5.5.85-preInstall.aar b/app/aliyun-libs/SecurityBodySDK-external-release-5.5.85-preInstall.aar deleted file mode 100644 index dbeadca40..000000000 Binary files a/app/aliyun-libs/SecurityBodySDK-external-release-5.5.85-preInstall.aar and /dev/null differ diff --git a/app/aliyun-libs/SecurityGuardSDK-external-release-5.5.75-preInstall.aar b/app/aliyun-libs/SecurityGuardSDK-external-release-5.5.75-preInstall.aar deleted file mode 100644 index 649670ab4..000000000 Binary files a/app/aliyun-libs/SecurityGuardSDK-external-release-5.5.75-preInstall.aar and /dev/null differ diff --git a/app/aliyun-libs/arm64-v8a/libc++_shared.so b/app/aliyun-libs/arm64-v8a/libc++_shared.so deleted file mode 100644 index ca0d05063..000000000 Binary files a/app/aliyun-libs/arm64-v8a/libc++_shared.so and /dev/null differ diff --git a/app/aliyun-libs/armeabi-v7a/libc++_shared.so b/app/aliyun-libs/armeabi-v7a/libc++_shared.so deleted file mode 100644 index b5dc9caf6..000000000 Binary files a/app/aliyun-libs/armeabi-v7a/libc++_shared.so and /dev/null differ diff --git a/app/aliyun-libs/rpsdk-4.14.3-open.aar b/app/aliyun-libs/rpsdk-4.14.3-open.aar deleted file mode 100644 index 61de65683..000000000 Binary files a/app/aliyun-libs/rpsdk-4.14.3-open.aar and /dev/null differ diff --git a/app/build.gradle b/app/build.gradle index 5d6570171..7ab8e7d60 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,9 +1,6 @@ -apply plugin: 'com.android.application' - apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -apply plugin: 'com.huawei.agconnect' apply plugin: 'com.tencent.vasdolly' apply from: '../mob.gradle' @@ -234,16 +231,7 @@ dependencies { implementation 'it.sephiroth.android.library.imagezoom:library:1.0.4' - // 易盾一键登录 - implementation 'io.github.yidun:quicklogin:3.1.8' - implementation 'com.github.fodroid:XRadioGroup:v1.5' - //华为推送 - implementation 'com.huawei.hms:push:6.5.0.300' - //魅族推送 - implementation 'com.meizu.flyme.internet:push-internal:4.1.0' - //oppo推送需要 - implementation 'commons-codec:commons-codec:1.6' api 'com.tencent.vasdolly:helper:3.0.3' implementation "io.github.tencent:vap:2.0.24" diff --git a/app/libs/MiPush_SDK_Client_4_5_0.jar b/app/libs/MiPush_SDK_Client_4_5_0.jar deleted file mode 100644 index b341c2541..000000000 Binary files a/app/libs/MiPush_SDK_Client_4_5_0.jar and /dev/null differ diff --git a/app/libs/humesdk-1.0.0.aar b/app/libs/humesdk-1.0.0.aar deleted file mode 100644 index 2db40915d..000000000 Binary files a/app/libs/humesdk-1.0.0.aar and /dev/null differ diff --git a/app/libs/push-3.0.0.aar b/app/libs/push-3.0.0.aar deleted file mode 100644 index af93542f6..000000000 Binary files a/app/libs/push-3.0.0.aar and /dev/null differ diff --git a/app/libs/vivo_pushSDK_v3.0.0.4_484.aar b/app/libs/vivo_pushSDK_v3.0.0.4_484.aar deleted file mode 100644 index f278999dc..000000000 Binary files a/app/libs/vivo_pushSDK_v3.0.0.4_484.aar and /dev/null differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c27c158c8..fa2780417 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -172,173 +172,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -364,39 +198,7 @@ android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/provider_paths" /> - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/java/com/yizhuan/erban/MiddleActivity.java b/app/src/main/java/com/yizhuan/erban/MiddleActivity.java deleted file mode 100644 index f2e5efc71..000000000 --- a/app/src/main/java/com/yizhuan/erban/MiddleActivity.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.yizhuan.erban; - -import android.os.Bundle; -import android.util.Log; - -import com.microquation.linkedme.android.LinkedME; -import com.microquation.linkedme.android.util.LinkProperties; -import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.xchat_android_core.linked.LinkedModel; -import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; - -import java.util.HashMap; - -/** - * Created by chenran on 2017/8/5. - */ - -public class MiddleActivity extends BaseActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getIntent() != null) { - //获取与深度链接相关的值 - LinkProperties linkProperties = getIntent().getParcelableExtra(LinkedME.LM_LINKPROPERTIES); - if (linkProperties != null) { - Log.i("LinkedME-Demo", "Channel " + linkProperties.getChannel()); - Log.i("LinkedME-Demo", "control params " + linkProperties.getControlParams()); - Log.i("LinkedME-Demo", "link(深度链接) " + linkProperties.getLMLink()); - Log.i("LinkedME-Demo", "是否为新安装 " + linkProperties.isLMNewUser()); - //获取自定义参数封装成的hashmap对象,参数键值对由集成方定义 - - HashMap hashMap = linkProperties.getControlParams(); - LogUtil.print("linkedme", hashMap); - //根据key获取传入的参数的值,该key关键字View可为任意值,由集成方规定,请与web端商议,一致即可 - LinkedInfo linkedInfo = new LinkedInfo(); - linkedInfo.setNewUser(linkProperties.isLMNewUser()); - String roomuid = hashMap.get("roomuid"); - String uid = hashMap.get("uid"); - String channel = hashMap.get("linkedmeChannel"); - String type = hashMap.get("type"); - String familyId = hashMap.get("familyId"); - String url = hashMap.get("url"); - String worldId = hashMap.get("worldId"); - String dynamicId = hashMap.get("dynamicId"); - String inviteCode = hashMap.get("inviteCode"); - if (roomuid != null) { - linkedInfo.setRoomUid(roomuid); - } - if (uid != null) { - linkedInfo.setUid(uid); - } - if (type != null) { - linkedInfo.setType(type); - } - if (familyId != null) { - linkedInfo.setFamilyId(familyId); - } - if (url != null) { - linkedInfo.setUrl(url); - } - if (worldId != null) { - linkedInfo.setWorldId(worldId); - } - if (dynamicId != null) { - linkedInfo.setDynamicId(dynamicId); - } - - linkedInfo.setInviteCode(inviteCode); - - LinkedModel.get().setLinkedInfo(linkedInfo); - } - } - finish(); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java b/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java index f5389bfde..7ccdc340c 100644 --- a/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java +++ b/app/src/main/java/com/yizhuan/erban/application/GlobalHandleManager.java @@ -13,7 +13,6 @@ import com.yizhuan.xchat_android_core.activity.bean.LotteryInfo; import com.yizhuan.xchat_android_core.level.event.CharmLevelUpEvent; import com.yizhuan.xchat_android_core.level.event.LevelUpEvent; import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.pay.bean.ShowCommonWebEvent; import com.yizhuan.xchat_android_core.pay.event.NewUserChargeEvent; import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo; import com.yizhuan.xchat_android_core.recall.event.CheckLostUserEvent; @@ -94,11 +93,6 @@ public class GlobalHandleManager { new NewUserChargePrizeDialog(activity, event.getChargeProdTitle(), event.getFirstChargeRewardList()).openDialog(); } - @Subscribe(threadMode = ThreadMode.MAIN) - public void onShowCommonWebEvent(ShowCommonWebEvent event) { - CommonWebViewActivity.start(event.getContext(), event.getUrl()); - } - @Subscribe(threadMode = ThreadMode.MAIN) public void onReceiveRecallStatus(CheckLostUserEvent event) { Activity activity = getActivity(); diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java index 0bb2f8d6c..6b9cb8e5b 100644 --- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java +++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java @@ -1,18 +1,5 @@ package com.yizhuan.erban.application; -import static com.yizhuan.xchat_android_constants.XChatConstants.HW_APP_ID; -import static com.yizhuan.xchat_android_constants.XChatConstants.HW_CERTIFICATE_NAME; -import static com.yizhuan.xchat_android_constants.XChatConstants.MZ_APP_ID; -import static com.yizhuan.xchat_android_constants.XChatConstants.MZ_APP_KEY; -import static com.yizhuan.xchat_android_constants.XChatConstants.MZ_CERTIFICATE_NAME; -import static com.yizhuan.xchat_android_constants.XChatConstants.OPPO_APP_ID; -import static com.yizhuan.xchat_android_constants.XChatConstants.OPPO_APP_KEY; -import static com.yizhuan.xchat_android_constants.XChatConstants.OPPO_CERTIFICATE_NAME; -import static com.yizhuan.xchat_android_constants.XChatConstants.OPPO_SECRET; -import static com.yizhuan.xchat_android_constants.XChatConstants.VIVO_CERTIFICATE_NAME; -import static com.yizhuan.xchat_android_constants.XChatConstants.XM_APP_ID; -import static com.yizhuan.xchat_android_constants.XChatConstants.XM_APP_KEY; -import static com.yizhuan.xchat_android_constants.XChatConstants.XM_CERTIFICATE_NAME; import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI; import android.annotation.SuppressLint; @@ -30,13 +17,9 @@ import android.util.Log; import androidx.multidex.MultiDex; import com.bumptech.glide.request.target.ViewTarget; -import com.bytedance.hume.readapk.HumeSDK; import com.coorchice.library.utils.LogUtils; -import com.heytap.msp.push.HeytapPushManager; import com.hjq.toast.ToastUtils; -import com.huawei.hms.support.common.ActivityMgr; import com.llew.huawei.verifier.LoadedApkHuaWei; -import com.microquation.linkedme.android.LinkedME; import com.mob.MobSDK; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.common.util.log.LogUtil; @@ -61,7 +44,6 @@ import com.tencent.vasdolly.helper.ChannelReaderUtil; import com.umeng.analytics.MobclickAgent; import com.umeng.commonsdk.UMConfigure; import com.yizhuan.erban.BuildConfig; -import com.yizhuan.erban.MiddleActivity; import com.yizhuan.erban.NimMiddleActivity; import com.yizhuan.erban.R; import com.yizhuan.erban.module_hall.HallDataManager; @@ -204,7 +186,6 @@ public class XChatApplication extends Application { isInitOtherSDK = true; Context context = BasicConfig.INSTANCE.getAppContext(); Application application = (Application) context.getApplicationContext(); - HeytapPushManager.init(context, false); // 初始化 sp long startTime = System.currentTimeMillis(); @@ -216,18 +197,10 @@ public class XChatApplication extends Application { BasicConfig.INSTANCE.setOriginalChannel(channel); - //头条分包渠道 - if (BasicConfig.INSTANCE.isByteDanceChannel()) { - String byteDanceChannel = HumeSDK.getChannel(context); - if (!TextUtils.isEmpty(byteDanceChannel)) { - channel = byteDanceChannel; - } - } BasicConfig.INSTANCE.setChannel(channel); initEnv(); - ActivityMgr.INST.init((Application) context); //延迟初始化云信 NIMClient.init(context, null, options()); @@ -282,7 +255,6 @@ public class XChatApplication extends Application { registerActivityLifecycleCallback(lifeManager); dealHuaWeiCrash(); initLinkedMe(); - LinkedME.getInstance().setImmediate(true); MobSDK.init(context); MobSDK.submitPolicyGrantResult(true); // 友盟统计初始化 @@ -307,15 +279,7 @@ public class XChatApplication extends Application { * 初始化linkedMe */ private static void initLinkedMe() { - LinkedME.getInstance(BasicConfig.INSTANCE.getAppContext(), XChatConstants.LINKED_ME_KEY); - if (isDebug()) { - //设置debug模式下打印LinkedME日志 - LinkedME.getInstance().setDebug(); - } - //初始时请设置为false - LinkedME.getInstance().setImmediate(false); - //设置处理跳转逻辑的中转页，MiddleActivity详见后续配置 - LinkedME.getInstance().setHandleActivity(MiddleActivity.class.getName()); + } private static void initEnv() { @@ -402,24 +366,8 @@ public class XChatApplication extends Application { DemoCache.setNotificationConfig(config); MixPushConfig mixPushConfig = new MixPushConfig(); - //华为推送 - mixPushConfig.hwAppId = HW_APP_ID; - mixPushConfig.hwCertificateName = HW_CERTIFICATE_NAME; - //小米推送 - mixPushConfig.xmAppId = XM_APP_ID; - mixPushConfig.xmAppKey = XM_APP_KEY; - mixPushConfig.xmCertificateName = XM_CERTIFICATE_NAME; - //魅族推送 - mixPushConfig.mzAppId = MZ_APP_ID; - mixPushConfig.mzAppKey = MZ_APP_KEY; - mixPushConfig.mzCertificateName = MZ_CERTIFICATE_NAME; - //vivo推送 - mixPushConfig.vivoCertificateName = VIVO_CERTIFICATE_NAME; - //oppo推送 - mixPushConfig.oppoAppId = OPPO_APP_ID; - mixPushConfig.oppoAppKey = OPPO_APP_KEY; - mixPushConfig.oppoAppSercet = OPPO_SECRET; - mixPushConfig.oppoCertificateName = OPPO_CERTIFICATE_NAME; + + options.mixPushConfig = mixPushConfig; return options; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt index 7ded00eb5..b1737ffa0 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt @@ -29,12 +29,9 @@ import com.yizhuan.erban.ui.webview.CommonWebViewActivity import com.yizhuan.xchat_android_core.UriProvider import com.yizhuan.xchat_android_core.auth.AuthModel import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.PaymentActivity import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_core.pay.bean.PaymentResult import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent -import com.yizhuan.xchat_android_core.pay.model.unionpay.UnionPayModel import com.yizhuan.xchat_android_core.utils.toast import com.yizhuan.xchat_android_library.annatation.ActLayoutRes import com.yizhuan.xchat_android_library.utils.JavaUtil @@ -206,43 +203,6 @@ class FirstChargeDialog : BaseViewBindingActivity() { if (resultCode != RESULT_OK) { return } - //支付页面返回处理 - if (requestCode == PaymentActivity.REQUEST_CODE_PAY) { - if (data != null && data.extras != null) { - val paymentResult: PaymentResult? = - data.getParcelableExtra(PaymentActivity.KEY_PAY_RESULT) - if (paymentResult != null) { - // 充值金额超过限定时，就必须先实名认证 - when (JavaUtil.str2int(paymentResult.code)) { - PayModel.NOT_REAL_NAME_BEFORE_CHARGING -> dialogManager.showTipsDialog( - getString(R.string.tips_need_to_certification), - getString(R.string.go_to_certification), - object : AbsOkDialogListener() { - override fun onOk() { - // 跳去实名认证页面 - CommonWebViewActivity.start( - this@FirstChargeDialog, - UriProvider.getTutuRealNamePage() - ) - } - }) - UnionPayModel.CODE_NEED_BIND_BANK_CARD_FIRST -> dialogManager.showTipsDialog( - getString(R.string.tips_need_bind_bank_card_first), - object : AbsOkDialogListener() { - override fun onOk() { - // 跳去添加银行卡页面 - AddBankCardAgreementActivity.start(this@FirstChargeDialog) - } - }) - else -> { - toast(paymentResult.msg) - //重新获取钱包信息 - PayModel.get().getWalletInfo(AuthModel.get().currentUid).subscribe() - } - } - } - } - } if (requestCode == BIND_CODE_GOLD) { ModifyPwdActivity.start(this, ModifyPwdActivity.FOGERT_PAY_PWD) } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/SelectPayTypeDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/SelectPayTypeDialog.kt index 9347537a3..cc963af38 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/SelectPayTypeDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/SelectPayTypeDialog.kt @@ -11,7 +11,6 @@ import com.yizhuan.erban.databinding.DialogSelectPayTypeBinding import com.yizhuan.erban.ui.pay.ChargeActivity import com.yizhuan.xchat_android_core.Constants import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.PaymentActivity import com.yizhuan.xchat_android_core.pay.bean.WalletInfo import com.yizhuan.xchat_android_library.annatation.ActLayoutRes import com.yizhuan.xchat_android_library.utils.SingleToastUtil @@ -64,11 +63,6 @@ class SelectPayTypeDialog : BaseDialog() { SingleToastUtil.showToast("数据初始化中,请稍后~") return@setOnClickListener } - if (binding.rbAlipay.isChecked) { - PaymentActivity.start(requireActivity(), Constants.CHARGE_ALIPAY, chargeProdId) - } else { - PaymentActivity.start(requireActivity(), Constants.CHARGE_WX, chargeProdId) - } dismissAllowingStateLoss() } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt index 77f015900..dee721232 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt @@ -21,7 +21,6 @@ import com.yizhuan.erban.R import com.yizhuan.erban.avroom.firstcharge.SelectPayTypeDialog import com.yizhuan.erban.bank_card.activity.AddBankCardAgreementActivity import com.yizhuan.erban.base.BaseViewBindingActivity -import com.yizhuan.erban.common.widget.dialog.DialogManager import com.yizhuan.erban.common.widget.dialog.DialogManager.AbsOkDialogListener import com.yizhuan.erban.databinding.DialogNewUserChargeGiftBinding import com.yizhuan.erban.ui.setting.ModifyPwdActivity @@ -30,12 +29,9 @@ import com.yizhuan.erban.ui.webview.CommonWebViewActivity import com.yizhuan.xchat_android_core.UriProvider import com.yizhuan.xchat_android_core.auth.AuthModel import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.PaymentActivity import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_core.pay.bean.PaymentResult import com.yizhuan.xchat_android_core.pay.event.NewUserChargeEvent -import com.yizhuan.xchat_android_core.pay.model.unionpay.UnionPayModel import com.yizhuan.xchat_android_core.statistic.StatisticManager import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol import com.yizhuan.xchat_android_core.user.UserModel @@ -192,43 +188,6 @@ class NewUserChargeGiftDialog : BaseViewBindingActivity dialogManager.showTipsDialog( - getString(R.string.tips_need_to_certification), - getString(R.string.go_to_certification), - object : AbsOkDialogListener() { - override fun onOk() { - // 跳去实名认证页面 - CommonWebViewActivity.start( - this@NewUserChargeGiftDialog, - UriProvider.getTutuRealNamePage() - ) - } - }) - UnionPayModel.CODE_NEED_BIND_BANK_CARD_FIRST -> dialogManager.showTipsDialog( - getString(R.string.tips_need_bind_bank_card_first), - object : AbsOkDialogListener() { - override fun onOk() { - // 跳去添加银行卡页面 - AddBankCardAgreementActivity.start(this@NewUserChargeGiftDialog) - } - }) - else -> { - toast(paymentResult.msg) - //重新获取钱包信息 - PayModel.get().getWalletInfo(AuthModel.get().currentUid).subscribe() - } - } - } - } - } if (requestCode == BIND_CODE_GOLD) { ModifyPwdActivity.start(this, ModifyPwdActivity.FOGERT_PAY_PWD) } diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java index f8dc8058d..5d1187bc7 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java @@ -48,7 +48,6 @@ import com.readystatesoftware.systembartint.SystemBarTintManager; import com.tbruyelle.rxpermissions2.RxPermissions; import com.trello.rxlifecycle3.android.ActivityEvent; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; -import com.yizhuan.erban.MiddleActivity; import com.yizhuan.erban.NimMiddleActivity; import com.yizhuan.erban.R; import com.yizhuan.erban.application.XChatApplication; @@ -974,7 +973,6 @@ public abstract class BaseActivity extends RxAppCompatActivity acts.add(LoginCodeActivity.class); acts.add(ResetPasswordActivity.class); acts.add(AddUserInfoActivity.class); - acts.add(MiddleActivity.class); acts.add(NimMiddleActivity.class); for (Class act : acts) { diff --git a/app/src/main/java/com/yizhuan/erban/push/HWPushMiddleActivity.java b/app/src/main/java/com/yizhuan/erban/push/HWPushMiddleActivity.java deleted file mode 100644 index d32d0a20d..000000000 --- a/app/src/main/java/com/yizhuan/erban/push/HWPushMiddleActivity.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.yizhuan.erban.push; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.os.Handler; -import android.util.Log; - -import com.yizhuan.erban.MainActivity; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.utils.PushMessageHandler; - -public class HWPushMiddleActivity extends Activity { - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - Intent intent = getIntent(); - if (null != intent) { - // 方法2设置的数据通过如下方式获取 - Log.d("HWPush", intent.toString()); - MainActivity.start(this); - new Handler().postDelayed(new Runnable() { - @Override - public void run() { - int skiptype = intent.getIntExtra("skiptype", 0); - if (skiptype == PushMessageHandler.PAYLOAD_SKIPTYPE_INVITE_FANS) { - String roomUid = intent.getStringExtra("roomUid"); - AVRoomActivity.start(HWPushMiddleActivity.this, Long.parseLong(roomUid)); - } else if (skiptype == PushMessageHandler.PAYLOAD_SKIPTYPE_PRIVATE_MSG) { - String uid = intent.getStringExtra("uid"); - NimP2PMessageActivity.start(HWPushMiddleActivity.this, uid); - } else if (skiptype == PushMessageHandler.PAYLOAD_SKIPTYPE_H5) { - String roomUid = intent.getStringExtra("roomUid"); - CommonWebViewActivity.start(HWPushMiddleActivity.this, roomUid); - } - } - }, 2000); - } - finish(); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/push/MeizuPushReceiver.java b/app/src/main/java/com/yizhuan/erban/push/MeizuPushReceiver.java deleted file mode 100644 index 0b6107941..000000000 --- a/app/src/main/java/com/yizhuan/erban/push/MeizuPushReceiver.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.yizhuan.erban.push; - -import android.content.Context; - -import com.meizu.cloud.pushsdk.platform.message.RegisterStatus; -import com.netease.nimlib.sdk.mixpush.MeiZuPushReceiver; -import com.orhanobut.logger.Logger; - -/** - * Created by lvzebiao on 2019/1/18. - */ - -public class MeizuPushReceiver extends MeiZuPushReceiver { - - @Override - public void onRegister(Context context, String pushId) { - super.onRegister(context, pushId); - } - - @Override - public void onRegisterStatus(Context context, RegisterStatus registerStatus) { - super.onRegisterStatus(context, registerStatus); - Logger.i("魅族推送ID:" + registerStatus.getPushId()); - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/push/MiPushReceiver.java b/app/src/main/java/com/yizhuan/erban/push/MiPushReceiver.java deleted file mode 100644 index 455bc0001..000000000 --- a/app/src/main/java/com/yizhuan/erban/push/MiPushReceiver.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.yizhuan.erban.push; - -import android.content.Context; - -import com.netease.nimlib.sdk.mixpush.MiPushMessageReceiver; -import com.orhanobut.logger.Logger; -import com.xiaomi.mipush.sdk.ErrorCode; -import com.xiaomi.mipush.sdk.MiPushClient; -import com.xiaomi.mipush.sdk.MiPushCommandMessage; - -import java.util.List; - -/** - * Created by lvzebiao on 2019/1/18. - */ - -public class MiPushReceiver extends MiPushMessageReceiver { - - - @Override - public void onCommandResult(Context context, MiPushCommandMessage message) { - super.onCommandResult(context, message); - - Logger.i("小米推送...."); - String command = message.getCommand(); - List arguments = message.getCommandArguments(); - if (MiPushClient.COMMAND_REGISTER.equals(command)) { - if (message.getResultCode() == ErrorCode.SUCCESS) { - String mRegID = arguments.get(0); - Logger.i("小米推送mRegID:" + mRegID); - } - } - - } -} diff --git a/app/src/main/java/com/yizhuan/erban/push/OppoAppPushService.java b/app/src/main/java/com/yizhuan/erban/push/OppoAppPushService.java deleted file mode 100644 index 24664c06a..000000000 --- a/app/src/main/java/com/yizhuan/erban/push/OppoAppPushService.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.erban.push; - -import com.netease.nimlib.sdk.mixpush.OppoAppPushMessageService; - -public class OppoAppPushService extends OppoAppPushMessageService { -} diff --git a/app/src/main/java/com/yizhuan/erban/push/OppoPushService.java b/app/src/main/java/com/yizhuan/erban/push/OppoPushService.java deleted file mode 100644 index 23368a2bc..000000000 --- a/app/src/main/java/com/yizhuan/erban/push/OppoPushService.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.erban.push; - -import com.netease.nimlib.sdk.mixpush.OppoPushMessageService; - -public class OppoPushService extends OppoPushMessageService { -} 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 83b92dbe9..5c1ca2494 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 @@ -14,34 +14,25 @@ import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.StatusBarUtil; import com.yizhuan.erban.R; -import com.yizhuan.erban.bank_card.activity.AddBankCardAgreementActivity; import com.yizhuan.erban.base.BaseActivity; import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.ui.setting.ModifyPwdActivity; import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.password.PassWordFragment; import com.yizhuan.erban.ui.widget.password.PasswordEvent; import com.yizhuan.xchat_android_core.Constants; import com.yizhuan.xchat_android_core.UriProvider; import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; import com.yizhuan.xchat_android_core.bean.response.result.ChargeListResult; import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.PaymentActivity; import com.yizhuan.xchat_android_core.pay.bean.ChargeBean; -import com.yizhuan.xchat_android_core.pay.bean.PaymentResult; import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.pay.bean.unionpay.UnionPayOrder; import com.yizhuan.xchat_android_core.pay.event.GetWalletInfoEvent; import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent; -import com.yizhuan.xchat_android_core.pay.model.unionpay.UnionPayModel; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; import com.yizhuan.xchat_android_core.utils.CheckUtils; import com.yizhuan.xchat_android_core.utils.net.BeanObserver; import com.yizhuan.xchat_android_core.web.event.WebViewRefreshEvent; -import com.yizhuan.xchat_android_library.utils.JavaUtil; import com.yizhuan.xchat_android_library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; @@ -50,14 +41,10 @@ import org.greenrobot.eventbus.ThreadMode; import java.util.List; import java.util.Objects; -import java.util.concurrent.TimeUnit; -import io.reactivex.Observable; import io.reactivex.SingleObserver; -import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; /** * 充值界面 @@ -147,7 +134,6 @@ public class ChargeActivity extends BaseActivity { tvCharge.setOnClickListener(v -> { if (mSelectChargeBean == null) return; getDialogManager().showProgressDialog(this, false); - PaymentActivity.start(this, payChannel, mSelectChargeBean.chargeProdId); }); tvAgreement.setOnClickListener(v -> { CommonWebViewActivity.start(this, UriProvider.getRechargeAgreementUrl()); @@ -373,125 +359,11 @@ public class ChargeActivity extends BaseActivity { if (resultCode != RESULT_OK) { return; } - //支付页面返回处理 - if (requestCode == PaymentActivity.REQUEST_CODE_PAY) { - if (data != null && data.getExtras() != null) { - PaymentResult paymentResult = data.getParcelableExtra(PaymentActivity.KEY_PAY_RESULT); - if (paymentResult != null) { - // 充值金额超过限定时，就必须先实名认证 - int payResultCode = JavaUtil.str2int(paymentResult.getCode()); - switch (payResultCode) { - case PayModel.NOT_REAL_NAME_BEFORE_CHARGING: - getDialogManager().showTipsDialog(getString(R.string.tips_need_to_certification), - getString(R.string.go_to_certification), - new DialogManager.AbsOkDialogListener() { - @Override - public void onOk() { - // 跳去实名认证页面 - CommonWebViewActivity.start(ChargeActivity.this, - UriProvider.getTutuRealNamePage()); - } - }); - break; - - case UnionPayModel.CODE_NEED_BIND_BANK_CARD_FIRST: - getDialogManager().showTipsDialog( - getString(R.string.tips_need_bind_bank_card_first), - new DialogManager.AbsOkDialogListener() { - @Override - public void onOk() { - // 跳去添加银行卡页面 - AddBankCardAgreementActivity.start(ChargeActivity.this); - } - }); - break; - - case PaymentResult.CODE_SHOW_PAYMENT_PSW: - showPaymentConfirmDialog(); - break; - - case PaymentResult.CODE_UNION_PAY_WAITING_FOR_RESULT: - queryingPaymentResult(); - break; - - default: - toast(paymentResult.getMsg()); - //重新获取钱包信息 - PayModel.get().getWalletInfo(AuthModel.get().getCurrentUid()).subscribe(); - } - } - } - } if (requestCode == BINDCODE_GOLD) { ModifyPwdActivity.start(this, ModifyPwdActivity.FOGERT_PAY_PWD); } } - /** - * 银联支付下，弹出确认弹窗，方便用户查看支付金额和支付使用的银行卡，还能切换银行卡 - */ - private void showPaymentConfirmDialog() { - if (mSelectChargeBean == null) { - return; - } - ConfirmPaymentDialog.newInstance(mSelectChargeBean.getMoney(), - selectedBankInfo -> { - UnionPayModel.getInstance().setSelectedBankInfo(selectedBankInfo); - PassWordFragment.newInstance().show(getSupportFragmentManager()); - }) - .show(getSupportFragmentManager(), ConfirmPaymentDialog.class.getName()); - } - - /** - * 银联支付存在一定的延时，所以这里加一个五秒的 loading 动画在前台， - * 后台在每秒轮询服务器获取订单状态 - * 当获取到订单状态为成功或者失败的时候，loading 结束， - * 否则一直 loading，直到五秒结束后 toast 提示用户自行查账单 - */ - private void queryingPaymentResult() { - UnionPayOrder unionPayOrder = UnionPayModel.getInstance().getUnionPayOrder(); - if (unionPayOrder == null) { - getDialogManager().dismissDialog(); - return; - } - // 前台 loading - getDialogManager().showProgressDialog(ChargeActivity.this, - getString(R.string.tips_querying_payment_result), false); - // 轮询订单支付结果 - Observable> stringObservable = - Observable.interval(0, 1, TimeUnit.SECONDS) - .take(5) - .subscribeOn(Schedulers.io()) - .concatMap(aLong -> UnionPayModel.getInstance() - .unionPayResult(unionPayOrder.getOrderNo()) - .toObservable()) - .observeOn(AndroidSchedulers.mainThread()) - .filter(pollingJsonResult -> - pollingJsonResult.getCode() == ServiceResult.SC_SUCCESS || - pollingJsonResult.getCode() == UnionPayModel.CODE_UNION_PAY_FAILED) - .timeout(5, TimeUnit.SECONDS); - compositeDisposable.add( - stringObservable.subscribe(stringServiceResult -> { - getDialogManager().dismissDialog(); - disposeCompositeDisposable(); - if (stringServiceResult != null) { - toast(stringServiceResult.getMessage()); - if (stringServiceResult.getCode() == ServiceResult.SC_SUCCESS) { - PayModel.get().setFirstChargeSuccess(false); - onRefreshing(); - } - } - }, throwable -> { - throwable.printStackTrace(); - getDialogManager().dismissDialog(); - toast(throwable.getMessage()); - }, () -> { - getDialogManager().dismissDialog(); - toast(R.string.toast_payment_result_delayed); - }) - ); - } - private void disposeCompositeDisposable() { if (compositeDisposable != null && !compositeDisposable.isDisposed()) { compositeDisposable.dispose(); @@ -605,7 +477,6 @@ public class ChargeActivity extends BaseActivity { @Subscribe(threadMode = ThreadMode.MAIN) public void onGetPassword(PasswordEvent event) { getDialogManager().showProgressDialog(this); - PaymentActivity.startToPay(this, Constants.CHARGE_UNION_PAY, event.getPassword()); } @Override diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeDialog.java b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeDialog.java deleted file mode 100644 index f60bf4396..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeDialog.java +++ /dev/null @@ -1,597 +0,0 @@ -package com.yizhuan.erban.ui.pay; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.text.TextUtils; -import android.view.Gravity; -import android.view.View; -import android.view.WindowManager; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.netease.nim.uikit.StatusBarUtil; -import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bank_card.activity.AddBankCardAgreementActivity; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.setting.ModifyPwdActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.password.PassWordFragment; -import com.yizhuan.erban.ui.widget.password.PasswordEvent; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.ChargeListResult; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.PaymentActivity; -import com.yizhuan.xchat_android_core.pay.bean.ChargeBean; -import com.yizhuan.xchat_android_core.pay.bean.PaymentResult; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.pay.bean.unionpay.UnionPayOrder; -import com.yizhuan.xchat_android_core.pay.event.GetWalletInfoEvent; -import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent; -import com.yizhuan.xchat_android_core.pay.model.unionpay.UnionPayModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.CheckUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.web.event.WebViewRefreshEvent; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; - -import org.greenrobot.eventbus.EventBus; -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; - -import java.util.List; -import java.util.Objects; -import java.util.concurrent.TimeUnit; - -import io.reactivex.Observable; -import io.reactivex.SingleObserver; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; - -/** - * 充值界面 - * - * @author zhouxiangfeng - * @date 2017/6/19 - */ -public class ChargeDialog extends BaseActivity { - - public static final int ALI_PAY_CLOSE = 1; - public static final int WX_PAY_CLOSE = 2; - public static final int ALI_PAY_OPEN = 3; - public static final int WX_PAY_OPEN = 4; - private static final String TAG = "ChargeDialog"; - private final int BINDCODE_GOLD = 200; - List mBigList; - List mList; - private TextView mTv_gold; - private LinearLayout ll_type_first; - private ImageView iv_type_first; - private TextView tv_type_first; - private LinearLayout ll_type_second; - private ImageView iv_type_second; - private TextView tv_type_second; - private TextView tvCharge; - private RecyclerView mRecyclerView; - private ChargeAdapter mChargeAdapter; - private TextView tvAgreement; - private LinearLayout ll_more; - private ChargeBean mSelectChargeBean; - private int mListSize; - private volatile String payChannel = Constants.CHARGE_WX; - private boolean mIsFromH5; - private CompositeDisposable compositeDisposable = new CompositeDisposable(); - - public static void start(Context context) { - UserInfo userInfo = UserModel.get().getCacheLoginUserInfo(); - if (context == null || userInfo == null) return; - Intent intent = new Intent(context, ChargeDialog.class); - context.startActivity(intent); - } - - public static void start(Context context, boolean isFromH5) { - UserInfo userInfo = UserModel.get().getCacheLoginUserInfo(); - if (context == null || userInfo == null) return; - Intent intent = new Intent(context, ChargeDialog.class); - intent.putExtra("isFromH5", isFromH5); - context.startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.dialog_charge); - //这里的height用MATCH_PARENT状态栏会被顶上去,不知道什么鬼 - int height = ScreenUtil.screenHeight - ScreenUtil.getStatusBarHeight(context); - getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, height); - getWindow().setGravity(Gravity.BOTTOM); - initTitleBar("充值"); - mTitleBar.setLeftClickListener(v -> finishPage()); - bindViews(); - setListener(); - initiate(); - } - - private void setListener() { - ll_more.setOnClickListener(v -> hideMoreButton()); - tvCharge.setOnClickListener(v -> { - if (mSelectChargeBean == null) return; - getDialogManager().showProgressDialog(this, false); - PaymentActivity.start(this, payChannel, mSelectChargeBean.chargeProdId); - }); - tvAgreement.setOnClickListener(v -> { - CommonWebViewActivity.start(this, UriProvider.getRechargeAgreementUrl()); - }); - } - - 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); - iv_type_first = findViewById(R.id.iv_type_first); - ll_type_second = findViewById(R.id.ll_type_second); - ll_more = findViewById(R.id.ll_more); - tvCharge = findViewById(R.id.tv_charge); - tvAgreement = findViewById(R.id.tv_agreement); - iv_type_second = findViewById(R.id.iv_type_second); - tv_type_first = findViewById(R.id.tv_type_first); - tv_type_second = findViewById(R.id.tv_type_second); - } - - public void selectPayChannelDisplay(String payChannel, int defaultPay) { - this.payChannel = payChannel; - boolean selectWeChatPay = (Objects.equals(this.payChannel, Constants.CHARGE_WX)); - boolean selectAliPay = (Objects.equals(this.payChannel, Constants.CHARGE_ALIPAY)); - 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: - case ALI_PAY_OPEN: - ll_type_first.setSelected(selectAliPay); - ll_type_second.setSelected(selectWeChatPay); - break; - - case WX_PAY_CLOSE: - case WX_PAY_OPEN: - ll_type_first.setSelected(selectWeChatPay); - ll_type_second.setSelected(selectAliPay); - break; - default: - defaultSetPay(selectWeChatPay, selectAliPay); - break; - } - } - - /** - * 默认选择的支付方式 - * - * @param selectWeChatPay - * @param selectAliPay - */ - private void defaultSetPay(boolean selectWeChatPay, boolean selectAliPay) { - ll_type_first.setSelected(selectWeChatPay); - ll_type_second.setSelected(selectAliPay); - } - - private void initiate() { - mIsFromH5 = getIntent().getBooleanExtra("isFromH5", false); - mRecyclerView = findViewById(R.id.recyclerView); - mRecyclerView.setNestedScrollingEnabled(false); - mRecyclerView.setLayoutManager(new GridLayoutManager(this, 3)); - mChargeAdapter = new ChargeAdapter(true); - mRecyclerView.setAdapter(mChargeAdapter); - mChargeAdapter.setOnItemClickListener((baseQuickAdapter, view, position) -> { - setItemSelect(position); - }); - onRefreshing(); - onLoadingData(); - } - - private void setItemSelect(int position) { - List list = mChargeAdapter.getData(); - if (ListUtils.isListEmpty(list)) return; - - // 空对象，不让蒙板遮挡最后一个item； - ChargeBean temp = list.get(position); - if (TextUtils.isEmpty(temp.getProdName())) - return; - - mSelectChargeBean = list.get(position); - int size = list.size(); - for (int i = 0; i < size; i++) { - list.get(i).isSelected = position == i; - } - mChargeAdapter.notifyDataSetChanged(); - } - - public void onLoadingData() { - UserInfo userInfos = UserModel.get().getCacheLoginUserInfo(); - if (userInfos != null) { - PayModel.get().getWalletInfo(userInfos.getUid()).subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(WalletInfo walletInfo) { - setWalletData(walletInfo); - } - - @Override - public void onError(Throwable e) { - - } - }); - } - } - - public void onRefreshing() { - 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()); - //默认选中 - } - - @Override - public void onErrorMsg(String error) { - onGetChargeListFail(error); - } - }); - } - - @Override - protected void onResume() { - super.onResume(); - EventBus.getDefault().register(this); - if (PayModel.get().isFirstChargeSuccess()) { - PayModel.get().setFirstChargeSuccess(false); - onRefreshing(); - } - } - - @Override - protected void onPause() { - super.onPause(); - EventBus.getDefault().unregister(this); - } - - public void onGetChargeList(List chargeBeanList) { - if (chargeBeanList != null && chargeBeanList.size() > 0) { - //先判断存不存在1元档位 - boolean isExistOneYuan = false; - for (int i = 0; i < chargeBeanList.size(); i++) { - ChargeBean chargeBean = chargeBeanList.get(i); - if (chargeBean.getMoney() == 1) { - isExistOneYuan = true; - break; - } - } - int selectedMoney = isExistOneYuan ? 1 : 6; - for (int i = 0; i < chargeBeanList.size(); i++) { - ChargeBean chargeBean = chargeBeanList.get(i); - chargeBean.isSelected = chargeBean.getMoney() == selectedMoney; - if (selectedMoney == chargeBean.getMoney()) { - mSelectChargeBean = chargeBean; - } - } - mChargeAdapter.setNewData(chargeBeanList); - } - } - - public void onGetChargeListFail(String error) { - toast(error); - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - getDialogManager().dismissDialog(); - if (resultCode != RESULT_OK) { - return; - } - //支付页面返回处理 - if (requestCode == PaymentActivity.REQUEST_CODE_PAY) { - if (data != null && data.getExtras() != null) { - PaymentResult paymentResult = data.getParcelableExtra(PaymentActivity.KEY_PAY_RESULT); - if (paymentResult != null) { - // 充值金额超过限定时，就必须先实名认证 - int payResultCode = JavaUtil.str2int(paymentResult.getCode()); - switch (payResultCode) { - case PayModel.NOT_REAL_NAME_BEFORE_CHARGING: - getDialogManager().showTipsDialog(getString(R.string.tips_need_to_certification), - getString(R.string.go_to_certification), - new DialogManager.AbsOkDialogListener() { - @Override - public void onOk() { - // 跳去实名认证页面 - CommonWebViewActivity.start(ChargeDialog.this, - UriProvider.getTutuRealNamePage()); - } - }); - break; - - case UnionPayModel.CODE_NEED_BIND_BANK_CARD_FIRST: - getDialogManager().showTipsDialog( - getString(R.string.tips_need_bind_bank_card_first), - new DialogManager.AbsOkDialogListener() { - @Override - public void onOk() { - // 跳去添加银行卡页面 - AddBankCardAgreementActivity.start(ChargeDialog.this); - } - }); - break; - - case PaymentResult.CODE_SHOW_PAYMENT_PSW: - showPaymentConfirmDialog(); - break; - - case PaymentResult.CODE_UNION_PAY_WAITING_FOR_RESULT: - queryingPaymentResult(); - break; - - default: - toast(paymentResult.getMsg()); - //重新获取钱包信息 - PayModel.get().getWalletInfo(AuthModel.get().getCurrentUid()).subscribe(); - } - } - } - } - if (requestCode == BINDCODE_GOLD) { - ModifyPwdActivity.start(this, ModifyPwdActivity.FOGERT_PAY_PWD); - } - } - - /** - * 银联支付下，弹出确认弹窗，方便用户查看支付金额和支付使用的银行卡，还能切换银行卡 - */ - private void showPaymentConfirmDialog() { - if (mSelectChargeBean == null) { - return; - } - ConfirmPaymentDialog.newInstance(mSelectChargeBean.getMoney(), - selectedBankInfo -> { - UnionPayModel.getInstance().setSelectedBankInfo(selectedBankInfo); - PassWordFragment.newInstance().show(getSupportFragmentManager()); - }) - .show(getSupportFragmentManager(), ConfirmPaymentDialog.class.getName()); - } - - /** - * 银联支付存在一定的延时，所以这里加一个五秒的 loading 动画在前台， - * 后台在每秒轮询服务器获取订单状态 - * 当获取到订单状态为成功或者失败的时候，loading 结束， - * 否则一直 loading，直到五秒结束后 toast 提示用户自行查账单 - */ - private void queryingPaymentResult() { - UnionPayOrder unionPayOrder = UnionPayModel.getInstance().getUnionPayOrder(); - if (unionPayOrder == null) { - getDialogManager().dismissDialog(); - return; - } - // 前台 loading - getDialogManager().showProgressDialog(ChargeDialog.this, - getString(R.string.tips_querying_payment_result), false); - // 轮询订单支付结果 - Observable> stringObservable = - Observable.interval(0, 1, TimeUnit.SECONDS) - .take(5) - .subscribeOn(Schedulers.io()) - .concatMap(aLong -> UnionPayModel.getInstance() - .unionPayResult(unionPayOrder.getOrderNo()) - .toObservable()) - .observeOn(AndroidSchedulers.mainThread()) - .filter(pollingJsonResult -> - pollingJsonResult.getCode() == ServiceResult.SC_SUCCESS || - pollingJsonResult.getCode() == UnionPayModel.CODE_UNION_PAY_FAILED) - .timeout(5, TimeUnit.SECONDS); - compositeDisposable.add( - stringObservable.subscribe(stringServiceResult -> { - getDialogManager().dismissDialog(); - disposeCompositeDisposable(); - if (stringServiceResult != null) { - toast(stringServiceResult.getMessage()); - if (stringServiceResult.getCode() == ServiceResult.SC_SUCCESS) { - PayModel.get().setFirstChargeSuccess(false); - onRefreshing(); - } - } - }, throwable -> { - throwable.printStackTrace(); - getDialogManager().dismissDialog(); - toast(throwable.getMessage()); - }, () -> { - getDialogManager().dismissDialog(); - toast(R.string.toast_payment_result_delayed); - }) - ); - } - - private void disposeCompositeDisposable() { - if (compositeDisposable != null && !compositeDisposable.isDisposed()) { - compositeDisposable.dispose(); - } - } - - @Override - protected void onDestroy() { - super.onDestroy(); - disposeCompositeDisposable(); - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onWalletInfoUpdate(UpdateWalletInfoEvent event) { - WalletInfo walletInfo = PayModel.get().getCurrentWalletInfo(); - if (walletInfo != null) { - setWalletData(walletInfo); - } - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onGetWalletInfo(GetWalletInfoEvent event) { - WalletInfo walletInfo = PayModel.get().getCurrentWalletInfo(); - if (walletInfo != null) { - setWalletData(walletInfo); - } - } - - /** - * defaultPay 1：默认支付宝，2：默认微信 - */ - private void setWalletData(WalletInfo walletInfo) { - if (walletInfo == null) return; - mTv_gold.setText(getString(R.string.charge_gold, walletInfo.getDiamondNum())); - int defaultPay = walletInfo.getDefaultPay(); - switch (defaultPay) { - case ALI_PAY_CLOSE: - payChannel = Constants.CHARGE_ALIPAY; - showMoreButton(); - setAliPayFirst(defaultPay); - break; - - case WX_PAY_CLOSE: - payChannel = Constants.CHARGE_WX; - showMoreButton(); - setWxPayFirst(defaultPay); - break; - - case ALI_PAY_OPEN: - payChannel = Constants.CHARGE_ALIPAY; - hideMoreButton(); - setAliPayFirst(defaultPay); - break; - - case WX_PAY_OPEN: - payChannel = Constants.CHARGE_WX; - hideMoreButton(); - setWxPayFirst(defaultPay); - break; - default: - defaultPay(defaultPay); - break; - } - if (CheckUtils.isCheckUser()) { - selectPayChannelDisplay(Constants.CHARGE_ALIPAY, defaultPay); - } else { - selectPayChannelDisplay(payChannel, defaultPay); - } - } - - /** - * 默认支付方式 - * - * @param defaultPay - */ - private void defaultPay(int defaultPay) { - payChannel = Constants.CHARGE_WX; - hideMoreButton(); - setWxPayFirst(defaultPay); - } - - private void setAliPayFirst(int defaultType) { - iv_type_first.setImageDrawable(getResources().getDrawable(R.drawable.dialog_charge_ic_alipay)); - iv_type_second.setImageDrawable(getResources().getDrawable(R.drawable.dialog_charge_ic_wechat)); - tv_type_first.setText("支付宝"); - tv_type_second.setText("微信"); - ll_type_first.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_ALIPAY, defaultType)); - ll_type_second.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_WX, defaultType)); - if (CheckUtils.isCheckUser()) { - ll_type_first.setVisibility(View.VISIBLE); - ll_type_second.setVisibility(View.GONE); - ll_more.setVisibility(View.GONE); - } - } - - private void setWxPayFirst(int defaultType) { - iv_type_first.setImageDrawable(getResources().getDrawable(R.drawable.dialog_charge_ic_wechat)); - iv_type_second.setImageDrawable(getResources().getDrawable(R.drawable.dialog_charge_ic_alipay)); - tv_type_first.setText("微信"); - tv_type_second.setText("支付宝"); - ll_type_first.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_WX, defaultType)); - ll_type_second.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_ALIPAY, defaultType)); - if (CheckUtils.isCheckUser()) { - ll_type_first.setVisibility(View.GONE); - ll_type_second.setVisibility(View.VISIBLE); - ll_more.setVisibility(View.GONE); - } - - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onGetPassword(PasswordEvent event) { - getDialogManager().showProgressDialog(this); - PaymentActivity.startToPay(this, Constants.CHARGE_UNION_PAY, event.getPassword()); - } - - @Override - protected boolean needSteepStateBar() { - return true; - } - - @Override - protected void setStatusBar() { - super.setStatusBar(); - StatusBarUtil.transparencyBar(this); - } - - @Override - public void onBackPressed() { - super.onBackPressed(); - finishPage(); - } - - private void finishPage() { - finish(); - if (!mIsFromH5) return; - EventBus.getDefault().post(new WebViewRefreshEvent()); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ConfirmPaymentDialog.java b/app/src/main/java/com/yizhuan/erban/ui/pay/ConfirmPaymentDialog.java deleted file mode 100644 index 390a7fdf9..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/ConfirmPaymentDialog.java +++ /dev/null @@ -1,294 +0,0 @@ -package com.yizhuan.erban.ui.pay; - -import android.animation.ObjectAnimator; -import android.app.Dialog; -import android.content.Context; -import android.graphics.drawable.ColorDrawable; -import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.FragmentManager; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import android.text.TextUtils; -import android.util.DisplayMetrics; -import android.view.Display; -import android.view.Gravity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.Window; -import android.view.WindowManager; -import android.widget.Button; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.pay.adapter.ConfirmPaymentSelectBankAdapter; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.bank_card.bean.BankCardBean; -import com.yizhuan.xchat_android_core.pay.model.unionpay.UnionPayModel; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.zyyoona7.lib.EasyPopup; -import com.zyyoona7.lib.HorizontalGravity; -import com.zyyoona7.lib.VerticalGravity; - -import java.util.List; - -import butterknife.BindView; -import butterknife.ButterKnife; -import butterknife.Unbinder; - -public class ConfirmPaymentDialog extends DialogFragment implements View.OnClickListener { - - public static final String CONFIRM_PAYMENT_AMOUNT = "confirm_payment_amount"; - @BindView(R.id.iv_close) - ImageView ivClose; - @BindView(R.id.tv_amount) - TextView tvAmount; - @BindView(R.id.iv_selected_bank_img) - ImageView ivSelectedBankImg; - @BindView(R.id.tv_selected_bank_name) - TextView tvSelectedBankName; - @BindView(R.id.iv_select) - ImageView ivSelect; - @BindView(R.id.layout_select_way) - LinearLayout layoutSelectWay; - @BindView(R.id.btn_pay) - Button btnPay; - - Unbinder unbinder; - private Context context; - - private EasyPopup easyPopup; - private ObjectAnimator objectAnimatorUp, objectAnimatorDown; - - // 参数 - private double amount; - private OnConfirmPaymentSelectBankListener onConfirmPaymentSelectBankListener; - - // 选中的银行卡信息 - private BankCardBean selectedBankInfo; - - public static ConfirmPaymentDialog newInstance(double amount, OnConfirmPaymentSelectBankListener listener) { - - Bundle args = new Bundle(); - args.putDouble(CONFIRM_PAYMENT_AMOUNT, amount); - ConfirmPaymentDialog fragment = new ConfirmPaymentDialog(); - fragment.setArguments(args); - if (listener != null) { - fragment.setOnConfirmPaymentSelectBankListener(listener); - } - return fragment; - } - - @Override - public void onAttach(Context context) { - super.onAttach(context); - this.context = context; - if (getArguments() != null) { - amount = getArguments().getDouble(CONFIRM_PAYMENT_AMOUNT); - } - } - - @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setStyle(DialogFragment.STYLE_NO_TITLE, R.style.ErbanBottomSheetDialog); - } - - @NonNull - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - Dialog dialog = super.onCreateDialog(savedInstanceState); - dialog.setCanceledOnTouchOutside(true); - dialog.setCancelable(true); - return dialog; - } - - @Override - public void onStart() { - super.onStart(); - Window window = getDialog().getWindow(); - if (window != null) { - window.setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.transparent))); - WindowManager.LayoutParams layoutParams = getDialog().getWindow().getAttributes(); - DisplayMetrics dm = new DisplayMetrics(); - Display display = window.getWindowManager().getDefaultDisplay(); - display.getRealMetrics(dm); - if (getActivity() != null && getActivity().getWindowManager() != null) { - getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm); - } - layoutParams.width = dm.widthPixels; - layoutParams.height = ScreenUtil.dip2px(400); - layoutParams.gravity = Gravity.BOTTOM; - window.setAttributes(layoutParams); - } - } - - @Nullable - @Override - public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.dialog_confirm_payment, container); - unbinder = ButterKnife.bind(this, view); - - initAnim(); - setListeners(); - setAmountInfo(); - initBankListData(); - return view; - } - - private void initAnim() { - objectAnimatorUp = ObjectAnimator.ofFloat(ivSelect, "rotation", 180f); - objectAnimatorUp.setDuration(600); - objectAnimatorDown = ObjectAnimator.ofFloat(ivSelect, "rotation", 360f); - objectAnimatorDown.setDuration(600); - } - - private void setListeners() { - ivClose.setOnClickListener(this); - btnPay.setOnClickListener(this); - layoutSelectWay.setOnClickListener(this); - } - - private void setAmountInfo() { - tvAmount.setText(String.format("%s", amount)); - changeButtonState();// 金额赋值 - } - - private void initBankListData() { - if (UnionPayModel.getInstance().getUnionPayOrder() != null && !ListUtils.isListEmpty(UnionPayModel.getInstance().getUnionPayOrder().getCardInfos())) { - List bankCardList = UnionPayModel.getInstance().getUnionPayOrder().getCardInfos(); - // 选择银行卡弹出框 - initEasyPop(bankCardList); - // 默认选中银行卡 - for (BankCardBean bankCardBean : bankCardList) { - if (bankCardBean != null && bankCardBean.isDefaultPaymentCard()) { - selectedBankInfo = bankCardBean; - } - } - if (selectedBankInfo == null) { - BankCardBean defaultBankCardBean = bankCardList.get(0); - if (defaultBankCardBean != null) { - selectedBankInfo = defaultBankCardBean; - } - } - setBankInfo(); - } - } - - private void initEasyPop(List list) { - easyPopup = new EasyPopup(context) - .setContentView(R.layout.dialog_confirm_payment_select) - .setFocusAndOutsideEnable(true) - .setBackgroundDimEnable(false) - .setWidth(UIUtil.dip2px(context, 280)) - .setHeight(UIUtil.dip2px(context, 200)) - .createPopup(); - RecyclerView bankRecyclerView = easyPopup.getView(R.id.recycler_bank_list); - bankRecyclerView.setLayoutManager(new LinearLayoutManager(context)); - ConfirmPaymentSelectBankAdapter adapter = new ConfirmPaymentSelectBankAdapter(R.layout.item_confirm_payment_select_bank, list); - bankRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener((adapter1, view, position) -> { - Object item = adapter1.getItem(position); - if (item instanceof BankCardBean) { - selectedBankInfo = (BankCardBean) item; - setBankInfo(); - } - dismissPopup(); - }); - - easyPopup.setOnDismissListener(() -> { - if (objectAnimatorDown != null) { - objectAnimatorDown.start(); - } - }); - } - - private void setBankInfo() { - if (selectedBankInfo == null) { - return; - } - String bankCardNo = selectedBankInfo.getBankCardNo(); - if (TextUtils.isEmpty(bankCardNo) && bankCardNo.length() < 4) { - bankCardNo = ""; - } else { - bankCardNo = bankCardNo.substring(bankCardNo.length() - 4); - } - String bankName = TextUtils.isEmpty(selectedBankInfo.getBankName()) ? "" : selectedBankInfo.getBankName(); - tvSelectedBankName.setText(String.format("%s(%s)", bankName, bankCardNo)); - ImageLoadUtils.loadImage(context, selectedBankInfo.getBankLogo(), ivSelectedBankImg); - - changeButtonState();// 银行卡信息赋值 - } - - private void changeButtonState() { - if (amount > 0 && selectedBankInfo != null) { - btnPay.setEnabled(true); - } else { - btnPay.setEnabled(false); - } - } - - @Override - public void onClick(View view) { - int id = view.getId(); - if (id == R.id.iv_close) {// 关闭 - dismiss(); - } else if (id == R.id.btn_pay) {// 支付 - if (onConfirmPaymentSelectBankListener != null && selectedBankInfo != null) { - onConfirmPaymentSelectBankListener.onSelectFinish(selectedBankInfo); - } - dismiss(); - } else if (id == R.id.layout_select_way) {// 选择支付方式 - showPopup(); - } - } - - private void showPopup() { - if (easyPopup != null) { - easyPopup.showAtAnchorView(layoutSelectWay, - VerticalGravity.BELOW, - HorizontalGravity.ALIGN_RIGHT, - UIUtil.dip2px(context, -15), - UIUtil.dip2px(context, 15)); - if (objectAnimatorUp != null) { - objectAnimatorUp.start(); - } - } - } - - private void dismissPopup() { - if (easyPopup != null) { - easyPopup.dismiss(); - } - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - unbinder.unbind(); - } - - @Override - public void show(FragmentManager manager, String tag) { - if (manager.findFragmentByTag(tag) == null) { - manager.beginTransaction() - .add(this, tag) - .commitAllowingStateLoss(); - } - } - - public interface OnConfirmPaymentSelectBankListener { - void onSelectFinish(BankCardBean selectedBankInfo); - } - - public void setOnConfirmPaymentSelectBankListener(OnConfirmPaymentSelectBankListener onConfirmPaymentSelectBankListener) { - this.onConfirmPaymentSelectBankListener = onConfirmPaymentSelectBankListener; - } -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/adapter/ConfirmPaymentSelectBankAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/pay/adapter/ConfirmPaymentSelectBankAdapter.java deleted file mode 100644 index ad26a5cb3..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/adapter/ConfirmPaymentSelectBankAdapter.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.yizhuan.erban.ui.pay.adapter; - -import androidx.annotation.Nullable; -import android.text.TextUtils; -import android.widget.ImageView; -import android.widget.TextView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bank_card.bean.BankCardBean; - -import java.util.List; - -public class ConfirmPaymentSelectBankAdapter extends BaseQuickAdapter { - - public ConfirmPaymentSelectBankAdapter(int layoutResId, @Nullable List data) { - super(layoutResId, data); - } - - @Override - protected void convert(BaseViewHolder helper, BankCardBean item) { - if (item == null) { - return; - } - ImageView bankImage = helper.getView(R.id.iv_bank_image); - ImageLoadUtils.loadImage(mContext, item.getBankLogo(), bankImage); - - TextView tvBankName = helper.getView(R.id.tv_bank_name); - String bankCardNo = item.getBankCardNo(); - if (TextUtils.isEmpty(bankCardNo) && bankCardNo.length() < 4) { - bankCardNo = ""; - } else { - bankCardNo = bankCardNo.substring(bankCardNo.length() - 4); - } - String bankName = TextUtils.isEmpty(item.getBankName()) ? "" : item.getBankName(); - tvBankName.setText(String.format("%s(%s)", bankName, bankCardNo)); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/JSInterface.java b/app/src/main/java/com/yizhuan/erban/ui/webview/JSInterface.java index c5f341ed6..005c45806 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/JSInterface.java +++ b/app/src/main/java/com/yizhuan/erban/ui/webview/JSInterface.java @@ -14,9 +14,6 @@ import android.webkit.WebView; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.alibaba.security.realidentity.RPEventListener; -import com.alibaba.security.realidentity.RPResult; -import com.alibaba.security.realidentity.RPVerify; import com.netease.nim.uikit.common.util.log.LogUtil; import com.orhanobut.logger.Logger; import com.umeng.commonsdk.statistics.common.DeviceConfig; @@ -458,36 +455,7 @@ public class JSInterface { */ @JavascriptInterface public void openFaceLiveness(String verifyToken) { - Log.d(TAG, "openFaceLiveness() called with: verifyToken = [" + verifyToken + "]"); - RPVerify.start(mActivity, verifyToken, new RPEventListener() { - @Override - public void onFinish(RPResult rpResult, String s, String s1) { - Log.d(TAG, String.format(Locale.getDefault(), "openFaceLiveness: auit: %s, s: %s", - rpResult, s)); - int result = -3; - if (rpResult == RPResult.AUDIT_PASS) { - // 认证通过 - result = 2; - // 更新本地缓存 - UserInfo userInfo = UserModel.get().getCacheLoginUserInfo(); - if (userInfo != null) { - userInfo.setCertified(true); - } - // 认证通过的时候刷新用户信息 - UserModel.get().updateCurrentUserInfo().subscribe(); - } else if (rpResult == RPResult.AUDIT_FAIL) { - // 认证不通过 - result = 1; - } else if (rpResult == RPResult.AUDIT_NOT) { - // 未认证，用户取消 - result = -1; - } else if (rpResult == RPResult.AUDIT_EXCEPTION) { - // 系统异常 - result = -2; - } - EventBus.getDefault().post(new CertificationResultEvent().setStatus(result)); - } - }); + } /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java index 61e01eb4b..0afcacc4a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java @@ -47,7 +47,7 @@ import com.yizhuan.erban.common.widget.CircleImageView; import com.yizhuan.erban.radish.task.activity.TaskCenterActivity; import com.yizhuan.erban.ui.gift.dialog.GiftInfoVm; import com.yizhuan.erban.ui.gift.dialog.PageIndicatorView; -import com.yizhuan.erban.ui.pay.ChargeDialog; +import com.yizhuan.erban.ui.pay.ChargeActivity; import com.yizhuan.erban.ui.utils.ImageLoadUtils; import com.yizhuan.erban.ui.webview.DialogWebViewActivity; import com.yizhuan.erban.ui.widget.dialog.GiftManualQuantityDialog; @@ -1040,7 +1040,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene if (itemType == ITEM_TYPE_GOLD) { StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_GIFT_PANEL_TO_RECHARGE, "礼物面板_去充值:" + GIFT_DIALOG_FROM); - ChargeDialog.start(getContext()); + ChargeActivity.start(getContext()); } else if (itemType == ITEM_TYPE_RADISH) { TaskCenterActivity.start(context, TaskCenterActivity.FromPage.GIFT); } 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 2c1e03feb..73b41099b 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 @@ -32,7 +32,6 @@ import com.yizhuan.erban.utils.SpannableBuilder; import com.yizhuan.xchat_android_core.UriProvider; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.initial.bean.TaxInfo; -import com.yizhuan.xchat_android_core.pay.bean.NotRealNameYetException; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; import com.yizhuan.xchat_android_core.utils.net.BeanObserver; @@ -60,6 +59,7 @@ import io.reactivex.disposables.Disposable; */ public class WithdrawActivity extends BaseActivity { + public WithdrwaListInfo checkedPosition; @BindView(R.id.tv_withdraw_type) TextView tvWithdrawType; @BindView(R.id.zhifubao) @@ -68,7 +68,6 @@ public class WithdrawActivity extends BaseActivity { TextView tvTaxMoney; @BindView(R.id.tv_income_money) TextView tvIncomeMoney; - private TitleBar mTitleBar; private TextView zxcAccount; private TextView alipayName; @@ -79,7 +78,6 @@ public class WithdrawActivity extends BaseActivity { private Button btnWithdraw; private Button unBtnWithdraw; private WithdrawJewelAdapter mJewelAdapter; - public WithdrwaListInfo checkedPosition; private WithdrawInfo withdrawInfos = new WithdrawInfo(); private TextView tvTip; private TextView tvWithdrawRule; @@ -207,30 +205,16 @@ public class WithdrawActivity extends BaseActivity { if (throwable == null) { onRequestExchange(exchangerInfo); } else { - if (throwable instanceof NotRealNameYetException) { - NotRealNameYetException exception = (NotRealNameYetException) throwable; - getDialogManager().showTipsDialog(getString(R.string.tips_need_to_certification), - getString(R.string.go_to_certification), - new DialogManager.AbsOkDialogListener() { - @Override - public void onOk() { - // 跳去实名认证页面 - CommonWebViewActivity.start(WithdrawActivity.this, - UriProvider.getTutuRealNamePage()); - } - }); - } else { - throwable.printStackTrace(); - toast(throwable.getMessage()); - } + throwable.printStackTrace(); + toast(throwable.getMessage()); } }); } private void loadAlipayInfo() { WithdrawModel.get().getWithdrawUserInfo( - AuthModel.get().getCurrentUid() - ) + AuthModel.get().getCurrentUid() + ) .compose(bindUntilEvent(ActivityEvent.DESTROY)) .subscribe(new SingleObserver() { @Override diff --git a/app/src/main/java/com/yizhuan/erban/utils/ActWhiteListMrg.java b/app/src/main/java/com/yizhuan/erban/utils/ActWhiteListMrg.java index 110739401..635487647 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/ActWhiteListMrg.java +++ b/app/src/main/java/com/yizhuan/erban/utils/ActWhiteListMrg.java @@ -3,10 +3,8 @@ package com.yizhuan.erban.utils; import android.content.Context; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.erban.MiddleActivity; import com.yizhuan.erban.NimMiddleActivity; import com.yizhuan.erban.other.activity.SplashActivity; -import com.yizhuan.xchat_android_core.pay.PaymentActivity; import com.yizhuan.xchat_android_core.utils.ActivityUtil; import java.util.ArrayList; @@ -26,9 +24,7 @@ public class ActWhiteListMrg { return true; } List acts = new ArrayList<>(); - acts.add(MiddleActivity.class); acts.add(NimMiddleActivity.class); - acts.add(PaymentActivity.class); acts.add(SplashActivity.class); for (Class act : acts) { diff --git a/app/src/main/java/com/yizhuan/erban/utils/PermissionUtil.kt b/app/src/main/java/com/yizhuan/erban/utils/PermissionUtil.kt index 39044c34a..e9ef3ff77 100644 --- a/app/src/main/java/com/yizhuan/erban/utils/PermissionUtil.kt +++ b/app/src/main/java/com/yizhuan/erban/utils/PermissionUtil.kt @@ -6,7 +6,7 @@ import android.content.Intent import android.content.pm.PackageManager import android.net.Uri import android.os.Build -import com.microquation.linkedme.android.v4.ContextCompatLKMe +import androidx.core.content.ContextCompat import com.yizhuan.erban.BuildConfig import com.yizhuan.erban.ui.setting.bean.PermissionEntity import java.lang.Exception @@ -27,7 +27,7 @@ class PermissionUtil { it } else { it.filter { s -> - ContextCompatLKMe.checkSelfPermission(context, s) == + ContextCompat.checkSelfPermission(context, s) == PackageManager.PERMISSION_GRANTED } } diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt b/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt index bf223728c..154e41cc3 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt @@ -19,11 +19,9 @@ import com.opensource.svgaplayer.SVGAParser import com.opensource.svgaplayer.SVGAVideoEntity import com.yizhuan.erban.R import com.yizhuan.erban.avroom.firstcharge.SelectPayTypeDialog -import com.yizhuan.erban.bank_card.activity.AddBankCardAgreementActivity import com.yizhuan.erban.base.BaseViewBindingActivity import com.yizhuan.erban.base.TitleBar import com.yizhuan.erban.common.EmptyViewHelper -import com.yizhuan.erban.common.widget.dialog.DialogManager import com.yizhuan.erban.databinding.ActivityVipMainBinding import com.yizhuan.erban.ui.setting.ModifyPwdActivity import com.yizhuan.erban.ui.utils.RVDelegate @@ -32,16 +30,12 @@ import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.Commo import com.yizhuan.xchat_android_core.UriProvider import com.yizhuan.xchat_android_core.auth.AuthModel import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.PaymentActivity -import com.yizhuan.xchat_android_core.pay.bean.PaymentResult -import com.yizhuan.xchat_android_core.pay.model.unionpay.UnionPayModel import com.yizhuan.xchat_android_core.statistic.StatisticManager import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol import com.yizhuan.xchat_android_core.utils.toast import com.yizhuan.xchat_android_core.vip.VipAuthInfo import com.yizhuan.xchat_android_core.vip.VipInfo import com.yizhuan.xchat_android_core.vip.VipOpenEvent -import com.yizhuan.xchat_android_library.utils.JavaUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -287,43 +281,6 @@ class VipMainActivity : BaseViewBindingActivity(), if (resultCode != RESULT_OK) { return } - //支付页面返回处理 - if (requestCode == PaymentActivity.REQUEST_CODE_PAY) { - if (data != null && data.extras != null) { - val paymentResult: PaymentResult? = - data.getParcelableExtra(PaymentActivity.KEY_PAY_RESULT) - if (paymentResult != null) { - // 充值金额超过限定时，就必须先实名认证 - when (JavaUtil.str2int(paymentResult.code)) { - PayModel.NOT_REAL_NAME_BEFORE_CHARGING -> dialogManager.showTipsDialog( - getString(R.string.tips_need_to_certification), - getString(R.string.go_to_certification), - object : DialogManager.AbsOkDialogListener() { - override fun onOk() { - // 跳去实名认证页面 - CommonWebViewActivity.start( - this@VipMainActivity, - UriProvider.getTutuRealNamePage() - ) - } - }) - UnionPayModel.CODE_NEED_BIND_BANK_CARD_FIRST -> dialogManager.showTipsDialog( - getString(R.string.tips_need_bind_bank_card_first), - object : DialogManager.AbsOkDialogListener() { - override fun onOk() { - // 跳去添加银行卡页面 - AddBankCardAgreementActivity.start(this@VipMainActivity) - } - }) - else -> { - toast(paymentResult.msg) - //重新获取钱包信息 - PayModel.get().getWalletInfo(AuthModel.get().currentUid).subscribe() - } - } - } - } - } if (requestCode == BIND_CODE_GOLD) { ModifyPwdActivity.start(this, ModifyPwdActivity.FOGERT_PAY_PWD) } @@ -335,7 +292,6 @@ class VipMainActivity : BaseViewBindingActivity(), vipViewModel.getVipPageInfo() } - override fun onDestroy() { super.onDestroy() EventBus.getDefault().unregister(this) diff --git a/app/src/main/res/layout/dialog_confirm_payment.xml b/app/src/main/res/layout/dialog_confirm_payment.xml deleted file mode 100644 index 4d0a4bb29..000000000 --- a/app/src/main/res/layout/dialog_confirm_payment.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - -