Merge remote-tracking branch 'origin/dev2' into dev2

This commit is contained in:
tongchenfei
2021-01-14 14:47:45 +08:00
2 changed files with 6 additions and 5 deletions

1
.idea/gradle.xml generated
View File

@@ -84,6 +84,7 @@
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings>
</option>
</component>

View File

@@ -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
}