parent
4efb55be7e
commit
37d4c43647
|
|
@ -146,6 +146,7 @@
|
|||
android:screenOrientation="portrait" />
|
||||
<activity
|
||||
android:name=".fragment.recharge.BackupRechargeActivity"
|
||||
android:process=":background"
|
||||
android:screenOrientation="portrait" />
|
||||
|
||||
<provider
|
||||
|
|
|
|||
|
|
@ -51,13 +51,13 @@ class BandPhoneActivity : BaseNotTitleActivity() {
|
|||
if (phoneNumber.startsWith("1") && phoneNumber.length == 11) {
|
||||
viewModel.getSMSCode(phoneNumber)
|
||||
} else {
|
||||
RxToast.warning("请输入正确的手机号")
|
||||
RxToast.warning(resources.getString(R.string.correctPhoneNumber))
|
||||
}
|
||||
} else {
|
||||
if (Utils.isEmail(phoneNumber)) {
|
||||
viewModel.getSMSCode(phoneNumber)
|
||||
} else {
|
||||
RxToast.warning("请输入正确的邮箱")
|
||||
RxToast.warning(resources.getString(R.string.correctPhoneEmail))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -66,19 +66,19 @@ class BandPhoneActivity : BaseNotTitleActivity() {
|
|||
phoneNumber = et_phone_number.text.trim().toString()
|
||||
if (isBandPhone) {
|
||||
if (!Utils.isPhoneNumber(phoneNumber)) {
|
||||
RxToast.warning("请输入正确的手机号")
|
||||
RxToast.warning(resources.getString(R.string.correctPhoneNumber))
|
||||
return@setOnClickListener
|
||||
}
|
||||
} else {
|
||||
if (!Utils.isEmail(phoneNumber)) {
|
||||
RxToast.warning("请输入正确的邮箱")
|
||||
RxToast.warning(resources.getString(R.string.correctPhoneEmail))
|
||||
return@setOnClickListener
|
||||
}
|
||||
}
|
||||
|
||||
val smsCode = et_sms_code.text.trim().toString()
|
||||
if (smsCode.length < 4) {
|
||||
RxToast.warning("请输入正确的验证码")
|
||||
RxToast.warning(resources.getString(R.string.correctCode))
|
||||
return@setOnClickListener
|
||||
}
|
||||
val userName = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_REMEMBER_USERNAME,"")!!
|
||||
|
|
@ -93,8 +93,8 @@ class BandPhoneActivity : BaseNotTitleActivity() {
|
|||
}
|
||||
|
||||
if (!isBandPhone){
|
||||
tv_title.text = "绑定邮箱"
|
||||
tv_account.text = "邮箱"
|
||||
tv_title.text =resources.getString(R.string.bindingEmail)
|
||||
tv_account.text = resources.getString(R.string.email)
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -108,13 +108,13 @@ class BandPhoneActivity : BaseNotTitleActivity() {
|
|||
if (it.reqType == HttpReqType.GETSMSCODE) {
|
||||
apply {
|
||||
rxDialogShapeLoading = RxDialogShapeLoading(this)
|
||||
rxDialogShapeLoading.setMessage("正在获取验证码...")
|
||||
rxDialogShapeLoading.setMessage(resources.getString(R.string.ObtainingVerificationCode))
|
||||
rxDialogShapeLoading.show()
|
||||
}
|
||||
} else {
|
||||
apply {
|
||||
rxDialogShapeLoading = RxDialogShapeLoading(this)
|
||||
rxDialogShapeLoading.setMessage("正在绑定...")
|
||||
rxDialogShapeLoading.setMessage(resources.getString(R.string.nowBinding))
|
||||
rxDialogShapeLoading.show()
|
||||
}
|
||||
}
|
||||
|
|
@ -125,16 +125,16 @@ class BandPhoneActivity : BaseNotTitleActivity() {
|
|||
if (it.reqType == HttpReqType.GETSMSCODE) {
|
||||
(it.rsp as GetSMSCodeRsp).let { rsp ->
|
||||
if (rsp.code == 1000) {
|
||||
RxToast.success("验证码已发送")
|
||||
RxToast.success(resources.getString(R.string.VerificationCodeSent))
|
||||
countDown()
|
||||
} else {
|
||||
RxToast.warning("验证码发送失败:" + rsp.message)
|
||||
RxToast.warning(resources.getString(R.string.VerificationCodeSentFail)+ rsp.message)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
(it.rsp as GetSMSCodeRsp).let { rsp ->
|
||||
if (rsp.code == 1000) {
|
||||
RxToast.success("绑定成功,请用绑定账号重新登录", Toast.LENGTH_LONG)
|
||||
RxToast.success(resources.getString(R.string.BingIngSuccess), Toast.LENGTH_LONG)
|
||||
MMKV.defaultMMKV().encode(BZYConstants.MMKV_KEY_REMEMBER_USERNAME, phoneNumber)
|
||||
MMKV.defaultMMKV().removeValueForKey(BZYConstants.MMKV_KEY_PH_TOKEN)
|
||||
MMKV.defaultMMKV().removeValueForKey(BZYConstants.MMKV_KEY_TOKEN)
|
||||
|
|
@ -145,7 +145,7 @@ class BandPhoneActivity : BaseNotTitleActivity() {
|
|||
startActivity(intent)
|
||||
finish()
|
||||
} else {
|
||||
RxToast.warning("绑定失败:" + rsp.message)
|
||||
RxToast.warning(resources.getString(R.string.BingIngFail) + rsp.message)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -154,9 +154,9 @@ class BandPhoneActivity : BaseNotTitleActivity() {
|
|||
is HttpStatus.Failure -> {
|
||||
rxDialogShapeLoading.cancel()
|
||||
if (it.reqType == HttpReqType.GETSMSCODE) {
|
||||
RxToast.warning("获取验证码失败:${it.msg}")
|
||||
RxToast.warning(resources.getString(R.string.GetSmsFail)+"${it.msg}")
|
||||
} else {
|
||||
RxToast.warning("绑定账号失败:${it.msg}")
|
||||
RxToast.warning(resources.getString(R.string.BingIngFail)+":${it.msg}")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -170,7 +170,7 @@ class BandPhoneActivity : BaseNotTitleActivity() {
|
|||
//1000ms运行一次onTick里面的方法
|
||||
override fun onFinish() {
|
||||
tv_sms_code.isEnabled = true
|
||||
tv_sms_code.text = "获取验证码"
|
||||
tv_sms_code.text = resources.getString(R.string.ObtainVerificationCode)
|
||||
}
|
||||
|
||||
override fun onTick(millisUntilFinished: Long) {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ class ExpensesRecordActivity : BaseActivity() {
|
|||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_expenses_record)
|
||||
showTitleBar("消费记录")
|
||||
showTitleBar(resources.getString(R.string.expenses_record))
|
||||
expensesRecordVM = ViewModelProvider(this).get(ExpensesRecordVM::class.java)
|
||||
observe(this, expensesRecordVM)
|
||||
initView()
|
||||
|
|
@ -139,7 +139,7 @@ class ExpensesRecordActivity : BaseActivity() {
|
|||
if(mPageInfo.isFirstPage) {
|
||||
swipeLayout.isRefreshing = true
|
||||
}
|
||||
RxToast.error("获取订单信息异常")
|
||||
RxToast.error(resources.getString(R.string.AAEr))
|
||||
expensesRecordAdapter.loadMoreModule.loadMoreFail()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,8 +103,8 @@ class RechargeFragment : BaseFragment() {
|
|||
backIv.setOnClickListener {
|
||||
activity?.finish()
|
||||
}
|
||||
titleTv.text = "充值"
|
||||
moreTv.text = "消费记录"
|
||||
titleTv.text = resources.getString(R.string.recharge)
|
||||
moreTv.text = resources.getString(R.string.expenses_record)
|
||||
val view = View.inflate(CommonUtils.getApp(), R.layout.fragment_recharge_new, null)
|
||||
initViews(view)
|
||||
container.addView(view)
|
||||
|
|
@ -114,10 +114,11 @@ class RechargeFragment : BaseFragment() {
|
|||
tv_pay = view.findViewById<TextView>(R.id.tv_pay)
|
||||
swipeLayout = view.findViewById(R.id.swipeLayout)
|
||||
payTv = view.findViewById(R.id.tv_pay)
|
||||
payTv.text = resources.getString(R.string.PayNow)
|
||||
swipeLayout.setColorSchemeColors(Color.rgb(47, 223, 189))
|
||||
swipeLayout.setOnRefreshListener {
|
||||
selectedGrade = null
|
||||
payTv.text = "立即支付"
|
||||
payTv.text = resources.getString(R.string.PayNow)
|
||||
val username = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_REMEMBER_USERNAME,"")!!
|
||||
val phToken = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_PH_TOKEN,"")!!
|
||||
viewModel.getPointCardSurplus(username, phToken)
|
||||
|
|
@ -142,23 +143,23 @@ class RechargeFragment : BaseFragment() {
|
|||
if (isChecked) {
|
||||
if (amount > point) {
|
||||
pointCardSurplusSwitch.isChecked = false //暂时先这样,点数不够一次付款不能用点
|
||||
RxToast.warning("点数不够")
|
||||
RxToast.warning(resources.getString(R.string.InsufficientPoints))
|
||||
} else {
|
||||
tv_pay.text = "立即支付(¥0.00)"
|
||||
tv_pay.text = resources.getString(R.string.PayNow)+"(¥0.00)"
|
||||
}
|
||||
} else {
|
||||
tv_pay.text = "立即支付(${decimalFormat.format(amount)})"
|
||||
tv_pay.text = resources.getString(R.string.PayNow)+"(${decimalFormat.format(amount)})"
|
||||
}
|
||||
}
|
||||
} else {
|
||||
RxToast.warning("请选择套餐")
|
||||
RxToast.warning(resources.getString(R.string.PleaseChoosePackage))
|
||||
pointCardSurplusSwitch.isChecked = false //暂时先这样,点数不够一次付款不能用点
|
||||
}
|
||||
}
|
||||
|
||||
payTv.setOnClickListener {
|
||||
if (selectedGrade == null) {
|
||||
RxToast.info("请选择充值金额")
|
||||
RxToast.info(resources.getString(R.string.selectRechargeAmount))
|
||||
return@setOnClickListener
|
||||
}
|
||||
var isUsePointCard = false
|
||||
|
|
@ -283,28 +284,28 @@ class RechargeFragment : BaseFragment() {
|
|||
|
||||
HttpReqType.PAY -> {
|
||||
Logger.d("支付获取订单号")
|
||||
showLoadingDialog("正在生成订单...")
|
||||
showLoadingDialog(resources.getString(R.string.GeneratingOrder))
|
||||
}
|
||||
|
||||
HttpReqType.APP_ALI_PAY -> {
|
||||
Logger.d("RechargeFragment:支付宝支付")
|
||||
showLoadingDialog("正在请求支付...")
|
||||
showLoadingDialog(resources.getString(R.string.RequestingPayment))
|
||||
}
|
||||
|
||||
HttpReqType.PURE_POINT_CARD_PAYMENT -> {
|
||||
Logger.d("纯点卡支付")
|
||||
showLoadingDialog("正在支付...")
|
||||
showLoadingDialog(resources.getString(R.string.PaymentIn))
|
||||
}
|
||||
|
||||
HttpReqType.QRPAY -> {
|
||||
showLoadingDialog("正在生成订单...")
|
||||
showLoadingDialog(resources.getString(R.string.GeneratingOrder))
|
||||
}
|
||||
|
||||
HttpReqType.QRPAYSTATU -> {
|
||||
showLoadingDialog("正在查询支付结果...")
|
||||
showLoadingDialog(resources.getString(R.string.QueryingPaymentResult))
|
||||
}
|
||||
HttpReqType.WEBPAYQUERY -> {
|
||||
showLoadingDialog("正在查询支付结果...")
|
||||
showLoadingDialog(resources.getString(R.string.QueryingPaymentResult))
|
||||
}
|
||||
else -> {}
|
||||
}
|
||||
|
|
@ -341,7 +342,7 @@ class RechargeFragment : BaseFragment() {
|
|||
(httpStatus.rsp as NormalRsp).let {
|
||||
if (it.code != "1000") {
|
||||
//RxToast.error(if (it.message.isNullOrBlank()) "获取点卡余额失败(${it.code})" else "${it.code}:${it.message}")
|
||||
pointTv.text = "重试"
|
||||
pointTv.text =resources.getString(R.string.retry)
|
||||
pointCard = "0"
|
||||
pointTv.setTextColor(resources.getColor(R.color.white_50))
|
||||
pointTv.setOnClickListener {
|
||||
|
|
@ -353,7 +354,7 @@ class RechargeFragment : BaseFragment() {
|
|||
pointCard = "${it.data}"
|
||||
pointCardSurplusSwitch.isEnabled = pointCard.toInt() > 0
|
||||
pointTv.setTextColor(resources.getColor(R.color.white))
|
||||
pointTv.text = "剩余点数: ${if (it.data.isNullOrEmpty()) "0.00" else it.data}"
|
||||
pointTv.text = resources.getString(R.string.RemainingPoints)+": ${if (it.data.isNullOrEmpty()) "0.00" else it.data}"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -363,7 +364,7 @@ class RechargeFragment : BaseFragment() {
|
|||
swipeLayout.isRefreshing = false
|
||||
(httpStatus.rsp as RechargeInfoRsp).let { it ->
|
||||
if (it.code != "1000") {
|
||||
RxToast.error(if (it.message.isNullOrBlank()) "获取充值列表失败(${it.code})" else "${it.code}:${it.message}")
|
||||
RxToast.error(if (it.message.isNullOrBlank())resources.getString(R.string.FailedRechargeList)+ "(${it.code})" else "${it.code}:${it.message}")
|
||||
} else {
|
||||
it.data?.let { it1 ->
|
||||
it1.grade?.let {
|
||||
|
|
@ -382,7 +383,7 @@ class RechargeFragment : BaseFragment() {
|
|||
Logger.d("生成订单请求成功")
|
||||
(httpStatus.rsp as PayRsp).let { rsp ->
|
||||
if (rsp.code != "1000") {
|
||||
RxToast.error(if (rsp.message.isNullOrBlank()) "订单生成失败(${rsp.code})" else "${rsp.code}:${rsp.message}")
|
||||
RxToast.error(if (rsp.message.isNullOrBlank()) resources.getString(R.string.OrderGenerationFailed)+"(${rsp.code})" else "${rsp.code}:${rsp.message}")
|
||||
} else {
|
||||
activity.let {
|
||||
outTradeNo = rsp.data?.outTradeNo!!
|
||||
|
|
@ -396,7 +397,7 @@ class RechargeFragment : BaseFragment() {
|
|||
HttpReqType.unionPay -> {
|
||||
(httpStatus.rsp as PayRsp).let { rsp ->
|
||||
if (rsp.code != "1000") {
|
||||
RxToast.error(if (rsp.message.isNullOrBlank()) "订单生成失败(${rsp.code})" else "${rsp.code}:${rsp.message}")
|
||||
RxToast.error(if (rsp.message.isNullOrBlank()) resources.getString(R.string.OrderGenerationFailed)+"(${rsp.code})" else "${rsp.code}:${rsp.message}")
|
||||
} else {
|
||||
if (rsp.data != null) {
|
||||
startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(rsp.data.payUrl)))
|
||||
|
|
@ -413,9 +414,9 @@ class RechargeFragment : BaseFragment() {
|
|||
hideLoadingDialog()
|
||||
(httpStatus.rsp as NormalMessageRsp).let {
|
||||
if (it.code != "1000") {
|
||||
RxToast.error(if (it.message.isNullOrBlank()) "点卡支付失败(${it.code})" else "${it.code}:${it.message}")
|
||||
RxToast.error(if (it.message.isNullOrBlank()) resources.getString(R.string.PointCardFailed)+"(${it.code})" else "${it.code}:${it.message}")
|
||||
} else {
|
||||
RxToast.success("点卡支付成功")
|
||||
RxToast.success(resources.getString(R.string.PointCardSuccessful))
|
||||
Logger.d("点卡支付成功更新有效期")
|
||||
viewModel.checkLogin()
|
||||
}
|
||||
|
|
@ -474,7 +475,7 @@ class RechargeFragment : BaseFragment() {
|
|||
// ivQr.setImageBitmap(bitmap)
|
||||
|
||||
getCustomView().findViewById<TextView>(R.id.tv_pay_finish).setOnClickListener {
|
||||
showLoadingDialog("正在查询支付结果...")
|
||||
showLoadingDialog(resources.getString(R.string.QueryingPaymentResult))
|
||||
viewModel.codePayStatus(outTradeNo)
|
||||
}
|
||||
|
||||
|
|
@ -487,7 +488,7 @@ class RechargeFragment : BaseFragment() {
|
|||
}
|
||||
}
|
||||
} else {
|
||||
RxToast.error("获取支付二维码失败,请联系客服")
|
||||
RxToast.error(resources.getString(R.string.FailedPaymentQRCode))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -496,11 +497,11 @@ class RechargeFragment : BaseFragment() {
|
|||
hideLoadingDialog()
|
||||
(httpStatus.rsp as QRPayStatusRsp).let {
|
||||
if (it.code == 1000) {
|
||||
RxToast.success("支付成功,正在更新用户信息")
|
||||
RxToast.success(resources.getString(R.string.upUser))
|
||||
qrPayDialog?.dismiss()
|
||||
viewModel.checkLogin()
|
||||
} else {
|
||||
RxToast.error("未查询到已支付,请重试")
|
||||
RxToast.error(resources.getString(R.string.paymentFound))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -508,11 +509,11 @@ class RechargeFragment : BaseFragment() {
|
|||
hideLoadingDialog()
|
||||
(httpStatus.rsp as NormalMessageRsp).let {
|
||||
if (it.code == "1000") {
|
||||
RxToast.success("支付成功,正在更新用户信息")
|
||||
RxToast.success(resources.getString(R.string.upUser))
|
||||
qrPayDialog?.dismiss()
|
||||
viewModel.checkLogin()
|
||||
} else {
|
||||
RxToast.error("未查询到已支付,请重试")
|
||||
RxToast.error(resources.getString(R.string.paymentFound))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -521,11 +522,11 @@ class RechargeFragment : BaseFragment() {
|
|||
hideLoadingDialog()
|
||||
(httpStatus.rsp as BiLaiPayStatusRsp).let {
|
||||
if (it.code == 1000) {
|
||||
RxToast.success("支付成功,正在更新用户信息")
|
||||
RxToast.error(resources.getString(R.string.paymentFound))
|
||||
qrPayDialog?.dismiss()
|
||||
viewModel.checkLogin()
|
||||
} else {
|
||||
RxToast.error("未查询到已支付,请重试")
|
||||
RxToast.error(resources.getString(R.string.paymentFound))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -705,7 +706,7 @@ class RechargeFragment : BaseFragment() {
|
|||
cornerRadius(res = R.dimen.dp_10)
|
||||
customView(R.layout.payconfirm_dialog_layout, scrollable = false, noVerticalPadding = true, horizontalPadding = false)
|
||||
getCustomView().findViewById<TextView>(R.id.tv_pay_finish).setOnClickListener {
|
||||
showLoadingDialog("正在查询支付结果...")
|
||||
showLoadingDialog(resources.getString(R.string.QueryingPaymentResult))
|
||||
// viewModel.biLaiPayStatus(outTradeNo)
|
||||
viewModel.webPayStatus(outTradeNo)
|
||||
}
|
||||
|
|
@ -730,59 +731,59 @@ class RechargeFragment : BaseFragment() {
|
|||
}
|
||||
pointLoadingPb.visibility = View.GONE
|
||||
pointTv.visibility = View.VISIBLE
|
||||
pointTv.text = "重试"
|
||||
pointTv.text = resources.getString(R.string.retry)
|
||||
pointTv.setOnClickListener {
|
||||
val username = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_REMEMBER_USERNAME,"")!!
|
||||
val phToken = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_PH_TOKEN,"")!!
|
||||
viewModel.getPointCardSurplus(username, phToken)
|
||||
}
|
||||
"获取点卡余额异常"
|
||||
resources.getString(R.string.AbnormalPointCard)
|
||||
}
|
||||
|
||||
HttpReqType.GET_RECHARGE_INFO -> {
|
||||
Logger.d("获取充值续费信息异常${httpStatus.msg}")
|
||||
swipeLayout.isRefreshing = false
|
||||
"获取充值续费信息异常"
|
||||
resources.getString(R.string.DataError)
|
||||
}
|
||||
|
||||
HttpReqType.PAY -> {
|
||||
Logger.d("获取支付订单号异常${httpStatus.msg}")
|
||||
"获取支付订单号异常"
|
||||
resources.getString(R.string.DataPayNumber)
|
||||
}
|
||||
|
||||
HttpReqType.APP_ALI_PAY -> {
|
||||
Logger.d("支付宝支付异常${httpStatus.msg}")
|
||||
"支付宝支付异常"
|
||||
resources.getString(R.string.AlipayDataError)
|
||||
}
|
||||
|
||||
HttpReqType.APP_WX_PAY -> {
|
||||
Logger.d("微信支付异常${httpStatus.msg}")
|
||||
"微信支付异常"
|
||||
resources.getString(R.string.weChatPayError)
|
||||
}
|
||||
|
||||
HttpReqType.PURE_POINT_CARD_PAYMENT -> {
|
||||
Logger.d("纯点卡支付异常${httpStatus.msg}")
|
||||
"纯点卡支付异常"
|
||||
resources.getString(R.string.PayCardException)
|
||||
}
|
||||
|
||||
HttpReqType.QRPAY -> {
|
||||
"获取付款二维码异常"
|
||||
resources.getString(R.string.AbnormalQRCode)
|
||||
}
|
||||
|
||||
HttpReqType.BILAIPAYSTATUS -> {
|
||||
"查询支付结果失败"
|
||||
resources.getString(R.string.paymentResultsFailed)
|
||||
}
|
||||
HttpReqType.WEBPAYQUERY -> {
|
||||
"查询支付结果失败"
|
||||
resources.getString(R.string.paymentResultsFailed)
|
||||
}
|
||||
|
||||
HttpReqType.BILAIPAY -> {
|
||||
"获取支付信息失败"
|
||||
resources.getString(R.string.paymentResultsFailed)
|
||||
}
|
||||
|
||||
else -> {
|
||||
Logger.d("${httpStatus.reqType}请求异常${httpStatus.msg}")
|
||||
"请求异常${httpStatus.reqType}"
|
||||
Logger.d("${httpStatus.reqType}${resources.getString(R.string.RequestException)}${httpStatus.msg}")
|
||||
resources.getString(R.string.RequestException)+ "${httpStatus.reqType}"
|
||||
}
|
||||
}
|
||||
RxToast.error(msgs)
|
||||
|
|
@ -818,12 +819,12 @@ class RechargeFragment : BaseFragment() {
|
|||
if (pointCardSurplusSwitch.isChecked) {
|
||||
val point = pointCard.toFloat()
|
||||
if (amount > point) {
|
||||
tv_pay.text = "立即支付(${decimalFormat.format(amount - point)})"
|
||||
tv_pay.text = resources.getString(R.string.PayNow)+"(${decimalFormat.format(amount - point)})"
|
||||
} else {
|
||||
tv_pay.text = "立即支付(¥0.00)"
|
||||
tv_pay.text =resources.getString(R.string.PayNow)+ "(¥0.00)"
|
||||
}
|
||||
} else {
|
||||
tv_pay.text = "立即支付(${decimalFormat.format(amount)})"
|
||||
tv_pay.text = resources.getString(R.string.PayNow)+"(${decimalFormat.format(amount)})"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -839,11 +840,11 @@ class RechargeFragment : BaseFragment() {
|
|||
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
|
||||
if (requestCode == REQUEST_CODE_PAY_WEB_VIEW_ACTIVITY) {
|
||||
if (resultCode == BZYConstants.REQUEST_CODE_PAY_WEB_Stripe) {
|
||||
RxToast.success("支付成功,正在更新信息", Toast.LENGTH_LONG)
|
||||
RxToast.success(resources.getString(R.string.upUser), Toast.LENGTH_LONG)
|
||||
viewModel.checkLogin()
|
||||
} else if (resultCode == BZYWebViewActivity.ALI_PAY_SUCCESS || resultCode == BZYWebViewActivity.WX_PAY_SUCCESS) {
|
||||
viewModel.checkLogin()
|
||||
RxToast.success("支付成功,正在更新信息", Toast.LENGTH_LONG)
|
||||
RxToast.success(resources.getString(R.string.upUser), Toast.LENGTH_LONG)
|
||||
Log.e("data", "微信或者支付宝支付成功更新有效期")
|
||||
} else if (resultCode == BZYConstants.REQUEST_CODE_PAY_WEB_BiLai) {
|
||||
// activity?.let {
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
tools:context=".fragment.recharge.BackupRechargeActivity">
|
||||
<androidx.fragment.app.FragmentContainerView
|
||||
android:id="@+id/BackupRechargeView"
|
||||
android:layout_marginTop="20dp"
|
||||
android:name="com.yingmao.clash.fragment.recharge.RechargeFragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/layout_login_welcome_text_top_margin"
|
||||
android:text="绑定账号"
|
||||
android:text="@string/BindAccount"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/layout_login_welcome_textsize"
|
||||
android:textStyle="bold"
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
android:background="@drawable/login_btn_bg_selector"
|
||||
android:gravity="center"
|
||||
android:padding="@dimen/dp_10"
|
||||
android:text="获取验证码"
|
||||
android:text="@string/ObtainVerificationCode"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="@dimen/layout_login_tv_login_textsize"
|
||||
android:textStyle="bold"
|
||||
|
|
@ -112,7 +112,7 @@
|
|||
android:gravity="center"
|
||||
android:paddingTop="@dimen/layout_login_tv_login_top_padding"
|
||||
android:paddingBottom="@dimen/layout_login_tv_login_bottom_padding"
|
||||
android:text="绑 定"
|
||||
android:text="@string/binding"
|
||||
android:textColor="@color/black"
|
||||
android:textSize="@dimen/layout_login_tv_login_textsize"
|
||||
android:textStyle="bold" />
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
android:layout_marginTop="20dp"
|
||||
android:layout_marginBottom="30dp"
|
||||
android:gravity="center"
|
||||
android:text="请选择绑定方式"
|
||||
android:text="@string/ChooseBindingMethod"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="17sp"
|
||||
android:textStyle="bold" />
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="手机"
|
||||
android:text="@string/mobilePhone"
|
||||
android:textColor="@color/white" />
|
||||
</LinearLayout>
|
||||
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="邮箱"
|
||||
android:text="@string/email"
|
||||
android:textColor="@color/white" />
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:textSize="14sp"
|
||||
android:src="@drawable/ic_s_back"
|
||||
android:textColor="@color/white"
|
||||
android:visibility="invisible" />
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@
|
|||
android:focusable="true"
|
||||
android:gravity="center"
|
||||
android:padding="15dp"
|
||||
android:text="立即支付"
|
||||
android:text="@string/PayNow"
|
||||
android:textColor="#2B3950"
|
||||
android:textSize="18sp"
|
||||
android:textStyle="bold"
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
<string name="change_password">Change Password</string>
|
||||
<string name="band_phone">Bind phone number</string>
|
||||
<string name="recharge_record">Recharge Record</string>
|
||||
<string name="expenses_record">Records of consumption</string>
|
||||
<string name="expenses_record">purchase history</string>
|
||||
<string name="point_card">My point card</string>
|
||||
|
||||
<string name="original_password">Old password</string>
|
||||
|
|
@ -221,4 +221,50 @@
|
|||
<string name="ActivityContentStr">Activity content</string>
|
||||
<string name="close">close</string>
|
||||
<string name="JumpTo">Jump to</string>
|
||||
|
||||
<string name="PayNow">Pay Now</string>
|
||||
<string name="InsufficientPoints">Insufficient points</string>
|
||||
<string name="PleaseChoosePackage">Please choose a package</string>
|
||||
<string name="selectRechargeAmount">Please select the recharge amount</string>
|
||||
<string name="GeneratingOrder">Generating order...</string>
|
||||
<string name="RequestingPayment">Requesting payment...</string>
|
||||
<string name="PaymentIn">Payment in progress...</string>
|
||||
<string name="QueryingPaymentResult">Querying payment results...</string>
|
||||
<string name="FailedRechargeList">Failed to obtain recharge list</string>
|
||||
<string name="OrderGenerationFailed">Order generation failed</string>
|
||||
<string name="DataError">Abnormal retrieval of recharge and renewal information</string>
|
||||
<string name="DataPayNumber">Abnormal acquisition of payment order number</string>
|
||||
<string name="AlipayDataError">Alipay payment exception</string>
|
||||
<string name="weChatPayError">WeChat Pay exception</string>
|
||||
<string name="PayCardException">Pure point card payment exception</string>
|
||||
<string name="AbnormalQRCode">Abnormal acquisition of payment QR code</string>
|
||||
<string name="paymentResultsFailed">Failed to query payment results</string>
|
||||
<string name="RequestException">Request exception</string>
|
||||
<string name="RemainingPoints">Remaining points</string>
|
||||
<string name="PointCardFailed">Point card payment failed</string>
|
||||
<string name="PointCardSuccessful">Point card payment successful</string>
|
||||
<string name="FailedPaymentQRCode">Failed to obtain payment QR code</string>
|
||||
<string name="upUser">Payment successful, updating user information</string>
|
||||
<string name="paymentFound">No payment found, please try again</string>
|
||||
<string name="AbnormalPointCard">Abnormal balance of point card obtained</string>
|
||||
<string name="correctPhoneNumber">Please enter the correct phone number</string>
|
||||
<string name="correctPhoneEmail">Please enter the correct email address</string>
|
||||
<string name="correctCode">Please enter the correct verification code</string>
|
||||
<string name="bindingEmail">Bind email</string>
|
||||
<string name="ObtainingVerificationCode">Obtaining verification code</string>
|
||||
<string name="nowBinding">Binding in progress....</string>
|
||||
<string name="VerificationCodeSent">Verification code has been sent</string>
|
||||
<string name="VerificationCodeSentFail">Verification code sending failed:</string>
|
||||
<string name="BingIngSuccess">Binding successful, please log in again with the bound account</string>
|
||||
<string name="BingIngFail">Binding failed</string>
|
||||
<string name="GetSmsFail">Failed to obtain verification code</string>
|
||||
<string name="email">email</string>
|
||||
<string name="ObtainVerificationCode">Obtain verification code</string>
|
||||
<string name="BindAccount">Bind account</string>
|
||||
|
||||
<string name="ChooseBindingMethod">Please choose the binding method</string>
|
||||
<string name="mobilePhone">mobile phone</string>
|
||||
<string name="NotReceivedYet">Please contact Telegram Group or customer service for any issues such as unpaid recharge, and we will definitely solve them!</string>
|
||||
<string name="AAEr">Abnormal acquisition of order information</string>
|
||||
|
||||
</resources>
|
||||
|
|
@ -215,4 +215,47 @@
|
|||
<string name="ActivityContentStr">活動內容</string>
|
||||
<string name="close">關閉</string>
|
||||
<string name="JumpTo">跳轉</string>
|
||||
<string name="PayNow">立即支付</string>
|
||||
<string name="InsufficientPoints">點數不夠</string>
|
||||
<string name="PleaseChoosePackage">請選擇套餐</string>
|
||||
<string name="selectRechargeAmount">請選擇充值金額</string>
|
||||
<string name="GeneratingOrder">正在生成訂單...</string>
|
||||
<string name="RequestingPayment">正在請求支付...</string>
|
||||
<string name="PaymentIn">正在支付...</string>
|
||||
<string name="QueryingPaymentResult">正在查詢支付結果...</string>
|
||||
<string name="FailedRechargeList">獲取充值列表失敗</string>
|
||||
<string name="OrderGenerationFailed">訂單生成失敗</string>
|
||||
<string name="DataError">獲取充值續費信息異常</string>
|
||||
<string name="DataPayNumber">獲取支付訂單號異常</string>
|
||||
<string name="AlipayDataError">支付寶支付異常</string>
|
||||
<string name="weChatPayError">微信支付異常</string>
|
||||
<string name="PayCardException">純點卡支付異常</string>
|
||||
<string name="AbnormalQRCode">獲取付款二維碼異常</string>
|
||||
<string name="paymentResultsFailed">查詢支付結果失敗</string>
|
||||
<string name="RequestException">請求異常</string>
|
||||
<string name="RemainingPoints">剩余點數</string>
|
||||
<string name="PointCardFailed">點卡支付失敗</string>
|
||||
<string name="PointCardSuccessful">點卡支付成功</string>
|
||||
<string name="FailedPaymentQRCode">獲取支付二維碼失敗,請聯系客服</string>
|
||||
<string name="upUser">支付成功,正在更新用戶信息</string>
|
||||
<string name="paymentFound">未查詢到已支付,請重試</string>
|
||||
<string name="AbnormalPointCard">獲取點卡余額異常</string>
|
||||
<string name="correctPhoneNumber">請輸入正確的手機號</string>
|
||||
<string name="correctPhoneEmail">請輸入正確的郵箱</string>
|
||||
<string name="correctCode">請輸入正確的驗證碼</string>
|
||||
<string name="bindingEmail">綁定郵箱</string>
|
||||
<string name="ObtainingVerificationCode">正在獲取驗證碼</string>
|
||||
<string name="nowBinding">正在綁定....</string>
|
||||
<string name="VerificationCodeSent">驗證碼已發送</string>
|
||||
<string name="VerificationCodeSentFail">驗證碼發送失敗:</string>
|
||||
<string name="BingIngSuccess">綁定成功,請用綁定賬號重新登錄</string>
|
||||
<string name="BingIngFail">綁定失敗</string>
|
||||
<string name="GetSmsFail">獲取驗證碼失敗</string>
|
||||
<string name="email">郵箱</string>
|
||||
<string name="ObtainVerificationCode">獲取驗證碼</string>
|
||||
<string name="BindAccount">綁定賬號</string>
|
||||
<string name="ChooseBindingMethod">請選擇綁定方式</string>
|
||||
<string name="mobilePhone">手機</string>
|
||||
<string name="NotReceivedYet">充值未到賬等任何問題請聯系電報群或客服,一定解決!</string>
|
||||
<string name="AAEr">獲取訂單信息異常</string>
|
||||
</resources>
|
||||
|
|
@ -214,4 +214,47 @@
|
|||
<string name="ActivityContentStr">活動內容</string>
|
||||
<string name="close">關閉</string>
|
||||
<string name="JumpTo">跳轉</string>
|
||||
<string name="PayNow">立即支付</string>
|
||||
<string name="InsufficientPoints">點數不夠</string>
|
||||
<string name="PleaseChoosePackage">請選擇套餐</string>
|
||||
<string name="selectRechargeAmount">請選擇充值金額</string>
|
||||
<string name="GeneratingOrder">正在生成訂單...</string>
|
||||
<string name="RequestingPayment">正在請求支付...</string>
|
||||
<string name="PaymentIn">正在支付...</string>
|
||||
<string name="QueryingPaymentResult">正在查詢支付結果...</string>
|
||||
<string name="FailedRechargeList">獲取充值列表失敗</string>
|
||||
<string name="OrderGenerationFailed">訂單生成失敗</string>
|
||||
<string name="DataError">獲取充值續費信息異常</string>
|
||||
<string name="DataPayNumber">獲取支付訂單號異常</string>
|
||||
<string name="AlipayDataError">支付寶支付異常</string>
|
||||
<string name="weChatPayError">微信支付異常</string>
|
||||
<string name="PayCardException">純點卡支付異常</string>
|
||||
<string name="AbnormalQRCode">獲取付款二維碼異常</string>
|
||||
<string name="paymentResultsFailed">查詢支付結果失敗</string>
|
||||
<string name="RequestException">請求異常</string>
|
||||
<string name="RemainingPoints">剩余點數</string>
|
||||
<string name="PointCardFailed">點卡支付失敗</string>
|
||||
<string name="PointCardSuccessful">點卡支付成功</string>
|
||||
<string name="FailedPaymentQRCode">獲取支付二維碼失敗,請聯系客服</string>
|
||||
<string name="upUser">支付成功,正在更新用戶信息</string>
|
||||
<string name="paymentFound">未查詢到已支付,請重試</string>
|
||||
<string name="AbnormalPointCard">獲取點卡余額異常</string>
|
||||
<string name="correctPhoneNumber">請輸入正確的手機號</string>
|
||||
<string name="correctPhoneEmail">請輸入正確的郵箱</string>
|
||||
<string name="correctCode">請輸入正確的驗證碼</string>
|
||||
<string name="bindingEmail">綁定郵箱</string>
|
||||
<string name="ObtainingVerificationCode">正在獲取驗證碼</string>
|
||||
<string name="nowBinding">正在綁定....</string>
|
||||
<string name="VerificationCodeSent">驗證碼已發送</string>
|
||||
<string name="VerificationCodeSentFail">驗證碼發送失敗:</string>
|
||||
<string name="BingIngSuccess">綁定成功,請用綁定賬號重新登錄</string>
|
||||
<string name="BingIngFail">綁定失敗</string>
|
||||
<string name="GetSmsFail">獲取驗證碼失敗</string>
|
||||
<string name="email">郵箱</string>
|
||||
<string name="ObtainVerificationCode">獲取驗證碼</string>
|
||||
<string name="BindAccount">綁定賬號</string>
|
||||
<string name="ChooseBindingMethod">請選擇綁定方式</string>
|
||||
<string name="mobilePhone">手機</string>
|
||||
<string name="NotReceivedYet">充值未到賬等任何問題請聯系電報群或客服,一定解決!</string>
|
||||
<string name="AAEr">獲取訂單信息異常</string>
|
||||
</resources>
|
||||
|
|
@ -226,4 +226,50 @@
|
|||
<string name="ActivityContentStr">活动内容</string>
|
||||
<string name="close">关闭</string>
|
||||
<string name="JumpTo">跳转</string>
|
||||
|
||||
<string name="PayNow">立即支付</string>
|
||||
<string name="InsufficientPoints">点数不够</string>
|
||||
<string name="PleaseChoosePackage">请选择套餐</string>
|
||||
<string name="selectRechargeAmount">请选择充值金额</string>
|
||||
<string name="GeneratingOrder">正在生成订单...</string>
|
||||
<string name="RequestingPayment">正在请求支付...</string>
|
||||
<string name="PaymentIn">正在支付...</string>
|
||||
<string name="QueryingPaymentResult">正在查询支付结果...</string>
|
||||
<string name="FailedRechargeList">获取充值列表失败</string>
|
||||
<string name="OrderGenerationFailed">订单生成失败</string>
|
||||
<string name="DataError">获取充值续费信息异常</string>
|
||||
<string name="DataPayNumber">获取支付订单号异常</string>
|
||||
<string name="AlipayDataError">支付宝支付异常</string>
|
||||
<string name="weChatPayError">微信支付异常</string>
|
||||
<string name="PayCardException">纯点卡支付异常</string>
|
||||
<string name="AbnormalQRCode">获取付款二维码异常</string>
|
||||
<string name="paymentResultsFailed">查询支付结果失败</string>
|
||||
<string name="RequestException">请求异常</string>
|
||||
<string name="RemainingPoints">剩余点数</string>
|
||||
<string name="PointCardFailed">点卡支付失败</string>
|
||||
<string name="PointCardSuccessful">点卡支付成功</string>
|
||||
<string name="FailedPaymentQRCode">获取支付二维码失败,请联系客服</string>
|
||||
<string name="upUser">支付成功,正在更新用户信息</string>
|
||||
<string name="paymentFound">未查询到已支付,请重试</string>
|
||||
<string name="AbnormalPointCard">获取点卡余额异常</string>
|
||||
<string name="correctPhoneNumber">请输入正确的手机号</string>
|
||||
<string name="correctPhoneEmail">请输入正确的邮箱</string>
|
||||
<string name="correctCode">请输入正确的验证码</string>
|
||||
<string name="bindingEmail">绑定邮箱</string>
|
||||
<string name="ObtainingVerificationCode">正在获取验证码</string>
|
||||
<string name="nowBinding">正在绑定....</string>
|
||||
<string name="VerificationCodeSent">验证码已发送</string>
|
||||
<string name="VerificationCodeSentFail">验证码发送失败:</string>
|
||||
<string name="BingIngSuccess">绑定成功,请用绑定账号重新登录</string>
|
||||
<string name="BingIngFail">绑定失败</string>
|
||||
<string name="GetSmsFail">获取验证码失败</string>
|
||||
<string name="email">邮箱</string>
|
||||
<string name="ObtainVerificationCode">获取验证码</string>
|
||||
<string name="BindAccount">绑定账号</string>
|
||||
|
||||
<string name="ChooseBindingMethod">请选择绑定方式</string>
|
||||
<string name="mobilePhone">手机</string>
|
||||
<string name="NotReceivedYet">充值未到账等任何问题请联系电报群或客服,一定解决!</string>
|
||||
<string name="AAEr">获取订单信息异常</string>
|
||||
|
||||
</resources>
|
||||
Loading…
Reference in New Issue