android/charge.git

			@@ -13,6 +13,7 @@
			import com.dayu.general.bean.card.ClearCard
			import com.dayu.general.bean.card.DebugCard
			import com.dayu.general.bean.card.UserCard
			import com.dayu.general.bean.net.CardInfoResult
			import com.dayu.general.dao.BaseDaoSingleton
			import com.dayu.general.databinding.ActivityNfcWriteGeBinding
			import com.dayu.general.net.ApiManager
			@@ -98,6 +99,8 @@
			/** 项目号（1-255） */
			private var projectNumber: String = ""

			private var cardInfo: CardInfoResult? = null

			override fun onCreate(savedInstanceState: Bundle?) {
			super.onCreate(savedInstanceState)
			binding = ActivityNfcWriteGeBinding.inflate(layoutInflater)
			@@ -116,6 +119,7 @@
			operationTypeCode = intent?.getIntExtra("operationTypeCode", -1) ?: -1
			orderNumber = intent?.getStringExtra("orderNumber") ?: ""
			operationType = CardOperationType.fromCode(operationTypeCode)
			cardInfo = intent?.getSerializableExtra("cardInfo") as? CardInfoResult

			// 获取充值相关金额
			rechargeAmount = intent?.getDoubleExtra("rechargeAmount", 0.0) ?: 0.0
			@@ -640,11 +644,44 @@

			// 跳转到写卡成功界面
			Intent(this@NfcWreatActivity, CardWriteSuccessActivity::class.java).apply {


			putExtra("cardNumber", cardNumber)
			putExtra("cardAddr", cardAddr)
			putExtra("operationTypeCode", operationTypeCode)
			putExtra("orderNumber", orderNumber)
			//开卡相关参数
			putExtra("cardFee", cardFee)

			// 传递充值相关参数
			putExtra("rechargeAmount", rechargeAmount)
			putExtra("bonusAmount", bonusAmount)

			// 传递销卡相关参数
			putExtra("refundAmount", refundAmount)
			putExtra("cardBalance", cardBalance)

			// 传递返还相关参数
			putExtra("returnAmount", returnAmount)

			// 传递补扣相关参数
			putExtra("deductAmount", deductAmount)

			// 传递补卡相关参数
			putExtra("cardCost", cardCost)
			putExtra("reissueAmount", reissueAmount)

			// 传递用户卡对象
			if (::userCard.isInitialized) {
			putExtra("userCard", userCard)
			}
			putExtra("operationTypeCode", operationTypeCode)

			// 传递卡片信息对象
			cardInfo?.let {
			putExtra("cardInfo", it)
			}


			startActivity(this)
			}