Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into dev2
This commit is contained in:
1
.idea/gradle.xml
generated
1
.idea/gradle.xml
generated
@@ -84,6 +84,7 @@
|
||||
</set>
|
||||
</option>
|
||||
<option name="resolveModulePerSourceSet" value="false" />
|
||||
<option name="useQualifiedModuleNames" value="true" />
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
|
||||
@@ -30,8 +30,8 @@ class CidiObu : BaseObu(), Handler.Callback, OnMessageReceiveListener {
|
||||
override fun init(context: Context) {
|
||||
super.init(context)
|
||||
// 初始化sdk,注册数据回调等信息
|
||||
Logger.d(TAG,"init====")
|
||||
V2xController.getInstance().setMessageReceiveListener(this)
|
||||
V2xController.getInstance().init()
|
||||
handler.sendEmptyMessageDelayed(MSG_MONITOR_OBU_STATUS, DEFAULT_MONITOR_TIME)
|
||||
}
|
||||
|
||||
@@ -111,11 +111,11 @@ class CidiObu : BaseObu(), Handler.Callback, OnMessageReceiveListener {
|
||||
override fun handleMessage(msg: Message?): Boolean {
|
||||
if (msg?.what == MSG_MONITOR_OBU_STATUS) {
|
||||
// obu未正常连接,需要重新连接
|
||||
Logger.d(TAG, "obu未正常连接,需要重新连接")
|
||||
V2xController.getInstance().release()
|
||||
V2xController.getInstance().setMessageReceiveListener(this)
|
||||
Logger.d(TAG, "obu初始化")
|
||||
// V2xController.getInstance().release()
|
||||
// V2xController.getInstance().setMessageReceiveListener(this)
|
||||
V2xController.getInstance().init()
|
||||
handler.sendEmptyMessageDelayed(MSG_MONITOR_OBU_STATUS, DEFAULT_MONITOR_TIME)
|
||||
// handler.sendEmptyMessageDelayed(MSG_MONITOR_OBU_STATUS, DEFAULT_MONITOR_TIME)
|
||||
// V2xController.getInstance().release()
|
||||
return true
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user