merge

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

@@ -6,7 +6,6 @@ import android.util.Log
 import androidx.annotation.RequiresPermission
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
-import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
 import com.mogo.eagle.core.data.autopilot.toAutoPilotLine
 import com.mogo.eagle.core.data.autopilot.toRouteInfo
@@ -29,6 +28,7 @@ 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
@@ -51,9 +51,7 @@ import com.zhidao.support.adas.high.OnMultiDeviceListener
 import com.zhidao.support.adas.high.common.Constants
 import com.zhidao.support.adas.high.common.Constants.IPC_CONNECTION_STATUS
 import com.zhidao.support.adas.high.common.CupidLogUtils
-import com.zhidao.support.adas.high.common.MessageType
 import com.zhidao.support.adas.high.common.MogoReport
-import com.zhidao.support.adas.high.subscribe.SubscribeInterfaceOptions
 import com.zhjt.service.chain.ChainLog
 import com.zhjt.service.chain.TracingConstants
 import io.netty.channel.Channel

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

@@ -1,6 +1,7 @@
 package com.mogo.eagle.core.function.autopilot.adapter
 
 import android.location.Location
+import android.util.Log
 import chassis.VehicleStateOuterClass
 import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
@@ -310,6 +311,7 @@ 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地址

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

@@ -5,13 +5,13 @@ 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;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarStateListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotVehicleStateListener;
+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.autopilot.CallerAutopilotCarStatusListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager;
@@ -19,6 +19,8 @@ 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;
 
@@ -60,6 +62,15 @@ public class MoGoHandAdasMsgManager implements
     private int brakeLight = -1;
 
 
+    public void getConfig() {
+        com.elegant.utils.UiThreadHandler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                CallerAutoPilotManager.INSTANCE.getCarConfig();
+            }
+        },0);
+    }
+
     private int setTurnLightState(int turn_light) {
         if (turn_light == 0) {
             if (isOnTurnLight) {
@@ -106,6 +117,7 @@ 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());
         }
     }
@@ -166,4 +178,5 @@ public class MoGoHandAdasMsgManager implements
     public void onAutopilotBrake(float brake) {
 
     }
+
 }

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

@@ -73,7 +73,6 @@ class TeleMsgHandler : IMsgHandler {
                             TextFormat.printer().escapingNonAscii(false).printToString(carConfig)
                         }"
                     )
