android/charge.git

			@@ -12,6 +12,7 @@
			import android.widget.Toast
			import androidx.appcompat.app.AppCompatActivity
			import com.dayu.baselibrary.net.subscribers.SubscriberListener
			import com.dayu.baselibrary.utils.MornyUtil
			import com.dayu.baselibrary.utils.ToastUtil
			import com.dayu.baselibrary.view.TitleBar
			import com.dayu.general.BaseApplication
			@@ -45,7 +46,12 @@
			private const val EXTRA_CARD_ADDRESS = "extra_card_address"
			private const val EXTRA_USER_CARD = "extra_user_card"

			fun start(context: Context, cardInfo: CardInfoResult?, cardAddress: String?, userCard: UserCard?) {
			fun start(
			context: Context,
			cardInfo: CardInfoResult?,
			cardAddress: String?,
			userCard: UserCard?
			) {
			val intent = Intent(context, RechargeDetailActivity::class.java)
			intent.putExtra(EXTRA_CARD_INFO, cardInfo)
			intent.putExtra(EXTRA_CARD_ADDRESS, cardAddress)
			@@ -389,7 +395,11 @@
			/**
			* 启动写卡界面
			*/
			private fun startWriteCardActivity(rechargeResult: RechargeResult, rechargeAmount: Double, bonusAmount: Double) {
			private fun startWriteCardActivity(
			rechargeResult: RechargeResult,
			rechargeAmount: Double,
			bonusAmount: Double
			) {
			try {
			// 创建UserCard对象用于写卡
			val userCard = UserCard().apply {
			@@ -398,7 +408,8 @@
			userCode = info.cardNum ?: ""

			// 计算新余额：原有余额 + 充值金额 + 赠送金额
			val originalBalance = this@RechargeDetailActivity.userCard?.balance ?: 0 // 原有余额（分）
			val originalBalance =
			this@RechargeDetailActivity.userCard?.balance ?: 0 // 原有余额（分）
			val rechargeAmountInCents = (rechargeAmount * 100).toInt() // 充值金额转分
			val bonusAmountInCents = (bonusAmount * 100).toInt() // 赠送金额转分

			@@ -407,7 +418,7 @@

			// 设置其他必要信息
			projectCode = rechargeResult.projectNo
			waterPrice = rechargeResult.waterPrice.toFloat()
			waterPrice = MornyUtil.changeY2F(rechargeResult.waterPrice.toString())
			rechargeDate = java.util.Calendar.getInstance()
			}