diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index f1d4a2503f..db8a1ed60a 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -44,6 +44,7 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setLaunchLocationService( BuildConfig.LAUNCH_LOCATION_SERVICE ); DebugConfig.setUseCustomNavi( BuildConfig.USE_CUSTOM_NAVI ); DebugConfig.setLauncher( BuildConfig.IS_LAUNCHER ); +// DebugConfig.setUseMockObuData(true); super.onCreate(); // Crash 日志收集 final long start = System.currentTimeMillis(); diff --git a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuConstant.java b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuConstant.java new file mode 100644 index 0000000000..bd9265768a --- /dev/null +++ b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuConstant.java @@ -0,0 +1,9 @@ +package com.zhidao.mogo.module.obu; + +/** + * obu涉及的常量汇总 + * + * @author tongchenfei + */ +class ObuConstant { +} diff --git a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuManager.kt b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuManager.kt index b155920683..00b18e6948 100644 --- a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuManager.kt +++ b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuManager.kt @@ -2,6 +2,8 @@ package com.zhidao.mogo.module.obu import android.content.Context import android.os.Bundle +import android.os.Handler +import android.os.Looper import android.view.View import androidx.fragment.app.Fragment import com.alibaba.android.arouter.facade.annotation.Route @@ -28,10 +30,12 @@ import com.zhidao.smartv2x.model.obu.TrafficLightInfo @Route(path = MogoServicePaths.PATH_OBU) class ObuManager: IMogoObuManager { companion object{ - const val TAG = "ObuProvider" + const val TAG = "ObuManger" } private var dataChangedListener: IMogoObuDataChangedListener? = null + private var handler = Handler(Looper.getMainLooper()) + override fun getNaviListener(): IMogoNaviListener? { return null } @@ -94,7 +98,7 @@ class ObuManager: IMogoObuManager { * 车辆位置信息回调接口 */ override fun showCarLocationInfo(info: CarLocationInfo?) { - Logger.d(TAG,"showCarLocationInfo: ${info?.carId}") + Logger.d(TAG, "thread: ${Thread.currentThread()} showCarLocationInfo: ${info?.carId}") dataChangedListener?.showCarLocationInfo(info) } @@ -102,7 +106,7 @@ class ObuManager: IMogoObuManager { * UDP 收发消息回调接口 */ override fun showOtherInfo(info: String?) { - Logger.d(TAG, "showOtherInfo: $info") + Logger.d(TAG, "thread: ${Thread.currentThread()} showOtherInfo: $info") dataChangedListener?.showOtherInfo(info) } @@ -110,7 +114,7 @@ class ObuManager: IMogoObuManager { * 交通信号灯信息回调接口 */ override fun showTrafficLightInfo(info: TrafficLightInfo?) { - Logger.d(TAG, "showTrafficLightInfo: ${info?.id}") + Logger.d(TAG, "thread: ${Thread.currentThread()} showTrafficLightInfo: ${info?.id}") dataChangedListener?.showTrafficLightInfo(info) } @@ -118,7 +122,7 @@ class ObuManager: IMogoObuManager { * 场景触发事件信息回调接口 */ override fun showCarEventInfo(info: CarEventInfo?) { - Logger.d(TAG, "showCarEventInfo: ${info?.type}") + Logger.d(TAG, "thread: ${Thread.currentThread()} showCarEventInfo: ${info?.type}") dataChangedListener?.showCarEventInfo(info) } } \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java index ffb5d0e913..082550d8db 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java @@ -30,6 +30,7 @@ import com.mogo.service.MogoServicePaths; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.intent.IMogoIntentManager; import com.mogo.service.module.IMogoModuleLifecycle; +import com.mogo.service.obu.IMogoObuDataChangedListener; import com.mogo.service.share.IMogoShareManager; import com.mogo.utils.TipToast; import com.mogo.utils.logger.Logger; @@ -40,6 +41,9 @@ import org.json.JSONObject; import java.util.HashMap; import java.util.Map; import com.mogo.commons.analytics.AnalyticsUtils; +import com.zhidao.smartv2x.model.obu.CarEventInfo; +import com.zhidao.smartv2x.model.obu.CarLocationInfo; +import com.zhidao.smartv2x.model.obu.TrafficLightInfo; import static com.mogo.module.share.bean.StepAfterAuthKt.STEP_AFTER_AUTH_TYPE_SEEK_HELP; import static com.mogo.module.share.bean.StepAfterAuthKt.STEP_AFTER_AUTH_TYPE_SHOW_DIALOG; @@ -196,27 +200,27 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo UPLOAD_ROAD_CONSTRUCTION, this); } -// ServiceApisManager.serviceApis.getRegisterCenterApi().registerObuDataListener("share", new IMogoObuDataChangedListener() { -// @Override -// public void showCarLocationInfo(CarLocationInfo info) { -// Logger.d(TAG, "获取到car location info: " + info.carId); -// } -// -// @Override -// public void showOtherInfo(String info) { -// Logger.d(TAG, "获取到other info: " + info); -// } -// -// @Override -// public void showTrafficLightInfo(TrafficLightInfo info) { -// Logger.d(TAG, "获取到traffic light info: " + info.id); -// } -// -// @Override -// public void showCarEventInfo(CarEventInfo info) { -// Logger.d(TAG, "获取到car event info: " + info.describe); -// } -// }); + ServiceApisManager.serviceApis.getRegisterCenterApi().registerObuDataListener("share", new IMogoObuDataChangedListener() { + @Override + public void showCarLocationInfo(CarLocationInfo info) { + Logger.d(TAG, "获取到car location info: " + info.carId); + } + + @Override + public void showOtherInfo(String info) { + Logger.d(TAG, "获取到other info: " + info); + } + + @Override + public void showTrafficLightInfo(TrafficLightInfo info) { + Logger.d(TAG, "获取到traffic light info: " + info.id); + } + + @Override + public void showCarEventInfo(CarEventInfo info) { + Logger.d(TAG, "获取到car event info: " + info.describe); + } + }); Logger.d(TAG,"init over===="); }