diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0d156937bb..663459aa50 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,18 +3,9 @@
-
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 21e99e2dc0..cd77a1f062 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
-
+
\ No newline at end of file
diff --git a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt
index 761b28c063..1e8e831acb 100644
--- a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt
+++ b/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")
}
diff --git a/services/mogo-service-api/build.gradle b/services/mogo-service-api/build.gradle
index b1f9011fa0..7ea6b1bb2b 100644
--- a/services/mogo-service-api/build.gradle
+++ b/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