修改支付流程

Author: dora4

README.md

@@ -17,7 +17,7 @@ dependencyResolutionManagement {
 dependencies {
     // 扩展包必须在有主框架dora的情况下使用
     implementation("com.github.dora4:dora:1.2.51")
-    implementation("com.github.dora4:dora-walletconnect-support:1.27")
+    implementation("com.github.dora4:dora-walletconnect-support:1.28")
 }
 ```
 
@@ -56,11 +56,11 @@ DoraTrade.connectWallet(this)
 init()中注册，则在回调处发送消息给处理界面。
 ```kotlin
 DoraTrade.setPayListener(object : DoraTrade.PayListener {
-    override fun onSendPaymentRequest(transactionHash: String) {
+    override fun onSendPaymentRequest(orderId: String, transactionHash: String) {
         // 冷钱包已发起支付请求
     }
 
-    override fun onCancelPayment(transactionHash: String) {
+    override fun onCancelPayment(orderId: String, transactionHash: String) {
         // 支付失败，用户点了冷钱包的取消支付
     }
 })
@@ -75,7 +75,7 @@ DoraTrade.pay(this,
                 "填写收款方的钱包地址，如0xfF6FC0F28835F2C1FE23B15fb4488d976B06Dcd9",
                 0.01,
                 object: DoraTrade.OrderListener {
-                    override fun onPrintOrder(transactionHash: String) {
+                    override fun onPrintOrder(orderId: String) {
                         // 在此记录该笔订单的交易订单号，便于以后查询支付状态
                     }
                 })

lib/build.gradle.kts

@@ -66,7 +66,7 @@ afterEvaluate {
                 from(components["release"])
                 groupId = "com.github.dora4"
                 artifactId = "dora-walletconnect-support"
-                version = "1.27"
+                version = "1.28"
             }
         }
     }

lib/src/main/java/dora/trade/DoraTrade.kt

@@ -21,6 +21,7 @@ object DoraTrade {
 
     private var payListener: PayListener? = null
     private lateinit var appMetaData: Core.Model.AppMetaData
+    private var transactionMap: Map<Long, String> = hashMapOf()
 
     /**
      * 朵拉支付初始化应用元信息。
@@ -139,9 +140,7 @@ object DoraTrade {
                         PayUtils.convertToHexWei(tokenValue), gasLimit, gasPrice,
                         onSuccess = {
                             if (it is SentRequestResult.WalletConnect) {
-                                // 提取交易hash
-                                val transactionHash = PayUtils.extractTransactionHash(it.params)
-                                transactionHash?.let { orderListener.onPrintOrder(transactionHash) }
+                                 orderListener.onPrintOrder(it.requestId.toString())
                             }
                             Log.d("sendTransactionRequest", it.toString())
                         },
@@ -223,7 +222,7 @@ object DoraTrade {
         /**
          * 生成该笔订单的交易订单号。
          */
-        fun onPrintOrder(transactionHash: String)
+        fun onPrintOrder(orderId: String)
     }
 
     interface PayListener {
@@ -232,11 +231,11 @@ object DoraTrade {
          * 发起支付订单，等待批准。
          * https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/token/ERC20/IERC20.sol
          */
-        fun onSendPaymentRequest(transactionHash: String)
+        fun onSendPaymentRequest(orderId: String, transactionHash: String)
 
         /**
          * 在用户点击钱包的取消按钮时回调。
          */
-        fun onCancelPayment(transactionHash: String)
+        fun onCancelPayment(orderId: String, transactionHash: String)
     }
 }

lib/src/main/java/dora/trade/PayUtils.kt

@@ -15,16 +15,6 @@ object PayUtils {
         return "0x" + weiValue.toString(16) // 转换为十六进制字符串
     }
 
-    @JvmStatic
-    fun extractTransactionHash(params: String): String? {
-        return try {
-            val json = JSONObject(params)
-            json.optString("transactionHash", null)
-        } catch (e: Exception) {
-            null
-        }
-    }
-
     /**
      * 查询区块链浏览器该笔订单是否已支付，且已被确认。
      */