diff --git 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 index 85bfb5aeb2..b7d7139a43 100644 --- 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 @@ -456,6 +456,10 @@ class MoGoHmiFragment : MvpFragment(), 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 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt index 82cefaf11a..1eb218e0fe 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt +++ b/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) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt index cde0dcdca9..c30efddd3a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt +++ b/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") -// } -// }) } //工控机版本视图点击事件 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 5bd509e41d..7e5c962fbd 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/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); } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_left_select_nor_daytime.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_left_select_nor_daytime.png index 2e4b0cd003..627ab8a566 100644 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_left_select_nor_daytime.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/module_arrow_left_select_nor_daytime.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/app_download_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/app_download_bg.xml new file mode 100644 index 0000000000..be5f6ff050 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/app_download_bg.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml index e9a9a68ad0..34ebc53536 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml +++ b/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" /> + +