Merge branch 'demo/shunyi_v2v_merge' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into demo/shunyi_v2v_merge

modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt

@@ -36,16 +36,28 @@ class CrashWarningProvider:IMogoCrashWarnProvider {
             override fun onBoxSelfCheckChanged(p0: TsSensorChannel?) {
             }
 
+            override fun onTsCleanFlashChanged(p0: Int) {
+            }
+
+            override fun onTsUpdateChanged(p0: Int) {
+            }
+
             override fun onBoxThresholdChanged(threshold: TsThreshold?) {
                 threshold?.let {
-                    Logger.d(TAG, "获取到当前阈值: $threshold")
+                    Logger.d(TAG, "获取到当前阈值==: $threshold")
                     crashThreshold.copy(threshold)
                 }
             }
 
+            override fun onTsReadFlashCountChanged(p0: Int) {
+            }
+
             override fun onTimeChanged(p0: Int, p1: Int, p2: Int, p3: Int, p4: Int, p5: Int) {
             }
 
+            override fun onTsRestoreBackupDataChanged(p0: Int) {
+            }
+
             override fun onVersionChanged(p0: String?) {
             }
 
@@ -70,8 +82,14 @@ class CrashWarningProvider:IMogoCrashWarnProvider {
             override fun onSerialNumChanged(p0: String?) {
             }
 
-        })
+            override fun onTsReadFlashDataChanged(p0: Int, p1: String?) {
+            }
 
+        })
+        val initResult = ZDPowerManager.getInstance().initTsDevice()
+        Logger.d(TAG, "initDevice: $initResult")
+        // 默认开启报警
+        ZDPowerManager.getInstance().setTsAlarmSwitch(1)
         val getThresholdResult = ZDPowerManager.getInstance().tsBoxStatus
         Logger.d(TAG, "获取当前碰撞阈值: $getThresholdResult")
     }

services/mogo-service-api/build.gradle

@@ -42,7 +42,7 @@ dependencies {
     annotationProcessor rootProject.ext.dependencies.aroutercompiler
     api rootProject.ext.dependencies.fresco
     api rootProject.ext.dependencies.obusdk
-    api 'com.mogo.module:module-crash-warning:1'
+    api 'com.mogo.module:module-crash-warning:1.1.0'
     if (Boolean.valueOf(RELEASE)) {
         api rootProject.ext.dependencies.mogomapapi
         api rootProject.ext.dependencies.skinsupport