Merge branch 'dev_robotaxi-d_230711_3.4.0' into dev_20230708_unmanned_3.5.0

OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt

@@ -155,7 +155,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
         super.onWindowFocusChanged(hasWindowFocus)
         if(isIfCurrentIsFullscreen&&smalllPlayer!=null){
             if(hasWindowFocus){//获取焦点
-                onVideoResume()
+                //onVideoResume()
             }else{
                 onVideoPause()
             }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt

@@ -127,10 +127,10 @@ class DevaToolsProvider : IDevaToolsProvider {
             logRecordProvider.start()
         }
 
-        mContext?.also {
-            block.init(it)
-            block.start()
-        }
+//        mContext?.also {
+//            block.init(it)
+//            block.start()
+//        }
     }
 
     override fun checkMonitorDb() {

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt

@@ -109,8 +109,6 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener {
         traceInfoCache[ChainConstant.CHAIN_TYPE_WEAK_NETWORK] =
             ChainLogParam(true, "WeakNetWork Record")
 
-        MoGoAiCloudClientConfig.getInstance()
-
         FileWriteManager.getInstance()
             .init(context, "", pkgName, fwBuildMap)
         FileWriteManager.getInstance().registerListener { type ->

core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/secret/PassPortSecret.java

@@ -1,7 +1,6 @@
 package com.mogo.eagle.core.function.startup.stageone.secret;
 
-import android.util.Base64;
-
+import com.elegant.analytics.utils.Base64;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;