diff --git a/OCH/charter/driver/build.gradle b/OCH/charter/driver/build.gradle index 91540463fb..a49dc26cb7 100644 --- a/OCH/charter/driver/build.gradle +++ b/OCH/charter/driver/build.gradle @@ -62,6 +62,8 @@ dependencies { compileOnly rootProject.ext.dependencies.recyclerviewadapterhelper implementation project(":OCH:common:common") + implementation project(":OCH:common:data") + implementation project(":OCH:common:bridge") compileOnly project(":libraries:mogo-map") androidTestImplementation rootProject.ext.dependencies.androidxjunit diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/CharterDriverProvider.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/CharterDriverProvider.kt index b50bc443d5..e64d95db78 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/CharterDriverProvider.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/CharterDriverProvider.kt @@ -1,6 +1,7 @@ package com.magic.mogo.och.charter import android.content.Context +import android.view.View import androidx.fragment.app.Fragment import com.alibaba.android.arouter.facade.annotation.Route import com.magic.mogo.och.charter.fragment.DriverM1Fragment @@ -11,7 +12,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.biz.provider.CommonService import com.mogo.och.common.module.biz.provider.CommonServiceImpl -import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics +import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics +import com.mogo.och.bridge.ui.autopilot.AutopilotState /** @@ -40,6 +42,12 @@ class CharterDriverProvider : CommonServiceImpl() { OchAutopilotAnalytics.ochEventKey = null } + override fun createStartAutopilotView(context: Context?): View? { + return context?.let { + AutopilotState(it) + } + } + override fun init(context: Context) { CallerLogger.d(SceneConstant.M_TAXI + tag, "init") } diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java index 246ab9d57a..b767b0fc7e 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterAnalyticsManager.java @@ -2,7 +2,7 @@ package com.magic.mogo.och.charter.manager; import androidx.annotation.NonNull; -import com.mogo.och.common.module.manager.autopilot.autopilot.IOchEventKey; +import com.mogo.och.bridge.autopilot.autopilot.IOchEventKey; public class CharterAnalyticsManager implements IOchEventKey { diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt index 3cabd439f7..af7bbc52d3 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt @@ -14,17 +14,15 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.GsonUtils +import com.mogo.och.bridge.autopilot.trajectory.ITrajectoryListListener +import com.mogo.och.bridge.autopilot.trajectory.TrajectoryManager import com.mogo.och.common.module.biz.login.LoginStatusManager -import com.mogo.och.common.module.manager.autopilot.trajectory.ITrajectoryListListener -import com.mogo.och.common.module.manager.autopilot.trajectory.TrajectoryManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.utils.SoundPoolHelper import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable -import io.reactivex.functions.Function import io.reactivex.schedulers.Schedulers -import mogo_msg.MogoReportMsg.MogoReportMessage import java.util.concurrent.TimeUnit /** diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt index ce819239d4..f54755fb19 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt @@ -35,15 +35,16 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.* import com.mogo.och.common.module.biz.login.LoginStatusManager -import com.mogo.och.common.module.callback.OchAdasStartFailureCallback +import com.mogo.och.bridge.autopilot.callback.OchAdasStartFailureCallback import com.mogo.och.common.module.constant.OchCommonConst -import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager -import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager -import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics -import com.mogo.och.common.module.manager.autopilot.line.LineManager -import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager -import com.mogo.och.common.module.manager.device.LightAirconditionDoorManager -import com.mogo.och.common.module.manager.device.LightAirconditionDoorStatusManager +import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager +import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotManager +import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics +import com.mogo.och.bridge.autopilot.line.LineManager +import com.mogo.och.bridge.autopilot.location.OchLocationManager +import com.mogo.och.bridge.device.LightAirconditionDoorManager +import com.mogo.och.bridge.device.LightAirconditionDoorStatusManager +import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager.startLoopAbnormalFactors import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager.stopLoopAbnormalFactors @@ -66,7 +67,7 @@ import com.mogo.och.common.module.manager.stopside.StopSideManager import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.utils.* import com.mogo.och.common.module.voice.VoiceNotice -import com.mogo.och.data.bean.* +import com.mogo.och.data.bean.LineInfo /** * @author: wangmingjun diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt index e69e6df9c6..89f1e717de 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt @@ -18,16 +18,15 @@ import com.mogo.och.common.module.biz.login.ILoginCallback import com.mogo.och.common.module.biz.login.LoginStatusEnum import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager.OPERATION_ROAD_SIDE_TYPE -import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager -import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation -import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener -import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager +import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager +import com.mogo.och.bridge.autopilot.autopilot.bean.ArrivedStation +import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener +import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager import com.mogo.och.common.module.manager.beautifymode.BeautifyManager import com.mogo.och.common.module.manager.stopside.OCHPlanningActionsCallback import com.mogo.och.common.module.manager.stopside.StopSideStatus import com.mogo.och.common.module.manager.stopside.StopSideManager import com.mogo.och.common.module.utils.DateTimeUtil -import mogo_msg.MogoReportMsg /** * @author: wangmingjun diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/DriverMoFangFunctionView.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/DriverMoFangFunctionView.kt index 8a8199efc0..86ee70624a 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/DriverMoFangFunctionView.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/DriverMoFangFunctionView.kt @@ -8,7 +8,7 @@ import com.magic.mogo.och.charter.R import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.och.common.module.manager.DriverMoFangFunctionManager -import com.mogo.och.common.module.manager.device.LightAirconditionDoorManager +import com.mogo.och.bridge.device.LightAirconditionDoorManager import com.mogo.och.common.module.utils.SoundPoolHelper import kotlinx.android.synthetic.main.driver_mofang_function_view.view.* diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt index 7d97a941b4..38a7776c8c 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/autopilot/AutopilotStatusViewModel.kt @@ -14,8 +14,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener -import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager +import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener +import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager import com.mogo.och.common.module.manager.beautifymode.BeautifyManager import com.mogo.och.common.module.manager.beautifymode.IBeautifyModeCallback import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/carstatus/CarStatusViewModel.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/carstatus/CarStatusViewModel.kt index 6257bd4812..af46234758 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/carstatus/CarStatusViewModel.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/view/carstatus/CarStatusViewModel.kt @@ -6,7 +6,7 @@ import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager +import com.mogo.och.bridge.autopilot.location.OchLocationManager import kotlin.math.abs class CarStatusViewModel: ViewModel(), IMoGoAutopilotStatusListener, diff --git a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml index 9e068099f2..c0e0c1341b 100644 --- a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml +++ b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml @@ -82,21 +82,21 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_71" - app:layout_constraintEnd_toEndOf="@+id/viewLimitingVelocity" + app:layout_constraintEnd_toEndOf="parent" app:layout_goneMarginEnd="40dp" app:layout_goneMarginTop="@dimen/dp_236" android:visibility="invisible" - app:layout_constraintTop_toBottomOf="@+id/viewLimitingVelocity"/> + app:layout_constraintTop_toBottomOf="@+id/ivCameraIcon"/> + android:visibility="invisible"/> @@ -197,7 +197,7 @@ android:layout_width="@dimen/dp_142" android:layout_height="@dimen/dp_142"/> - - if(logininfo.startsWith(timeText)){ - val json = logingInfoJson.replace(timeText,"" ) - val oldLoginInfo = GsonUtils.fromJson(json, DriverStatusQueryRespBean::class.java) - go2LoginInfo(oldLoginInfo,"缓存获取") + val logingInfoJson = OchSPManager.getString(loginInfoKey) + val timeText = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd) + logingInfoJson?.let {logininfo-> + if(logininfo.startsWith(timeText)){ + val json = logingInfoJson.replace(timeText,"" ) + val oldLoginInfo = GsonUtils.fromJson(json, DriverStatusQueryRespBean::class.java) + go2LoginInfo(oldLoginInfo,"缓存获取") + } } } - } OchCommonServiceManager.queryDriverServiceStatus(it, object : OchCommonServiceCallback { override fun onSuccess(data: DriverStatusQueryRespBean?) { val map: MutableMap = HashMap() diff --git a/OCH/common/bridge/.gitignore b/OCH/common/bridge/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/OCH/common/bridge/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/OCH/common/bridge/build.gradle b/OCH/common/bridge/build.gradle new file mode 100644 index 0000000000..05a72ca347 --- /dev/null +++ b/OCH/common/bridge/build.gradle @@ -0,0 +1,58 @@ +plugins { + id 'com.android.library' + id 'org.jetbrains.kotlin.android' + id 'kotlin-android-extensions' +} + +android { + compileSdkVersion rootProject.ext.android.compileSdkVersion + defaultConfig { + minSdkVersion rootProject.ext.android.minSdkVersion + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles "consumer-rules.pro" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + lintOptions { + abortOnError false + } + kotlinOptions { + jvmTarget = '1.8' + } +} + +dependencies { + + implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation rootProject.ext.dependencies.kotlinstdlib + implementation rootProject.ext.dependencies.androidxccorektx + implementation rootProject.ext.dependencies.androidxappcompat + implementation rootProject.ext.dependencies.material + implementation rootProject.ext.dependencies.rxandroid + implementation project(':libraries:mogo-adas-data') + implementation project(':core:mogo-core-data') + implementation project(':foudations:mogo-commons') + implementation project(':OCH:common:common') + implementation project(':OCH:common:data') + + implementation rootProject.ext.dependencies.amapnavi3dmap + + + if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { + implementation rootProject.ext.dependencies.mogo_core_function_call + api rootProject.ext.dependencies.mogo_core_function_map + }else { + implementation project(':core:mogo-core-function-call') + api project(':core:function-impl:mogo-core-function-map') + } +} \ No newline at end of file diff --git a/OCH/common/bridge/consumer-rules.pro b/OCH/common/bridge/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/OCH/common/bridge/proguard-rules.pro b/OCH/common/bridge/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/OCH/common/bridge/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/OCH/common/bridge/src/main/AndroidManifest.xml b/OCH/common/bridge/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..dd5f1f5088 --- /dev/null +++ b/OCH/common/bridge/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/OCHAdasAbilityManager.java b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/OCHAdasAbilityManager.java similarity index 97% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/OCHAdasAbilityManager.java rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/OCHAdasAbilityManager.java index 10135d784e..d3416461e1 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/OCHAdasAbilityManager.java +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/OCHAdasAbilityManager.java @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.autopilot; +package com.mogo.och.bridge.autopilot; import android.content.Context; @@ -14,8 +14,8 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.eagle.core.utilcode.util.ParseVersionUtils; -import com.mogo.och.common.module.callback.OchAdasStartFailureCallback; -import com.mogo.och.common.module.manager.autopilot.line.LineManager; +import com.mogo.och.bridge.autopilot.callback.OchAdasStartFailureCallback; +import com.mogo.och.bridge.autopilot.line.LineManager; import com.zhjt.mogo.adas.data.bean.AutopilotStatistics; import com.zhjt.mogo.adas.data.bean.LaunchConditionData; import com.zhjt.mogo.adas.data.bean.UnableLaunchReason; diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/IOchAutopilotStatusListener.java b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/IOchAutopilotStatusListener.java similarity index 94% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/IOchAutopilotStatusListener.java rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/IOchAutopilotStatusListener.java index 96a2161695..1f77f40952 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/IOchAutopilotStatusListener.java +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/IOchAutopilotStatusListener.java @@ -1,7 +1,7 @@ -package com.mogo.och.common.module.manager.autopilot.autopilot; +package com.mogo.och.bridge.autopilot.autopilot; import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; -import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation; +import com.mogo.och.bridge.autopilot.autopilot.bean.ArrivedStation; import com.zhjt.mogo.adas.data.AdasConstants; import mogo.telematics.pad.MessagePad; diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/IOchEventKey.java b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/IOchEventKey.java similarity index 96% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/IOchEventKey.java rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/IOchEventKey.java index b362130185..ef17c3c7c1 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/IOchEventKey.java +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/IOchEventKey.java @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.autopilot.autopilot; +package com.mogo.och.bridge.autopilot.autopilot; public interface IOchEventKey { // 无人化taxi event_key_unmanned_taxi_start_service * diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutoPilotManager.kt similarity index 90% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotManager.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutoPilotManager.kt index 2c74531658..afbffa060d 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutoPilotManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.autopilot.autopilot +package com.mogo.och.bridge.autopilot.autopilot import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters import com.mogo.eagle.core.data.config.FunctionBuildConfig @@ -8,10 +8,10 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxType import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager -import com.mogo.och.common.module.manager.autopilot.autopilot.bean.SessionWithTime -import com.mogo.och.common.module.manager.autopilot.line.LineManager -import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager +import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager +import com.mogo.och.bridge.autopilot.autopilot.bean.SessionWithTime +import com.mogo.och.bridge.autopilot.line.LineManager +import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import java.util.concurrent.atomic.AtomicReference @@ -48,7 +48,7 @@ object OchAutoPilotManager { if(sessionInfo==null){ return true }else{ - if(currentTimeMillis-sessionInfo.setTime>=OchAutopilotAnalytics.LOOP_PERIOD_16S){ + if(currentTimeMillis-sessionInfo.setTime>= OchAutopilotAnalytics.LOOP_PERIOD_16S){ clearGlobalSessionId("检测session 自带的时间 ${currentTimeMillis}_${sessionInfo.setTime}_${sessionInfo.sessionId}") return true }else{ diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt similarity index 95% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt index babef2cd6e..c84d05ca58 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.autopilot.autopilot +package com.mogo.och.bridge.autopilot.autopilot import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters import com.mogo.eagle.core.data.config.FunctionBuildConfig @@ -13,14 +13,13 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.R -import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation -import com.mogo.och.common.module.manager.autopilot.line.LineManager -import com.mogo.och.common.module.manager.autopilot.trajectory.TrajectoryManager +import com.mogo.och.bridge.autopilot.autopilot.bean.ArrivedStation +import com.mogo.och.bridge.autopilot.line.LineManager +import com.mogo.och.bridge.autopilot.trajectory.TrajectoryManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.utils.CallerBase import com.zhjt.mogo.adas.common.MessageType import com.zhjt.mogo.adas.data.AdasConstants -import com.zhjt.mogo.adas.data.bean.MogoReport import com.zhjt.mogo.adas.data.bean.ReceivedAck import com.zhjt.mogo.adas.data.bean.ReceivedAck.Status import fsm.Fsm2024 @@ -201,7 +200,7 @@ object OchAutoPilotStatusListenerManager : CallerBase() { private var autopilotId: String by Delegates.observable("") { _, oldValue, newValue -> if (oldValue != newValue) { CallerEagleBaseFunctionCall4OchManager.setOchAutopilotOrderId(newValue) + isFirstStartAutopilot = true if(!AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)&&!AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){ val (start, end) = getStations() if(start!=null&&end!=null){ @@ -164,9 +165,9 @@ object LineManager : CallerBase() { clearGlobalTrajectory(true) CallerEagleBaseFunctionCall4OchManager.updateOrderLine("") } - this._lineInfos = lineInfo + _lineInfos = lineInfo setAutopilotControlParameters() - this._lineInfos?.let { line -> + _lineInfos?.let { line -> if (ProjectUtils.isSaas()) { val sb = StringBuilder() sb.append(line.lineName) @@ -176,7 +177,7 @@ object LineManager : CallerBase() { CallerEagleBaseFunctionCall4OchManager.updateOrderLine(sb.toString()) } } - OchChainLogManager.writeChainLogAutopilot("自驾参数", "线路信息:${contraiInfo}") + OchChainLogManager.writeChainLogAutopilot("自驾参数", "线路信息:$contraiInfo") } fun getStations(): Pair { @@ -190,7 +191,7 @@ object LineManager : CallerBase() { return } } - OchChainLogManager.writeChainLog("异常情况","startStation:${startStation}__endStation:${endStation}") + OchChainLogManager.writeChainLog("异常情况","startStation:${startStation}__endStation:$endStation") } fun getStationsWithLine(function: (start: BusStationBean, end: BusStationBean, lineInfo: LineInfo) -> Unit) { @@ -204,7 +205,7 @@ object LineManager : CallerBase() { } OchChainLogManager.writeChainLog( "异常情况", - "startStation:${startStation}__endStation:${endStation}__lineInfos:${_lineInfos}" + "startStation:${startStation}__endStation:${endStation}__lineInfos:$_lineInfos" ) } @@ -221,7 +222,7 @@ object LineManager : CallerBase() { } OchChainLogManager.writeChainLog( "异常情况", - "startStation:${startStation}__endStation:${endStation}__lineInfos:${_lineInfos}__contraiInfo:${_contraiInfo}" + "startStation:${startStation}__endStation:${endStation}__lineInfos:${_lineInfos}__contraiInfo:$_contraiInfo" ) } @@ -230,7 +231,7 @@ object LineManager : CallerBase() { function.invoke(start) return } - OchChainLogManager.writeChainLog("异常情况", "startStation:${startStation}") + OchChainLogManager.writeChainLog("异常情况", "startStation:$startStation") } fun getLineInfo(function: (lineInfo: LineInfo) -> Unit){ @@ -238,7 +239,7 @@ object LineManager : CallerBase() { function.invoke(line) return } - OchChainLogManager.writeChainLog("异常情况", "lineInfos:${_lineInfos}") + OchChainLogManager.writeChainLog("异常情况", "lineInfos:$_lineInfos") } @@ -253,7 +254,7 @@ object LineManager : CallerBase() { private fun setAutopilotControlParameters(){ getStationsWithLineAndContrai { start, end, lineInfo, contrai -> - val parameters = LineManager.initAutopilotControlParameters() + val parameters = initAutopilotControlParameters() if (null == parameters) { e(M_BUS + TAG, "AutopilotControlParameters is empty.") return@getStationsWithLineAndContrai @@ -268,7 +269,7 @@ object LineManager : CallerBase() { endStationLocation.latitude = end.gcjLat endStationLocation.longitude = end.gcjLon TrajectoryAndDistanceManager.setStationPoint(startStationLocation, endStationLocation, lineInfo.lineId) - OchLocationManager.addGCJ02Listener(TAG,1,mMapLocationListener) + OchLocationManager.addGCJ02Listener(TAG,1, mMapLocationListener) // 恢复启动自驾信息 searchAutopilotState() } @@ -279,7 +280,7 @@ object LineManager : CallerBase() { private fun clearAutopilotControlParameters(){ CallerAutoPilotStatusListenerManager.updateAutopilotControlParameters(null) TrajectoryAndDistanceManager.setStationPoint(null, null, null) - this.autopilotId = "" + autopilotId = "" OchLocationManager.removeGCJ02Listener(TAG) } @@ -324,8 +325,8 @@ object LineManager : CallerBase() { parameters?.startLatLon = AutoPilotLonLat(start.lat, start.lon) parameters?.endLatLon = AutoPilotLonLat(end.lat, end.lon) parameters?.vehicleType = 10 - this.autopilotId = "${lineInfo.lineId}_${start.siteId}_${end.siteId}_${lineInfo.orderId}" - parameters?.orderId = this.autopilotId + autopilotId = "${lineInfo.lineId}_${start.siteId}_${end.siteId}_${lineInfo.orderId}" + parameters?.orderId = autopilotId parameters?.firstAutopilotFlag = isFirstStartAutopilot if (parameters?.autoPilotLine == null) { @@ -428,7 +429,7 @@ object LineManager : CallerBase() { // 启动自动驾驶 fun startAutopilot() { - if(startStation==null|| endStation==null){ + if(startStation ==null|| endStation ==null){ ToastUtils.showShort("未设置起始或终点站点") return } @@ -450,7 +451,7 @@ object LineManager : CallerBase() { OchAutopilotAnalytics.triggerClickStartAutopilotTime(System.currentTimeMillis()) //1、判断轨迹url是否可用 - if(_contraiInfo==null){ + if(_contraiInfo ==null){ ToastUtils.showLong("无发布轨迹, 请发布后重试") return }else{ @@ -462,7 +463,7 @@ object LineManager : CallerBase() { e( TAG, "isPassStartAutopilotCommand = " + FunctionBuildConfig.isPassStartAutopilotCommand - + "busRoutesResult.csvFileUrl = " + LineManager._contraiInfo!!.csvFileUrl + + "busRoutesResult.csvFileUrl = " + _contraiInfo!!.csvFileUrl ) return } @@ -501,7 +502,7 @@ object LineManager : CallerBase() { M_BUS + TAG, "行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters) + " startLatLon=" + parameters.startName + "，endLatLon=" + parameters.endName + - "isRestart = " + LineManager.isFirstStartAutopilot + "isRestart = " + isFirstStartAutopilot ) M_LISTENERS.forEach { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/location/LocationManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/location/LocationManager.kt similarity index 96% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/location/LocationManager.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/location/LocationManager.kt index 27fa0eea15..05af79168c 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/location/LocationManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/location/LocationManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.autopilot.location +package com.mogo.och.bridge.autopilot.location import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/ITrajectoryListListener.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/trajectory/ITrajectoryListListener.kt similarity index 93% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/ITrajectoryListListener.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/trajectory/ITrajectoryListListener.kt index fcea33e918..a0bd1730be 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/ITrajectoryListListener.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/trajectory/ITrajectoryListListener.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.autopilot.trajectory +package com.mogo.och.bridge.autopilot.trajectory import com.mogo.eagle.core.data.map.MogoLocation diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryCache.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/trajectory/TrajectoryCache.kt similarity index 97% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryCache.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/trajectory/TrajectoryCache.kt index 8b1528f772..f378627c4d 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryCache.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/trajectory/TrajectoryCache.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.autopilot.trajectory +package com.mogo.och.bridge.autopilot.trajectory import com.elegant.network.utils.GsonUtil import com.mogo.commons.AbsMogoApplication diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/trajectory/TrajectoryManager.kt similarity index 97% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryManager.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/trajectory/TrajectoryManager.kt index 867f77bba2..62a7d85f6b 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/trajectory/TrajectoryManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.autopilot.trajectory +package com.mogo.och.bridge.autopilot.trajectory import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.data.map.MogoLocation @@ -10,7 +10,7 @@ import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager.writeChainLog import com.mogo.och.common.module.utils.CallerBase -import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil +import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil import com.zhjt.mogo.adas.data.bean.MogoReport import mogo.telematics.pad.MessagePad @@ -57,7 +57,7 @@ object TrajectoryManager : CallerBase(),IMoGoPlanningR CallerLogger.d(SceneConstant.M_OCHCOMMON + TAG, "重复轨迹") return } - this.lineId = globalPathResp.lineId + lineId = globalPathResp.lineId } updateRoutePoints(it) } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/LightAirconditionDoorManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/LightAirconditionDoorManager.kt similarity index 92% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/LightAirconditionDoorManager.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/LightAirconditionDoorManager.kt index ddfabbd9d6..dafd3bf5d0 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/LightAirconditionDoorManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/LightAirconditionDoorManager.kt @@ -1,7 +1,7 @@ -package com.mogo.och.common.module.manager.device +package com.mogo.och.bridge.device import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager -import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager +import com.mogo.och.bridge.autopilot.location.OchLocationManager import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.wigets.toast.ToastCharterUtils import io.reactivex.disposables.Disposable diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/LightAirconditionDoorStatusManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/LightAirconditionDoorStatusManager.kt similarity index 90% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/LightAirconditionDoorStatusManager.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/LightAirconditionDoorStatusManager.kt index b5d7224342..00cd21102f 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/LightAirconditionDoorStatusManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/LightAirconditionDoorStatusManager.kt @@ -1,13 +1,13 @@ -package com.mogo.och.common.module.manager.device +package com.mogo.och.bridge.device import chassis.VehicleStateOuterClass import com.mogo.eagle.core.function.api.autopilot.IMoGoRoboBusJinlvM1StatesListener import com.mogo.eagle.core.function.call.autopilot.CallerRoboBusJinlvM1StatesListenerManager -import com.mogo.och.common.module.manager.device.callback.LightAirconditionDoorCallback -import com.mogo.och.common.module.manager.device.data.AirconditionStatus -import com.mogo.och.common.module.manager.device.data.DoorStatus -import com.mogo.och.common.module.manager.device.data.HeaterStatue -import com.mogo.och.common.module.manager.device.data.LightStatus +import com.mogo.och.bridge.device.callback.LightAirconditionDoorCallback +import com.mogo.och.bridge.device.data.AirconditionStatus +import com.mogo.och.bridge.device.data.DoorStatus +import com.mogo.och.bridge.device.data.HeaterStatue +import com.mogo.och.bridge.device.data.LightStatus import java.util.concurrent.ConcurrentHashMap object LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListener { @@ -37,8 +37,8 @@ object LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListener { listener.onLightTop1Callback(lightStatus,true) listener.onLightTop2Callback(lightStatus,true) listener.onLightAtmosphereCallback(lightStatus,true) - listener.onAirconditionStatusCallback(heaterStatue.isOpen,airconditionStatus,true) - listener.onHeaterStatusCallback(airconditionStatus.isOpen,heaterStatue,true) + listener.onAirconditionStatusCallback(heaterStatue.isOpen, airconditionStatus,true) + listener.onHeaterStatusCallback(airconditionStatus.isOpen, heaterStatue,true) } fun removeListener(tag: String) { @@ -78,7 +78,7 @@ object LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListener { M_LISTENERS.forEach { val tag = it.key val listener = it.value - listener.onAirconditionStatusCallback(heaterState.isOn,airconditionStatus,false) + listener.onAirconditionStatusCallback(heaterState.isOn, airconditionStatus,false) } } if (heaterState.isOn != heaterStatue.isOpen || @@ -89,7 +89,7 @@ object LightAirconditionDoorStatusManager : IMoGoRoboBusJinlvM1StatesListener { M_LISTENERS.forEach { val tag = it.key val listener = it.value - listener.onHeaterStatusCallback(airConditionerState.isOn,heaterStatue,false) + listener.onHeaterStatusCallback(airConditionerState.isOn, heaterStatue,false) } } if (states.frontDoorState.isOn != doorStatus.isOpen) { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/TaxiDoorStateManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/TaxiDoorStateManager.kt similarity index 88% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/TaxiDoorStateManager.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/TaxiDoorStateManager.kt index 053142e944..704ae30c48 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/TaxiDoorStateManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/TaxiDoorStateManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.device +package com.mogo.och.bridge.device import chassis.Chassis import chassis.VehicleStateOuterClass @@ -7,9 +7,9 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisDoorStateListene import com.mogo.eagle.core.function.call.base.CallerBase import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant -import com.mogo.och.common.module.manager.device.callback.DoorStateCallback -import com.mogo.och.common.module.manager.device.data.DoorPosition -import com.mogo.och.common.module.manager.device.data.DoorState +import com.mogo.och.bridge.device.callback.DoorStateCallback +import com.mogo.och.bridge.device.data.DoorPosition +import com.mogo.och.bridge.device.data.DoorState object TaxiDoorStateManager : IMoGoChassisDoorStateListener, CallerBase() { @@ -67,9 +67,14 @@ object TaxiDoorStateManager : IMoGoChassisDoorStateListener, override fun onAutopilotSingleDoorState(num: Chassis.DoorNumber, status: Int) { CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "门太变化：${num}--${status}") when (status) { - 0 -> { exchangeEnum(num, DoorState.CLOSE)} - 1 -> {exchangeEnum(num, DoorState.OPEN)} - 2 -> {exchangeEnum(num, DoorState.UNKNOWN)} + 0 -> { exchangeEnum(num, DoorState.CLOSE) + } + 1 -> { + exchangeEnum(num, DoorState.OPEN) + } + 2 -> { + exchangeEnum(num, DoorState.UNKNOWN) + } else -> {} } @@ -118,7 +123,7 @@ object TaxiDoorStateManager : IMoGoChassisDoorStateListener, * @param doorState 车门状态 */ @Synchronized - private fun invokeSingleDoorOpenState(doorPosition: DoorPosition,doorState: DoorState) { + private fun invokeSingleDoorOpenState(doorPosition: DoorPosition, doorState: DoorState) { M_LISTENERS.forEach { val listener = it.value listener.doorStateChangeCallback(doorPosition,doorState) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/callback/DoorStateCallback.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/callback/DoorStateCallback.kt similarity index 52% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/callback/DoorStateCallback.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/callback/DoorStateCallback.kt index 04e690690a..ed7f5902f6 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/callback/DoorStateCallback.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/callback/DoorStateCallback.kt @@ -1,7 +1,7 @@ -package com.mogo.och.common.module.manager.device.callback +package com.mogo.och.bridge.device.callback -import com.mogo.och.common.module.manager.device.data.DoorPosition -import com.mogo.och.common.module.manager.device.data.DoorState +import com.mogo.och.bridge.device.data.DoorPosition +import com.mogo.och.bridge.device.data.DoorState interface DoorStateCallback { @@ -15,5 +15,5 @@ interface DoorStateCallback { * @param position 车门位置 * @param state 当前车门状态 */ - fun doorStateChangeCallback(position: DoorPosition,state: DoorState){} + fun doorStateChangeCallback(position: DoorPosition, state: DoorState){} } \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/callback/LightAirconditionDoorCallback.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/callback/LightAirconditionDoorCallback.kt similarity index 63% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/callback/LightAirconditionDoorCallback.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/callback/LightAirconditionDoorCallback.kt index 54406dec6d..e7fa12c8bb 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/callback/LightAirconditionDoorCallback.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/callback/LightAirconditionDoorCallback.kt @@ -1,17 +1,17 @@ -package com.mogo.och.common.module.manager.device.callback +package com.mogo.och.bridge.device.callback -import com.mogo.och.common.module.manager.device.data.AirconditionStatus -import com.mogo.och.common.module.manager.device.data.HeaterStatue -import com.mogo.och.common.module.manager.device.data.LightStatus +import com.mogo.och.bridge.device.data.AirconditionStatus +import com.mogo.och.bridge.device.data.HeaterStatue +import com.mogo.och.bridge.device.data.LightStatus interface LightAirconditionDoorCallback { fun onAirconditionStatusCallback(heaterIsOpen: Boolean, airconditionStatus: AirconditionStatus, - isFirst: Boolean) { + isFirst: Boolean) { } fun onHeaterStatusCallback(airconditionIsOpen: Boolean, heaterStatue: HeaterStatue, - isFirst: Boolean) { + isFirst: Boolean) { } fun onDoorStatusCallback(isOpen: Boolean, isFirst: Boolean) {} diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/checkvin/CheckVinErrorDialog.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/checkvin/CheckVinErrorDialog.kt similarity index 85% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/checkvin/CheckVinErrorDialog.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/checkvin/CheckVinErrorDialog.kt index 76b3741ffc..a588f7f450 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/checkvin/CheckVinErrorDialog.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/checkvin/CheckVinErrorDialog.kt @@ -1,10 +1,10 @@ -package com.mogo.och.common.module.manager.device.checkvin +package com.mogo.och.bridge.device.checkvin import android.content.Context import androidx.lifecycle.LifecycleObserver import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog import com.mogo.eagle.core.utilcode.kotlin.onClick -import com.mogo.och.common.module.R +import com.mogo.och.bridge.R import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import kotlinx.android.synthetic.main.common_checkvin_view.actv_see @@ -19,7 +19,9 @@ class CheckVinErrorDialog(context: Context) : BaseFloatDialog(context), Lifecycl setCanceledOnTouchOutside(true) actv_see.onClick { - OchChainLogManager.writeChainLog("vinCheck","用户点击了 ”我知道了“",true,EVENT_KEY_INFO_CHECK_VIN) + OchChainLogManager.writeChainLog("vinCheck","用户点击了 ”我知道了“",true, + EVENT_KEY_INFO_CHECK_VIN + ) dismiss() } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/checkvin/CheckVinManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/checkvin/CheckVinManager.kt similarity index 88% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/checkvin/CheckVinManager.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/checkvin/CheckVinManager.kt index b2540b997b..da8b6f52c0 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/checkvin/CheckVinManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/checkvin/CheckVinManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.device.checkvin +package com.mogo.och.bridge.device.checkvin import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager @@ -16,11 +16,11 @@ object CheckVinManager : IMoGoAutopilotCarConfigListener { private val TAG = CheckVinManager::class.java.simpleName init { - BizLoopManager.setLoopFunction(TAG, LoopInfo(60*5,::checkVin,scheduler = Schedulers.io())) + BizLoopManager.setLoopFunction(TAG, LoopInfo(60*5, CheckVinManager::checkVin,scheduler = Schedulers.io())) CallerAutopilotCarConfigListenerManager.addListener(TAG,this) } - private var checkVinErrorDialog:CheckVinErrorDialog?=null + private var checkVinErrorDialog: CheckVinErrorDialog?=null override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) { checkVin() @@ -55,7 +55,7 @@ object CheckVinManager : IMoGoAutopilotCarConfigListener { val topActivity = ActivityUtils.getTopActivity() topActivity?.let { UiThreadHandler.post({ - if(checkVinErrorDialog!=null&&checkVinErrorDialog!!.isShowing){ + if(checkVinErrorDialog !=null&& checkVinErrorDialog!!.isShowing){ return@post } checkVinErrorDialog = CheckVinErrorDialog(it) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/AirconditionStatus.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/data/AirconditionStatus.kt similarity index 70% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/AirconditionStatus.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/data/AirconditionStatus.kt index 6eca247f1e..0f05cf4d6a 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/AirconditionStatus.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/data/AirconditionStatus.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.device.data +package com.mogo.och.bridge.device.data data class AirconditionStatus( var isOpen: Boolean, diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/DoorStatus.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/data/DoorStatus.kt similarity index 76% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/DoorStatus.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/data/DoorStatus.kt index 7d2c168f12..3864969cee 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/DoorStatus.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/data/DoorStatus.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.device.data +package com.mogo.och.bridge.device.data data class DoorStatus(var isOpen: Boolean) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/HeaterStatue.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/data/HeaterStatue.kt similarity index 54% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/HeaterStatue.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/data/HeaterStatue.kt index 753814fd82..7e9dc0802e 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/HeaterStatue.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/data/HeaterStatue.kt @@ -1,3 +1,3 @@ -package com.mogo.och.common.module.manager.device.data +package com.mogo.och.bridge.device.data data class HeaterStatue(var isOpen: Boolean, var windSpeed: Int) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/LightStatus.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/data/LightStatus.kt similarity index 68% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/LightStatus.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/data/LightStatus.kt index d23adad76b..c59b612345 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/data/LightStatus.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/device/data/LightStatus.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.device.data +package com.mogo.och.bridge.device.data data class LightStatus( var isOpenLight1: Boolean, diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/DistanceDegree.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/DistanceDegree.kt similarity index 96% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/DistanceDegree.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/DistanceDegree.kt index 5c335f7757..6121638ef5 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/DistanceDegree.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/DistanceDegree.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.distance +package com.mogo.och.bridge.distance data class DistanceDegree(var distance: Float, var degree: Double?, var isNext: Boolean?) : Comparable { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/IDistanceListener.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/IDistanceListener.kt similarity index 95% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/IDistanceListener.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/IDistanceListener.kt index 977db15d01..d59cf6d1eb 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/IDistanceListener.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/IDistanceListener.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.distance +package com.mogo.och.bridge.distance import com.mogo.eagle.core.data.map.MogoLocation diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/StationAndIndex.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/StationAndIndex.kt similarity index 89% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/StationAndIndex.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/StationAndIndex.kt index 3ae219b294..c6482f7dd9 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/StationAndIndex.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/StationAndIndex.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.distance +package com.mogo.och.bridge.distance import com.mogo.eagle.core.data.map.MogoLocation diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/TrajectoryAndDistanceManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/TrajectoryAndDistanceManager.kt similarity index 98% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/TrajectoryAndDistanceManager.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/TrajectoryAndDistanceManager.kt index 1a81404c10..abac76254c 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/distance/TrajectoryAndDistanceManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/distance/TrajectoryAndDistanceManager.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.manager.distance +package com.mogo.och.bridge.distance import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.data.map.MogoLocation @@ -11,12 +11,12 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.LocationUtils import com.mogo.och.common.module.constant.OchCommonConst -import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics -import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager -import com.mogo.och.common.module.manager.autopilot.trajectory.TrajectoryCache +import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics +import com.mogo.och.bridge.autopilot.location.OchLocationManager +import com.mogo.och.bridge.autopilot.trajectory.TrajectoryCache import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.manager.loop.LoopInfo -import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil +import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil import io.reactivex.schedulers.Schedulers import mogo.telematics.pad.MessagePad import java.util.concurrent.ConcurrentHashMap diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotState.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotState.kt similarity index 96% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotState.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotState.kt index 5495ba79b8..c64db1306c 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotState.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotState.kt @@ -1,25 +1,20 @@ -package com.mogo.och.common.module.wigets.autopilot +package com.mogo.och.bridge.ui.autopilot -import android.animation.Animator -import android.animation.Animator.AnimatorListener import android.animation.AnimatorSet import android.animation.ObjectAnimator -import android.animation.ValueAnimator import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater -import android.view.View import android.view.animation.LinearInterpolator import androidx.annotation.DrawableRes -import androidx.annotation.IntegerRes import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.och.common.module.R -import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener +import com.mogo.och.bridge.R +import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener import com.mogo.och.common.module.utils.BigFrameAnimatorContainer import com.mogo.och.common.module.utils.ResourcesUtils import kotlinx.android.synthetic.main.common_autopilot_view.view.aciv_autopilot_running_ani diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotStateModel.kt similarity index 73% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotStateModel.kt index 38e889137b..d3885dda79 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/autopilot/AutopilotStateModel.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/autopilot/AutopilotStateModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.wigets.autopilot +package com.mogo.och.bridge.ui.autopilot import androidx.lifecycle.ViewModel import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener @@ -6,10 +6,10 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.debug.autopilot.AutopilotStateDebug import com.mogo.och.common.module.debug.autopilot.IOchDebugAutopilotStatusListener -import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener -import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager -import com.mogo.och.common.module.manager.autopilot.line.ILineCallback -import com.mogo.och.common.module.manager.autopilot.line.LineManager +import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener +import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager +import com.mogo.och.bridge.autopilot.line.ILineCallback +import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.utils.RxUtils @@ -20,12 +20,14 @@ import java.util.concurrent.atomic.AtomicBoolean * @description BadCase录包管理页面 * @since: 2022/12/15 */ -class AutopilotStateModel : ViewModel(), IOchAutopilotStatusListener, ILineCallback, +class AutopilotStateModel : ViewModel(), + com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener, + com.mogo.och.bridge.autopilot.line.ILineCallback, IOchDebugAutopilotStatusListener { private val TAG = AutopilotStateModel::class.java.simpleName - private var viewCallback:AutopilotStateCallback?=null + private var viewCallback: AutopilotStateCallback?=null private val isPalyStartAni = AtomicBoolean(false) @@ -33,25 +35,25 @@ class AutopilotStateModel : ViewModel(), IOchAutopilotStatusListener, ILineCall override fun onCleared() { this.viewCallback = null AutopilotStateDebug.removeListener(TAG) - OchAutoPilotStatusListenerManager.removeListener(TAG) - LineManager.removeListener(TAG) + com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.removeListener(TAG) + com.mogo.och.bridge.autopilot.line.LineManager.removeListener(TAG) } - fun setViewCallback(viewCallback:AutopilotStateCallback){ + fun setViewCallback(viewCallback: AutopilotStateCallback){ this.viewCallback = viewCallback AutopilotStateDebug.addListener(TAG,this) - OchAutoPilotStatusListenerManager.addListener(TAG,this) - LineManager.addListener(TAG,this) + com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.addListener(TAG,this) + com.mogo.och.bridge.autopilot.line.LineManager.addListener(TAG,this) } override fun debugStatusChange(debugStatus: Boolean) { super.debugStatusChange(debugStatus) if(debugStatus){ - OchAutoPilotStatusListenerManager.removeListener(TAG) - LineManager.removeListener(TAG) + com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.removeListener(TAG) + com.mogo.och.bridge.autopilot.line.LineManager.removeListener(TAG) }else{ - OchAutoPilotStatusListenerManager.addListener(TAG,this) - LineManager.addListener(TAG,this) + com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.addListener(TAG,this) + com.mogo.och.bridge.autopilot.line.LineManager.addListener(TAG,this) } } @@ -98,19 +100,19 @@ class AutopilotStateModel : ViewModel(), IOchAutopilotStatusListener, ILineCall // 按照启动自驾失败计算 if(isPalyStartAni.get() && (!CallerAutoPilotControlManager.isCanStartAutopilot(false) - || OchAutoPilotStatusListenerManager.autopilotState!=IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING)){ + || com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.autopilotState!=IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING)){ OchChainLogManager.writeChainLog("自驾信息","正在起自驾过程中、自驾状态变化切为非自驾状态或者FSM 状态改为不能启动自驾") startAutopilotFail() return } BizLoopManager.runInMainThread{ - OchChainLogManager.writeChainLog("自驾信息","自驾状态:${OchAutoPilotStatusListenerManager.autopilotState} 能否启动自驾：${CallerAutoPilotControlManager.isCanStartAutopilot(false)}") - when (OchAutoPilotStatusListenerManager.autopilotState) { + OchChainLogManager.writeChainLog("自驾信息","自驾状态:${com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.autopilotState} 能否启动自驾：${CallerAutoPilotControlManager.isCanStartAutopilot(false)}") + when (com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.autopilotState) { IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE-> {// 不可用 不可启动自驾 this.viewCallback?.autopilotDisable() } IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE-> { - if (CallerAutoPilotControlManager.isCanStartAutopilot(false) && OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用 + if (CallerAutoPilotControlManager.isCanStartAutopilot(false) && com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.canStartAutopilotFromFSM) {// 不可用 this.viewCallback?.canStartAutopilot() } else {// 部分可用 this.viewCallback?.autopilotDisable() @@ -136,7 +138,7 @@ class AutopilotStateModel : ViewModel(), IOchAutopilotStatusListener, ILineCall startAutopilotFail() } }else { - LineManager.startAutopilot() + com.mogo.och.bridge.autopilot.line.LineManager.startAutopilot() } } @@ -153,7 +155,7 @@ class AutopilotStateModel : ViewModel(), IOchAutopilotStatusListener, ILineCall override fun startAutopilotTimeOut() { OchChainLogManager.writeChainLog("自驾信息","启动自驾超时失败") - if(OchAutoPilotStatusListenerManager.autopilotState == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ + if(com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.autopilotState == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ autopilotStateChange() }else { startAutopilotFail() @@ -162,7 +164,7 @@ class AutopilotStateModel : ViewModel(), IOchAutopilotStatusListener, ILineCall override fun startAutopilotFailure(startFailedCode: String?, startFailedMessage: String?) { OchChainLogManager.writeChainLog("自驾信息","底盘强制失败原因：${startFailedCode}_${startFailedMessage}") - if(OchAutoPilotStatusListenerManager.autopilotState == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ + if(com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager.autopilotState == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){ autopilotStateChange() }else { startAutopilotFail() diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/drawline/LineView.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/drawline/LineView.kt similarity index 93% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/drawline/LineView.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/drawline/LineView.kt index 7515dcdc06..51e2497617 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/drawline/LineView.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/drawline/LineView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.wigets.map.drawline +package com.mogo.och.bridge.ui.drawline import android.content.Context import android.util.AttributeSet @@ -8,8 +8,8 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.och.common.module.R -import com.mogo.och.common.module.manager.autopilot.line.LineManager +import com.mogo.och.bridge.R +import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.utils.ResourcesUtils import kotlinx.android.synthetic.main.common_line_view.view.iv_toolkit_item_head import kotlinx.android.synthetic.main.common_line_view.view.iv_toolkit_item_title diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/drawline/LineViewModel.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/drawline/LineViewModel.kt similarity index 84% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/drawline/LineViewModel.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/drawline/LineViewModel.kt index d16d17d0ae..0ae43099a4 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/drawline/LineViewModel.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/drawline/LineViewModel.kt @@ -1,10 +1,10 @@ -package com.mogo.och.common.module.wigets.map.drawline +package com.mogo.och.bridge.ui.drawline import androidx.annotation.DrawableRes import androidx.lifecycle.ViewModel import com.mogo.och.common.module.R -import com.mogo.och.common.module.manager.autopilot.line.ILineCallback -import com.mogo.och.common.module.manager.autopilot.line.LineManager +import com.mogo.och.bridge.autopilot.line.ILineCallback +import com.mogo.och.bridge.autopilot.line.LineManager class LineViewModel : ViewModel(), ILineCallback { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/IMapDirectionView.java b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/mapdirectionview/IMapDirectionView.java similarity index 84% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/IMapDirectionView.java rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/mapdirectionview/IMapDirectionView.java index 114957dd67..49d9a9d194 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/IMapDirectionView.java +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/mapdirectionview/IMapDirectionView.java @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.wigets.mapdirectionview; +package com.mogo.och.bridge.ui.mapdirectionview; /** * @author xiaoyuzhou diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/MapDirectionView.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/mapdirectionview/MapDirectionView.kt similarity index 99% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/MapDirectionView.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/mapdirectionview/MapDirectionView.kt index 42ba30dda7..bb1e6a7c93 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/MapDirectionView.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/mapdirectionview/MapDirectionView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.wigets.mapdirectionview +package com.mogo.och.bridge.ui.mapdirectionview import android.content.Context import android.os.Bundle @@ -28,7 +28,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.R -import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager +import com.mogo.och.bridge.autopilot.location.OchLocationManager import com.mogo.och.shuttle.passenger.ui.mapdirectionview.MapDirectionViewModel import me.jessyan.autosize.utils.AutoSizeUtils diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/MapDirectionViewModel.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/mapdirectionview/MapDirectionViewModel.kt similarity index 92% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/MapDirectionViewModel.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/mapdirectionview/MapDirectionViewModel.kt index e21fb838d2..07cc42d88f 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/mapdirectionview/MapDirectionViewModel.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/ui/mapdirectionview/MapDirectionViewModel.kt @@ -4,8 +4,8 @@ import androidx.lifecycle.ViewModel import com.amap.api.maps.model.LatLng import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.och.common.module.manager.distance.ITrajectoryListener -import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager +import com.mogo.och.bridge.distance.ITrajectoryListener +import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager class MapDirectionViewModel: ViewModel(), ITrajectoryListener { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/utils/CoordinateCalculateRouteUtil.kt similarity index 99% rename from OCH/common/common/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/utils/CoordinateCalculateRouteUtil.kt index dfca958168..78ac9a26e2 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/CoordinateCalculateRouteUtil.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/utils/CoordinateCalculateRouteUtil.kt @@ -1,4 +1,4 @@ -package com.mogo.och.common.module.utils +package com.mogo.och.bridge.utils import android.content.Context import android.location.Location @@ -9,7 +9,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils -import com.mogo.och.common.module.manager.distance.DistanceDegree +import com.mogo.och.bridge.distance.DistanceDegree import mogo.telematics.pad.MessagePad import java.util.TreeMap import kotlin.math.acos @@ -752,8 +752,8 @@ object CoordinateCalculateRouteUtil { // 最近点中包含上次计算的点和上次计算的最近的一个点 if(distanceMap.containsValue(preIndex)&&distanceMap.containsValue(preIndex+1)&&type==1){ - var preIndexDistance:DistanceDegree?=null - var preIndexNextDistance:DistanceDegree?=null + var preIndexDistance: com.mogo.och.bridge.distance.DistanceDegree?=null + var preIndexNextDistance: com.mogo.och.bridge.distance.DistanceDegree?=null distanceMap.iterator().forEach { en -> val key = en.key val value = en.value diff --git a/OCH/common/common/src/main/res/layout/common_autopilot_view.xml b/OCH/common/bridge/src/main/res/layout/common_autopilot_view.xml similarity index 100% rename from OCH/common/common/src/main/res/layout/common_autopilot_view.xml rename to OCH/common/bridge/src/main/res/layout/common_autopilot_view.xml diff --git a/OCH/common/common/src/main/res/layout/common_checkvin_view.xml b/OCH/common/bridge/src/main/res/layout/common_checkvin_view.xml similarity index 100% rename from OCH/common/common/src/main/res/layout/common_checkvin_view.xml rename to OCH/common/bridge/src/main/res/layout/common_checkvin_view.xml diff --git a/OCH/common/common/src/main/res/layout/common_line_view.xml b/OCH/common/bridge/src/main/res/layout/common_line_view.xml similarity index 100% rename from OCH/common/common/src/main/res/layout/common_line_view.xml rename to OCH/common/bridge/src/main/res/layout/common_line_view.xml diff --git a/OCH/common/common/build.gradle b/OCH/common/common/build.gradle index f4659eaf17..b2bf5d7a58 100644 --- a/OCH/common/common/build.gradle +++ b/OCH/common/common/build.gradle @@ -73,7 +73,6 @@ dependencies { implementation rootProject.ext.dependencies.litezxing api rootProject.ext.dependencies.flexbox - api project(":OCH:common:data") api rootProject.ext.dependencies.lottie if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { diff --git a/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt index e33aff3eed..c255209fb5 100644 --- a/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt +++ b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt @@ -33,8 +33,9 @@ import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.common.module.debug.location.MogoLocationExit -import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager -import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil +//import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager +//import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil +//import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil import com.mogo.och.common.module.view.DebugFloatWindow import com.zhjt.mogo.adas.data.bean.AutopilotStatistics import mogo.telematics.pad.MessagePad @@ -214,16 +215,16 @@ object DebugDataDispatch { } fun setStation(startLon:Double,startLat:Double,endLon:Double,endLat:Double,lineID:Long){ - if(startLon<0||startLat<0||endLon<0||endLat<0||lineID<0){ - TrajectoryAndDistanceManager.setStationPoint(null,null,-1) - } - val startLocation = MogoLocation() - startLocation.longitude = startLon - startLocation.latitude = startLat - val endLocation = MogoLocation() - endLocation.longitude = endLon - endLocation.latitude = endLat - TrajectoryAndDistanceManager.setStationPoint(startLocation,endLocation,lineID) +// if(startLon<0||startLat<0||endLon<0||endLat<0||lineID<0){ +// TrajectoryAndDistanceManager.setStationPoint(null,null,-1) +// } +// val startLocation = MogoLocation() +// startLocation.longitude = startLon +// startLocation.latitude = startLat +// val endLocation = MogoLocation() +// endLocation.longitude = endLon +// endLocation.latitude = endLat +// TrajectoryAndDistanceManager.setStationPoint(startLocation,endLocation,lineID) } fun getLocaitonByLog(path:String) { @@ -290,11 +291,11 @@ object DebugDataDispatch { val mogoSecondLocation = MogoLocation() mogoSecondLocation.latitude = list[1].latitude mogoSecondLocation.longitude = list[1].longitude - val angle = CoordinateCalculateRouteUtil.getHeadingAngle( - mogoLocation, - mogoSecondLocation - ) - mogoLocation.heading = angle +// val angle = CoordinateCalculateRouteUtil.getHeadingAngle( +// mogoLocation, +// mogoSecondLocation +// ) +// mogoLocation.heading = angle CallerChassisLocationGCJ02ListenerManager.invokeChassisLocationGCJ02( mogoLocation, diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/BusinessEnum.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/BusinessEnum.kt index 420c9bbc9c..e5661b914c 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/BusinessEnum.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/BusinessEnum.kt @@ -13,7 +13,8 @@ enum class BusinessEnum(val code: Int) { Taxi( 9), Bus( 10), Shuttle( 11), - Charter( 13),; + Charter( 13), + SCHEDULED(14); companion object { @JvmStatic diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/provider/CommonService.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/provider/CommonService.kt index db9dd2de76..742525ced1 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/provider/CommonService.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/provider/CommonService.kt @@ -4,7 +4,6 @@ import android.content.Context import android.view.View import androidx.fragment.app.Fragment import com.alibaba.android.arouter.facade.template.IProvider -import com.mogo.och.common.module.wigets.autopilot.AutopilotState interface CommonService : IProvider { @@ -20,10 +19,6 @@ interface CommonService : IProvider { fun createOchBindQRCodeView(context: Context?):View?{return null} - fun createStartAutopilotView(context: Context?):View?{ - return context?.let { - AutopilotState(it) - } - } + fun createStartAutopilotView(context: Context?):View?{return null} } \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/exception/InitException.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/exception/InitException.java new file mode 100644 index 0000000000..7703562631 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/exception/InitException.java @@ -0,0 +1,7 @@ +package com.mogo.och.common.module.exception; + +public class InitException extends RuntimeException { + public InitException(String detailMessage) { + super(detailMessage); + } +} \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/bean/SessionWithTime.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/bean/SessionWithTime.kt deleted file mode 100644 index 7a3e97167f..0000000000 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/bean/SessionWithTime.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.mogo.och.common.module.manager.autopilot.autopilot.bean - -data class SessionWithTime(val sessionId:Long,val setTime:Long) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/bean/DataBean.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/bean/DataBean.kt index bd37153d84..1f6f4e837a 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/bean/DataBean.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/socket/lan/bean/DataBean.kt @@ -145,7 +145,8 @@ enum class BusinessType { shuttle, charter, taxi, - taxiunmanned + taxiunmanned, + } enum class ProjectType { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt index 9fb386dd51..ec5618f0fc 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt @@ -152,6 +152,7 @@ object FlavorUtils { BusinessType.charter } + else -> { BusinessType.none } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/biz/OperationalInfoGatewayView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/biz/OperationalInfoGatewayView.kt index c548b06851..05224d7997 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/biz/OperationalInfoGatewayView.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/biz/OperationalInfoGatewayView.kt @@ -4,11 +4,10 @@ import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.och.common.module.R import com.mogo.och.common.module.utils.ResourcesUtils -import kotlinx.android.synthetic.main.common_line_view.view.iv_toolkit_item_head -import kotlinx.android.synthetic.main.common_line_view.view.iv_toolkit_item_title +import kotlinx.android.synthetic.main.common_biz_board.view.iv_toolkit_item_head +import kotlinx.android.synthetic.main.common_biz_board.view.iv_toolkit_item_title /** * @@ -28,7 +27,7 @@ class OperationalInfoGatewayView : ConstraintLayout { ) private fun initView() { - LayoutInflater.from(context).inflate(R.layout.common_line_view, this, true) + LayoutInflater.from(context).inflate(R.layout.common_biz_board, this, true) iv_toolkit_item_head.setImageResource(R.drawable.common_biz_operation) iv_toolkit_item_title.text = ResourcesUtils.getString(R.string.common_operation) } diff --git a/OCH/common/common/src/main/res/layout/common_biz_board.xml b/OCH/common/common/src/main/res/layout/common_biz_board.xml new file mode 100644 index 0000000000..bbbb20d3a2 --- /dev/null +++ b/OCH/common/common/src/main/res/layout/common_biz_board.xml @@ -0,0 +1,36 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt b/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt index 28081667e4..e7c57fdb16 100644 --- a/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt +++ b/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt @@ -7,7 +7,7 @@ import com.mogo.eagle.core.utilcode.util.CoordinateTransform import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.och.common.module.debug.location.MogoLocationExit -import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager +import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager import com.mogo.och.common.module.manager.socket.lan.ILanMessageListener import com.mogo.och.common.module.manager.socket.lan.LanSocketManager import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType @@ -112,7 +112,7 @@ class ExampleUnitTest { mogoLocation.latitude = 26.81621974773846 mogoLocation.longitude = 112.58256523642582 mogoLocation.heading = 54.70416759597498 - TrajectoryAndDistanceManager.distanceWithTrajectory(mutableListOf,mogoLocation) + com.mogo.och.bridge.distance.TrajectoryAndDistanceManager.distanceWithTrajectory(mutableListOf,mogoLocation) } @Test diff --git a/OCH/facade/build.gradle b/OCH/facade/build.gradle index 0094d2ec71..3daccbaaa9 100644 --- a/OCH/facade/build.gradle +++ b/OCH/facade/build.gradle @@ -60,6 +60,7 @@ dependencies { implementation rootProject.ext.dependencies.material implementation rootProject.ext.dependencies.rxandroid implementation rootProject.ext.dependencies.arouter + implementation project(':OCH:common:bridge') kapt rootProject.ext.dependencies.aroutercompiler apply from: "./script/och.gradle" diff --git a/OCH/facade/script/och.gradle b/OCH/facade/script/och.gradle index a9b2e0736e..c49beba858 100644 --- a/OCH/facade/script/och.gradle +++ b/OCH/facade/script/och.gradle @@ -26,23 +26,20 @@ project.dependencies { } else if (isCurrentPassenger("B2")) { implementation project.project(':OCH:shuttle:passenger_weaknet') } else if (isCurrentDriver("T1T2")) { -// implementation project.project(':OCH:taxi:driver') implementation project.project(':OCH:taxi:unmanned-driver') } else if (isCurrentPassenger("T1T2")) { implementation project.project(':OCH:taxi:unmanned-passenger') -// implementation project.project(':OCH:taxi:passenger') } else if (isCurrentDriver("ALL")) { implementation project.project(':OCH:offline:driver') implementation project.project(':OCH:taxi:unmanned-driver') -// implementation project.project(':OCH:taxi:driver') implementation project.project(':OCH:charter:driver') implementation project.project(':OCH:sweeper:driver') + implementation project.project(':OCH:shuttle:driver_weaknet') } else if (isCurrentPassenger("ALL")) { implementation project.project(':OCH:taxi:unmanned-passenger') -// implementation project.project(':OCH:taxi:passenger') implementation project.project(':OCH:charter:passenger') implementation project.project(':OCH:shuttle:passenger_weaknet') - implementation project.project(':OCH:shuttle:driver_weaknet') + } else { implementation project.project(':OCH:offline:driver') implementation project.project(':OCH:charter:driver') diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeDriverProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeDriverProvider.kt index eda61eeabd..861b870117 100644 --- a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeDriverProvider.kt +++ b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeDriverProvider.kt @@ -6,10 +6,10 @@ import androidx.fragment.app.FragmentActivity import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import com.mogo.och.bridge.device.checkvin.CheckVinManager import com.mogo.och.common.module.biz.lansocket.LoginLanDriverSocket import com.mogo.och.common.module.biz.login.LoginStatusEnum import com.mogo.och.common.module.biz.login.LoginStatusManager -import com.mogo.och.common.module.manager.device.checkvin.CheckVinManager import com.mogo.och.common.module.manager.socket.lan.LanSocketManager import com.mogo.och.facade.constant.FacadeConst diff --git a/OCH/offline/driver/build.gradle b/OCH/offline/driver/build.gradle index 72d90e458e..4cce5afb48 100644 --- a/OCH/offline/driver/build.gradle +++ b/OCH/offline/driver/build.gradle @@ -51,6 +51,7 @@ dependencies { implementation rootProject.ext.dependencies.kotlinstdlib implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.arouter + implementation project(':OCH:common:bridge') kapt rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.amapnavi3dmap diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ShuttleDriverProvider.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ShuttleDriverProvider.kt index 54ef442d7a..1789a93fd2 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ShuttleDriverProvider.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ShuttleDriverProvider.kt @@ -1,6 +1,7 @@ package com.mogo.och.offline import android.content.Context +import android.view.View import androidx.fragment.app.Fragment import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d @@ -8,7 +9,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.offline.fragment.ShuttleFragment import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.biz.provider.CommonServiceImpl -import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics +import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics +import com.mogo.och.bridge.ui.autopilot.AutopilotState import com.mogo.och.offline.util.BusAnalyticsManager import com.mogo.och.offline.util.OffLineTrajectoryManager @@ -42,4 +44,10 @@ class ShuttleDriverProvider : CommonServiceImpl() { busFragment = null } + override fun createStartAutopilotView(context: Context?): View? { + return context?.let { + AutopilotState(it) + } + } + } diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java index 6c4d246dc3..821ce8f786 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java @@ -20,9 +20,12 @@ import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.utilcode.util.StringUtils; -import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics; -import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager; -import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager; +import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager; +import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotManager; +import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics; +import com.mogo.och.bridge.autopilot.autopilot.bean.ArrivedStation; +import com.mogo.och.bridge.autopilot.callback.OchAdasStartFailureCallback; +import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager; import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction; import com.mogo.och.common.module.manager.socket.lan.LanSocketManager; import com.mogo.och.common.module.manager.socket.lan.LedScreenManager; @@ -36,7 +39,6 @@ import com.mogo.och.common.module.manager.socket.lan.bean.BaseDPMsg; import com.mogo.och.common.module.manager.socket.lan.bean.DPMsgType; import com.mogo.och.common.module.manager.socket.lan.bean.TaskDetailsMsg; import com.mogo.och.common.module.biz.login.LoginStatusManager; -import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation; import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager; import com.mogo.och.common.module.utils.OCHThreadPoolManager; import com.mogo.och.data.bean.BusStationBean; @@ -57,9 +59,7 @@ import com.mogo.och.offline.callback.ISlidePannelHideCallback; import com.mogo.och.offline.constant.BusConst; import com.mogo.och.offline.util.OffLineTrajectoryManager; import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager; -import com.mogo.och.common.module.callback.OchAdasStartFailureCallback; import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager; -import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager; import com.mogo.och.common.module.utils.DateTimeUtil; import com.mogo.och.common.module.utils.NumberFormatUtil; import com.mogo.och.common.module.utils.PinYinUtil; diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/presenter/BusPresenter.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/presenter/BusPresenter.java index 8cf0dcae8c..87640b5fdd 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/presenter/BusPresenter.java +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/presenter/BusPresenter.java @@ -16,10 +16,11 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; +import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager; +import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener; +import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager; +import com.mogo.och.bridge.autopilot.autopilot.bean.ArrivedStation; import com.mogo.och.common.module.biz.login.LoginStatusEnum; -import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation; -import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener; -import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager; import com.mogo.och.data.bean.BusStationBean; import com.mogo.och.offline.callback.IBusADASStatusCallback; import com.mogo.och.offline.callback.IBusControllerStatusCallback; @@ -31,13 +32,11 @@ import com.mogo.och.offline.model.OrderModel; import com.mogo.och.offline.util.OffLineTrajectoryManager; import com.mogo.och.common.module.biz.login.ILoginCallback; import com.mogo.och.common.module.biz.login.LoginStatusManager; -import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager; import java.util.ArrayList; import java.util.List; -import mogo_msg.MogoReportMsg; /** * 网约车小巴 diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/BusAnalyticsManager.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/BusAnalyticsManager.java index 227088b931..ca5882302c 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/BusAnalyticsManager.java +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/BusAnalyticsManager.java @@ -3,7 +3,8 @@ package com.mogo.och.offline.util; import androidx.annotation.NonNull; -import com.mogo.och.common.module.manager.autopilot.autopilot.IOchEventKey; +import com.mogo.och.bridge.autopilot.autopilot.IOchEventKey; + /** * OCH Bus埋点工具 diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/OffLineTrajectoryManager.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/OffLineTrajectoryManager.kt index 1beb9ab5ae..0e747b3314 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/OffLineTrajectoryManager.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/OffLineTrajectoryManager.kt @@ -6,9 +6,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.GsonUtils +import com.mogo.och.bridge.autopilot.trajectory.TrajectoryManager import com.mogo.och.common.module.biz.login.LoginStatusManager.isLogin -import com.mogo.och.common.module.manager.autopilot.trajectory.ITrajectoryListListener -import com.mogo.och.common.module.manager.autopilot.trajectory.TrajectoryManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager.writeChainLog import com.mogo.och.offline.constant.BusConst @@ -18,14 +17,13 @@ import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import io.reactivex.functions.Function import io.reactivex.schedulers.Schedulers -import mogo_msg.MogoReportMsg.MogoReportMessage import java.util.concurrent.TimeUnit /** * Bus轨迹管理：给MEC下发用于轨迹下载的信息 * Created on 2022/6/23 */ -object OffLineTrajectoryManager : ITrajectoryListListener { +object OffLineTrajectoryManager : com.mogo.och.bridge.autopilot.trajectory.ITrajectoryListListener { private var mAutoPilotLine: AutoPilotLine? = null private var mSendReqDisposable: Disposable? = null diff --git a/OCH/shuttle/driver_weaknet/build.gradle b/OCH/shuttle/driver_weaknet/build.gradle index efe2c8b90d..79b33674e6 100644 --- a/OCH/shuttle/driver_weaknet/build.gradle +++ b/OCH/shuttle/driver_weaknet/build.gradle @@ -49,6 +49,7 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation project(':OCH:common:bridge') testImplementation 'junit:junit:4.12' testImplementation project(path: ':OCH:shuttle:driver_weaknet') diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt index 702590f17b..7d344f83f4 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt @@ -10,7 +10,8 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.biz.provider.CommonServiceImpl -import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutopilotAnalytics +import com.mogo.och.bridge.autopilot.autopilot.OchAutopilotAnalytics +import com.mogo.och.bridge.ui.autopilot.AutopilotState import com.mogo.och.common.module.manager.scnner.ScannerClientManager import com.mogo.och.weaknet.repository.db.repository.EventDb import com.mogo.och.weaknet.repository.db.repository.LineDb @@ -81,4 +82,10 @@ class ShuttleDriverProvider : CommonServiceImpl() { QrOpenView(it) } } + + override fun createStartAutopilotView(context: Context?): View? { + return context?.let { + AutopilotState(it) + } + } } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt index ab37358544..a8dddaa3bb 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt @@ -3,7 +3,7 @@ package com.mogo.och.weaknet.bean.request import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.network.utils.digest.DigestUtils import com.mogo.och.common.module.biz.login.LoginStatusManager -import com.mogo.och.common.module.manager.device.checkvin.CheckVinManager +import com.mogo.och.bridge.device.checkvin.CheckVinManager import com.mogo.och.weaknet.repository.db.bean.EventDataBean import com.mogo.och.weaknet.repository.db.bean.WriteOffDataBean diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt index f3ba690a50..fc98509b6b 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/BusRoutesResponse.kt @@ -3,7 +3,7 @@ package com.mogo.och.weaknet.bean.response import com.google.gson.reflect.TypeToken import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.utilcode.util.GsonUtils -import com.mogo.och.common.module.manager.autopilot.line.LineManager +import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.data.bean.BusRoutesResult import com.mogo.och.data.bean.BusStationBean import com.mogo.och.data.bean.LineInfo diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt index 533b802664..3af5bd7be0 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt @@ -16,7 +16,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.util.NetworkUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.biz.login.LoginStatusManager -import com.mogo.och.common.module.manager.autopilot.line.LineManager +import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.manager.socket.lan.LanSocketManager diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt index ace5b743ac..f2608df7ee 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt @@ -15,12 +15,12 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.biz.login.LoginStatusManager -import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener -import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager -import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation -import com.mogo.och.common.module.manager.autopilot.line.ILineCallback -import com.mogo.och.common.module.manager.autopilot.line.LineManager -import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager +import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener +import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager +import com.mogo.och.bridge.autopilot.autopilot.bean.ArrivedStation +import com.mogo.och.bridge.autopilot.line.ILineCallback +import com.mogo.och.bridge.autopilot.line.LineManager +import com.mogo.och.bridge.autopilot.location.OchLocationManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.manager.loop.LoopInfo @@ -30,7 +30,6 @@ import com.mogo.och.common.module.manager.transform.OchTransform import com.mogo.och.common.module.manager.transform.OchTransformDispatch import com.mogo.och.common.module.map.MapMakerManager import com.mogo.och.common.module.utils.DateTimeUtil -import com.mogo.och.common.module.utils.NumberFormatUtil import com.mogo.och.common.module.utils.OCHThreadPoolManager import com.mogo.och.common.module.utils.ResourcesUtils import com.mogo.och.common.module.utils.RxUtils @@ -45,7 +44,6 @@ import io.reactivex.Observer import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers -import mogo_msg.MogoReportMsg.MogoReportMessage /** * @author congtaowang diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt index cf6986c4f7..565b11fe0a 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt @@ -6,7 +6,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.biz.login.LoginStatusManager -import com.mogo.och.common.module.manager.autopilot.line.LineManager +import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager import com.mogo.och.common.module.manager.socket.cloud.action.OperateAction diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt index ff3893c434..e1545ef967 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt @@ -12,7 +12,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P -import com.mogo.och.common.module.manager.autopilot.line.LineManager +import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.manager.loop.LoopInfo diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/ContrailDataBean.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/ContrailDataBean.kt index 449fba737f..a783e16c4b 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/ContrailDataBean.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/ContrailDataBean.kt @@ -3,11 +3,6 @@ package com.mogo.och.weaknet.repository.db.bean import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey -import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager -import com.mogo.och.common.module.manager.autopilot.line.LineManager -import com.mogo.och.data.bean.ContraiInfo -import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager /** * 启动自驾使用的轨迹信息 diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt index 627b6f9352..163a8efc6b 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/NormalRepository.kt @@ -7,7 +7,7 @@ import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.och.common.module.manager.autopilot.line.LineManager +import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.data.bean.BusStationBean diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt index 8701bd166e..22a12c6f2d 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt @@ -10,7 +10,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS import com.mogo.eagle.core.utilcode.util.ToastUtils -import com.mogo.och.common.module.manager.autopilot.line.LineManager +import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.data.bean.ContraiInfo diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffCacheRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffCacheRepository.kt index 51fefe31db..5538b88616 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffCacheRepository.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffCacheRepository.kt @@ -8,7 +8,7 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.och.common.module.biz.login.LoginStatusManager -import com.mogo.och.common.module.manager.autopilot.line.LineManager +import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.manager.cache.OchSPManager import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffDetialMsg import com.mogo.och.common.module.utils.DateTimeUtil diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/BusPresenter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/BusPresenter.kt index 1624907f38..bd838c4d82 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/BusPresenter.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/BusPresenter.kt @@ -4,19 +4,14 @@ import androidx.lifecycle.LifecycleOwner import com.mogo.commons.AbsMogoApplication import com.mogo.commons.mvp.Presenter import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.common.module.biz.login.ILoginCallback import com.mogo.och.common.module.biz.login.LoginStatusEnum import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.common.module.biz.login.LoginStatusManager.isLogin -import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager -import com.mogo.och.common.module.manager.autopilot.autopilot.bean.ArrivedStation -import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener -import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager +import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager import com.mogo.och.weaknet.model.OrderModel import com.mogo.och.weaknet.util.BusTrajectoryManager -import mogo_msg.MogoReportMsg.MogoReportMessage /** * 网约车小巴 diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt index 803b201105..48e6a156bb 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt @@ -14,7 +14,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListener import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d -import com.mogo.och.common.module.wigets.map.drawline.LineView +import com.mogo.och.bridge.ui.drawline.LineView import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.repository.RepositoryManager import com.mogo.och.weaknet.ui.taskrunned.RunningTaskManager diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt index edf9b193e7..56f0b10cb6 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt @@ -6,11 +6,9 @@ import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner -import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.util.ActivityUtils -import com.mogo.och.common.module.manager.autopilot.line.LineManager +import com.mogo.och.bridge.autopilot.line.LineManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.utils.ResourcesUtils import com.mogo.och.common.module.wigets.dialog.CommonDialogStatus diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusAnalyticsManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusAnalyticsManager.kt index 9181f1468c..abc1c5fac0 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusAnalyticsManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusAnalyticsManager.kt @@ -1,6 +1,6 @@ package com.mogo.och.weaknet.util -import com.mogo.och.common.module.manager.autopilot.autopilot.IOchEventKey +import com.mogo.och.bridge.autopilot.autopilot.IOchEventKey /** diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt index d0159b732b..87f6c69d8e 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt @@ -7,24 +7,22 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.och.common.module.biz.login.LoginStatusManager.isLogin -import com.mogo.och.common.module.manager.autopilot.line.LineManager.contraiInfo -import com.mogo.och.common.module.manager.autopilot.line.LineManager.initAutopilotControlParameters -import com.mogo.och.common.module.manager.autopilot.line.LineManager.lineInfos -import com.mogo.och.common.module.manager.autopilot.trajectory.ITrajectoryListListener -import com.mogo.och.common.module.manager.autopilot.trajectory.TrajectoryManager +import com.mogo.och.bridge.autopilot.line.LineManager.contraiInfo +import com.mogo.och.bridge.autopilot.line.LineManager.initAutopilotControlParameters +import com.mogo.och.bridge.autopilot.line.LineManager.lineInfos +import com.mogo.och.bridge.autopilot.trajectory.ITrajectoryListListener +import com.mogo.och.bridge.autopilot.trajectory.TrajectoryManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager.writeChainLog import com.mogo.och.weaknet.constant.BusConst import com.mogo.och.weaknet.model.LineModel.currentTask import com.mogo.och.weaknet.model.LineModel.startStationIndex import com.mogo.och.weaknet.model.OrderModel.isGoingToNextStation -import com.zhjt.mogo.adas.data.bean.MogoReport import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import io.reactivex.functions.Function import io.reactivex.schedulers.Schedulers -import mogo_msg.MogoReportMsg.MogoReportMessage import java.util.concurrent.TimeUnit /** diff --git a/OCH/shuttle/passenger_weaknet/build.gradle b/OCH/shuttle/passenger_weaknet/build.gradle index 6e34a57ef0..6de3388d2b 100644 --- a/OCH/shuttle/passenger_weaknet/build.gradle +++ b/OCH/shuttle/passenger_weaknet/build.gradle @@ -67,6 +67,8 @@ dependencies { implementation rootProject.ext.dependencies.arouter implementation rootProject.ext.dependencies.androidxrecyclerview implementation rootProject.ext.dependencies.material + implementation project(':OCH:common:data') + implementation project(':OCH:common:bridge') kapt rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.rxandroid implementation rootProject.ext.dependencies.androidxconstraintlayout diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/ShuttlePassengerProvider.kt b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/ShuttlePassengerProvider.kt index dec8f5e354..8e36cd5534 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/ShuttlePassengerProvider.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/ShuttlePassengerProvider.kt @@ -9,6 +9,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.DeviceUtils import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils +import com.mogo.och.bridge.ui.autopilot.AutopilotState import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.biz.provider.CommonServiceImpl import com.mogo.och.common.module.voice.OutOffVoice @@ -72,4 +73,8 @@ class ShuttlePassengerProvider : CommonServiceImpl() { mPM2Fragment = null } + override fun createStartAutopilotView(context: Context?): View? { + return null + } + } \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt index a2473d8c4c..17695f2988 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt @@ -19,11 +19,11 @@ import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.och.common.module.biz.lansocket.IOchLanPassengerStatusListener import com.mogo.och.common.module.biz.lansocket.LoginLanPassengerSocket import com.mogo.och.common.module.biz.media.MediaManager -import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener -import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager -import com.mogo.och.common.module.manager.autopilot.location.OchLocationManager -import com.mogo.och.common.module.manager.distance.IDistanceListener -import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager +import com.mogo.och.bridge.autopilot.autopilot.IOchAutopilotStatusListener +import com.mogo.och.bridge.autopilot.autopilot.OchAutoPilotStatusListenerManager +import com.mogo.och.bridge.autopilot.location.OchLocationManager +import com.mogo.och.bridge.distance.IDistanceListener +import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager import com.mogo.och.common.module.manager.download.DownloadManager import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager import com.mogo.och.common.module.manager.socket.lan.ILanMessageListener diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java index 339a416291..171ccfc774 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java @@ -28,7 +28,7 @@ import com.mogo.och.shuttle.weaknet.passenger.R; import com.mogo.och.shuttle.weaknet.passenger.ui.adapter.BusPassengerLineStationsAdapter; import com.mogo.och.shuttle.weaknet.passenger.presenter.BaseBusPassengerPresenter; import com.mogo.och.shuttle.weaknet.passenger.ui.layoutmanager.CenterLayoutManager; -import com.mogo.och.common.module.wigets.mapdirectionview.MapDirectionView; +import com.mogo.och.bridge.ui.mapdirectionview.MapDirectionView; import com.mogo.och.common.module.utils.NumberFormatUtil; import com.mogo.och.common.module.wigets.MarqueeTextView; import com.mogo.och.common.module.wigets.OCHGradientTextView; diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_route_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_route_fragment.xml index 73c2306227..5a6800f3b2 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_route_fragment.xml +++ b/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_route_fragment.xml @@ -265,7 +265,7 @@ -