From ebebb55d11cda5ddb1017cf38163ce98ca546511 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 27 May 2021 22:59:32 +0800 Subject: [PATCH] remove test code --- .../com/mogo/launcher/MogoApplication.java | 36 +++++++++---------- libraries/map-custom/build.gradle | 2 +- .../drawer/AdasRecognizedResultDrawer.java | 2 +- .../common/drawer/SnapshotSetDataDrawer.java | 2 +- .../service/marker/MapMarkerManager.java | 2 +- .../small/map/SmallMapDirectionView.java | 6 ++-- .../mogo/module/v2x/V2XModuleProvider.java | 2 +- 7 files changed, 24 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 4917af400e..f21630545b 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -158,27 +158,25 @@ public class MogoApplication extends AbsMogoApplication { // 设置是否是直播推流的主播 clientConfig.setAnchor(false); // 设置从蘑菇AI开放平台获取的APPKey -// switch (DebugConfig.getCarMachineType()) { -// // 自研车机 -// case DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE: -// clientConfig.setThirdPartyAppKey("wbvpzgar"); -// break; -// // 比亚迪 -// case DebugConfig.CAR_MACHINE_TYPE_BYD: -// clientConfig.setThirdPartyAppKey("bydauto"); -// break; -// // 衡阳-鹰眼项目 -// case DebugConfig.CAR_MACHINE_TYPE_LENOVO: -// clientConfig.setThirdPartyAppKey("pfieouqg"); -// break; -// } - clientConfig.setThirdPartyAppKey("pfieouqg"); // todo test验证用 + switch (DebugConfig.getCarMachineType()) { + // 自研车机 + case DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE: + clientConfig.setThirdPartyAppKey("wbvpzgar"); + break; + // 比亚迪 + case DebugConfig.CAR_MACHINE_TYPE_BYD: + clientConfig.setThirdPartyAppKey("bydauto"); + break; + // 衡阳-鹰眼项目 + case DebugConfig.CAR_MACHINE_TYPE_LENOVO: + clientConfig.setThirdPartyAppKey("pfieouqg"); + break; + } // 设置应用服务AppId 长链、鉴权 clientConfig.setServiceAppId("com.mogo.launcher"); // 设置AI云平台分配给三方应用的签名密钥，需要从AI云平台申请 // 设置车机设备的唯一标识（这些表识必须是通过后台录入的设备） -// clientConfig.setThirdPartyDeviceId(Utils.getDevicesId()); - clientConfig.setThirdPartyDeviceId("937f4f21d7fabbd2"); // todo test验证用 + clientConfig.setThirdPartyDeviceId(Utils.getDevicesId()); // 设置循环检测间隔时间 clientConfig.setLoopCheckDelay(15 * 1000); @@ -207,7 +205,7 @@ public class MogoApplication extends AbsMogoApplication { new IMoGoTokenCallback() { @Override public void onTokenGot(String token, String sn) { - // 初始化鹰眼HttpDns服务 todo 验证是否有问题 + // 初始化鹰眼HttpDns服务 initMogoHttpDns(); // 鉴权成功后开启socket长链服务 prepareSocketAndLocationServices(); @@ -248,7 +246,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_WIDGETS, MogoServicePaths.PATH_WIDGETS)); // if (DebugConfig.isMapBased()) { -// MogoModulePaths.addModule(new MogoModule(CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME)); +// MogoModulePaths.addModule(new MogoModule(CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME)); //todo 需要更新版本 // } MogoModulePaths.addBaseModule(new MogoModule(ShareConstants.TAG, ShareConstants.MODEL_NAME)); diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 2c3ee4aa9a..a0fb142fb5 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.32' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.33' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java index 5368014d73..3d63facadf 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java @@ -192,7 +192,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer { , foreCastMogoLatLon.getLon(), foreCastMogoLatLon.getLat()); long foreCastInternal = System.currentTimeMillis() - startTime; - Log.d(FORECAST, "foreCastInternal :" + foreCastInternal); //todo 看是否耗时，增加的时间需要从当前SNTP时间减去 + Log.d(FORECAST, "foreCastInternal :" + foreCastInternal); //todo 耗时1~2毫秒 需要测试是否由于补点算法造成 adasResult.lat = foreCastMogoLatLon.getLat(); adasResult.lon = foreCastMogoLatLon.getLon(); diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java index 5e36dcf97d..20bc6015f9 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java @@ -393,7 +393,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic , foreCastMogoLatLon.getLon(), foreCastMogoLatLon.getLat()); long foreCastInternal = System.currentTimeMillis() - startTime; - Log.d(FORECAST, "foreCastInternal :" + foreCastInternal); //todo 看是否耗时，增加的时间需要从当前SNTP时间减去 + Log.d(FORECAST, "foreCastInternal :" + foreCastInternal); //todo 耗时1~2毫秒 需要测试是否由于补点算法造成 builder.setWgslat(foreCastMogoLatLon.getLat()); builder.setWgslon(foreCastMogoLatLon.getLon()); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 49904f554a..ee1aa969d7 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -148,7 +148,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, @Override public void onMsgReceived(SocketDownData.LauncherSnapshotProto mogoSnapshotSetData) { DebugConfig.setStatus(DebugConfig.sDownloadSnapshot, true); - SnapshotSetDataDrawer.getInstance().renderSnapshotData(mogoSnapshotSetData); +// SnapshotSetDataDrawer.getInstance().renderSnapshotData(mogoSnapshotSetData); //todo 6月4号 提测版本中去掉云端下发数据展示 // Message msg = mSnapshotHandler.obtainMessage(); // msg.obj = mogoSnapshotSetData; // msg.what = MSG_SNAPSHOT; diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java index 8f0da7df7f..6d0bdb7db5 100644 --- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java +++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java @@ -6,8 +6,6 @@ import android.util.AttributeSet; import android.util.Log; import android.view.LayoutInflater; import android.view.MotionEvent; -import android.view.ViewGroup; -import android.widget.FrameLayout; import android.widget.RelativeLayout; import androidx.annotation.Nullable; @@ -216,7 +214,7 @@ public class SmallMapDirectionView extends RelativeLayout { setOnClickListener(view -> { - // if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) { // todo test验证用 + if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO) { MogoApisHandler.getInstance().getApis() .getMapServiceApi() .getMapUIController() @@ -226,7 +224,7 @@ public class SmallMapDirectionView extends RelativeLayout { .getAdasControllerApi() .getCurrentSkinMode() ); - //} + } }); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java index a54b005391..340a86bc68 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java @@ -434,7 +434,7 @@ public class V2XModuleProvider implements @Override public void onMapVisualAngleChanged(VisualAngleMode visualAngleMode) { - //todo visual 涉及到V2X,V2N业务，视距状态切换回调 + //todo visual 涉及到V2X,V2N业务，视距状态切换回调 切换到近景如何处理 产品侧需要定义 } @Override