From 38c61d9752729e5264408d00b8494ecb2ebef93b Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 17 Jan 2020 15:55:12 +0800 Subject: [PATCH] modify push broadcastreciver --- .../tanlu/fragment/TanluCardViewFragment.java | 14 +++++++++----- .../com/mogo/module/tanlu/receiver/PushReceiver.kt | 6 ++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java index 007b241a4c..dfa159b832 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java @@ -874,11 +874,15 @@ public class TanluCardViewFragment extends MvpFragment> */ @Subscribe(threadMode = ThreadMode.MAIN) public void onPushInfo(final PushTypeInfo event) { - Logger.d(TAG, " onPushInfo event.type =" + event.type); - if (event.type.equals("1")) { - getNaviRoadLineInfo(); - } else if (event.type.equals("2")) { - getRoadLineData(); + if (event != null && TextUtils.isEmpty(event.type)) { + Logger.d(TAG, " onPushInfo event.type =" + event.type); + if (event.type.equals("1")) { + getNaviRoadLineInfo(); + } else if (event.type.equals("2")) { + getRoadLineData(); + } + } else { + Log.e(TAG, "event == null "); } } diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/PushReceiver.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/PushReceiver.kt index 731f251884..f5c93d81ef 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/PushReceiver.kt +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/receiver/PushReceiver.kt @@ -3,6 +3,7 @@ package com.mogo.module.tanlu.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.net.Uri import android.util.Log import com.mogo.module.tanlu.model.event.PushTypeInfo import com.mogo.module.tanlu.model.event.VoiceRoadInfo @@ -14,9 +15,10 @@ import org.greenrobot.eventbus.EventBus class PushReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { if (intent.action == "com.zhidao.roadcondition.split"){ - var type = intent.getStringExtra("type") + var type = intent.getStringExtra("uri") + var uri = Uri.parse(type) Log.d("PushReceiver", "type = $type") - EventBus.getDefault().post(PushTypeInfo(type)) + EventBus.getDefault().post(PushTypeInfo(uri.getQueryParameter("type"))) } } }