[2.13.0] merge 2.13.0 branch

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

@@ -242,10 +242,10 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
         if (AppConfigInfo.uniqueDeviceId.isNullOrEmpty()) {
             AppConfigInfo.uniqueDeviceId = DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp())
         }
-        if (AppConfigInfo.widevineIDMd5.isNullOrEmpty()) {
-            AppConfigInfo.widevineIDMd5 =
-                DeviceIdUtils.getWidevineIDWithMd5(AbsMogoApplication.getApp())
-        }
+//        if (AppConfigInfo.widevineIDMd5.isNullOrEmpty()) {
+//            AppConfigInfo.widevineIDMd5 =
+//                DeviceIdUtils.getWidevineIDWithMd5(AbsMogoApplication.getApp())
+//        }
         if (MoGoAiCloudClient.getInstance().aiCloudClientConfig != null) {
             AppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
             AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
@@ -999,7 +999,9 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
     override fun showWarning(direction: WarningDirectionEnum) {
         CallerLogger.d(TAG, "showWarning====")
         flV2XWarningView?.showWarning(direction)
-        flicker(flV2XWarningView)
+        if (flV2XWarningView != null) {
+            flicker(flV2XWarningView)
+        }
     }
 
     /**

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

@@ -54,7 +54,7 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb
      * 去下载
      */
     fun downloadApp() {
-        ToastUtils.showLong("开始下载APK,稍后可前往downloads文件夹查看")
+        ToastUtils.showLong("开始下载APK,稍后可前往downloads文件夹查看,通知栏查看下载进度")
         tag?.let { downloarUrl?.let { it1 -> CallerDevaToolsManager.downLoadPackage(it, it1) } }
 
         dismiss()

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

@@ -1,19 +1,24 @@
 package com.mogo.eagle.core.function.hmi.ui.widget
 
+import android.app.NotificationManager
 import android.content.Context
 import android.util.AttributeSet
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import androidx.core.app.NotificationCompat
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
 import com.mogo.eagle.core.data.bindingcar.AdUpgradeStateHelper
 import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.bindingcar.IMoGoBindingCarListener
+import com.mogo.eagle.core.function.api.devatools.IMogoDevaToolsUpgradeListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.bindingcar.CallerBindingCarListenerManager
 import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsUpgradeListenerManager
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showUpgradeDialog
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
@@ -23,6 +28,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import kotlinx.android.synthetic.main.view_system_version.view.*
 
+
 /**
  * @author XuXinChao
  * @description 工具箱-系统版本（鹰眼版本、工控机版本）视图
@@ -57,10 +63,64 @@ class SystemVersionView @JvmOverloads constructor(
     private fun initView() {
         showCurrentPadVersion()
         showCurrentAdVersion()
+
+        val builder = NotificationCompat.Builder(context)
+        builder.setSmallIcon(R.mipmap.icon1001)
+        builder.setContentTitle("下载")
+        builder.setContentText("正在下载")
+        val manager: NotificationManager? = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager?
+
         //鹰眼版本视图点击事件
         ivPadVersion.setOnClickListener {
             CallerLogger.i("$M_HMI$$TAG", "pad version view clicked")
             CallerBindingcarManager.getBindingcarProvider().queryAppUpgrade()
+
+//            showUpgradeDialog(
+//                "",
+//                "",
+//                "",
+//                "",
+//                "1"
+//            )
+//
+//            CallerDevaToolsUpgradeListenerManager.registerDevaToolsUpgradeListener(TAG,
+//                object  : IMogoDevaToolsUpgradeListener {
+//                    override fun onStart(url: String?) {
+//                        Log.d("Package-DownLoad", " SystemVersionView onStart --------> ")
+//                    }
+//
+//                    override fun onPause(url: String?) {
+//
+//                    }
+//
+//                    override fun onProgress(url: String?, length: Int) {
+//                        Log.d("Package-DownLoad", " SystemVersionView onProgress  length = $length")
+//                        builder.setProgress(100, length,false)
+//                        manager?.notify(0x3,builder.build())
+//                        //下载进度提示
+//                        if (length == 99) {
+//                            UiThreadHandler.postDelayed({
+//                                length == 100
+//                                builder.setContentText("已下载" + length + "%")
+//
+//                                UiThreadHandler.postDelayed({
+//                                    manager?.cancel(0x3)
+//                                }, 1000L)
+//
+//                            }, 1500L)
+//                        }
+//
+//                        builder.setContentText("已下载" + length + "%")
+//                    }
+//
+//                    override fun onFinished(url: String?) {
+//                        Log.d("Package-DownLoad", " SystemVersionView onFinished ------> ")
+//                    }
+//
+//                    override fun onError(url: String?, errorMsg: String?) {
+//                        Log.d("Package-DownLoad", " errorMsg = $errorMsg")
+//                    }
+//                })
         }