android/charge.git

			@@ -3,23 +3,17 @@
			import android.content.Context
			import android.content.Intent
			import android.os.Bundle
			import android.util.TypedValue
			import android.view.View
			import android.widget.RadioButton
			import android.widget.Toast
			import com.dayu.baselibrary.net.subscribers.SubscriberListener
			import com.dayu.baselibrary.utils.MornyUtil
			import com.dayu.baselibrary.utils.ToastUtil
			import com.dayu.baselibrary.view.TipDialog
			import com.dayu.baselibrary.view.TitleBar
			import com.dayu.general.BaseApplication
			import com.dayu.general.R
			import com.dayu.general.bean.card.UserCard
			import com.dayu.general.bean.net.CardInfoResult
			import com.dayu.general.bean.net.CardInfoByClientResult
			import com.dayu.general.bean.net.CardInfoResult
			import com.dayu.general.bean.net.CardReplaceResult
			import com.dayu.general.bean.net.PaymentMethod
			import com.dayu.general.bean.net.PaymentMethodResponse
			import com.dayu.general.databinding.ActivityCardReplaceBinding
			import com.dayu.general.net.ApiManager
			import com.dayu.general.net.BaseResponse
			@@ -181,7 +175,9 @@
			}

			else -> {

			showConfirmDialog("当前非白卡") {
			resetToReadingState()
			}
			}
			}

			@@ -380,6 +376,7 @@
			putExtra("paymentMethod", paymentMethod) // 传递支付方式
			putExtra("paymentId", paymentId) // 传递支付方式ID
			putExtra("userCard", updatedUserCard as java.io.Serializable)
			putExtra("cardInfo", cardInfo)
			}
			startActivity(intent)
			finish()