From e41ec828f6d19fb9edd539c327d27e410c0b2126 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Wed, 29 Dec 2021 17:45:39 +0800 Subject: [PATCH] =?UTF-8?q?[New=20branch]=20=E5=85=B3=E9=97=AD=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=97=A5=E5=BF=97=20=E4=BF=AE=E5=A4=8DADAS=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=A8=A1=E5=9D=97=E8=BF=87=E5=BF=AB=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../com/mogo/launcher/MogoApplication.java | 3 +- .../function/main/MainMoGoApplication.java | 20 +++- gradle.properties | 16 +-- .../com/mogo/module/adas/AdasProvider.java | 5 +- .../common/drawer/IdentifyDataDrawer.java | 4 +- .../com/mogo/module/common/utils/SPConst.java | 4 - .../extensions/entrance/EntranceFragment.java | 103 ------------------ .../src/main/res/values/strings.xml | 14 --- .../com/mogo/module/main/MainActivity.java | 1 + .../main/java/com/mogo/tts/pad/PadTTS.java | 2 +- 10 files changed, 32 insertions(+), 140 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index e51b4aa2ff..8f6f7d701a 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -38,11 +38,12 @@ public class MogoApplication extends MainMoGoApplication { initCrash(); initApmInsight(); //设置debug模式，日志不上传 - // crashSystem.setDebug(BuildConfig.DEBUG); + crashSystem.setDebug(BuildConfig.DEBUG); } @Override protected void initLogConfig() { + super.initLogConfig(); Logger.init(BuildConfig.DEBUG ? LogLevel.DEBUG : LogLevel.OFF); } diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index f27d1d31dc..79a21a5828 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -3,7 +3,6 @@ package com.mogo.eagle.core.function.main; import static com.mogo.commons.debug.DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE; import android.content.Context; -import android.content.Intent; import android.os.Process; import android.util.Log; @@ -13,6 +12,7 @@ import com.mogo.cloud.httpdns.bean.HttpDnsSimpleLocation; import com.mogo.cloud.passport.IMoGoTokenCallback; import com.mogo.cloud.passport.MoGoAiCloudClient; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.cloud.socket.SocketBuildConfig; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.constants.SharedPrefsConstants; import com.mogo.commons.debug.DebugConfig; @@ -27,7 +27,6 @@ import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; import com.mogo.module.common.constants.HostConst; -import com.mogo.module.main.service.MogoMainService; import com.mogo.module.push.base.PushUIConstants; import com.mogo.module.service.ServiceConst; import com.mogo.module.share.constant.ShareConstants; @@ -41,6 +40,8 @@ import com.mogo.utils.storage.SharedPrefsMgr; import com.zhidao.boot.persistent.lib.PersistentManager; import com.zhidao.support.obu.ami.AmiClientManager; +import java.lang.reflect.Field; + /** * 默认初始化一些基础服务配置 */ @@ -87,7 +88,18 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { /** * 初始化日志 */ - protected abstract void initLogConfig(); + protected void initLogConfig() { + // 为了不引入maven的情况下修改日志控制字段值，采用反射 + try { + Class clazz = Class.forName("com.mogo.cloud.location.LocationConfig"); + Field nameField = clazz.getField("isPrintLog"); + nameField.setBoolean(null, false); + } catch (Exception e) { + e.printStackTrace(); + } + SocketBuildConfig.isPrintLog = false; + } + /** * 初始化 MoGoAiCloudClientConfig @@ -334,8 +346,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { if (!DebugConfig.isLauncher()) { PersistentManager.getInstance().initManager(this); - Intent intent = new Intent(this, MogoMainService.class); - startService(intent); } Log.i(TAG, "App launch timer cost " + (System.currentTimeMillis() - start) + "ms"); diff --git a/gradle.properties b/gradle.properties index 51647cd43d..37400a67ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -63,21 +63,21 @@ SERVICE_CHAIN_VERSION=1.0.32 LOGLIB_VERSION=1.0.4 ######## MogoAiCloudSDK Version ######## # 网络请求 -MOGO_NETWORK_VERSION=1.3.13 +MOGO_NETWORK_VERSION=1.3.15 # 鉴权 -MOGO_PASSPORT_VERSION=1.3.13 +MOGO_PASSPORT_VERSION=1.3.15 # 常链接 -MOGO_SOCKET_VERSION=1.3.13 +MOGO_SOCKET_VERSION=1.3.15 # 数据采集 -MOGO_REALTIME_VERSION=1.3.13 +MOGO_REALTIME_VERSION=1.3.15 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.3.13 +MOGO_TANLU_VERSION=1.3.15 # 直播推流 -MOGO_LIVE_VERSION=1.3.13 +MOGO_LIVE_VERSION=1.3.15 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.3.13 +MOGO_TRAFFICLIVE_VERSION=1.3.15 # 定位服务 -MOGO_LOCATION_VERSION=1.3.13 +MOGO_LOCATION_VERSION=1.3.15 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=2.0.0.18 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 f9f10eec9f..fced5ef10b 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 @@ -9,9 +9,8 @@ import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.utils.logger.Logger; import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel; import com.zhidao.support.adas.high.AdasManager; -import com.zhidao.support.adas.high.bean.AutopilotRoute; import com.zhidao.support.adas.high.bean.BasicInfo; -import com.zhidao.support.adas.high.bean.guardian.AutopilotGuardianInfo; +import com.zhidao.support.adas.high.common.CupidLogUtils; /** @@ -46,6 +45,8 @@ public class AdasProvider implements IProvider { } private void initAdas(Context context, AdasEventManager adasEventManager) { + CupidLogUtils.setEnableLog(false); + CupidLogUtils.setIsWriteLog(false); AdasManager.getInstance().create(context); AdasManager.getInstance().setOnAdasListener(new OnAdasListenerAdapter()); AdasManager.getInstance().setOnAdasConnectStatusListener(adasEventManager); diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java index a0c8b7da2d..a383454f72 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java @@ -155,9 +155,9 @@ public class IdentifyDataDrawer extends BaseDrawer { while (iterator.hasNext()) { TrafficData result = iterator.next(); long internal = result.getSatelliteTime() - getCurSatelliteTime(); -// if (internal > 3000) { //防止帧率过低导致误删除上一个节点对象，从而出现跳跃现象 + if (internal > 3000) { //防止帧率过低导致误删除上一个节点对象，从而出现跳跃现象 iterator.remove(); -// } + } } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SPConst.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SPConst.java index 36ed5551d0..2d678da5b3 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SPConst.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SPConst.java @@ -14,9 +14,5 @@ public class SPConst { private static String SP_GUIDE_FIRST_TIME_RECORD = "SP_GUIDE_FIRST_TIME_RECORD"; - //用于多模块之间首次引导时间记录 - public static String getSPGuideRecord(){ - return SP_GUIDE_FIRST_TIME_RECORD; - } } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 4a79816536..a8fa4cf17e 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -1,17 +1,10 @@ package com.mogo.module.extensions.entrance; -import static com.mogo.module.common.utils.SPConst.getSPGuideRecord; import static com.mogo.module.extensions.ExtensionsModuleConst.TYPE_ENTRANCE; import static com.mogo.module.service.receiver.MogoReceiver.ACTION_V2X_REMOVE_TIP_WINDOW; import static com.mogo.module.share.constant.ShareConstants.KEY_CLICK_SHARE_BUTTON; import static com.mogo.module.share.constant.ShareConstants.KEY_CLICK_SHARE_TIME; -import static com.mogo.module.share.constant.ShareConstants.KEY_SERVER_SHOW_DAY_COUNT; -import static com.mogo.module.share.constant.ShareConstants.KEY_SHARE_INNER_GUIDE; -import static com.mogo.module.share.constant.ShareConstants.KEY_SHARE_INNER_GUIDE_TIME; -import static com.mogo.module.share.constant.ShareConstants.KEY_SHARE_OUTER_GUIDE; -import static com.mogo.module.share.constant.ShareConstants.KEY_SHARE_OUTER_GUIDE_TIME; import static com.mogo.module.share.constant.ShareConstants.ONE_DAY_TIME; -import static com.mogo.module.share.constant.ShareConstants.SEVEN_DAY_TIME; import static com.mogo.module.share.constant.ShareConstants.VOICE_ALERT_COUNT; import android.content.Intent; @@ -170,10 +163,6 @@ public class EntranceFragment extends MvpFragment 200) { - showSlideMapVoiceGuide(); - } - } break; @@ -679,10 +580,6 @@ public class EntranceFragment extends MvpFragment你好小智，返回桌面 - - - 查询路况，唤醒小智说“天安门附近路况怎么样” - 想知道出行路况，唤醒小智说“中关村堵车吗” - 出行路况早知道，唤醒小智说“长安街路况怎么样” - - 您可以将当前的路况分享给其他车友，帮助他们获得最新的路况信息，试试对我说“上报路况” 您的分享信息将会帮助更多车友，当您发现以下交通事件，可以直接对我说上报路况 - - - 查路况您可以直接唤醒小智说“天安门附近堵不堵” - 出行路况早知道，试试唤醒小智说，“附近路况怎么样” - 提前看看出行路况，试试唤醒小智说，“中关村路况怎么样” - - diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 79d0e2993c..afd2e44252 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -18,6 +18,7 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.fragment.app.Fragment; import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.context.ContextHolderUtil; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.mvp.BaseFragment; diff --git a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java index 717229c0d5..ffa6b8c6de 100644 --- a/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java +++ b/tts/tts-pad/src/main/java/com/mogo/tts/pad/PadTTS.java @@ -669,7 +669,7 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList @Override public void onProgress(int currentTime, int totalTime, boolean isRefTextTTSFinished) { - Logger.d(TAG, "当前:" + currentTime + "ms, 总计:" + totalTime + "ms, 可信度:" + isRefTextTTSFinished); + //Logger.d(TAG, "当前:" + currentTime + "ms, 总计:" + totalTime + "ms, 可信度:" + isRefTextTTSFinished); } @Override