From c63c5ea87b6d3100f7c1d3730165605b52083c4b Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 22 Sep 2020 10:59:38 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0site=E7=BB=B4=E5=BA=A6?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=9D=A5=E5=8C=BA=E5=88=86=E9=A1=BA=E4=B9=89?= =?UTF-8?q?=E8=BF=98=E6=98=AF=E8=8B=8F=E5=B7=9E=EF=BC=8C=E4=B8=BB=E8=A6=81?= =?UTF-8?q?=E6=98=AF=E4=B8=BA=E4=BA=86=E5=8C=BA=E5=88=86obu=202.=20?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=8E=A5=E6=94=B6obu=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E8=B0=83=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 21 ++- .../com/mogo/launcher/MogoApplication.java | 3 +- .../com/zhidao/mogo/module/obu/MockUtil.kt | 120 +++++++++++++----- .../com/zhidao/mogo/module/obu/ObuManager.kt | 19 +-- .../zhidao/mogo/module/obu/obu/HualiObu.kt | 43 +++++-- .../src/main/res/layout/mock_obu.xml | 48 +++++-- .../com/mogo/module/v2x/V2XObuManager.java | 5 +- .../scene/obu/V2XObuEventScenario.java | 3 +- 8 files changed, 189 insertions(+), 73 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ac67091a5b..82b401e0a3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -70,12 +70,13 @@ android { em4 { manifest.srcFile 'src/em4/AndroidManifest.xml' } - f8xxLauncherOnlineRelease { - manifest.srcFile 'src/f8xxLauncherOnlineRelease/AndroidManifest.xml' - } + // 演示分支，暂时不需要这一项 +// f8xxLauncherOnlineRelease { +// manifest.srcFile 'src/f8xxLauncherOnlineRelease/AndroidManifest.xml' +// } } - flavorDimensions "product", "basic", "env" + flavorDimensions "site","product", "basic", "env" productFlavors { //独立app @@ -276,6 +277,18 @@ android { // 是否支持换肤 buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false' } + // 演示地点-顺义 + shunyi{ + dimension "site" + // 西迪obu + buildConfigField 'int', "OBU_TYPE", '1' + } + // 演示地点-苏州 + suzhou{ + dimension "site" + // 华砺智行obu + buildConfigField 'int', "OBU_TYPE", '2' + } qa { dimension "env" buildConfigField 'int', 'NET_ENV', '2' diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 254c30320d..43a4a48dae 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -128,7 +128,7 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setUseCustomNavi( BuildConfig.USE_CUSTOM_NAVI ); DebugConfig.setLauncher( BuildConfig.IS_LAUNCHER ); DebugConfig.setActiveAIAssistFlag( BuildConfig.AI_ASSIST_ACTIVE_STAUTS ); - DebugConfig.setUseMockObuData(false); + DebugConfig.setUseMockObuData(true); ObuConfig.useObuLocation = false; DebugConfig.setCarMachineType( BuildConfig.CAR_MACHINE_TYPE ); DebugConfig.setProductFlavor( BuildConfig.FLAVOR_product ); @@ -136,6 +136,7 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setRoadEventAnimated( BuildConfig.ROAD_EVENT_ANIMATED ); DebugConfig.setLoadGuideModule( BuildConfig.LOAD_GUIDE_MODULE ); DebugConfig.setSkinSupported( BuildConfig.IS_SKIN_SUPPORTED ); + DebugConfig.setObuType(BuildConfig.OBU_TYPE); } @Override 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 472c0f6bb7..3508d407eb 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 @@ -1,12 +1,18 @@ package com.zhidao.mogo.module.obu import android.content.Context +import android.os.Handler +import android.os.Message import android.view.LayoutInflater +import android.view.View import android.widget.Button import com.alibaba.android.arouter.launcher.ARouter +import com.mogo.commons.debug.DebugConfig import com.mogo.service.IMogoServiceApis import com.mogo.service.MogoServicePaths import com.mogo.utils.logger.Logger +import com.zhidao.mogo.module.obu.obu.HualiObu +import com.zhidao.mogo.module.obu.obu.IObu import com.zhidao.smartv2x.listener.OnMessageReceiveListener import com.zhidao.smartv2x.model.obu.CarEventInfo import com.zhidao.smartv2x.model.obu.TrafficLightInfo @@ -24,18 +30,34 @@ import kotlin.random.Random * * @author tongchenfei */ -object MockUtil { - const val TAG = "MockUtil" - private var dataCallback : OnMessageReceiveListener?=null +class MockUtil:Handler.Callback { + companion object { + const val TAG = "MockUtil" + } - private lateinit var intervalObs:Disposable - private lateinit var intervalObs2:Disposable + private var dataCallback: OnMessageReceiveListener? = null - fun init(context: Context, callback: OnMessageReceiveListener? = null){ + private lateinit var intervalObs: Disposable + private lateinit var intervalObs2: Disposable + + private lateinit var context: Context + private lateinit var view:View + + private val handler = Handler(this) + + override fun handleMessage(msg: Message): Boolean { + if (msg.what == 1001) { + Logger.d(TAG,"准备添加调试view") + val api = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context) as IMogoServiceApis + api.windowManagerApi.addView(view, 1000, 600, false) + } + return false + } + + fun init(context: Context,obu:HualiObu){ Logger.d(TAG, "使用模拟obu数据===") - dataCallback = callback - val api = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context) as IMogoServiceApis - val view = LayoutInflater.from(context).inflate(R.layout.mock_obu, null) + this.context = context + view = LayoutInflater.from(context).inflate(R.layout.mock_obu, null) view.findViewById