From 43e798e90e9c780f313b7c930fbe5518dbcb2b01 Mon Sep 17 00:00:00 2001 From: songzhiling <17630035658@163.com> Date: Wed, 30 Apr 2025 15:11:23 +0800 Subject: [PATCH] =?UTF-8?q?refactor(servicing):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86=E5=B9=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7-=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC=E5=8F=B7=E8=87=B3?= =?UTF-8?q?=201.0.1.9.9.33=20-=20=E4=BF=AE=E6=94=B9=20MainActivity=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=20taskCode=20=E4=BB=A5=E5=8F=8D=E6=98=A0?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B7=20-=20?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=20PushMessageActivity=20=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=20setupPushMessageReceiver=20=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E8=B0=83=E7=94=A8=20-=20=E8=B0=83=E6=95=B4=20ServiceManager=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=8E=A8=E9=80=81=E6=B6=88=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E5=99=A8=E6=B3=A8=E5=86=8C=E9=80=BB=E8=BE=91=20-=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20PUSH=5FMESSAGE=E6=84=8F=E5=9B=BE=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AF=B9=E4=B8=BB=E8=BF=9B=E7=A8=8B=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/za/sdk/demo/MainActivity.kt | 2 +- servicing/build.gradle | 2 +- .../src/main/java/com/za/base/PushMessageActivity.kt | 2 +- servicing/src/main/java/com/za/service/ServiceManager.kt | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/za/sdk/demo/MainActivity.kt b/app/src/main/java/com/za/sdk/demo/MainActivity.kt index 9389713..42b17e8 100644 --- a/app/src/main/java/com/za/sdk/demo/MainActivity.kt +++ b/app/src/main/java/com/za/sdk/demo/MainActivity.kt @@ -27,7 +27,7 @@ class MainActivity : ComponentActivity() { .fillMaxSize() .clickable { val uri = - "zd.assist://app?taskCode=ZD250429100095&driverName=宋志领&driverPhone=17630035658&rescueVehicle=沪88888".toUri() + "zd.assist://app?taskCode=ZD250429100116&driverName=宋志领&driverPhone=17630035658&rescueVehicle=沪88888".toUri() val intent = Intent(Intent.ACTION_VIEW, uri) startActivity(intent) } diff --git a/servicing/build.gradle b/servicing/build.gradle index 3e3a581..3e910b4 100644 --- a/servicing/build.gradle +++ b/servicing/build.gradle @@ -73,7 +73,7 @@ publishing { release(MavenPublication) { groupId = 'io.github.szl9' artifactId = 'zd_servicing' - version = "1.0.1.9.9.31" + version = "1.0.1.9.9.33" pom { packaging = "aar" diff --git a/servicing/src/main/java/com/za/base/PushMessageActivity.kt b/servicing/src/main/java/com/za/base/PushMessageActivity.kt index a904130..631b23d 100644 --- a/servicing/src/main/java/com/za/base/PushMessageActivity.kt +++ b/servicing/src/main/java/com/za/base/PushMessageActivity.kt @@ -16,7 +16,7 @@ open class PushMessageActivity : AppCompatActivity() { override fun onCreate(savedInstanceState : Bundle?) { super.onCreate(savedInstanceState) - setupPushMessageReceiver() +// setupPushMessageReceiver() } private fun setupPushMessageReceiver() { // 注册推送消息接收器 diff --git a/servicing/src/main/java/com/za/service/ServiceManager.kt b/servicing/src/main/java/com/za/service/ServiceManager.kt index 3418f30..b9f34f2 100644 --- a/servicing/src/main/java/com/za/service/ServiceManager.kt +++ b/servicing/src/main/java/com/za/service/ServiceManager.kt @@ -44,9 +44,7 @@ object ServiceManager { LogUtil.print("ServiceManager", "Initializing ServiceManager") jpushRegister(context) MyMqttClient.initialize(deviceId = DeviceUtil.getAndroidId(context)) - if (! GlobalData.isMaster) { - setupPushMessageReceiver(context) - } + setupPushMessageReceiver(context) } private fun setupPushMessageReceiver(context : Context) { // 注册推送消息接收器 @@ -82,7 +80,9 @@ object ServiceManager { private fun sendMessageToMainProcess(context : Context, type : String, message : String) { // 使用广播将消息发送到主进程 - val intent = Intent("com.za.rescue.dealer.PUSH_MESSAGE") + val intent = Intent("com.za.rescue.dealer.PUSH_MESSAGE".takeIf { GlobalData.isMaster } + ?: ZdPushServiceReceive.RECEIVE_ACTION) + intent.setPackage(context.packageName) intent.putExtra("type", type) intent.putExtra("message", message) context.sendBroadcast(intent)