From 4ff3c0e2ccc98c8b7a9f62d6d22b4198bda86ab0 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 29 Jun 2020 09:52:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0vip=E5=8F=98=E7=81=AF?= =?UTF-8?q?=E6=8F=90=E9=86=92=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/mogo/launcher/MogoApplication.java | 1 + gradle.properties | 2 +- .../main/java/com/zhidao/mogo/module/obu/ObuConstant.java | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 2204824228..c3bb8b9885 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -43,6 +43,7 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setLaunchLocationService(BuildConfig.LAUNCH_LOCATION_SERVICE); DebugConfig.setUseCustomNavi(BuildConfig.USE_CUSTOM_NAVI); DebugConfig.setLauncher(BuildConfig.IS_LAUNCHER); + DebugConfig.setUseMockObuData(false); super.onCreate(); // Crash 日志收集 final long start = System.currentTimeMillis(); diff --git a/gradle.properties b/gradle.properties index d09bf832ee..137c8144cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,7 +24,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -RELEASE=true +RELEASE=false # 模块版本 ## 工程内模块 MOGO_COMMONS_VERSION=1.2.1.12-shunyi diff --git a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuConstant.java b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuConstant.java index 70c82e564f..7ced90581f 100644 --- a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuConstant.java +++ b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuConstant.java @@ -30,4 +30,9 @@ public class ObuConstant { * 行人碰撞预警 */ public static final int TYPE_ROAD_USER_COLLISION_WARNING = 115; + + /** + * 为vip车辆变灯提醒 + */ + public static final int TYPE_CHANGE_LIGHT_FOR_VIP = 116; } From f41f21483d97ce439ef7bf804a998ef7fd57fab3 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 29 Jun 2020 09:59:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0vip=E5=8F=98=E7=81=AF?= =?UTF-8?q?=E6=8F=90=E9=86=92=E7=B1=BB=E5=9E=8B=E6=A8=A1=E6=8B=9F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhidao/mogo/module/obu/MockUtil.kt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt index d8d0563ce3..46f3183941 100644 --- a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt +++ b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt @@ -33,7 +33,7 @@ object MockUtil { intervalObs = Observable.interval(5000,TimeUnit.MILLISECONDS).map { it.toString() }.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe { - val random = Random.nextInt(0, 3) + val random = Random.nextInt(0, 4) Logger.d(TAG, "random====$random") val carEventInfo = CarEventInfo() when (random) { @@ -63,6 +63,17 @@ object MockUtil { carEventInfo.describe = "这个应该是随便写，反正也不用" dataCallback.showCarEventInfo(carEventInfo) } + 3 -> { + // vip变灯提醒 + carEventInfo.type = "vip变灯提醒" + carEventInfo.typeCode = "vip变灯提醒" + val r = Random.nextInt(0, 2) + carEventInfo.describe = when (r) { + 0 -> "已更改前方红绿灯状态，可优先通行" + else -> "已增加前方绿灯时间，可优先通行" + } + dataCallback.showCarEventInfo(carEventInfo) + } else->{ // 其他，不处理 }