diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt index 1a4e463101..58e49237c1 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt @@ -17,6 +17,7 @@ import com.google.android.flexbox.FlexboxLayout import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.msgbox.MsgBoxBean +import com.mogo.eagle.core.data.msgbox.MsgCategory import com.mogo.eagle.core.data.msgbox.RecordBagMsg import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarStateListener import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarStatusListenerManager @@ -275,14 +276,20 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene mInViewY = motionEvent.y // 获取相对屏幕的坐标，即以屏幕左上角为原点 mDownInScreenX = motionEvent.rawX - mDownInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight() +// mDownInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight() +// mInScreenX = motionEvent.rawX +// mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight() + + mDownInScreenY = motionEvent.rawY mInScreenX = motionEvent.rawX - mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight() + mInScreenY = motionEvent.rawY + } MotionEvent.ACTION_MOVE -> { // 更新浮动窗口位置参数 mInScreenX = motionEvent.rawX - mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight() +// mInScreenY = motionEvent.rawY - BarUtils.getStatusBarHeight() + mInScreenY = motionEvent.rawY mWindowParams!!.x = (mInScreenX - mInViewX).toInt() mWindowParams!!.y = (mInScreenY - mInViewY).toInt() // 手指移动的时候更新小悬浮窗的位置 @@ -298,7 +305,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene // 默认固定位置，靠屏幕右边缘的中间 mWindowManager!!.defaultDisplay.getMetrics(metrics) mWindowParams!!.x = metrics.widthPixels - mWindowParams!!.y = metrics.heightPixels / 2 - BarUtils.getStatusBarHeight()-350 + mWindowParams!!.y = metrics.heightPixels - BarUtils.getStatusBarHeight()-950 mWindowManager!!.addView(mFloatLayout, mWindowParams) } 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 7732d44741..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 @@ -257,10 +257,12 @@ class MoGoHmiFragment : MvpFragment(), viewDriverMsgBoxList.visibility = View.VISIBLE viewDriverMsgBoxList.notifyData() viewDriverMsgBoxBubble.visibility = View.GONE + viewDriverMsgBoxBubble.isShowData(false) CallerHmiManager.updateDriverMsgBoxTipView(false) }else{ viewDriverMsgBoxList.visibility = View.GONE viewDriverMsgBoxBubble.visibility = View.VISIBLE + viewDriverMsgBoxBubble.isShowData(true) } } @@ -269,9 +271,12 @@ class MoGoHmiFragment : MvpFragment(), viewPassengerMsgBoxList.visibility = View.VISIBLE viewPassengerMsgBoxBubble.visibility = View.GONE viewPassengerMsgBoxList.notifyData() + viewPassengerMsgBoxBubble.isShowData(false) + CallerHmiManager.updatePassengerMsgBoxTipView(false) }else{ viewPassengerMsgBoxList.visibility = View.GONE viewPassengerMsgBoxBubble.visibility = View.VISIBLE + viewPassengerMsgBoxBubble.isShowData(true) } } @@ -451,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 @@ -459,6 +468,14 @@ class MoGoHmiFragment : MvpFragment(), } } + override fun updatePassengerMsgBoxTipView(show: Boolean) { + if(show){ + MsgBoxPTipView.visibility = View.VISIBLE + }else{ + MsgBoxPTipView.visibility = View.GONE + } + } + /** * 设置 红绿灯 代理View */ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt index bc557a33ca..766910439f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt @@ -46,6 +46,7 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor( private val TAG = "DriverMsgBoxBubbleView" private val dataList :ArrayList = ArrayList() + private var isShowData = true private fun initView() { val linearLayoutManager = LinearLayoutManager(context) @@ -65,10 +66,16 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor( rvBubbleList.layoutManager = linearLayoutManager } + /** + * 是否展示接收消息，消息盒子打开状态下不再展示气泡消息 + * @param show true 展示；false 不展示 + */ + fun isShowData(show: Boolean){ + isShowData = show + } override fun onDataChanged(category: MsgCategory, msgBoxBean: MsgBoxBean) { UiThreadHandler.post { - CallerHmiManager.updateDriverMsgBoxTipView(true) when (category) { MsgCategory.NOTICE -> { MsgBoxConfig.noticeList.add(msgBoxBean) @@ -80,13 +87,16 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor( MsgBoxConfig.recordBagList.add(msgBoxBean) } } - if(category == MsgCategory.RECORD_BAG){ - //弹出被动录包弹窗 - CallerDevaToolsManager.onReceiveBadCaseRecord(msgBoxBean,context as Activity,true) - }else{ - rvBubbleList.visibility = View.VISIBLE - dataList.add(msgBoxBean) - driverMsgBoxBubbleAdapter?.setData(dataList) + if(isShowData){ + CallerHmiManager.updateDriverMsgBoxTipView(true) + if(category == MsgCategory.RECORD_BAG){ + //弹出被动录包弹窗 + CallerDevaToolsManager.onReceiveBadCaseRecord(msgBoxBean,context as Activity,true) + }else{ + rvBubbleList.visibility = View.VISIBLE + dataList.add(msgBoxBean) + driverMsgBoxBubbleAdapter?.setData(dataList) + } } } } @@ -105,12 +115,4 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor( } } -// var i = 0 -// -// fun setData(){ -// val one = MsgBoxBean(MsgBoxType.OPERATION, OperationMsg(System.currentTimeMillis(),"测试"+i++)) -// dataList.add(one) -// driverMsgBoxBubbleAdapter?.setData(dataList) -// } - } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt index f2f7d666e4..d5960c0760 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt @@ -7,13 +7,7 @@ import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager -import com.mogo.eagle.core.data.enums.EventTypeEnum import com.mogo.eagle.core.data.msgbox.MsgBoxBean -import com.mogo.eagle.core.data.msgbox.MsgBoxType -import com.mogo.eagle.core.data.msgbox.OperationMsg -import com.mogo.eagle.core.data.msgbox.RecordBagMsg -import com.mogo.eagle.core.data.notice.NoticeNormalData -import com.mogo.eagle.core.data.report.ReportEntity import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.msgbox.adapter.DriverMsgBoxListAdapter @@ -48,7 +42,7 @@ class DriverMsgBoxListView @JvmOverloads constructor( //获取通知消息列表 noticeList= CallerMsgBoxManager.getCachedNotifyData() as ArrayList? - noticeList?.reversed() + noticeList = noticeList?.reversed() as ArrayList? //获取车辆系统信息列表 ipcReportList = CallerMsgBoxManager.getCachedSysInfoData() as ArrayList? ipcReportList?.reversed() @@ -118,6 +112,7 @@ class DriverMsgBoxListView @JvmOverloads constructor( val localSysInfoList = MsgBoxConfig.systemInfoList.reversed() ipcReportList?.addAll(0,localSysInfoList) val localRecordList = MsgBoxConfig.recordBagList.reversed() + badCaseList?.addAll(0,localRecordList) //获取当前Tab选择 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt index ea7f8bab64..edd8a0688b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt @@ -2,9 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui.msgbox import android.app.Activity import android.content.Context -import android.graphics.PixelFormat import android.util.AttributeSet -import android.util.DisplayMetrics import android.view.* import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager @@ -12,14 +10,13 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgBoxType import com.mogo.eagle.core.data.msgbox.MsgCategory -import com.mogo.eagle.core.data.msgbox.OperationMsg import com.mogo.eagle.core.function.api.msgbox.IMsgBoxListener +import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.msgbox.adapter.PassengerMsgBoxBubbleAdapter import com.mogo.eagle.core.function.msgbox.MsgBoxConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils -import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.layout_passenger_msg_box_bubble.view.* @@ -36,7 +33,9 @@ class PassengerMsgBoxBubbleView @JvmOverloads constructor( private val TAG = "PassengerMsgBoxBubbleView" private val dataList :ArrayList = ArrayList() - var passengerMsgBoxBubbleAdapter: PassengerMsgBoxBubbleAdapter ?= null + private var passengerMsgBoxBubbleAdapter: PassengerMsgBoxBubbleAdapter ?= null + private var isShowData = true + init { LayoutInflater.from(context).inflate(R.layout.layout_passenger_msg_box_bubble, this, true) initView() @@ -45,21 +44,30 @@ class PassengerMsgBoxBubbleView @JvmOverloads constructor( private fun initView(){ val linearLayoutManager = LinearLayoutManager(context) linearLayoutManager.orientation = LinearLayoutManager.VERTICAL -// linearLayoutManager.stackFromEnd = true -// linearLayoutManager.reverseLayout = true passengerMsgBoxBubbleAdapter = PassengerMsgBoxBubbleAdapter(context as Activity) rvPassengerBubbleList.adapter = passengerMsgBoxBubbleAdapter rvPassengerBubbleList.layoutManager = linearLayoutManager } + /** + * 是否展示接收消息，消息盒子打开状态下不再展示气泡消息 + * @param show true 展示；false 不展示 + */ + fun isShowData(show: Boolean){ + isShowData = show + } + override fun onDataChanged(category: MsgCategory, msgBoxList: MsgBoxBean) { UiThreadHandler.post { if(category == MsgCategory.NOTICE){ if(msgBoxList.type == MsgBoxType.NOTICE || msgBoxList.type == MsgBoxType.V2X || msgBoxList.type == MsgBoxType.OBU){ - dataList.add(msgBoxList) - passengerMsgBoxBubbleAdapter?.setData(dataList) MsgBoxConfig.noticeList.add(msgBoxList) + if(isShowData){ + CallerHmiManager.updatePassengerMsgBoxTipView(true) + dataList.add(msgBoxList) + passengerMsgBoxBubbleAdapter?.setData(dataList) + } } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt index 4a2796dfe6..976daf5d2b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt @@ -10,7 +10,6 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.mogo.eagle.core.data.enums.EventTypeEnum import com.mogo.eagle.core.data.msgbox.* -import com.mogo.eagle.core.data.notice.NoticeNormalData import com.mogo.eagle.core.data.report.ReportEntity import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt index 8e76cc3fdb..6b6cd3a740 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt @@ -107,6 +107,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : RecyclerView.Ada } holder.tvReportTimeNormal.text = "时间：${TimeUtils.millis2String(it[position].timestamp)}" holder.tvReportTimeOpen.text = "时间：${TimeUtils.millis2String(it[position].timestamp)}" + holder.tvReportTime.text =TimeUtils.millis2String(it[position].timestamp,getHourMinFormat()) var resultStr = "类型：" for (result in reportEntity.resultList){ resultStr = "${resultStr}${CallerAutoPilotManager.getReportResultDesc(result)}" @@ -114,6 +115,11 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : RecyclerView.Ada holder.tvReportTypeNormal.text = resultStr holder.tvReportTypeOpen.text = resultStr holder.tvReportReasonOpen.text = "原因：${reportEntity.msg}" + var actionStr = "" + for (action in reportEntity.actionsList){ + actionStr = "${actionStr}${CallerAutoPilotManager.getReportActionDesc(action)}" + } + holder.tvReportActionOpen.text = "建议操作：$actionStr" holder.tvStatusSelect.setOnClickListener { if(holder.tvReportLevelNormal.isVisible){ holder.tvStatusSelect.setCompoundDrawablesWithIntrinsicBounds(getDrawable(R.drawable.icon_msg_close),null,null,null) @@ -127,6 +133,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : RecyclerView.Ada holder.tvReportTimeOpen.visibility = View.VISIBLE holder.tvReportTypeOpen.visibility = View.VISIBLE holder.tvReportReasonOpen.visibility = View.VISIBLE + holder.tvReportActionOpen.visibility = View.VISIBLE }else{ holder.tvStatusSelect.setCompoundDrawablesWithIntrinsicBounds(getDrawable(R.drawable.icon_msg_open),null,null,null) holder.ivReportImageNormal.visibility = View.VISIBLE @@ -139,6 +146,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : RecyclerView.Ada holder.tvReportTimeOpen.visibility = View.GONE holder.tvReportTypeOpen.visibility = View.GONE holder.tvReportReasonOpen.visibility = View.GONE + holder.tvReportActionOpen.visibility = View.GONE } } } @@ -243,11 +251,13 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : RecyclerView.Ada var tvReportTimeNormal: TextView = itemView.findViewById(R.id.tvReportTimeNormal) var tvReportTypeNormal: TextView = itemView.findViewById(R.id.tvReportTypeNormal) var tvStatusSelect: TextView = itemView.findViewById(R.id.tvStatusSelect) + var tvReportTime: TextView = itemView.findViewById(R.id.tvReportTime) var ivReportImageOpen: ImageView = itemView.findViewById(R.id.ivReportImageOpen) var tvReportLevelOpen: TextView = itemView.findViewById(R.id.tvReportLevelOpen) var tvReportTimeOpen: TextView = itemView.findViewById(R.id.tvReportTimeOpen) var tvReportTypeOpen: TextView = itemView.findViewById(R.id.tvReportTypeOpen) var tvReportReasonOpen: TextView = itemView.findViewById(R.id.tvReportReasonOpen) + var tvReportActionOpen: TextView = itemView.findViewById(R.id.tvReportActionOpen) } //运营平台 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 005d4eeab3..e9a90bfcc2 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 @@ -28,6 +28,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; @@ -151,6 +152,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { manager.notify(0x3, builder.build()); //下载进度提示 builder.setContentText("已下载" + length + "%"); + CallerHmiManager.INSTANCE.updateStatusBarDownloadView(true, "download", length); } @Override @@ -160,6 +162,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/bg_msg_box.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_msg_box.png new file mode 100644 index 0000000000..c901f3937b Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_msg_box.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_msg_box_p.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_msg_box_p.png new file mode 100644 index 0000000000..2ae1744cea Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_msg_box_p.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_msg_box_video.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_msg_box_video.png new file mode 100644 index 0000000000..fa4c8e0e5f Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_msg_box_video.png differ 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/drawable/bg_msg_box_list_p.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_msg_box_list_p.xml new file mode 100644 index 0000000000..0b1a7249a2 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_msg_box_list_p.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/msg_box_tips.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/msg_box_tips.xml new file mode 100644 index 0000000000..50d0edef7f --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/msg_box_tips.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/selector_msg_box_p.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/selector_msg_box_p.xml new file mode 100644 index 0000000000..be20f0e722 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/selector_msg_box_p.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml index 1017310fd2..a9a6f19e19 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml @@ -182,7 +182,7 @@ app:layout_goneMarginTop="40dp" tools:visibility="gone" /> - + - - - + + + + + + + @@ -259,6 +275,7 @@ app:layout_constraintBottom_toTopOf="@id/cbMsgBoxPassenger" app:layout_constraintLeft_toLeftOf="@id/cbMsgBoxPassenger" app:layout_constraintRight_toRightOf="@id/cbMsgBoxPassenger" + android:layout_marginBottom="20dp" android:visibility="gone" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml index 579b05e954..80c1f6b035 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml @@ -4,7 +4,7 @@ android:layout_width="804px" android:layout_height="160px" xmlns:app="http://schemas.android.com/apk/res-auto" - android:background="#1B2966" + android:background="#1A2344" app:roundLayoutRadius="24px" android:layout_gravity="center_horizontal" android:layout_marginStart="30px" @@ -43,6 +43,7 @@ android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="@id/ivBadCaseImage" app:layout_constraintLeft_toRightOf="@id/ivBadCaseImage" + android:layout_marginBottom="5px" android:layout_marginStart="25px" android:textColor="#B3FFFFFF" android:textSize="30px" @@ -56,7 +57,7 @@ app:layout_constraintTop_toTopOf="@id/tvRecordTip" android:textColor="#80FFFFFF" android:textSize="24px" - android:layout_marginEnd="15px" + android:layout_marginEnd="25px" /> + + + + @@ -54,7 +54,7 @@ app:layout_constraintLeft_toLeftOf="@id/tvBubbleOperationTitle" app:layout_constraintRight_toRightOf="@id/tvBubbleOperationTime" app:layout_constraintTop_toBottomOf="@id/tvBubbleOperationTitle" - android:layout_marginTop="20px" + android:layout_marginTop="10px" android:gravity="start" android:maxLines="2" android:ellipsize="end" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml index 51a11c2d5a..0b83bbd4c6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml @@ -42,7 +42,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvBubbleReportTitle" app:layout_constraintLeft_toLeftOf="@id/tvBubbleReportTitle" - android:layout_marginTop="10px" + android:layout_marginTop="5px" android:textColor="#B3FFFFFF" android:textSize="28px" /> @@ -53,7 +53,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvBubbleReportTime" app:layout_constraintLeft_toLeftOf="@id/tvBubbleReportTime" - android:layout_marginTop="10px" + android:layout_marginTop="5px" android:textColor="#B3FFFFFF" android:textSize="28px" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_notice.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_notice.xml index dadb719dc4..8a26d7a513 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_notice.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_notice.xml @@ -5,8 +5,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:background="#465878" app:roundLayoutRadius="24px" - android:layout_marginTop="10px" - android:layout_marginBottom="10px" + android:layout_marginTop="16px" + android:layout_marginBottom="16px" > + + + app:roundLayoutRadius="24px" + android:layout_marginTop="16px" + android:layout_marginBottom="16px"> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_list.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_list.xml index 7a7c1766d8..9dc41d3ab8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_list.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_list.xml @@ -1,10 +1,10 @@ - + android:background="@drawable/bg_msg_box" + > - \ No newline at end of file + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_passenger_msg_box_list.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_passenger_msg_box_list.xml index 7c37044c4e..74431ca542 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_passenger_msg_box_list.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_passenger_msg_box_list.xml @@ -1,10 +1,12 @@ - + android:layout_marginBottom="16px"> + +