From f73939b25a5de7bdd1160799942279fa95708767 Mon Sep 17 00:00:00 2001 From: songzhiling <17630035658@163.com> Date: Tue, 17 Jun 2025 14:43:13 +0800 Subject: [PATCH] =?UTF-8?q?feat(servicing):=20=E6=96=B0=E5=A2=9E=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9C=8D=E5=8A=A1=E8=B4=B9=E5=8A=9F=E8=83=BD=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E5=A4=84?= =?UTF-8?q?=E7=90=86-=20=E5=9C=A8=20PushMessageActivity=20=E5=92=8C=20Serv?= =?UTF-8?q?icingMainActivity=20=E4=B8=AD=E6=B7=BB=E5=8A=A0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=AE=A2=E5=8D=95=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86?= =?UTF-8?q?-=20=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89=EF=BC=8C=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=B8=B8=E9=87=8F=E6=9B=BF=E4=BB=A3=E7=A1=AC=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2-=20=E7=A7=BB=E9=99=A4=20ModifyMoney?= =?UTF-8?q?Activity=20=E4=B8=AD=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/za/base/PushMessageActivity.kt | 6 ++++++ .../main/java/com/za/ui/main/ServicingMainActivity.kt | 10 +++++++--- .../order_confirm/modify_money/ModifyMoneyActivity.kt | 1 - 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/servicing/src/main/java/com/za/base/PushMessageActivity.kt b/servicing/src/main/java/com/za/base/PushMessageActivity.kt index 90e8b8d..d40f5e3 100644 --- a/servicing/src/main/java/com/za/base/PushMessageActivity.kt +++ b/servicing/src/main/java/com/za/base/PushMessageActivity.kt @@ -56,6 +56,12 @@ open class PushMessageActivity : AppCompatActivity() { message = Gson().toJson(jpushBean), context = this@PushMessageActivity) } + + override fun modifyOrder(jpushBean : JpushBean) { + sendMessageToMainProcess(type = Const.PushMessageType.MODIFY, + message = Gson().toJson(jpushBean), + context = this@PushMessageActivity) + } }) } diff --git a/servicing/src/main/java/com/za/ui/main/ServicingMainActivity.kt b/servicing/src/main/java/com/za/ui/main/ServicingMainActivity.kt index 546af1a..eed5310 100644 --- a/servicing/src/main/java/com/za/ui/main/ServicingMainActivity.kt +++ b/servicing/src/main/java/com/za/ui/main/ServicingMainActivity.kt @@ -105,15 +105,19 @@ class ServicingMainActivity : BaseActivity() { } override fun newOrderMsg(jpushBean : JpushBean) { - sendMessageToMainProcess(context = context, "newOrder", Gson().toJson(jpushBean)) + sendMessageToMainProcess(context = context, Const.PushMessageType.NEW_ORDER, Gson().toJson(jpushBean)) } override fun reDispatchOrder(jpushBean : JpushBean) { - sendMessageToMainProcess(context = context, "reDispatch", Gson().toJson(jpushBean)) + sendMessageToMainProcess(context = context, Const.PushMessageType.RE_DISPATCH, Gson().toJson(jpushBean)) } override fun revokeOrder(jpushBean : JpushBean) { - sendMessageToMainProcess(context = context, "revoke", Gson().toJson(jpushBean)) + sendMessageToMainProcess(context = context, Const.PushMessageType.REVOKE, Gson().toJson(jpushBean)) + } + + override fun modifyOrder(jpushBean : JpushBean) { + sendMessageToMainProcess(context = context, Const.PushMessageType.MODIFY, Gson().toJson(jpushBean)) } }) } diff --git a/servicing/src/main/java/com/za/ui/servicing/order_confirm/modify_money/ModifyMoneyActivity.kt b/servicing/src/main/java/com/za/ui/servicing/order_confirm/modify_money/ModifyMoneyActivity.kt index 9d14950..28058ea 100644 --- a/servicing/src/main/java/com/za/ui/servicing/order_confirm/modify_money/ModifyMoneyActivity.kt +++ b/servicing/src/main/java/com/za/ui/servicing/order_confirm/modify_money/ModifyMoneyActivity.kt @@ -1,6 +1,5 @@ package com.za.ui.servicing.order_confirm.modify_money -import ModifyMoneyScreen import android.content.Context import android.content.Intent import androidx.compose.runtime.Composable