2.13.0 fixed conflict

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

@@ -456,6 +456,10 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
         statusBarView?.updateRightView(insert, tag, viewGroup)
     }
 
+    override fun updateStatusBarDownloadView(insert: Boolean, tag: String, progress: Int) {
+        statusBarView?.updateProgressView(insert, tag, progress)
+    }
+
     override fun updateDriverMsgBoxTipView(show: Boolean) {
         if(show){
             MsgBoxTipView.visibility = View.VISIBLE

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

@@ -70,6 +70,16 @@ class StatusBarView @JvmOverloads constructor(
         }
     }
 
+
+    fun updateProgressView(insert: Boolean, tag: String, progress: Int) {
+        if (insert) {
+            viewProgressTv.visibility = VISIBLE
+            viewProgressTv.text = "$progress%"
+        } else {
+            viewProgressTv.visibility = GONE
+        }
+    }
+
     private fun setTextColor(color: Int) {
         viewTextClock.setTextColor(color)
         viewStatusBarTag.setTextColor(color)

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

@@ -77,43 +77,6 @@ class SystemVersionView @JvmOverloads constructor(
 //                "",
 //                "1"
 //            )
-
-//            val builder = NotificationCompat.Builder(context)
-//            builder.setSmallIcon(R.mipmap.icon1001)
-//            builder.setContentTitle("下载")
-//            builder.setContentText("正在下载")
-//            val manager: NotificationManager? = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager?
-//
-//            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())
-//                        //下载进度提示
-//                        builder.setContentText("已下载" + length + "%")
-//                    }
-//
-//                    override fun onFinished(url: String?) {
-////                        Log.d("Package-DownLoad", " SystemVersionView onFinished ------> ")
-//                        builder.setContentText("已下载" + 100 + "%")
-//                        UiThreadHandler.postDelayed({
-//                            manager?.cancel(0x3)
-//                        }, 500L)
-//                    }
-//
-//                    override fun onError(url: String?, errorMsg: String?) {
-////                        Log.d("Package-DownLoad", " errorMsg = $errorMsg")
-//                    }
-//                })
         }
 
         //工控机版本视图点击事件

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

@@ -26,6 +26,7 @@ import com.mogo.eagle.core.function.api.devatools.IMogoDevaToolsUpgradeListener;
 import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager;
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsUpgradeListenerManager;
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager;
 import com.mogo.eagle.core.function.hmi.R;
 import com.mogo.eagle.core.function.msgbox.db.MsgBoxDb;
@@ -149,6 +150,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
                 manager.notify(0x3, builder.build());
                 //下载进度提示
                 builder.setContentText("已下载" + length + "%");
+                CallerHmiManager.INSTANCE.updateStatusBarDownloadView(true, "download", length);
             }
 
             @Override
@@ -158,6 +160,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
                     @Override
                     public void run() {
                         manager.cancel(0x3);
+                        CallerHmiManager.INSTANCE.updateStatusBarDownloadView(false, "download", 100);
                     }
                 }, 1000);
             }

core/function-impl/mogo-core-function-hmi/src/main/res/drawable/app_download_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="24dp"/>
+    <solid android:color="#0056FF" />
+
+</shape>

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

@@ -35,6 +35,19 @@
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/dp_18" />
 
+    <TextView
+        android:id="@+id/viewProgressTv"
+        android:layout_width="@dimen/dp_96"
+        android:layout_height="@dimen/dp_50"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        android:background="@drawable/app_download_bg"
+        android:layout_marginStart="@dimen/dp_20"
+        android:gravity="center"
+        android:drawableLeft="@drawable/icon_download_guide"
+        android:textColor="@color/background_debug"
+        android:textSize="@dimen/dp_20" />
+
     <Space
         android:layout_width="0dip"
         android:layout_height="@dimen/dp_1"

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

@@ -305,4 +305,9 @@ interface IMoGoWaringProvider : IMoGoHmiViewProxy {
      * 设置乘客端消息盒子是否展示
      */
     fun updatePassengerMsgBoxTipView(show: Boolean)
+
+    /**
+     * 更新(添加/删除)下载进度
+     */
+    fun updateStatusBarDownloadView(insert: Boolean, tag: String, progress: Int)
 }

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

@@ -488,4 +488,12 @@ object CallerHmiManager : CallerBase() {
     fun updatePassengerMsgBoxTipView(show: Boolean = false){
         waringProviderApi?.updatePassengerMsgBoxTipView(show)
     }
+    /**
+     * 更新(添加/删除)状态栏右侧元素
+     */
+    fun updateStatusBarDownloadView(insert: Boolean, tag: String, progress: Int) {
+        waringProviderApi?.updateStatusBarDownloadView(insert, tag, progress)
+    }
+
+
 }