From 1fa89774017a04c7404b32ce902f336bcaf64378 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Fri, 25 Mar 2022 15:39:02 +0800 Subject: [PATCH 01/11] =?UTF-8?q?[Change]=20=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8adas=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- app/build.gradle | 2 - .../mogo-core-function-main/build.gradle | 3 - .../function/main/EventDispatchCenter.java | 138 +++--------------- .../core/function/main/MainActivity.java | 18 +-- .../service/adas/IMogoADASController.java | 2 - services/mogo-service/build.gradle | 2 - .../service/impl/adas/MogoADASController.java | 6 - 7 files changed, 24 insertions(+), 147 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 97f2c4cbc1..5145b95f1a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -233,8 +233,6 @@ dependencies { implementation rootProject.ext.dependencies.arouter implementation rootProject.ext.dependencies.boostmultidex - compileOnly rootProject.ext.dependencies.adasapi - compileOnly rootProject.ext.dependencies.adasconfigapi debugImplementation rootProject.ext.dependencies.debugleakcanary releaseImplementation rootProject.ext.dependencies.releaseleakcanary diff --git a/core/function-impl/mogo-core-function-main/build.gradle b/core/function-impl/mogo-core-function-main/build.gradle index 58076f0352..72babe725b 100644 --- a/core/function-impl/mogo-core-function-main/build.gradle +++ b/core/function-impl/mogo-core-function-main/build.gradle @@ -48,9 +48,6 @@ dependencies { implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.boostmultidex - compileOnly rootProject.ext.dependencies.adasapi - compileOnly rootProject.ext.dependencies.adasconfigapi - debugImplementation rootProject.ext.dependencies.debugleakcanary releaseImplementation rootProject.ext.dependencies.releaseleakcanary diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java index 22af3e7933..b1a07c2242 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/EventDispatchCenter.java @@ -20,10 +20,6 @@ import com.mogo.map.navi.IMogoNaviListener; import com.mogo.map.navi.MogoNaviInfo; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.map.uicontroller.VisualAngleMode; -import com.mogo.service.adas.IMogoADASControlStatusChangedListener; -import com.zhidao.adasconfig.common.config.EnumCarChatIncognitoMode; -import com.zhidao.adasconfig.listener.IAdasSettingUIListener; -import com.zhidao.adasconfig.listener.IAdasSkinStyleListener; import java.util.ArrayList; import java.util.Iterator; @@ -39,9 +35,7 @@ public class EventDispatchCenter implements IMogoMarkerClickListener, IMogoCarLocationChangedListener2, IMogoMapListener, - IMogoLocationListener, - IAdasSettingUIListener, - IAdasSkinStyleListener { + IMogoLocationListener { private static volatile EventDispatchCenter sInstance; @@ -70,7 +64,7 @@ public class EventDispatchCenter implements try { return listener.onMarkerClicked(marker); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMarkerClicked error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMarkerClicked error : " + e); } } return false; @@ -87,7 +81,7 @@ public class EventDispatchCenter implements return listener.onStaticMarkerClicked(marker); } } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onStaticMarkerClicked error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onStaticMarkerClicked error : " + e); } return false; } @@ -138,7 +132,7 @@ public class EventDispatchCenter implements try { listener.onMapLoaded(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMapLoaded error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMapLoaded error : " + e); } } } @@ -156,7 +150,7 @@ public class EventDispatchCenter implements try { listener.onTouch(motionEvent); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onTouch error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onTouch error : " + e); } } } @@ -174,7 +168,7 @@ public class EventDispatchCenter implements try { listener.onPOIClick(poi); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onPOIClick error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onPOIClick error : " + e); } } } @@ -192,7 +186,7 @@ public class EventDispatchCenter implements try { listener.onMapClick(latLng); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMapClick error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMapClick error : " + e); } } } @@ -210,7 +204,7 @@ public class EventDispatchCenter implements try { listener.onLockMap(isLock); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onLockMap error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onLockMap error : " + e); } } } @@ -228,7 +222,7 @@ public class EventDispatchCenter implements try { listener.onMapModeChanged(ui); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMapModeChanged error :" + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMapModeChanged error :" + e); } } } @@ -246,7 +240,7 @@ public class EventDispatchCenter implements try { listener.onMapVisualAngleChanged(visualAngleMode); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMapVisualAngleChanged error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMapVisualAngleChanged error : " + e); } } } @@ -266,7 +260,7 @@ public class EventDispatchCenter implements try { listener.onMapChanged(location, zoom, tilt, bearing); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onMapChanged error :" + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onMapChanged error :" + e); } } } @@ -284,7 +278,7 @@ public class EventDispatchCenter implements try { listener.onInitNaviFailure(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onInitNaviFailure error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onInitNaviFailure error : " + e); } } } @@ -302,7 +296,7 @@ public class EventDispatchCenter implements try { listener.onInitNaviSuccess(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onInitNaviSuccess error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onInitNaviSuccess error : " + e); } } } @@ -321,7 +315,7 @@ public class EventDispatchCenter implements try { listener.onNaviInfoUpdate(naviinfo); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onNaviInfoUpdate error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onNaviInfoUpdate error : " + e); } } } @@ -340,7 +334,7 @@ public class EventDispatchCenter implements try { listener.onStartNavi(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onStartNavi error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onStartNavi error : " + e); } } } @@ -358,7 +352,7 @@ public class EventDispatchCenter implements try { listener.onStopNavi(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onStopNavi error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onStopNavi error : " + e); } } } @@ -376,7 +370,7 @@ public class EventDispatchCenter implements try { listener.onCalculateSuccess(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onCalculateSuccess error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onCalculateSuccess error : " + e); } } } @@ -394,7 +388,7 @@ public class EventDispatchCenter implements try { listener.onoCalculateFailed(); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onoCalculateFailed error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onoCalculateFailed error : " + e); } } } @@ -414,104 +408,10 @@ public class EventDispatchCenter implements try { listener.onLocationChanged(location); } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "onLocationChanged error : " + e); + CallerLogger.INSTANCE.e(M_MAIN + TAG, "onLocationChanged error : " + e); } } } } - @Override - public void northModel() { - Iterator iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners(); - if (iterator == null) { - return; - } - while (iterator.hasNext()) { - IMogoADASControlStatusChangedListener listener = iterator.next(); - if (listener == null) { - continue; - } - try { - listener.onMapUiModeChanged(EnumMapUI.NorthUP_2D); - } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "northModel error : " + e); - } - } - } - - @Override - public void carHeadUp() { - Iterator iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners(); - if (iterator == null) { - return; - } - while (iterator.hasNext()) { - IMogoADASControlStatusChangedListener listener = iterator.next(); - if (listener == null) { - continue; - } - try { - listener.onMapUiModeChanged(EnumMapUI.CarUp_2D); - } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "carHeadUp error : " + e); - } - } - } - - @Override - public void switchCarChat(EnumCarChatIncognitoMode enumCarChatIncognitoMode) { - Iterator iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners(); - if (iterator == null) { - return; - } - while (iterator.hasNext()) { - IMogoADASControlStatusChangedListener listener = iterator.next(); - if (listener == null) { - continue; - } - try { - listener.onCarStatusChanged(enumCarChatIncognitoMode == EnumCarChatIncognitoMode.OPEN); - } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "switchCarChat error : " + e); - } - } - } - - @Override - public void whiteModel() { - Iterator iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners(); - if (iterator == null) { - return; - } - while (iterator.hasNext()) { - IMogoADASControlStatusChangedListener listener = iterator.next(); - if (listener == null) { - continue; - } - try { - listener.onMapUiModeChanged(EnumMapUI.Type_Light); - } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "whiteModel error : " + e); - } - } - } - - @Override - public void blackModel() { - Iterator iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners(); - if (iterator == null) { - return; - } - while (iterator.hasNext()) { - IMogoADASControlStatusChangedListener listener = iterator.next(); - if (listener == null) { - continue; - } - try { - listener.onMapUiModeChanged(EnumMapUI.Type_Night); - } catch (Exception e) { - CallerLogger.INSTANCE.e(M_MAIN +TAG, "blackModel error : " + e); - } - } - } } diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java index cf554a11b5..0858fe21b9 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java @@ -1,7 +1,7 @@ package com.mogo.eagle.core.function.main; -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAIN; 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_MAIN; import android.content.Intent; import android.content.pm.PackageManager; @@ -24,13 +24,13 @@ import com.mogo.commons.mvp.MvpActivity; import com.mogo.commons.mvp.MvpFragment; import com.mogo.eagle.core.data.constants.MoGoFragmentPaths; import com.mogo.eagle.core.data.map.MogoLocation; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.function.main.cards.MogoModulesManager; import com.mogo.eagle.core.function.main.service.MogoMainService; import com.mogo.eagle.core.function.main.utils.DisplayEffectsHelper; import com.mogo.eagle.core.function.main.windowview.FloatingViewHandler; import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils; +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.permissions.PermissionsDialogUtils; import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper; import com.mogo.eagle.core.utilcode.util.NetworkUtils; @@ -48,9 +48,6 @@ import com.mogo.service.fragmentmanager.IMogoFragmentManager; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.statusmanager.StatusDescriptor; -import com.zhidao.adasconfig.api.AdasConfigApiController; -import com.zhidao.adasconfig.common.log.LoggerController; -import com.zhidao.autopilot.support.api.AutopilotServiceManage; import java.util.HashMap; import java.util.Map; @@ -183,7 +180,6 @@ public class MainActivity extends MvpActivity implement } mMogoStatusManager = mServiceApis.getStatusManagerApi(); mMogoStatusManager.setMainPageLaunchedStatus(TAG, true); - AutopilotServiceManage.getInstance().init(getContext()); } @Override @@ -253,10 +249,6 @@ public class MainActivity extends MvpActivity implement private void initAdasControlStatusListener() { mServiceApis.getRegisterCenterApi().registerADASControlStatusChangedListener(TAG, this); - AdasConfigApiController.getInstance().registerAdasSettingUiListener(EventDispatchCenter.getInstance()); - AdasConfigApiController.getInstance().registerAdasSettingSkinModelListener(EventDispatchCenter.getInstance()); - AdasConfigApiController.getInstance().init(getApplicationContext()); - LoggerController.setPrinterLog(DebugConfig.isDebug()); } private void startBaseService() { @@ -394,9 +386,9 @@ public class MainActivity extends MvpActivity implement mMogoFragmentManager = null; } IMogoMapUIController mapUIController = CallerMapUIServiceManager.INSTANCE.getMapUIController(); - if (mapUIController != null) mapUIController.destroy(); - AdasConfigApiController.getInstance().release(); - mServiceApis.getAdasControllerApi().release(); + if (mapUIController != null) { + mapUIController.destroy(); + } CallerLogger.INSTANCE.d(M_MAIN + TAG, "destroy."); ContextHolderUtil.releaseContext(); MogoModulesManager.getInstance().onDestroy(); diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java index 79661e5e81..a73e21ca1d 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java @@ -10,8 +10,6 @@ import com.alibaba.android.arouter.facade.template.IProvider; */ public interface IMogoADASController extends IProvider { - void release(); - /** * 获取车身的定位纬度 * diff --git a/services/mogo-service/build.gradle b/services/mogo-service/build.gradle index f6c6e92e28..fce6dd6a98 100644 --- a/services/mogo-service/build.gradle +++ b/services/mogo-service/build.gradle @@ -48,8 +48,6 @@ dependencies { implementation rootProject.ext.dependencies.arouter kapt rootProject.ext.dependencies.aroutercompiler - implementation rootProject.ext.dependencies.adasapi - implementation rootProject.ext.dependencies.adasconfigapi if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { api rootProject.ext.dependencies.mogomap implementation rootProject.ext.dependencies.mogomapapi diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 2862da2fa0..6a079a3c2a 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -5,7 +5,6 @@ import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.service.adas.IMogoADASController; -import com.zhidao.autopilot.support.api.AutopilotServiceManage; @Route(path = MogoServicePaths.PATH_ADAS_CONTROLLER) public class MogoADASController implements IMogoADASController { @@ -51,11 +50,6 @@ public class MogoADASController implements IMogoADASController { } - @Override - public void release() { - AutopilotServiceManage.getInstance().release(); - } - } From bdaffe788bd4176444928cf6dcd91bef73ff9c76 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Fri, 25 Mar 2022 16:40:04 +0800 Subject: [PATCH 02/11] =?UTF-8?q?[Fix]=E5=8D=87=E7=BA=A7=E5=A4=9A=E5=B1=8F?= =?UTF-8?q?=E6=A1=86=E6=9E=B6=E7=89=88=E6=9C=AC=E3=80=81=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=BB=99=E6=8C=87=E5=AE=9Achannel=E5=90=8C=E6=AD=A5=E7=BE=8E?= =?UTF-8?q?=E5=8C=96=E6=A8=A1=E5=BC=8F=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_ipc_monitoring/build.gradle | 2 +- .../function/autopilot/MoGoAutopilotProvider.kt | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app_ipc_monitoring/build.gradle b/app_ipc_monitoring/build.gradle index 9bb528f9a9..e688cb6413 100644 --- a/app_ipc_monitoring/build.gradle +++ b/app_ipc_monitoring/build.gradle @@ -58,5 +58,5 @@ dependencies { // api "com.zhidao.support.adas:high:1.2.1.2_bate21" implementation 'org.greenrobot:eventbus:3.2.0' implementation 'com.android.support:multidex:1.0.3' - implementation 'com.mogo.cloud:telematic:1.3.31' + implementation 'com.mogo.cloud:telematic:1.3.50' } 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 532a214d64..363922b59a 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 @@ -27,6 +27,7 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.telematic.MogoProtocolMsg import com.mogo.telematic.MogoProtocolMsg.NORMAL_DATA +import com.mogo.telematic.MogoProtocolMsg.SYNC_MODE_STATUS import com.mogo.telematic.NSDNettyManager import com.mogo.telematic.client.listener.NettyClientListener import com.mogo.telematic.client.status.ConnectState @@ -90,13 +91,9 @@ class MoGoAutopilotProvider : override fun onChannelConnect(channel: Channel?) { val socketAddress = channel?.remoteAddress().toString() CallerLogger.d("$M_ADAS_IMPL$TAG", "Client ip is:${socketAddress}") - synchronized(this@MoGoAutopilotProvider) { - NSDNettyManager.getInstance().selectChannel(channel) - var byteArray = if(FunctionBuildConfig.isDemoMode) byteArrayOf(1) else byteArrayOf(0) - NSDNettyManager.getInstance().sendMogoProtocolMsgToClient(MogoProtocolMsg(3, byteArray.size, byteArray) - ) { - CallerLogger.d("$M_ADAS_IMPL$TAG", "同步美化模式状态是否成功：${it.isSuccess}") - } + val byteArray = if(FunctionBuildConfig.isDemoMode) byteArrayOf(1) else byteArrayOf(0) + NSDNettyManager.getInstance().sendMsgToSpecifiedClient(MogoProtocolMsg(SYNC_MODE_STATUS, byteArray.size, byteArray), channel) { + CallerLogger.d("$M_ADAS_IMPL$TAG", "同步美化模式状态是否成功：${it.isSuccess}") } } @@ -328,7 +325,7 @@ class MoGoAutopilotProvider : var byteArray = if (isEnable) byteArrayOf(1) else byteArrayOf(0) if (NSDNettyManager.getInstance().isServerStart) { NSDNettyManager.getInstance() - .sendMsgToAllClients(MogoProtocolMsg(3, byteArray.size, byteArray)) + .sendMsgToAllClients(MogoProtocolMsg(SYNC_MODE_STATUS, byteArray.size, byteArray)) } else { CallerLogger.d("$M_ADAS_IMPL$TAG", "同步美化模式状态时司机端Server未启动！") } From 24d6bbaaf59e3fdfff8bc36a45f249e1937172ab Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Fri, 25 Mar 2022 16:42:37 +0800 Subject: [PATCH 03/11] =?UTF-8?q?[Fix]=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6?= =?UTF-8?q?=E5=8A=A0=E9=80=9F=E5=BA=A6=E5=BE=97=E4=B8=BB=E5=8A=A8=E6=9F=A5?= =?UTF-8?q?=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt index 99f5b52ca4..74d7a2f745 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt @@ -120,6 +120,7 @@ class AutoPilotAndCheckView @JvmOverloads constructor( } } updateSpeedSettingViews() + CallerAutoPilotManager.getCarConfig() // // 比如需要设置默认速度 // val speed = "30" // etInputSpeed.setText(speed) From 324e1aedc2a22ecfbb68a9ff842cef3614e965ad Mon Sep 17 00:00:00 2001 From: renwj Date: Fri, 25 Mar 2022 17:03:10 +0800 Subject: [PATCH 04/11] =?UTF-8?q?[feedback]=E4=BF=AE=E6=AD=A3=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E5=BC=B9=E7=AA=97=E5=B1=95=E7=A4=BA=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=A4=96=E9=83=A8=E4=B8=8D=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E8=A7=A6=E6=91=B8=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt index cf25d9c3af..a62b8fecd6 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt @@ -104,7 +104,11 @@ internal fun Context.pop(content: View, width: Int, height: Int, key: String, fi } } } - return@setTouchInterceptor true + try { + return@setTouchInterceptor true + } finally { + activity.window.decorView.dispatchTouchEvent(event) + } } it.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) } From e02459b1025545c2a8d88e13682dc6cff3d6c87f Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 25 Mar 2022 17:45:40 +0800 Subject: [PATCH 05/11] fix bug of delay problem --- app/build.gradle | 13 ++++++------- .../trace/TraceManager.kt | 4 ++-- gradle.properties | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5145b95f1a..4b0dee9b30 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,13 +15,12 @@ if (!isAndroidTestBuild()) { logLevel "DEBUG" } } -//if (!isAndroidTestBuild()) { -// apply plugin: 'chain.log.hook' -// hooklog{ -// enableLoggerToServer false -// enableLoggerToLocal false -// } -//} +if (!isAndroidTestBuild()) { + apply plugin: 'chain.log.hook' + hooklog{ + enableLoggerToServer true + } +} //if (!isAndroidTestBuild()) { // apply plugin: 'apm-plugin' 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 23694c81a2..c2b0e1262e 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 @@ -33,9 +33,9 @@ class TraceManager { // Trace过程中进行日志抓取，对日志进行配置 fwBuildMap[ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS] = - FwBuild(true, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_INIT, 5_000) + FwBuild(true, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_INIT) fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA] = - FwBuild(false, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_MSG, 500) + FwBuild(false, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_MSG) traceInfoCache[ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS] = ChainLogParam(true, "ADAS连接状态") diff --git a/gradle.properties b/gradle.properties index 87de84e7f3..017d71ea9c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -56,11 +56,11 @@ bytex.forbidUseLenientMutationDuringGetArtifact=true bytex.verifyProguardConfigurationChanged=false bytex.ASM_API=ASM7 -HOOK_LOG_VERSION=1.5.22 +HOOK_LOG_VERSION=1.5.17 SERVICE_CHAIN_VERSION=1.0.53 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.2.20 +LOGLIB_VERSION=1.2.22 ######## MogoAiCloudSDK Version ######## # 网络请求 MOGO_NETWORK_VERSION=1.3.50 From 871f7e3ec7e5f29f9de015a0c423d098c243aac6 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 25 Mar 2022 18:08:06 +0800 Subject: [PATCH 06/11] add sn binding --- .../adapter/MoGoHandAdasMsgManager.java | 25 +++++++- .../bindingcar/BindingcarProvider.java | 24 +++++--- .../network/BindingcarApiService.java | 10 ++-- .../network/BindingcarNetWorkManager.java | 58 ++++++++++--------- .../ui/bindingcar/ModifyBindingCarDialog.kt | 1 + .../hmi/ui/bindingcar/ToBindingCarDialog.kt | 2 +- .../constants/SharedPrefsConstants.java | 3 + .../module/common/constants/HostConst.java | 2 + 8 files changed, 79 insertions(+), 46 deletions(-) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java index 25c28d16c0..ab0e846755 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java @@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.autopilot.adapter; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_DEVA; +import android.text.TextUtils; import android.util.Log; import com.mogo.eagle.core.data.config.FunctionBuildConfig; @@ -10,10 +11,14 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotVehicleStateListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager; +import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.ThreadUtils; import com.mogo.module.common.drawer.IdentifyDataDrawer; +import com.zhidao.support.adas.high.OnAdasConnectStatusListener; +import com.zhidao.support.adas.high.common.Constants; + import org.jetbrains.annotations.NotNull; import java.util.List; @@ -25,7 +30,8 @@ import record_cache.RecordPanelOuterClass; public class MoGoHandAdasMsgManager implements IMoGoAutopilotIdentifyListener, IMoGoAutopilotVehicleStateListener, - IMoGoAutopilotCarConfigListener { + IMoGoAutopilotCarConfigListener, + OnAdasConnectStatusListener { private final String TAG = "AdasEventManager"; @@ -123,12 +129,25 @@ public class MoGoHandAdasMsgManager implements } + private volatile boolean isIPCConnect = false; + @Override public void onAutopilotCarConfig(@NotNull MessagePad.CarConfigResp carConfigResp) { +// Log.d("liyz", "onAutopilotCarConfig ---------> "); // if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) { -// CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress()); +// Log.d("liyz", " carConfigResp.getMacAddress() = " + carConfigResp.getMacAddress()); +// if (!isIPCConnect) { +// CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress()); +// isIPCConnect = true; +// } // } - } + @Override + public void onConnectionIPCStatus(int ipcConnectionStatus, String failedMsg) { +// Log.d("liyz", "onConnectionIPCStatus ---------> ipcConnectionStatus = " + ipcConnectionStatus); +// if (ipcConnectionStatus != Constants.IPC_CONNECTION_STATUS.CONNECTED) { +// isIPCConnect = false; +// } + } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java index 0bfee198e3..4b8c9cf4ef 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java @@ -1,26 +1,30 @@ package com.mogo.eagle.core.function.bindingcar; import android.content.Context; +import android.text.TextUtils; import android.util.Log; import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.commons.constants.SharedPrefsConstants; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack; import com.mogo.eagle.core.function.api.bindingcar.IMoGoBindingcarProvider; import com.mogo.eagle.core.function.bindingcar.network.BindingcarNetWorkManager; +import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import org.jetbrains.annotations.NotNull; /** - * @author Jing - * @description 云公告公告 - * @since: 10/27/21 + * @author lixiaopeng + * @description 绑定sn + * @since: 3/26/22 */ @Route(path = MogoServicePaths.PATH_BINDING_CAR) public class BindingcarProvider implements IMoGoBindingcarProvider { private Context mContext; + private volatile String mAddress; @NotNull @Override @@ -30,6 +34,7 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { @Override public void onDestroy() { + } @Override @@ -38,21 +43,22 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { } /** - * TODO 获取,每次连接请求一次 + * 获取macaddress,每次连接请求一次 + * * @param macAddress */ @Override public void getBindingcarInfo(String macAddress) { -// Log.d("liyz", "macAddress = " + macAddress); -// BindingcarNetWorkManager.getInstance().getBindingcarInfo(macAddress); + mAddress = macAddress; + BindingcarNetWorkManager.getInstance().getBindingcarInfo(mContext, macAddress); + Log.d("liyz", "BindingcarProvider getBindingcarInfo macAddress = " + macAddress); } @Override public void modifyCarInfo(BindingcarCallBack callBack) { - BindingcarNetWorkManager.getInstance().modifyBindingcar("",callBack); + Log.d("liyz", "BindingcarProvider modifyCarInfo mAddress = " + mAddress); + BindingcarNetWorkManager.getInstance().modifyBindingcar(mAddress, callBack); } - - } diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java index d9e4a80a59..b6549f9b57 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java @@ -2,11 +2,11 @@ package com.mogo.eagle.core.function.bindingcar.network; import com.mogo.eagle.core.data.bindingcar.BindingcarInfo; import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo; -import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo; import io.reactivex.Observable; import okhttp3.RequestBody; import retrofit2.http.Body; +import retrofit2.http.Header; import retrofit2.http.Headers; import retrofit2.http.POST; @@ -22,8 +22,8 @@ public interface BindingcarApiService { * @return {@link BindingcarInfo} */ @Headers("Content-Type:application/json;charset=UTF-8") - @POST("/pad/selectPadByMac") - Observable getBindingcarInfo(@Body RequestBody requestBody); + @POST("pad/selectPadByMac") + Observable getBindingcarInfo(@Header("access_token") String access_token, @Body RequestBody requestBody); /** * 绑定和修改绑定车机 @@ -31,7 +31,7 @@ public interface BindingcarApiService { * @return {@link ModifyBindingcarInfo} */ @Headers("Content-Type:application/json;charset=UTF-8") - @POST("/pad/updatePadByMac") - Observable modifyBindingcarInfo(@Body RequestBody requestBody); + @POST("pad/updatePadByMac") + Observable modifyBindingcarInfo(@Header("access_token") String access_token, @Body RequestBody requestBody); } diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java index 4d2873bdc4..4a25019f50 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java @@ -1,14 +1,18 @@ package com.mogo.eagle.core.function.bindingcar.network; -import android.util.Log; +import android.content.Context; -import com.mogo.cloud.network.RetrofitFactory; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.constants.SharedPrefsConstants; import com.mogo.eagle.core.data.bindingcar.BindingcarInfo; import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo; import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; +import com.mogo.eagle.core.network.MoGoRetrofitFactory; import com.mogo.eagle.core.network.utils.GsonUtil; +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; +import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; +import com.mogo.module.common.constants.HostConst; import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; @@ -19,19 +23,18 @@ import okhttp3.MediaType; import okhttp3.RequestBody; /** - * @author Jing - * @description 云公告网络请求类 - * @since: 10/28/21 + * @author lixiaopeng + * @description 绑定车机网络请求 + * @since: 3/25/22 */ public class BindingcarNetWorkManager { private static volatile BindingcarNetWorkManager requestNoticeManager; private final BindingcarApiService mBindingcarApiService; + private String token = "c4a2f30cebf64972bcd11577e1c07f86"; //中台做了接口适配，需要这个token + private static final String TAG = "BindingcarNetWorkManager"; - private BindingcarNetWorkManager() { //TODO -// mBindingcarApiService = RetrofitFactory.INSTANCE.getInstance(NetConstants.DEVA_HOST) -// .create(BindingcarApiService.class); - - mBindingcarApiService = RetrofitFactory.INSTANCE.getInstance("http://cmdb.ee-private-dev.myghost.zhidaoauto.com/") + private BindingcarNetWorkManager() { + mBindingcarApiService = MoGoRetrofitFactory.getInstance(HostConst.BINDING_SN_HOST) .create(BindingcarApiService.class); } @@ -46,85 +49,84 @@ public class BindingcarNetWorkManager { return requestNoticeManager; } + /** * 获取绑定的车辆信息 * - * @param macAddress mac地址 TODO - * + * @param macAddress mac地址 */ - public void getBindingcarInfo(String macAddress) { + public void getBindingcarInfo(Context context, String macAddress) { String sn = MoGoAiCloudClientConfig.getInstance().getSn(); - BindingcarRequest request = new BindingcarRequest("48:b0:2d:3a:9c:19", sn); + BindingcarRequest request = new BindingcarRequest(macAddress, sn); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); - mBindingcarApiService.getBindingcarInfo(requestBody) + mBindingcarApiService.getBindingcarInfo(token, requestBody) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.d("liyz", "getBindingcarInfo onSubscribe -----> "); } @Override public void onNext(@NonNull BindingcarInfo info) { if (info != null && info.getData() != null) { - Log.d("liyz", "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); + CallerLogger.INSTANCE.d(TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); if (info.getData().getCompare() == 0) { CallerHmiManager.INSTANCE.showBindingcarDialog(); } else if (info.getData().getCompare() == 3) { CallerHmiManager.INSTANCE.showModifyBindingcarDialog(); } + + SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_MODE_TYPE, info.data.getSeries()); } } @Override public void onError(@NonNull Throwable e) { - Log.d("liyz", "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); + CallerLogger.INSTANCE.e(TAG, "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); } @Override public void onComplete() { - Log.d("liyz", "getBindingcarInfo onComplete"); } }); } /** - * 绑定和修改绑定车辆 TODO + * 绑定和修改绑定车辆 + * mac: 48:b0:2d:3a:9c:19 */ public void modifyBindingcar(String macAddress, BindingcarCallBack callBack) { String sn = MoGoAiCloudClientConfig.getInstance().getSn(); - BindingcarRequest request = new BindingcarRequest("48:b0:2d:3a:9c:19", sn); + BindingcarRequest request = new BindingcarRequest(macAddress, sn); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); - mBindingcarApiService.modifyBindingcarInfo(requestBody) + mBindingcarApiService.modifyBindingcarInfo(token, requestBody) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @Override public void onSubscribe(@NonNull Disposable d) { - Log.d("liyz", "modifyBindingcar onSubscribe -----> "); } @Override public void onNext(@NonNull ModifyBindingcarInfo info) { - if (info.getData() != null) { + if (info != null) { callBack.callBackResult(info); + CallerLogger.INSTANCE.d(TAG, "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString()); } - Log.d("liyz", "modifyBindingcar onNext info " + info.toString()); } @Override public void onError(@NonNull Throwable e) { - Log.d("liyz", "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); + CallerLogger.INSTANCE.e(TAG, "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); } @Override public void onComplete() { - Log.d("liyz", "modifyBindingcar onComplete "); } }); + } - } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt index 12912d60fe..84f070921c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.hmi.ui.bindingcar import android.content.Context +import android.util.Log import android.widget.TextView import androidx.lifecycle.LifecycleObserver import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt index db27456c94..6d38ac8373 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt @@ -46,7 +46,7 @@ class ToBindingCarDialog(context: Context) : BaseFloatDialog(context), Lifecycle } /** - * 修改绑定车机 TODO + * 修改绑定车机 */ fun toBindingcar() { CallerBindingcarManager.getBindingcarProvider().modifyCarInfo { diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/SharedPrefsConstants.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/SharedPrefsConstants.java index bbcbbb9bb1..ee268eca8a 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/SharedPrefsConstants.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/constants/SharedPrefsConstants.java @@ -12,4 +12,7 @@ public class SharedPrefsConstants { public static final String LOCATION_LATITUDE = "location_latitude"; public static final String LOCATION_LONGITUDE = "location_longitude"; + public static final String CAR_MODE_TYPE = "car_mode_type"; + + public static final String MAC_ADDRESS = "mac_address"; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java index 1c7db8cea1..81f0f468e3 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/HostConst.java @@ -19,4 +19,6 @@ public class HostConst { public static final String CITY_HOST = "http://dzt-city.zhidaozhixing.com"; public static final String SOCKET_CENTER_DOMAIN = "socketRegion"; + public static final String BINDING_SN_HOST = "https://mygateway.zhidaozhixing.com/cmdbapi/"; //中台提供的接口服务 + } From 1336a3ea7aba145e7583b269047b2faf3f0c889f Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 25 Mar 2022 18:12:52 +0800 Subject: [PATCH 07/11] close for now --- app/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4b0dee9b30..331e4262b3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,12 +15,12 @@ if (!isAndroidTestBuild()) { logLevel "DEBUG" } } -if (!isAndroidTestBuild()) { - apply plugin: 'chain.log.hook' - hooklog{ - enableLoggerToServer true - } -} +//if (!isAndroidTestBuild()) { +// apply plugin: 'chain.log.hook' +// hooklog{ +// enableLoggerToServer true +// } +//} //if (!isAndroidTestBuild()) { // apply plugin: 'apm-plugin' From 3dcb2e05de15c604506d77f442fd4633a5e0976a Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Fri, 25 Mar 2022 18:27:41 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E8=B0=83=E8=AF=95=E7=AA=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加断开工控机连接功能入口 --- .../autopilot/MoGoAutopilotProvider.kt | 7 +++++++ .../hmi/ui/setting/DebugSettingView.kt | 9 +++++---- .../main/res/layout/view_debug_setting.xml | 20 ++++++++++++++++--- .../api/autopilot/IMoGoAutopilotProvider.kt | 5 +++++ .../call/autopilot/CallerAutoPilotManager.kt | 7 +++++++ 5 files changed, 41 insertions(+), 7 deletions(-) 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 363922b59a..13d7dac84d 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 @@ -207,6 +207,13 @@ class MoGoAutopilotProvider : }, 1000, TimeUnit.MILLISECONDS) } + /** + * 断开与工控机的连接 + */ + override fun disconnectIpc() { + AdasManager.getInstance().disconnect() + } + override fun onMapCollectStart(cmdId: Int, cmdTime: Long) { val result = recordPackage(2, cmdId) CallerLogger.d("$M_ADAS_IMPL$TAG", "开始记录包: [$cmdId, $result]") 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 cd25df7a14..0bf25f12fd 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 @@ -396,9 +396,6 @@ class DebugSettingView @JvmOverloads constructor( //日志中心事件点击监听 setLogCheckedChangeListener() - - - //OBU配置信息 tvObuInfo.text = CallerObuListenerManager.getObuStatusInfoJsonString() @@ -527,6 +524,10 @@ class DebugSettingView @JvmOverloads constructor( } } + //断开与工控机的连接 + btnDisconnectIpc.setOnClickListener { + CallerAutoPilotManager.disconnectIpc() + } updateSpeedSettingViews() @@ -966,7 +967,7 @@ class DebugSettingView @JvmOverloads constructor( } override fun upgradeVersionUrls(urls: Map?) { - //todo 版本信息更新 + } }) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index d74b47cd8a..e6e28ae6db 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -604,13 +604,28 @@ app:layout_constraintTop_toTopOf="@id/btnSetAutopilotIP" app:layout_constraintBottom_toBottomOf="@id/btnSetAutopilotIP" app:layout_constraintLeft_toRightOf="@id/btnSetAutopilotIP" - app:layout_constraintRight_toRightOf="parent" + app:layout_constraintRight_toLeftOf="@id/btnDisconnectIpc" android:layout_marginStart="@dimen/dp_30" - android:layout_marginEnd="@dimen/dp_30" + android:layout_marginEnd="@dimen/dp_20" android:layout_marginTop="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_10" /> +