Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_2110_220915_2.11.0' into dev_robotaxi-d-app-module_2110_220915_2.11.0

2022-09-23 12:56:51 +08:00
parent eba9d60df0 1a50a2911b
commit 7eb429e878
8 changed files with 39 additions and 59 deletions
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
@@ -1,8 +1,5 @@
 package com.mogo.och.bus.model;

-import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_OCH_BUS_START_AUTOPILOT;
-import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_ADAS;
-import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT;
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
 import static com.mogo.och.bus.constant.BusConst.STATION_STATUS_ARRIVING;
 import static com.mogo.och.bus.constant.BusConst.STATION_STATUS_STOPPED;
@@ -528,16 +525,7 @@ public class BusOrderModel {
     * 服务端返回的OchBusRoutesResult逻辑， 离开站为当前站， 到达下一站后才会将下一站置为当前站，
     * 车机端展示是离开当前站，下一站设置为当前站， 所以服务端数据回来要做处理，不能直接渲染
     */
-//    @ChainLog(
-//            linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
-//            linkCode = CHAIN_LINK_ADAS,
-//            endpoint = TracingConstants.Endpoint.PAD,
-//            nodeAliasCode = CHAIN_ALIAS_CODE_OCH_BUS_START_AUTOPILOT,
-//            paramIndexes = {0},
-//            clientPkFileName = "sn"
-//    )
    private void leaveStationSuccess(boolean isRestart) {
-
        //开启自动驾驶 2.10.0: 如果自动驾驶状态下开启， 非自动驾驶状态下不开启，需手动点击自动驾驶按钮开启
        if (isRestart || CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()
                == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
@@ -1,12 +1,12 @@
 package com.mogo.och.taxi.ui;

+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI;
 import static com.mogo.och.taxi.constant.TaxiConst.TIMER_START_AUTOPILOT_INTERVAL;

 import android.animation.ObjectAnimator;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.animation.LinearInterpolator;
@@ -34,6 +34,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListener
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.map.CallerSmpManager;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.MogoMapUIController;
@@ -208,7 +209,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V

                    }
                } finally {
-                    Log.d("XXXX", "cost:" + (SystemClock.elapsedRealtime() - start));
+                    CallerLogger.INSTANCE.d(M_TAXI + TAG, "cost:" + (SystemClock.elapsedRealtime() - start));
                }

            }
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
@@ -2,7 +2,6 @@ package com.mogo.eagle.core.function.autopilot

 import android.Manifest.permission
 import android.content.Context
-import android.util.Log
 import androidx.annotation.RequiresPermission
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
@@ -28,7 +27,6 @@ import com.mogo.eagle.core.function.autopilot.adapter.MoGoHandAdasMsgManager
 import com.mogo.eagle.core.function.autopilot.server.AsyncDataToAutopilotServer
 import com.mogo.eagle.core.function.autopilot.telematic.IMsgHandler
 import com.mogo.eagle.core.function.autopilot.telematic.TeleMsgHandler
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager
 import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager
 import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager
@@ -590,7 +588,6 @@ class MoGoAutopilotProvider :
    }

    override fun sendStatusQueryReq() {
-        Log.d(TAG, "---- sendStatusQueryReq ----")
        AdasManager.getInstance().sendStatusQueryReq()
    }
 }
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt
@@ -311,7 +311,6 @@ class MoGoAdasListenerImpl : OnAdasListener {
            header: MessagePad.Header,
            carConfigResp: MessagePad.CarConfigResp?
    ) {
-        Log.d("Upgrade", "isMapLoaded = " + HdMapBuildConfig.isMapLoaded + "___carConfigResp = " + carConfigResp)
        if (HdMapBuildConfig.isMapLoaded && carConfigResp != null) {
            AppConfigInfo.plateNumber = carConfigResp.plateNumber//车牌号
            AppConfigInfo.iPCMacAddress = carConfigResp.macAddress//工控机MAC地址
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
@@ -2,9 +2,9 @@ package com.mogo.eagle.core.function.autopilot.adapter;

 import android.content.Context;
 import android.text.TextUtils;
-import android.util.Log;

 import androidx.annotation.Nullable;
+
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.constants.MoGoConfig;
@@ -19,8 +19,6 @@ import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
-import com.zhidao.support.adas.high.AdasManager;

 import org.jetbrains.annotations.NotNull;

@@ -68,7 +66,7 @@ public class MoGoHandAdasMsgManager implements
            public void run() {
                CallerAutoPilotManager.INSTANCE.getCarConfig();
            }
-        },0);
+        }, 0);
    }

    private int setTurnLightState(int turn_light) {
@@ -117,7 +115,6 @@ public class MoGoHandAdasMsgManager implements
    @Override
    public void onAutopilotCarConfig(@NotNull MessagePad.CarConfigResp carConfigResp) {
        if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) {
-            Log.d("Upgrade", "onAutopilotCarConfig carConfigResp.getMacAddress() = " + carConfigResp.getMacAddress());
            CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress(), MoGoAiCloudClientConfig.getInstance().getSn());
        }
    }
--- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java
+++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java
@@ -1,7 +1,6 @@
 package com.mogo.eagle.core.function.bindingcar;

 import android.content.Context;
-import android.util.Log;

 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
@@ -58,7 +57,6 @@ public class BindingcarProvider implements IMoGoBindingcarProvider {
     */
    @Override
    public void getBindingcarInfo(String macAddress, String widevineIDWithMd5) {
-        Log.d("Upgrade", "getBindingcarInfo mAddress = " + macAddress + "--widevineIDWithMd5 = " + widevineIDWithMd5);
        mAddress = macAddress;
        mWidevineIDWithMd5 = widevineIDWithMd5;
        if (getScreenType() == 1) { //司机屏
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
@@ -45,6 +45,7 @@ import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
 import com.mogo.eagle.core.data.report.ReportEntity
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener.Companion.STATUS_AUTOPILOT_RUNNING
 import com.mogo.eagle.core.function.api.hmi.IMoGoHmiViewProxy
 import com.mogo.eagle.core.function.api.hmi.IMoGoHmiViewProxy.IViewNotificationProvider
 import com.mogo.eagle.core.function.api.hmi.view.IOchBusView
@@ -55,6 +56,7 @@ import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager
 import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager
 import com.mogo.eagle.core.function.call.check.CallerCheckManager
@@ -588,9 +590,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
     */
    override fun toggleDebugView() {
        CallerLogger.d("$M_HMI$TAG", "长按显示状态工具栏")
-        Log.i("DebugViewSwitchLog", "长按显示状态工具栏")
        activity?.let {
-            Log.i("DebugViewSwitchLog", "activity 不为null")
            if (mDebugSettingViewFloat != null) {
                WarningFloat.dismiss(mDebugSettingViewFloat!!.config.floatTag, false)
                mDebugSettingViewFloat = null
@@ -599,10 +599,8 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
                reportListFloatWindow?.hideFloatWindow()
                reportListFloatWindow = null
            } else {
-                Log.i("DebugViewSwitchLog", "打开调试窗")
                if (mDebugSettingView == null) {
                    mDebugSettingView = DebugSettingView(it)
-                    Log.i("DebugViewSwitchLog", "new DebugSettingView")
                    mDebugSettingView?.reportInit(reportList)
                    mDebugSettingView?.setClickListener(object : DebugSettingView.ClickListener {
                        override fun showReportListWindow(show: Boolean) {
@@ -618,7 +616,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
                        }
                    })
                    if (mDebugSettingView != null) {
-                        Log.i("DebugViewSwitchLog", "new DebugSettingView success")
+                        CallerLogger.d("$M_HMI$TAG", "new DebugSettingView success")
                    }
                }
                var side = SidePattern.RIGHT
@@ -692,7 +690,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
            val content = mViewNotificationProvider?.getNotificationView() ?: return
            content.setWarningIcon(EventTypeEnum.getWarningIcon(v2xType))
            content.setWarningContent(warningContent)
-            Log.d(
+            CallerLogger.d(
                "$M_HMI$TAG",
                "--- show v2x dialog 1 ---: info -> v2x-type: $v2xType : expireTime: $expireTime"
            )
@@ -728,7 +726,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
                    override fun show() {
                        val parent = it.window.decorView
                        parent.doOnAttach {
-                            Log.d(
+                            CallerLogger.d(
                                "$M_HMI$TAG",
                                "--- show v2x dialog 2 ---: info -> v2x-type: $v2xType : expireTime: $expireTime"
                            )
@@ -807,7 +805,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
        activity?.let {
            WarningFloat.dismiss(tag)
        }
-        Log.d("$M_HMI$TAG", "--- disableWarningV2X ---")
+        CallerLogger.d("$M_HMI$TAG", "--- disableWarningV2X ---")
        lifecycleScope.launch {
            showingV2XTip?.takeIf { it.isShowing() }?.also { it.hide() }
        }
@@ -894,7 +892,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
     * @see WarningDirectionEnum
     */
    override fun showWarning(direction: WarningDirectionEnum) {
-        Log.d(TAG, "showWarning====")
+        CallerLogger.d(TAG, "showWarning====")
        flV2XWarningView?.showWarning(direction)
        flicker(flV2XWarningView)
    }
@@ -904,10 +902,10 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
     */
    fun flicker(view: View) {
        val alphaAnimation = AlphaAnimation(0f, 0.88f)
-        alphaAnimation.setDuration(600)
-        alphaAnimation.setInterpolator(LinearInterpolator())
-        alphaAnimation.setRepeatCount(Animation.INFINITE)
-        alphaAnimation.setRepeatMode(Animation.REVERSE)
+        alphaAnimation.duration = 600
+        alphaAnimation.interpolator = LinearInterpolator()
+        alphaAnimation.repeatCount = Animation.INFINITE
+        alphaAnimation.repeatMode = Animation.REVERSE
        view.startAnimation(alphaAnimation)
    }

@@ -1394,10 +1392,10 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
                )
                reportListFloatWindow?.refreshData(reportList)

-                if(FunctionBuildConfig.isDemoMode){
+                if (FunctionBuildConfig.isDemoMode) {
                    return@let
                }
-                if(takeOver){
+                if (takeOver) {
                    return@let
                }
                when (it.code) {
@@ -1405,25 +1403,28 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
                    EXIT_AUTOPILOT_FOR_LOCATION,
                    EXIT_AUTOPILOT_FOR_CHASSIS,
                    EXIT_AUTOPILOT_FOR_DISTANCE -> {
-                        showWarningV2X(
-                            EventTypeEnum.TAKE_OVER_EVENT.poiType,
-                            EventTypeEnum.TAKE_OVER_EVENT.content,
-                            EventTypeEnum.TAKE_OVER_EVENT.tts,
-                            EventTypeEnum.TAKE_OVER_EVENT.poiType,
-                            object : IMoGoWarningStatusListener {
-                                override fun onShow() {
-                                    takeOver = true
-                                    clTakeOverView.visibility = View.VISIBLE
-                                }
+                        if (FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData
+                            && getAutoPilotStatusInfo().state != STATUS_AUTOPILOT_RUNNING) {
+                            showWarningV2X(
+                                EventTypeEnum.TAKE_OVER_EVENT.poiType,
+                                EventTypeEnum.TAKE_OVER_EVENT.content,
+                                EventTypeEnum.TAKE_OVER_EVENT.tts,
+                                EventTypeEnum.TAKE_OVER_EVENT.poiType,
+                                object : IMoGoWarningStatusListener {
+                                    override fun onShow() {
+                                        takeOver = true
+                                        clTakeOverView.visibility = View.VISIBLE
+                                    }

-                                override fun onDismiss() {
-                                    takeOver = false
-                                    clTakeOverView.visibility = View.GONE
-                                }
-                            },
-                            true,
-                            6000L
-                        )
+                                    override fun onDismiss() {
+                                        takeOver = false
+                                        clTakeOverView.visibility = View.GONE
+                                    }
+                                },
+                                true,
+                                6000L
+                            )
+                        }
                    }
                }
            }
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt
@@ -66,7 +66,6 @@ class ChainConstant {
        const val CHAIN_ALIAS_CODE_START_UP = "CHAIN_ALIAS_CODE_START_UP"

        //operation by user
-        const val CHAIN_ALIAS_CODE_OCH_BUS_START_AUTOPILOT = "CHAIN_ALIAS_CODE_OCH_BUS_START_AUTOPILOT"
        const val CHAIN_ALIAS_CODE_OCH_TAXI_START_AUTOPILOT = "CHAIN_ALIAS_CODE_OCH_TAXI_START_AUTOPILOT"
        const val CHAIN_ALIAS_CODE_EAGLE_START_AUTOPILOT = "CHAIN_ALIAS_CODE_EAGLE_START_AUTOPILOT"
        const val CHAIN_ALIAS_CODE_EAGLE_START_AUTOPILOT_RESULT = "CHAIN_ALIAS_CODE_EAGLE_START_AUTOPILOT_RESULT"