From 4a129c2624e3a12a52fbbb721049842c39ed7e7f Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 7 Sep 2022 10:19:57 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[=E7=8A=B6=E6=80=81=E6=A0=8F]=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3GPS=E6=9D=83=E9=99=90=E6=8E=88=E4=BA=88=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo_core_function_devatools/status/flow/gps/GpsImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt index f53bf35c5e..01b5a2ff9f 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/gps/GpsImpl.kt @@ -57,7 +57,7 @@ internal class GpsImpl(ctx: Context): IFlow(ctx) { PermissionUtils.requestAccessFineLocation(object : SimpleCallback { override fun onGranted() { Log.d(TAG,"权限: ${Manifest.permission.ACCESS_FINE_LOCATION} 被授予了....") - send(enabled = isLocationEnabled(), isGranted = false) + send(enabled = isLocationEnabled(), isGranted = true) } override fun onDenied() { From fd7b16f06f45fa8b26e3617c47df0ef4dcd655ab Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 7 Sep 2022 10:42:43 +0800 Subject: [PATCH 2/7] =?UTF-8?q?[=E7=BA=BF=E7=A8=8B=E4=BC=98=E5=8C=96]?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 859b9de1c5..e4c22b5d5d 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ buildscript { classpath "com.bytedance.android.byteX:base-plugin:0.3.0" classpath "com.mogo.cloud:hook:${HOOK_LOG_VERSION}" classpath 'com.volcengine:apm_insight_plugin:1.4.1' - classpath 'com.mogo.thread.opt:plg:2.1.10' + classpath 'com.mogo.thread.opt:plg:2.2.0' classpath 'com.mogo.cloud:systrace:1.0.1' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' classpath 'com.mogo.sticky:service:1.0.8' From a6c60d266b099e5f747a29b74fa6f0f691d72c32 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 7 Sep 2022 14:45:12 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[Feat]=E5=A2=9E=E5=8A=A0Native=E5=86=85?= =?UTF-8?q?=E5=AD=98=E6=B3=84=E6=BC=8F=E7=9B=91=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 6 ++- .../trace/TraceManager.kt | 6 +++ .../mogo-core-function-hmi/build.gradle | 2 + .../core/function/main/MainActivity.java | 46 ++++++++++++++++++- .../function/main/MainMoGoApplication.java | 9 ++-- .../core/data/deva/chain/ChainConstant.kt | 6 +++ 6 files changed, 70 insertions(+), 5 deletions(-) diff --git a/config.gradle b/config.gradle index 4bedccbba8..0341f9f4a2 100644 --- a/config.gradle +++ b/config.gradle @@ -244,7 +244,11 @@ ext { //========================= Shizuku ====================== shizuku_api : "dev.rikka.shizuku:api:12.1.0", - shizuku_provider : "dev.rikka.shizuku:provider:12.1.0" + shizuku_provider : "dev.rikka.shizuku:provider:12.1.0", + + //========================= Koom ====================== + koomnative : "com.kuaishou.koom:koom-native-leak-static:2.2.0", + koomxhook : "com.kuaishou.koom:xhook-static:2.2.0" ] } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt index 824290a98d..5d38abba20 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt @@ -59,6 +59,10 @@ class TraceManager : IMoGoCloudListener { FwBuild(false, 30, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_PLANNING_OBJECTS) fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_ACTIONS] = FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_PLANNING_ACTIONS) + fwBuildMap[ChainConstant.CHAIN_LINK_LOG_NATIVE_LEAK] = + FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_RECORD_NATIVE_LEAK) + + traceInfoCache[ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS] = ChainLogParam(true, "ADAS连接状态") @@ -78,6 +82,8 @@ class TraceManager : IMoGoCloudListener { ChainLogParam(false, "ADAS PLANNING 感知障碍物") traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_ACTIONS] = ChainLogParam(true, "ADAS PLANNING 决策行为") + traceInfoCache[ChainConstant.CHAIN_LINK_LOG_NATIVE_LEAK] = + ChainLogParam(true, "Native Leak Record") FileWriteManager.getInstance() .init(context, MoGoAiCloudClientConfig.getInstance().sn, pkgName, fwBuildMap) diff --git a/core/function-impl/mogo-core-function-hmi/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle index 9822314159..9f40e36205 100644 --- a/core/function-impl/mogo-core-function-hmi/build.gradle +++ b/core/function-impl/mogo-core-function-hmi/build.gradle @@ -75,6 +75,8 @@ dependencies { implementation rootProject.ext.dependencies.android_start_up implementation rootProject.ext.dependencies.cicle_indicator + implementation rootProject.ext.dependencies.koomnative + implementation rootProject.ext.dependencies.koomxhook if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { api rootProject.ext.dependencies.mogoaicloudservicesdk api rootProject.ext.dependencies.mogocommons diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java index 5fabab1775..ba48df44ff 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java @@ -1,5 +1,8 @@ package com.mogo.eagle.core.function.main; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_RECORD_NATIVE_LEAK; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LEAK; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_NATIVE_LEAK; import static com.mogo.eagle.core.function.main.MainPresenter.MOGO_PERMISSION_REQUEST_CODE; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI; @@ -19,6 +22,10 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.launcher.ARouter; +import com.kwai.koom.base.MonitorManager; +import com.kwai.koom.nativeoom.leakmonitor.LeakMonitor; +import com.kwai.koom.nativeoom.leakmonitor.LeakMonitorConfig; +import com.kwai.koom.nativeoom.leakmonitor.LeakRecord; import com.mogo.cloud.commons.BuildConfig; import com.mogo.commons.context.ContextHolderUtil; import com.mogo.commons.mvp.BaseFragment; @@ -54,6 +61,8 @@ import com.mogo.service.statusmanager.IMogoStatusManager; import com.rousetime.android_startup.StartupManager; import com.rousetime.android_startup.model.LoggerLevel; import com.rousetime.android_startup.model.StartupConfig; +import com.zhjt.service.chain.ChainLog; +import com.zhjt.service.chain.TracingConstants; import java.util.ArrayList; import java.util.HashMap; @@ -274,6 +283,8 @@ public class MainActivity extends MvpActivity implement // 启动一些基本的服务：定位等 startBaseService(); + // 启动Native内存泄漏监测 + startLeakMonitor(); } /** @@ -288,6 +299,38 @@ public class MainActivity extends MvpActivity implement // startService(intentCarcorderService); } + private void startLeakMonitor() { + LeakMonitorConfig leakMonitorConfig = new LeakMonitorConfig.Builder() + .setLoopInterval(50000) + .setMonitorThreshold(16) + .setNativeHeapAllocatedThreshold(0) + .setEnableLocalSymbolic(true) + .setLeakListener(leaks -> { + StringBuilder stringBuilder = new StringBuilder(); + if (!leaks.isEmpty()) { + for (LeakRecord leakRecord : leaks) { + stringBuilder.append(leakRecord.toString()); + } + printLeakMsg(stringBuilder.toString()); + } + }) + .build(); + MonitorManager.addMonitorConfig(leakMonitorConfig); + LeakMonitor.INSTANCE.start(); + } + + @ChainLog( + linkChainLog = CHAIN_LINK_LOG_NATIVE_LEAK, + linkCode = CHAIN_LINK_LEAK, + endpoint = TracingConstants.Endpoint.PAD, + nodeAliasCode = CHAIN_ALIAS_CODE_RECORD_NATIVE_LEAK, + paramIndexes = {0}, + clientPkFileName = "sn" + ) + private void printLeakMsg(String leakRecord) { + CallerLogger.INSTANCE.d(M_HMI + TAG, "内存泄漏日志如下：\n" + leakRecord); + } + @Override public void hideCoverUpLayout() { mConnectInfoRV.setVisibility(View.GONE); @@ -388,7 +431,8 @@ public class MainActivity extends MvpActivity implement } @Override - public void onAutopilotIpcConnectStatusChanged(int status, @Nullable String reason) { } + public void onAutopilotIpcConnectStatusChanged(int status, @Nullable String reason) { + } @Override public void onAutopilotSNRequest() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index fb1ee3827d..abe6e87ea1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -7,7 +7,7 @@ import android.os.Process; import com.bytedance.boost_multidex.BoostMultiDex; import com.elegant.utils.UiThreadHandler; -import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.kwai.koom.base.DefaultInitTask; import com.mogo.cloud.socket.SocketBuildConfig; import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.data.config.FunctionBuildConfig; @@ -41,8 +41,6 @@ import java.util.List; public abstract class MainMoGoApplication extends AbsMogoApplication { private static final String TAG = "MogoApplication"; - // 配置云服务API - protected MoGoAiCloudClientConfig clientConfig = MoGoAiCloudClientConfig.getInstance(); private long start; @Override @@ -60,6 +58,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { initTipToast(); initModules(); + initKoom(); //查询是否有版本的更新 queryAppUpgrade(); checkMonitorDb(); @@ -92,6 +91,10 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { }).start(); } + private void initKoom() { + DefaultInitTask.INSTANCE.init(this); + } + /** * 初始化异常采集配置 */ diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt index 2c5377b5b0..bf710b77f2 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt @@ -10,6 +10,8 @@ class ChainConstant { const val CHAIN_LINK_ADAS = 1 // 鹰眼初始化流程顺序相关 const val CHAIN_LINK_INIT = 2 + // Native内存泄漏 + const val CHAIN_LINK_LEAK = 10 const val CHAIN_LINK_LOG_CONNECT_STATUS = 0 const val CHAIN_LINK_LOG_WEB_SOCKET_GNSSINFO = 1 @@ -20,6 +22,7 @@ class ChainConstant { const val CHAIN_LINK_LOG_WEB_SOCKET_TRAFFIC_LIGHT = 6 const val CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_OBJECTS = 7 const val CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_ACTIONS = 8 + const val CHAIN_LINK_LOG_NATIVE_LEAK = 100 const val CHAIN_LINK_LOG_ADAS_INIT = "-eagleInitStatus" const val CHAIN_LINK_LOG_ADAS_GNSS = "-adasWsGnssInfo" @@ -30,6 +33,7 @@ class ChainConstant { const val CHAIN_LINK_LOG_ADAS_TRAFFIC_LIGHT = "-adasWsTrafficLight" const val CHAIN_LINK_LOG_ADAS_PLANNING_OBJECTS = "-adasWsPlanningObj" const val CHAIN_LINK_LOG_ADAS_PLANNING_ACTIONS = "-adasWsPlanningActions" + const val CHAIN_LINK_LOG_RECORD_NATIVE_LEAK = "-eagleRecordNativeLeak" const val CHAIN_ALIAS_CODE_MULTI_CONNECT = "CHAIN_ALIAS_CODE_MULTI_CONNECT" const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_CONFIG = "CHAIN_ALIAS_CODE_CAR_CONFIG" @@ -48,6 +52,8 @@ class ChainConstant { const val CHAIN_ALIAS_CODE_ADAS_STATUS_QUERY_RESP = "CHAIN_ALIAS_CODE_ADAS_STATUS_QUERY_RESP" const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN = "PAD_ADAS_MESSAGE_AUTOPILOT_WARN" + const val CHAIN_ALIAS_CODE_RECORD_NATIVE_LEAK = "CHAIN_ALIAS_CODE_RECORD_NATIVE_LEAK" + const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL" const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS" const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST" From e22b8911b05736203e5953445be7e65ec25e1449 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 7 Sep 2022 15:38:17 +0800 Subject: [PATCH 4/7] =?UTF-8?q?[VisualAngle]=E5=9C=B0=E5=9B=BE=E8=A7=86?= =?UTF-8?q?=E8=A7=92=E5=88=87=E6=8D=A2=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/fragment/BaseBusTabFragment.java | 4 +++ .../ui/TaxiPassengerBaseFragment.java | 4 +++ .../mogo/och/taxi/ui/BaseTaxiTabFragment.java | 32 +++++++++++++------ .../hmi/ui/widget/PerspectiveSwitchView.kt | 26 ++++++++------- .../java/com/mogo/map/AMapViewWrapper.java | 7 +++- 5 files changed, 52 insertions(+), 21 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index f42de596bc..607fda1e40 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -152,6 +152,10 @@ public abstract class BaseBusTabFragment .inVisibleWithoutMarkers(DataTypes.TYPE_MARKER_ADAS, BusConst.TYPE_MARKER_BUS_ORDER); MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null); mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_long); + } else { + MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).visibleAllMarkers(); + MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null); + mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_medium); } } }); diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java index d47490d697..34b8898d5f 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java @@ -139,6 +139,10 @@ public class TaxiPassengerBaseFragment extends MvpFragment onGoToTaxiOrders()); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt index 8b2d1bac06..e2f86e8bb8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/PerspectiveSwitchView.kt @@ -1,17 +1,16 @@ package com.mogo.eagle.core.function.hmi.ui.widget -import android.content.Context -import android.util.AttributeSet -import android.view.LayoutInflater -import android.view.View -import android.widget.FrameLayout -import com.mogo.commons.AbsMogoApplication +import android.content.* +import android.util.* +import android.view.* +import android.widget.* +import com.mogo.commons.* import com.mogo.eagle.core.function.hmi.R -import com.mogo.map.MogoMapUIController -import com.mogo.map.MogoMarkerManager -import com.mogo.map.uicontroller.VisualAngleMode -import com.mogo.module.common.MogoApisHandler -import com.mogo.module.common.constants.DataTypes +import com.mogo.eagle.core.function.hmi.R.drawable +import com.mogo.map.* +import com.mogo.map.uicontroller.* +import com.mogo.map.uicontroller.VisualAngleMode.MODE_MEDIUM_SIGHT +import com.mogo.module.common.constants.* import kotlinx.android.synthetic.main.view_perspective_switch.view.* /** @@ -43,6 +42,11 @@ class PerspectiveSwitchView @JvmOverloads constructor( .inVisibleWithoutMarkers(DataTypes.TYPE_MARKER_ADAS) MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null) textSwitch.setText(R.string.module_map_model_faster) + } else { + MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) + .visibleAllMarkers() + MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null) + textSwitch.setText(R.string.module_map_model_normal) } } } \ No newline at end of file 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 456e388c08..fa71aec7a7 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 @@ -359,17 +359,22 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng) { + Log.d("XXXX", "--- 2 -----"); MapAutoViewHelper mapAutoViewHelper = mMapView.getMapAutoViewHelper(); if (mapAutoViewHelper != null) { + Log.d("XXXX", "--- 3 -----"); mVisualAngleMode = angelMode; if (angelMode == MODE_CLOSE_SIGHT) { + Log.d("XXXX", "--- 4 -----"); if (mogoLatLng == null) { + Log.d("XXXX", "--- 5 -----"); CallerLogger.INSTANCE.e(M_MAP + TAG, "切换地图近景需要传入要移动的经纬度数据"); return; } // 近景传入经纬度为点击地图上静态marker经纬度数据，为GPS坐标点。 mapAutoViewHelper.setNearViewAnglePosition(new LonLatPoint(mogoLatLng.lon, mogoLatLng.lat), true); } else { + Log.d("XXXX", "--- 6 -----"); mapAutoViewHelper.setMapViewVisualAngle(angelMode.getCode()); } } @@ -425,7 +430,6 @@ public class AMapViewWrapper implements IMogoMapView, } /** - * 是否是VR模式 * * @return true-是，false=不是 */ @@ -673,6 +677,7 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void changeMapViewAngle(int type) { + Log.d("XXXX", "--- 1 -----"); if (checkAMapView()) { //mMapView.getMapAutoViewHelper().testMapViewAngle(type); } From b6c8ad491ede63c3673d23338ea071c344b6b72b Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 7 Sep 2022 16:27:31 +0800 Subject: [PATCH 5/7] =?UTF-8?q?[2.10.0]taxi=E5=8F=B8=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E9=87=8D=E5=90=AF=E5=90=8E=E6=92=AD=E6=8A=A5=E9=87=8C=E7=A8=8B?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index 0b5a063e82..d073bbc7c5 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -1335,9 +1335,9 @@ public class TaxiModel { private void reportTotalDisAndTime() { float lastSumLength = CoordinateCalculateRouteUtil.calculateRouteSumLength(mRoutePoints); double lastTime = lastSumLength / TaxiConst.TAXI_AVERAGE_SPEED * 3.6; //秒 - if (mOrderStatusCallback != null) { - mOrderStatusCallback.onCurrentOrderDistToEndChanged((long) lastSumLength, (long) lastTime); - } +// if (mOrderStatusCallback != null) { +// mOrderStatusCallback.onCurrentOrderDistToEndChanged((long) lastSumLength, (long) lastTime); +// } reportOrderRemain((long) lastSumLength, (long) lastTime); } From 5c3669b8ddb1bde8dc4fa9a90361cc1ab1497e23 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 7 Sep 2022 19:07:02 +0800 Subject: [PATCH 6/7] =?UTF-8?q?[=E7=BA=BF=E7=A8=8B=E4=BC=98=E5=8C=96]?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [状态栏]优化GPS使能状态 --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e4c22b5d5d..b6ad0b3f3e 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ apply from: "javadoc.gradle" buildscript { repositories { + mavenLocal() maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' } maven { url "https://artifact.bytedance.com/repository/byteX/" } maven { url 'http://nexus.zhidaoauto.com/repository/maven-releases/' } @@ -32,7 +33,7 @@ buildscript { classpath "com.bytedance.android.byteX:base-plugin:0.3.0" classpath "com.mogo.cloud:hook:${HOOK_LOG_VERSION}" classpath 'com.volcengine:apm_insight_plugin:1.4.1' - classpath 'com.mogo.thread.opt:plg:2.2.0' + classpath 'com.mogo.thread.opt:plg:2.2.4' classpath 'com.mogo.cloud:systrace:1.0.1' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' classpath 'com.mogo.sticky:service:1.0.8' @@ -49,6 +50,7 @@ buildscript { allprojects { repositories { + mavenLocal() maven { url 'https://maven.aliyun.com/repository/public' } maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' } maven { url 'http://nexus.zhidaoauto.com/repository/maven-releases/' } From d283a7fef08b8f3409cc37b39cc6efe2e56f3a95 Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 8 Sep 2022 10:39:27 +0800 Subject: [PATCH 7/7] =?UTF-8?q?[CrashFix]=E4=BF=AE=E6=AD=A3android.view.Vi?= =?UTF-8?q?ewRootImpl$CalledFromWrongThreadException:=20Only=20the=20origi?= =?UTF-8?q?nal=20thread=20that=20created=20a=20view=20hierarchy=20can=20to?= =?UTF-8?q?uch=20its=20views.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 754ec01701..4bdb0a6522 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -728,7 +728,9 @@ import java.util.* WarningFloat.dismiss(tag) } Log.d("$M_HMI$TAG", "--- disableWarningV2X ---") - showingV2XTip?.takeIf { it.isShowing() }?.also { it.hide() } + lifecycleScope.launch { + showingV2XTip?.takeIf { it.isShowing() }?.also { it.hide() } + } } /**