feat: update google 支付

baseswago/build.gradle

@@ -108,7 +108,7 @@ dependencies {
     //agora
     api "io.agora.rtc:full-rtc-basic:3.7.0.2"
     //支付
-    api 'com.android.billingclient:billing-ktx:5.2.0'
+    api 'com.android.billingclient:billing-ktx:7.0.0'
     //抓包
     debugImplementation "com.github.chuckerteam.chucker:library:3.5.2"
     releaseImplementation "com.github.chuckerteam.chucker:library-no-op:3.5.2"

baseswago/src/main/java/com/swago/baseswago/dialog/PayDialog.kt

@@ -143,7 +143,7 @@ class PayDialog : BaseXDFragment<DialogPayBinding>(), IPayCallback{
     override fun onUnConsumeOrder(data: List<Purchase>) {
         lifecycleScope.launch(Dispatchers.Main) {
             data.forEach {
-                val orderLostDialog = OrderLostDialog.newInstance(it.orderId)
+                val orderLostDialog = OrderLostDialog.newInstance(it.orderId?:"")
                 orderLostDialog.commitLostOrderFun = {
                     payVm.payOrderToServer(it, 4)
                 }

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.7.10"
+    ext.kotlin_version = "1.9.0"
     repositories {
         google()
         maven {
@@ -19,7 +19,7 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:7.2.1"
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0'
         classpath 'com.google.gms:google-services:4.3.10'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
         classpath 'com.google.firebase:perf-plugin:1.4.1'

home/src/main/java/com/swago/home/HomeActivity.kt

@@ -272,7 +272,7 @@ class HomeActivity : BaseXActivity<ActivityHomeBinding>(), IPayCallback {
     override fun onUnConsumeOrder(data: List<Purchase>) {
         lifecycleScope.launch(Dispatchers.Main) {
             data.forEach {
-                val orderLostDialog = OrderLostDialog.newInstance(it.orderId)
+                val orderLostDialog = OrderLostDialog.newInstance(it.orderId?:"")
                 orderLostDialog.commitLostOrderFun = {
                     payVm.payOrderToServer(it, 4)
                 }

user/src/main/java/com/swago/user/recharge/RechargeActivity.kt

@@ -159,7 +159,7 @@ class RechargeActivity : BaseXActivity<ActivityRechargeBinding>(),IPayCallback {
     override fun onUnConsumeOrder(data: List<Purchase>) {
         lifecycleScope.launch(Dispatchers.Main) {
             data.forEach {
-                val orderLostDialog = OrderLostDialog.newInstance(it.orderId)
+                val orderLostDialog = OrderLostDialog.newInstance(it.orderId?:"")
                 orderLostDialog.commitLostOrderFun = {
                     payVm.payOrderToServer(it, 4)
                 }