From 8877763a2963f1d183325c4857b668d9cd592d2f Mon Sep 17 00:00:00 2001 From: shenzuqiang Date: Thu, 26 Mar 2026 18:34:27 +0800 Subject: [PATCH] =?UTF-8?q?Dev=EF=BC=9A=201=E3=80=81=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=9B=91=E5=90=AC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/img/rabbit/MainActivity.kt | 17 +++++++++++++++++ .../com/img/rabbit/pages/screen/HomeScreen.kt | 3 +++ 2 files changed, 20 insertions(+) diff --git a/app/src/main/java/com/img/rabbit/MainActivity.kt b/app/src/main/java/com/img/rabbit/MainActivity.kt index eb0f1df..d600cb8 100644 --- a/app/src/main/java/com/img/rabbit/MainActivity.kt +++ b/app/src/main/java/com/img/rabbit/MainActivity.kt @@ -54,9 +54,11 @@ import com.img.rabbit.viewmodel.GeneralViewModel import com.img.rabbit.viewmodel.LoginViewModel import com.img.rabbit.viewmodel.ReportViewModel import com.img.rabbit.viewmodel.SplashViewModel +import io.dcloud.feature.sdk.DCUniMPSDK import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import org.json.JSONObject class MainActivity : ComponentActivity(), LoadingCallback { private lateinit var generalViewModel: GeneralViewModel @@ -173,6 +175,21 @@ class MainActivity : ComponentActivity(), LoadingCallback { } } + LaunchedEffect(Unit) { + DCUniMPSDK.getInstance().setOnUniMPEventCallBack { appid, event, data, callback ->//appid, event, data, callback -> + if(event == "start_combo_pay"){ + //拉起微信小程序来支付 + val weixinMpOriId = JSONObject(data.toString()).optString("weixinMpOriId") + val outTradeNo = JSONObject(data.toString()).optString("outTradeNo") + UniAppUtils.startUniPay( + api = generalViewModel.api, + weixinMpOriId = weixinMpOriId, + outTradeNo = outTradeNo + ) + } + } + } + // 同意隐私政策后,获取服务器时间(系统时间同步完成后获取用户配置信息,配置信息同步完成才能启动) LaunchedEffect(generalViewModel.agreementStatus.value) { if (generalViewModel.agreementStatus.value){ diff --git a/app/src/main/java/com/img/rabbit/pages/screen/HomeScreen.kt b/app/src/main/java/com/img/rabbit/pages/screen/HomeScreen.kt index 6c2531c..dba0dc6 100644 --- a/app/src/main/java/com/img/rabbit/pages/screen/HomeScreen.kt +++ b/app/src/main/java/com/img/rabbit/pages/screen/HomeScreen.kt @@ -135,6 +135,8 @@ fun HomeScreen( } } + /* + //已移到MainActivity中监听处理 LaunchedEffect(Unit) { DCUniMPSDK.getInstance().setOnUniMPEventCallBack { _, _, data, _ ->//appid, event, data, callback -> //拉起微信小程序来支付 @@ -147,6 +149,7 @@ fun HomeScreen( ) } } + */ var homeIconConfig by remember { mutableStateOf(PreferenceUtil.getUserConfig()?.config?.homeIconEntity) } var uniVersionConfig by remember { mutableStateOf(PreferenceUtil.getUserConfig()?.config?.uniVersionEntity) }