From 0fd8e8d156a75b3dc1a8386da0701d167b2bd925 Mon Sep 17 00:00:00 2001
From: lianglihui <lianglihui@zhidaoauto.com>
Date: Wed, 30 Jun 2021 12:37:40 +0800
Subject: [PATCH 1/2] customMap sdkversion update 8.5.60

---
 gradle.properties                       | 2 +-
 libraries/map-custom/map-version-update | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 50a272b742..8e9b56b215 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -187,4 +187,4 @@ applicationId=com.mogo.launcer
 applicationName=IntelligentPilot
 versionCode=80007
 versionName=8.0.7
-MAP_SDK_VERSION=1.0.0-vr-8.5.59
\ No newline at end of file
+MAP_SDK_VERSION=1.0.0-vr-8.5.60
\ No newline at end of file
diff --git a/libraries/map-custom/map-version-update b/libraries/map-custom/map-version-update
index 6971456ed8..d02212f12e 100644
--- a/libraries/map-custom/map-version-update
+++ b/libraries/map-custom/map-version-update
@@ -94,7 +94,8 @@ fix crash
 修改崩溃
 
 8.5.54
-1.更新衡阳数据  2. 新增路牌
+1.更新衡阳数据
+2. 新增路牌
 
 8.5.55
 修改路牌数据以及图片
@@ -103,4 +104,7 @@ fix crash
 日志：修改crash
 
 8.5.58
-修改画线问题
\ No newline at end of file
+修改画线问题
+
+8.5.60
+修改崩溃
\ No newline at end of file

From 1d2deb527821b3c59bc36ea554bdd8a06534b9b6 Mon Sep 17 00:00:00 2001
From: lianglihui <lianglihui@zhidaoauto.com>
Date: Wed, 30 Jun 2021 22:46:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BD=91=E7=BA=A6=E8=BD=A6=20=E4=B8=BA?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B7=A5=E6=8E=A7=E6=9C=BA=E6=8B=BF=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0sn=20=E4=B8=B4=E6=97=B6=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/adas/AdasProvider.java    |  1 +
 .../service/impl/adas/MogoADASController.java | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java
index 39db10a759..7227a55410 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java
@@ -52,6 +52,7 @@ public class AdasProvider implements IProvider {
     }
 
     public void setBasicInfo(){
+        Logger.e("lianglihui","setBasicInfo");
         BasicInfo info = new BasicInfo();
         info.setSn(MoGoAiCloudClientConfig.getInstance().getSn());
         AdasManager.getInstance().setBasicInfo(info);
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
index e6bb4813c9..e9e15649bb 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
@@ -67,8 +67,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.TimeUnit;
 
+import io.reactivex.Observable;
+import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
+import rx.android.schedulers.AndroidSchedulers;
+
+import static rx.android.schedulers.AndroidSchedulers.mainThread;
 
 /**
  * @author congtaowang
@@ -347,6 +353,8 @@ public class MogoADASController implements IMogoADASController {
 
                 //测试网约车
                 //testOCH();
+                // TODO: 2021/6/30 临时解决方案
+                timeLoop();
             }
 
             @Override
@@ -749,6 +757,8 @@ public class MogoADASController implements IMogoADASController {
         adasProvider.removeAdasEventListener(mAdasDataListener);
         adasProvider.removeAdasStatusListener();
         //AutopilotServiceManage.getInstance().release();
+        //关闭定时任务
+        if (mDisposable != null) mDisposable.dispose();
     }
 
     @Override
@@ -935,4 +945,23 @@ public class MogoADASController implements IMogoADASController {
     public void mockAdasRecognized(String json) {
         mAdasDataListener.cameraEyeDetectResult(json);
     }
+
+
+    private static final int PERIOD = 5 * 1000;
+    private static final int DELAY = 10000;
+    private Disposable mDisposable;
+
+    /**
+     * 定时循环任务
+     */
+    private void timeLoop() {
+        mDisposable = Observable.interval(DELAY, PERIOD, TimeUnit.MILLISECONDS)
+                .map((aLong -> aLong + 1))
+                .subscribeOn(Schedulers.io())
+                .subscribe(aLong ->
+                        adasProvider.setBasicInfo()
+                );//getUnreadCount()执行的任务
+    }
 }
+
+