-//                    Log.d("liyz", "TeleMsgHandler macAddress = " + carConfig.macAddress)
                     CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(
                         carConfig.macAddress,
                         MoGoAiCloudClientConfig.getInstance().sn

core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java

@@ -59,12 +59,11 @@ public class UpgradeAppNetWorkManager {
      * 获取app升级信息
      */
     public void getAppUpgradeInfo(Context context, String mac, String screenType) {
-        String sn = "X20202203105S688HZ";
+//        String sn = "X20202203105S688HZ";
 //        String mac = "48:b0:2d:3a:bc:78";
-//        String sn = MoGoAiCloudClientConfig.getInstance().getSn();
+        String sn = MoGoAiCloudClientConfig.getInstance().getSn();
         int versionCode = AppUtils.getAppVersionCode();
-
-        //TODO 不能写死
+        Log.d("Upgrade", "mac = " + mac + "---type = " + screenType + "---sn = " + sn );
         UpgradeAppRequest request = new UpgradeAppRequest(sn, mac, screenType);
         RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
         mUpgradeApiService.getUpgradeInfo(requestBody)
@@ -81,7 +80,7 @@ public class UpgradeAppNetWorkManager {
                             CallerLogger.INSTANCE.d(TAG, "UpgradeAppInfo url = " + info.result.getAppUrl() + "----code = " + info.result.getVersionCode());
                             Log.d(TAG, "UpgradeAppInfo url = " + info.result.getAppUrl() + "----code = " + info.result.getVersionCode() + "--versionCode =" + versionCode + "--info.result = " + info.result);
                             if (info.result.getVersionCode() > versionCode) {
-                                CallerHmiManager.INSTANCE.showUpgradeDialog(info.result.getAppUrl().substring(info.result.getAppUrl().lastIndexOf("/")+1), info.result.getAppUrl());
+                                CallerHmiManager.INSTANCE.showUpgradeDialog(info.result.getAppUrl().substring(info.result.getAppUrl().lastIndexOf("/")+1), info.result.getAppUrl(), info.result.getInstallTitle(), info.result.getInstallContent());
                             }
                         } else {
                             Log.e(TAG, "onNext info == null");

core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java

@@ -11,6 +11,7 @@ import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack;
 import com.mogo.eagle.core.function.api.bindingcar.IMoGoBindingcarProvider;
 import com.mogo.eagle.core.function.appupgrade.network.UpgradeAppNetWorkManager;
 import com.mogo.eagle.core.function.bindingcar.network.BindingcarNetWorkManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
 import com.mogo.eagle.core.function.ipcupgrade.IPCUpgradeManager;
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
@@ -57,6 +58,7 @@ 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) { //司机屏
@@ -172,7 +174,6 @@ public class BindingcarProvider implements IMoGoBindingcarProvider {
      */
     @Override
     public void queryAppUpgrade() {
-        Log.d("Upgrade", "mac = " + mAddress + "---type = " + getCarScreenType() );
         UpgradeAppNetWorkManager.getInstance().getAppUpgradeInfo(mContext, mAddress, getCarScreenType());
     }
 

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

@@ -77,7 +77,6 @@ class UpgradeManager : IDownload {
         if (downloadUrl != null) {
             AppUtils.installApp(Config.downLoadPath + downloadUrl.substring(downloadUrl.lastIndexOf("/") + 1))
         }
-
         findKey(downloadUrl) {
             CallerDevaToolsUpgradeListenerManager.invokeUpgradeFinish(it)
         }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt

@@ -1306,11 +1306,11 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
     /**
      * 升级app弹框
      */
-    override fun showUpgradeDialog(name: String, url: String) {
+    override fun showUpgradeDialog(name: String, url: String, title: String, content: String) {
         if (upgradeAppDialog == null) {
             upgradeAppDialog = UpgradeAppDialog(requireContext())
         }
-        upgradeAppDialog!!.showUpgradeAppDialog(name, url)
+        upgradeAppDialog!!.showUpgradeAppDialog(name, url, title, content)
     }
 
     /**

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/UpgradeAppDialog.kt

@@ -21,20 +21,17 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb
     private val TAG = "UpgradeAppDialog"
     private var confirmTv: TextView? = null
     private var cancleTv: TextView? = null
+    private var upgradeTitleTv: TextView? = null
+    private var upgradeContentTv: TextView? = null
     private var tag: String? = null
     private var downloarUrl: String? = null
 
-    private var mServiceApis: IMogoServiceApis? = null
-    private val statusChangedListenerForCheckNotice = IMogoStatusChangedListener { descriptor, isTrue ->
-        if (descriptor == StatusDescriptor.MAIN_PAGE_IS_BACKGROUND) {
-            dismiss()
-        }
-    }
-
     init {
         setContentView(R.layout.dialog_upgrade_app)
         setCanceledOnTouchOutside(true)
 
+        upgradeTitleTv = findViewById(R.id.tv_upgrade_title)
+        upgradeContentTv = findViewById(R.id.tv_upgrade_content)
         confirmTv = findViewById(R.id.tv_upgrade_confirm)
         cancleTv = findViewById(R.id.tv_upgrade_cancel)
 
@@ -61,12 +58,16 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb
         super.dismiss()
     }
 
-    fun showUpgradeAppDialog(name: String, url: String) {
+    fun showUpgradeAppDialog(name: String, url: String, title: String, content: String) {
         if (isShowing) {
             return
         }
         tag = name
         downloarUrl = url
+
+        upgradeTitleTv?.text = title
+        upgradeContentTv?.text = content
+
         show()
     }
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java

@@ -4,16 +4,20 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI
 
 import android.content.Context;
 import android.os.Process;
+import android.util.Log;
 
 import com.bytedance.boost_multidex.BoostMultiDex;
 import com.elegant.utils.UiThreadHandler;
 import com.kwai.koom.base.DefaultInitTask;
 import com.mogo.cloud.socket.SocketBuildConfig;
 import com.mogo.commons.AbsMogoApplication;
+import com.mogo.eagle.core.data.app.AppConfigInfo;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.constants.MoGoConfig;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.eagle.core.function.api.chat.biz.ChatConsts;
+import com.mogo.eagle.core.function.autopilot.adapter.MoGoHandAdasMsgManager;
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
 import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager;
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
 import com.mogo.eagle.core.function.notice.PushUIConstants;
@@ -27,6 +31,7 @@ import com.mogo.map.MapApiPath;
 import com.mogo.module.common.MogoModule;
 import com.mogo.module.common.MogoModulePaths;
 import com.mogo.module.service.ServiceConst;
+import com.zhidao.support.adas.high.AdasManager;
 import com.zhidao.support.obu.ami.AmiClientManager;
 import com.zhjt.mogo_core_function_devatools.monitor.db.CpuInfo;
 import com.zhjt.mogo_core_function_devatools.monitor.db.MemInfo;
@@ -71,12 +76,22 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
     }
 
     private void queryAppUpgrade() {
+        UiThreadHandler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                Log.e("Upgrade", "queryAppUpgrade isConnectAutopilot = " + AppConfigInfo.INSTANCE.isConnectAutopilot());
+                if (AppConfigInfo.INSTANCE.isConnectAutopilot()) {
+                    MoGoHandAdasMsgManager.getInstance(getBaseContext()).getConfig();
+                }
+            }
+        },8000);
+
         UiThreadHandler.postDelayed(new Runnable() {
             @Override
             public void run() {
                 CallerBindingcarManager.getBindingcarProvider().queryAppUpgrade();
             }
-        },5000);
+        },10000);
     }
 
     private void checkMonitorDb() {

core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml

@@ -2,7 +2,7 @@
 <com.mogo.eagle.core.widget.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="840px"
-    android:layout_height="470px"
+    android:layout_height="530px"
     android:background="@color/dialog_bg_color"
     app:roundLayoutRadius="32px">
 
@@ -10,7 +10,7 @@
         android:id="@+id/tv_upgrade_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="50px"
+        android:layout_marginTop="30px"
         android:text="@string/application_upgrade"
         android:textColor="#FFFFFFFF"
         android:textSize="56px"
@@ -22,7 +22,7 @@
         android:id="@+id/tv_upgrade_tips"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="50px"
+        android:layout_marginTop="30px"
         android:text="@string/application_upgrade_confirm"
         android:textColor="#FFFFFFFF"
         android:textSize="43px"
@@ -30,15 +30,32 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_upgrade_title" />
 
+    <TextView
+        android:id="@+id/tv_upgrade_content"
+        android:layout_width="0px"
+        android:layout_height="130px"
+        android:layout_marginStart="50px"
+        android:layout_marginTop="20px"
+        android:layout_marginEnd="50px"
+        android:layout_marginBottom="15px"
+        android:text=""
+        android:textColor="#FFFFFFFF"
+        android:textSize="36px"
+        android:visibility="visible"
+        app:layout_constraintBottom_toTopOf="@id/view_horizontal_line"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_upgrade_tips" />
+
     <View
         android:id="@+id/view_horizontal_line"
         android:layout_width="match_parent"
         android:layout_height="2px"
-        android:layout_marginTop="80px"
+        android:layout_marginTop="20px"
         android:background="#66B8BFE8"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_upgrade_tips" />
+        app:layout_constraintTop_toBottomOf="@id/tv_upgrade_content" />
 
     <View
         android:id="@+id/view_vertical_line"

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt

@@ -222,7 +222,7 @@ interface IMoGoWaringProvider : IMoGoHmiViewProxy {
     /**
      * 展示升级app弹框
      */
-    fun showUpgradeDialog(name: String, url: String)
+    fun showUpgradeDialog(name: String, url: String, title: String, content: String)
 
     /**
      * 呈现工控机升级确认框

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt

@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.call.devatools
 
 import android.app.Activity
 import android.content.Context
+import android.util.Log
 import android.view.*
 import com.mogo.eagle.core.data.config.*
 import com.mogo.eagle.core.data.constants.MogoServicePaths
@@ -145,6 +146,7 @@ object CallerDevaToolsManager {
      */
     fun downLoadPackage(downloadKey: String, downloadUrl: String) {
         devaToolsProviderApi?.downLoadPackage(downloadKey, downloadUrl)
+//        devaToolsProviderApi?.downLoadPackage("IntelligentPilot_v2.9.0.1002_20220725_[fPadLenovoOchBus-launcher-qa]_debug.apk", "https://scm-1255510688.cos.ap-beijing.myqcloud.com/test/com.mogo.launcher.f/2.9.0.1002/IntelligentPilot_v2.9.0.1002_20220725_[fPadLenovoOchBus-launcher-qa]_debug.apk")
     }
 
     /**

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt

@@ -292,8 +292,8 @@ object CallerHmiManager : CallerBase() {
         waringProviderApi?.showModifyBindingcarDialog()
     }
 
-    fun showUpgradeDialog(name: String, url: String) {
-        waringProviderApi?.showUpgradeDialog(name, url)
+    fun showUpgradeDialog(name: String, url: String, title: String, content: String) {
+        waringProviderApi?.showUpgradeDialog(name, url, title, content)
     }
 
     /**

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/services/DownloadService.java

@@ -154,11 +154,9 @@ public class DownloadService implements InitThread.InitCallBack, DownloadCallBac
 
     @Override
     public void threadDownLoadFinished(String url, ThreadBean threadBean) {
-        Log.e(DOWN_LOAD_TAG, "threadDownLoadFinished 1  : " + url);
         IDownload iDownload = callBacks.get(url);
         Log.d(DOWN_LOAD_TAG, "iDownload = " + iDownload);
         if (iDownload != null) {
-            Log.e(DOWN_LOAD_TAG, "threadDownLoadFinished  2 : " + url);
             iDownload.onFinished(url, threadBean);
         }
     }

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/InitThread.java

@@ -1,5 +1,9 @@
 package com.mogo.eagle.core.utilcode.breakpoint.thread;
 
+import static com.mogo.eagle.core.utilcode.breakpoint.Config.DOWN_LOAD_TAG;
+
+import android.util.Log;
+
 import com.mogo.eagle.core.utilcode.breakpoint.bean.FileBean;
 import com.mogo.eagle.core.utilcode.breakpoint.event.DownloadData;
 
@@ -41,6 +45,7 @@ public class InitThread extends Thread {
             if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
                 fileLength = connection.getContentLength();
             }
+            Log.d(DOWN_LOAD_TAG, "InitThread fileLength = " + fileLength + "---connection.getResponseCode() = " + connection.getResponseCode());
             if (fileLength <= 0) return;
             File dir = new File(fileBean.getSavePath());
             if (!dir.exists()) {
@@ -52,6 +57,7 @@ public class InitThread extends Thread {
             fileBean.setLength(fileLength);
             this.initCallBack.initSuccess(fileBean);
         } catch (Exception e) {
+            Log.e(DOWN_LOAD_TAG, "InitThread e = " + e);
             DownloadData downloadData = new DownloadData();
             downloadData.setUrl(fileBean.getUrl());
             downloadData.setMsg(e.getMessage());

libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java

@@ -13,6 +13,7 @@ import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_LINK_LOG_CONNEC
 import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT;
 
 import android.text.TextUtils;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;