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)