Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge

# Conflicts:
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt

core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt

@@ -97,8 +97,8 @@ class MoGoAutopilotProvider :
             0x01 -> // 乘客
             {
                 // 乘客端默认接收绘制全局路径+引导线
-                FunctionBuildConfig.isDemoMode = true
-                FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true
+                //FunctionBuildConfig.isDemoMode = true
+                //FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true
                 // "192.168.1.102"
                 val options = AdasOptions.Builder().build()
                 AdasManager.getInstance().create(context, options)
@@ -302,4 +302,17 @@ class MoGoAutopilotProvider :
             AdasManager.getInstance().disableDemoMode()
         }
     }
+
+    /**
+     * 办公室调试使用，强制开启自动驾驶，将 status，pilotmode，control_pilotmode，强追设置为 1
+     * isEnable = true  开启
+     * isEnable = false 关闭
+     */
+    override fun setControlAutopilotCarAuto(isEnable: Boolean) {
+        if (isEnable) {
+            AdasManager.getInstance().controlAutopilotCarAuto()
+        } else {
+            AdasManager.getInstance().controlAutopilotCarHead()
+        }
+    }
 }

core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java

@@ -366,9 +366,16 @@ public class MoGoAdasListenerImpl implements OnAdasListener {
         }
     }
 
-
+    /**
+     * 命令返回结果
+     * @param info 结果返回实体
+     */
     @Override
     public void onSSHResult(SSHResult info) {
-
+        if(info!=null && "docker restart autocar_default_1".equals(info.cmd)){
+            CallerHmiManager.INSTANCE.showDockerRebootResult(info.code, info.msg);
+        }else{
+            Logger.d(TAG,"onSSHResult : result info is null");
+        }
     }
 }

core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt

@@ -1,8 +1,11 @@
 package com.mogo.eagle.core.function.autopilot.adapter
 
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.commons.debug.DebugConfig
+import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
+import com.mogo.eagle.core.data.constants.MoGoConfig
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.autopilot.network.AdasServiceModel
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
@@ -78,7 +81,10 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasMsgConnectStatusListener, IMo
     private fun syncBasicInfoToAutopilot() {
         Logger.d(TAG, "同步PAD的SN给工控机……")
         val info = BasicInfo()
+        // 设置PAD-SN给工控
         info.setSn(MoGoAiCloudClientConfig.getInstance().sn)
+        // 设置网络环境
+        info.setNetEnvironment(DebugConfig.getNetMode())
         AdasManager.getInstance().setBasicInfo(info)
     }