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 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()执行的任务 + } } + +