diff --git a/app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt b/app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt index 07cecec..282cc2f 100644 --- a/app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt @@ -34,6 +34,7 @@ import com.yingmao.clash.net.http.HttpStatus import com.yingmao.clash.net.http.entity.Activity_ import com.yingmao.clash.net.http.entity.GetActivityRsp import com.yingmao.clash.util.CommonUtils +import com.yingmao.clash.util.Utils import com.yingmao.clash.view.RxToast import com.yingmao.clash.view.adapter.GetActivityAdapter @@ -75,14 +76,11 @@ class ActivityActivity : BaseActivity() { GetActivityAdapter(R.layout.get_activity_item_layout, object : MyAdapterListener { override fun onMyItemChildClickListener(itemBean: Activity_) { if (itemBean.redirectLink.contains("BindAccount")) { - showBindAccDialog(itemBean) } else { - showActDialog(itemBean) } } - }) getActivityAdapter.animationEnable = true expensesRecordRv.adapter = getActivityAdapter @@ -122,7 +120,12 @@ class ActivityActivity : BaseActivity() { } private fun showBindAccDialog(bean: Activity_) { - + var useraccount = + MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_REMEMBER_USERNAME, "")!!; + if (Utils.isEmail(useraccount) || Utils.isPhoneNumber(useraccount)) { + RxToast.info("您的账号已绑定,无需再次绑定") + return + } var act_dialog = MaterialDialog(this@ActivityActivity).show { this.cancelable(false) cornerRadius(res = R.dimen.dp_10) @@ -248,7 +251,6 @@ class ActivityActivity : BaseActivity() { } else { getActivityAdapter.loadMoreModule.loadMoreComplete() } - } else { RxToast.error("${getActivityRsp.code}${getActivityRsp.message}") getActivityAdapter.loadMoreModule.loadMoreFail() diff --git a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt index aaff3d1..a5d84eb 100644 --- a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt @@ -43,6 +43,7 @@ import com.yingmao.clash.core.model.LogMessage import com.yingmao.clash.entity.CheckLoginRsp import com.yingmao.clash.fragment.NewAccFragment import com.yingmao.clash.fragment.mine.MineFragment +import com.yingmao.clash.fragment.recharge.BackupRechargeActivity import com.yingmao.clash.fragment.recharge.RechargeFragment import com.yingmao.clash.listener.DownLoadListener import com.yingmao.clash.net.http.HttpApi @@ -673,7 +674,11 @@ class NewMainActivity : BaseActivity() { intent.putExtra("url", rcURL) // startActivity(intent) startActivityForResult(intent, REQUEST_CODE_PAY_WEB_VIEW_ACTIVITY) + } + public fun goBackupRechargeWeb() { + + startActivityForResult(Intent(this@NewMainActivity, BackupRechargeActivity::class.java), REQUEST_CODE_PAY_WEB_VIEW_ACTIVITY) } private fun showPayResultDialog() { diff --git a/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt b/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt index f81d772..2acbedb 100644 --- a/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt +++ b/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt @@ -25,6 +25,7 @@ import com.tencent.mmkv.MMKV import com.yingmao.clash.R import com.yingmao.clash.act.ChangeNodeActivity import com.yingmao.clash.act.NewMainActivity +import com.yingmao.clash.act.NewMainActivity.Companion.REQUEST_CODE_PAY_WEB_VIEW_ACTIVITY import com.yingmao.clash.act.NewMainActivity.Companion.isSubed import com.yingmao.clash.act.NewMainActivity.Companion.newUuid import com.yingmao.clash.act.ProxyModeActivity @@ -173,15 +174,13 @@ class NewAccFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatch } //备用充值 view.findViewById