From a69058476071bd0628e0c8251d121e4cecc0c5b3 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 26 Sep 2022 15:00:41 +0800 Subject: [PATCH] fix bug of car color and biz config upper case --- app/build.gradle | 2 + .../autopilot/MoGoAutopilotProvider.kt | 1 + .../funcconfig/FuncConfigCenter.kt | 2 +- .../funcconfig/FuncConfigConst.kt | 10 ++-- .../funcconfig/FuncConfigImpl.kt | 28 +++++---- .../logcatch/MogoLogCatchManager.kt | 10 +++- .../hmi/ui/setting/DebugSettingView.kt | 15 ++++- .../function/map/identify/WarningHelper.kt | 3 + .../v2x/speedlimit/SpeedLimitDataManager.java | 59 +++++++++++-------- .../core/data/deva/bizconfig/FuncBizConfig.kt | 4 +- .../call/autopilot/CallerAutoPilotManager.kt | 4 ++ ...allerDevaToolsFuncConfigListenerManager.kt | 1 - gradle.properties | 4 +- .../java/com/mogo/map/AMapViewWrapper.java | 1 - .../main/java/com/mogo/map/AMapWrapper.java | 1 + .../com/mogo/map/CustomMapApiBuilder.java | 1 - .../java/com/mogo/map/utils/ObjectUtils.java | 2 + 17 files changed, 95 insertions(+), 53 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index afb3ab9496..2758e8edee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,6 +27,8 @@ if (!isAndroidTestBuild()) { enableTraceToServer false enableLoggerToLocal true } + + apply plugin: 'biz.config.hook' } if (!isAndroidTestBuild()) { diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt index 0a8c633f83..8f783ae662 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt @@ -52,6 +52,7 @@ import com.zhidao.support.adas.high.common.CupidLogUtils import com.zhidao.support.adas.high.common.MogoReport import com.zhjt.service.chain.ChainLog import com.zhjt.service.chain.TracingConstants +import com.zhjt.service_biz.BizConfig import io.netty.channel.Channel import mogo.telematics.pad.MessagePad import java.util.* diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt index 3b7572cea9..958cc1b152 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt @@ -69,7 +69,7 @@ class FuncConfigCenter : IMogoOnMessageListener { BizManager.updateBizConfigData(funcConfig) funcConfig.business.forEach { business -> CallerDevaToolsFuncConfigListenerManager.invokeDevaToolsFuncConfigBizUpdate( - business.biz, + business.biz.uppercase(), business.data ) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kt index b071595ab0..b7a6c6728f 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kt @@ -54,7 +54,7 @@ class FuncConfigConst { v2nSubList.add(SubBiz(BIZ_VIP, lock = false, state = true, dependNode = "", data = "")) v2nSubList.add(SubBiz(BIZ_OPT_LINE, lock = false, state = false, dependNode = "", data = "")) v2nSubList.add(SubBiz(BIZ_VRU, lock = false, state = true, dependNode = "", data = "")) - v2nSubList.add(SubBiz(BIZ_VRU_RI, lock = false, state = true, dependNode = "", data = "")) + v2nSubList.add(SubBiz(BIZ_VRU_RI, lock = false, state = false, dependNode = "", data = "")) v2nSubList.add(SubBiz(BIZ_HLW, lock = false, state = true, dependNode = "", data = "")) businessList.add(Business(V2N, v2nSubList)) @@ -79,12 +79,12 @@ class FuncConfigConst { businessList.add(Business(V2V,v2vSubList)) val foundationSubList = mutableListOf() - foundationSubList.add(SubBiz(BIZ_BEAUTY_MODE, lock = true, state = false, dependNode = "", data = "")) - foundationSubList.add(SubBiz(BIZ_RAIN_MODE, lock = true, state = false, dependNode = "", data = "")) + foundationSubList.add(SubBiz(BIZ_BEAUTY_MODE, lock = false, state = false, dependNode = "", data = "")) + foundationSubList.add(SubBiz(BIZ_RAIN_MODE, lock = false, state = false, dependNode = "", data = "")) foundationSubList.add(SubBiz(BIZ_FULL_LOG, lock = false, state = false, dependNode = "", data = "")) foundationSubList.add(SubBiz(BIZ_TRACE_LOG, lock = false, state = true, dependNode = "", data = "")) - foundationSubList.add(SubBiz(BIZ_BAG_RECORD, lock = true, state = true, dependNode = "", data = "")) - foundationSubList.add(SubBiz(BIZ_WARNING_UPLOAD, lock = true, state = true, dependNode = "", data = "")) + foundationSubList.add(SubBiz(BIZ_BAG_RECORD, lock = false, state = true, dependNode = "", data = "")) + foundationSubList.add(SubBiz(BIZ_WARNING_UPLOAD, lock = false, state = true, dependNode = "", data = "")) foundationSubList.add(SubBiz(BIZ_LIMIT_SPEED_SET, lock = false, state = true, dependNode = "", data = "")) foundationSubList.add(SubBiz(BIZ_BYPASS, lock = false, state = true, dependNode = "", data = "")) foundationSubList.add(SubBiz(BIZ_AUTOPILOT_LANE_SELECTION, lock = false, state = true, dependNode = "", data = "")) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigImpl.kt index 6f3d0524bd..f2c0e0c114 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigImpl.kt @@ -8,23 +8,29 @@ import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.FOUNDATIO import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsFuncConfigListener import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsFuncConfigListenerManager -object FuncConfigImpl : IMoGoDevaToolsFuncConfigListener { +object FuncConfigImpl { private const val TAG = "FuncConfigImpl" fun init() { - CallerDevaToolsFuncConfigListenerManager.registerDevaToolsFuncConfigListener( - FOUNDATION, + CallerDevaToolsFuncConfigListenerManager.registerDevaToolsFuncConfigListener(FOUNDATION, TAG, - this + object : IMoGoDevaToolsFuncConfigListener { + override fun updateBizData( + type: String, + state: Boolean, + lock: Boolean, + data: String? + ) { + when (type) { + BIZ_BEAUTY_MODE -> FunctionBuildConfig.isDemoMode = state + BIZ_RAIN_MODE -> FunctionBuildConfig.isRainMode = state + BIZ_WARNING_UPLOAD -> FunctionBuildConfig.isReportWarning = state + } + } + } ) + } - override fun updateBizData(type: String, state: Boolean, lock: Boolean, data: String?) { - when (type) { - BIZ_BEAUTY_MODE -> FunctionBuildConfig.isDemoMode = state - BIZ_RAIN_MODE -> FunctionBuildConfig.isRainMode = state - BIZ_WARNING_UPLOAD -> FunctionBuildConfig.isReportWarning = state - } - } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt index 7614bfc5e2..8cbc2c5abc 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt @@ -12,6 +12,8 @@ import com.mogo.commons.AbsMogoApplication import com.mogo.commons.debug.DebugConfig import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.constants.MoGoConfig +import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_FULL_LOG +import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.FOUNDATION import com.mogo.eagle.core.function.api.map.deva.IMoGoMapDevaProvider import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager @@ -34,6 +36,7 @@ import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchConst.Companio import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchConst.Companion.LOG_PUSH_TYPE import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchConst.Companion.START_CATCH_LOG import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchConst.Companion.STOP_CATCH_LOG +import com.zhjt.service_biz.BizConfig import java.io.File @SuppressLint("StaticFieldLeak") @@ -136,6 +139,7 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl return false } + @BizConfig(FOUNDATION, "", BIZ_FULL_LOG) fun startCatchLog(duration: Int = 10, logPrefixName: String? = null) { if (catchingList.contains(manualContent.pkgName + logPrefixName)) { TipToast.shortTip("已经在抓取日志了,请稍后再试") @@ -156,7 +160,7 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl private fun startCatchLog(content: RemoteLogPushContent, logPrefixName: String? = null) { CallerLogger.d("$M_DEVA$TAG", "startCatchLog path : ${content.pkgName + logPrefixName}") - if(MoGoAiCloudClientConfig.getInstance().sn == null){ + if (MoGoAiCloudClientConfig.getInstance().sn == null) { ThreadUtils.runOnUiThread { TipToast.shortTip("缺少设备唯一ID，请检查网络") } @@ -247,14 +251,14 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl } override fun uploadFile(filePath: String) { - if(!mapCacheUpload){ + if (!mapCacheUpload) { return } val file = File(filePath) if (file.isFile) { CallerLogger.d("$M_DEVA$TAG", "uploadFile path : $filePath") LogInfoManagerFactory.handleSingleUploadFile(filePath) - }else{ + } else { CallerLogger.d("$M_DEVA$TAG", "file absPath : ${file.absolutePath}") } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index adc7747c96..9a1a722122 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -9,7 +9,6 @@ import android.graphics.Color import android.os.Build import android.text.Html import android.util.AttributeSet -import android.util.Log import android.view.LayoutInflater import android.view.View import android.widget.* @@ -30,6 +29,7 @@ import com.mogo.eagle.core.data.constants.MoGoConfig import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_BAG_RECORD import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_BEAUTY_MODE +import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_FULL_LOG import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_RAIN_MODE import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_WARNING_UPLOAD import com.mogo.eagle.core.data.deva.chain.ChainConstant @@ -1868,6 +1868,19 @@ class DebugSettingView @JvmOverloads constructor( btnRecordBag.requestFocus() } } + BIZ_FULL_LOG -> { + if(state){ + tbLogCatch.visibility = View.VISIBLE + }else{ + tbLogCatch.visibility = View.GONE + } + if (lock) { + tbLogCatch.isClickable = false + } else { + tbLogCatch.isClickable = true + tbLogCatch.requestFocus() + } + } } } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/WarningHelper.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/WarningHelper.kt index f7f70ccb05..fe6285a7f1 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/WarningHelper.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/identify/WarningHelper.kt @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.map.identify import android.annotation.SuppressLint +import android.util.Log import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.traffic.TrafficData import com.mogo.eagle.core.data.traffic.threatLevelColor @@ -96,6 +97,7 @@ object WarningHelper { return } if (exist) { + Log.i("EmArrow0926","obu color uuid : ${obuTrafficData.uuid}") obuWarningTrafficData[obuTrafficData.uuid!!] = obuTrafficData } else { obuWarningTrafficData.remove(obuTrafficData.uuid) @@ -115,6 +117,7 @@ object WarningHelper { if (pncWarningBeautyTrafficData.containsKey(uuid)) { val planningTrack = pncWarningBeautyTrafficData[uuid] if (planningTrack != null && !timeOut(planningTrack.time)) { + Log.i("EmArrow0926","pnc color uuid : $uuid") return planningTrack.color } else { pncWarningBeautyTrafficData.remove(uuid) diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java index 5c236f86c7..bb2fd2e7b8 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/speedlimit/SpeedLimitDataManager.java @@ -1,5 +1,8 @@ package com.mogo.eagle.core.function.v2x.speedlimit; +import static com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.BIZ_SLW; +import static com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.V2I; + import android.location.Location; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; @@ -8,58 +11,64 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.MogoMapUIController; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.module.common.MogoApisHandler; +import com.zhjt.service_biz.BizConfig; import java.util.Timer; import java.util.TimerTask; /** * 限速 + * * @author mogoauto */ public class SpeedLimitDataManager implements IMogoCarLocationChangedListener2 { - private static SpeedLimitDataManager instance ; + private static SpeedLimitDataManager instance; private Location mLocation; -// private static Context mContext; - private Timer mTimer; - private SpeedLimitDataManager(){ + + private SpeedLimitDataManager() { } - public static SpeedLimitDataManager getInstance(){ - if (instance == null){ - synchronized (SpeedLimitDataManager.class){ - if (instance == null){ + + public static SpeedLimitDataManager getInstance() { + if (instance == null) { + synchronized (SpeedLimitDataManager.class) { + if (instance == null) { instance = new SpeedLimitDataManager(); } } } return instance; } - private class SpeedTimerTask extends TimerTask{ + + private class SpeedTimerTask extends TimerTask { @Override public void run() { - if (mLocation != null){ + if (mLocation != null) { if (MogoMapUIController.getInstance() != null) { - int speedLimmit = MogoMapUIController.getInstance().getLimitSpeed(mLocation.getLongitude(), mLocation.getLatitude(), mLocation.getBearing()); - UiThreadHandler.post(new Runnable() { - @Override - public void run() { - if (speedLimmit > 0) { - CallerHmiManager.INSTANCE.showLimitingVelocity(speedLimmit); - CallLimitingVelocityListenerManager.INSTANCE.invokeOnLimitingVelocityChange(speedLimmit); - } - } - }); + getSpeedLimit(); } } } - }; - public void start(){ - MogoApisHandler.getInstance().getApis().getRegisterCenterApi().registerCarLocationChangedListener("SpeedLimitDataManager",this); - mTimer = new Timer(); - mTimer.schedule(new SpeedTimerTask(), 3000,1000); + @BizConfig(biz = V2I,dependentBizNode = "",bizNode = BIZ_SLW) + private void getSpeedLimit() { + int speedLimit = MogoMapUIController.getInstance().getLimitSpeed(mLocation.getLongitude(), mLocation.getLatitude(), mLocation.getBearing()); + UiThreadHandler.post(() -> { + if (speedLimit > 0) { + CallerHmiManager.INSTANCE.showLimitingVelocity(speedLimit); + CallLimitingVelocityListenerManager.INSTANCE.invokeOnLimitingVelocityChange(speedLimit); + } + }); + } + } + + public void start() { + MogoApisHandler.getInstance().getApis().getRegisterCenterApi().registerCarLocationChangedListener("SpeedLimitDataManager", this); + Timer mTimer = new Timer(); + mTimer.schedule(new SpeedTimerTask(), 3000, 1000); } + @Override public void onCarLocationChanged2(Location latLng) { mLocation = latLng; diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/bizconfig/FuncBizConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/bizconfig/FuncBizConfig.kt index d371af2c24..50a3380fad 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/bizconfig/FuncBizConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/bizconfig/FuncBizConfig.kt @@ -33,8 +33,8 @@ class FuncBizConfig { // Foundation const val BIZ_BEAUTY_MODE = "BIZ_BEAUTY_MODE" // 美化模式 const val BIZ_RAIN_MODE = "BIZ_RAIN_MODE" // 雨天模式 - const val BIZ_FULL_LOG = "BIZ_FULL_LOG" // 全量日志 todo - const val BIZ_TRACE_LOG = "BIZ_TRACE_LOG" // 链路日志 todo + const val BIZ_FULL_LOG = "BIZ_FULL_LOG" // 全量日志 + const val BIZ_TRACE_LOG = "BIZ_TRACE_LOG" // 链路日志 todo 暂未有场景，未实现 const val BIZ_BAG_RECORD = "BIZ_BAG_RECORD" // Bag录制 const val BIZ_WARNING_UPLOAD = "BIZ_WARNING_UPLOAD" // 异常上报 const val BIZ_LIMIT_SPEED_SET = "BIZ_LIMIT_SPEED_SET" // 限速设置 todo diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt index 85e8eb1663..56bb110906 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotManager.kt @@ -4,6 +4,7 @@ import android.os.SystemClock import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.constants.MogoServicePaths +import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig import com.mogo.eagle.core.data.deva.chain.ChainConstant import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_EAGLE_START_AUTOPILOT import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_ADAS @@ -14,6 +15,7 @@ import com.mogo.eagle.core.function.call.base.CallerBase import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.zhjt.service.chain.ChainLog import com.zhjt.service.chain.TracingConstants +import com.zhjt.service_biz.BizConfig import kotlin.random.Random /** @@ -98,12 +100,14 @@ object CallerAutoPilotManager { /** * 开启域控制器录制bag包 */ + @BizConfig(FuncBizConfig.FOUNDATION,"", FuncBizConfig.BIZ_BAG_RECORD) fun recordPackage() { if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { providerApi?.recordPackage(1, Random(SystemClock.elapsedRealtime()).nextInt()) } } + @BizConfig(FuncBizConfig.FOUNDATION,"", FuncBizConfig.BIZ_BAG_RECORD) fun recordPackage(duration: Int) { if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { providerApi?.recordPackage(1, Random(SystemClock.elapsedRealtime()).nextInt(), duration) diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsFuncConfigListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsFuncConfigListenerManager.kt index d847a8f288..fc7254e0d7 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsFuncConfigListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsFuncConfigListenerManager.kt @@ -1,6 +1,5 @@ package com.mogo.eagle.core.function.call.devatools -import android.util.Log import androidx.annotation.Nullable import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsFuncConfigListener import com.zhjt.service_biz.SubBiz diff --git a/gradle.properties b/gradle.properties index 5fddde6d6b..18446ff6a9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,8 +59,8 @@ bytex.ASM_API=ASM7 HOOK_LOG_VERSION=1.6.1 SERVICE_CHAIN_VERSION=1.1.0 -BIZCONFIG_VERSION=1.2.7 -SERVICE_BIZ_VERSION=1.2.0 +BIZCONFIG_VERSION=1.2.8 +SERVICE_BIZ_VERSION=1.2.1 ################ 外部依赖引用 ################ # loglib LOGLIB_VERSION=1.3.38 diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index 6a64322c93..e9e8b4e45d 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -677,7 +677,6 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void changeMapViewAngle(int type) { - Log.d("XXXX", "--- 1 -----"); if (checkAMapView()) { //mMapView.getMapAutoViewHelper().testMapViewAngle(type); } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java index 6c490ccaa7..ee0e175877 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java @@ -116,6 +116,7 @@ public class AMapWrapper implements IMogoMap { optionsArrayList.forEach((s, trackedObject) -> { MarkerSimpleData markerOptions = ObjectUtils.fromTrafficData(trackedObject); if (markerOptions != null) { + Log.i("EmArrow0926","markerOpt : " + markerOptions.toString()); markerOptionsArrayList.add(markerOptions); } }); diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java b/libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java index c327f9e862..9914ff80d3 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java @@ -54,7 +54,6 @@ public class CustomMapApiBuilder implements IMogoMapApiBuilder { @Override public IMogoMapView getMapView(Context context) { - Log.d(TAG, "setDebugMode==true"); MapParams mapParams = MapParams.Companion.init(); mapParams.setDebugMode(false) //todo 1-使用本地地图数据，0-使用在线地图数据 diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java index 4b9327d7da..8b8c65d4a8 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java @@ -132,6 +132,8 @@ public class ObjectUtils { markerOptions.setLon(trafficData.getLongitude()); if(trafficData.getColor()!=null && !trafficData.getColor().isEmpty()){ markerOptions.setColor(trafficData.getColor()); + }else{ + markerOptions.setColor("#00000000"); } } catch (Exception e) { e.printStackTrace();