diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxBubbleView.kt index 6774246ebe..7f26f51f5d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxBubbleView.kt @@ -14,7 +14,6 @@ import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager 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.MMsgBoxBubbleAdapter -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.util.UiThreadHandler import kotlinx.android.synthetic.main.layout_m_msg_box_bubble.view.* diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxListView.kt index f5d04d3eb3..19098003da 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxListView.kt @@ -17,7 +17,6 @@ import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager 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.MMsgBoxListAdapter -import com.mogo.eagle.core.function.hmi.ui.msgbox.adapter.PassengerMsgBoxListAdapter import com.mogo.eagle.core.utilcode.util.ResourceUtils.getDrawable import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.layout_m_msg_box_list.view.* diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_notice.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_notice.xml index c25e5ca499..ff62ba2a18 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_notice.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_notice.xml @@ -3,7 +3,7 @@ android:layout_width="450dp" android:layout_height="110dp" xmlns:app="http://schemas.android.com/apk/res-auto" - android:background="@color/color_white" + android:background="#FFFFFFFF" app:roundLayoutRadius="24dp" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:text="官方公告" android:textColor="#FF203555" - android:textSize="24dp" + android:textSize="25dp" android:layout_marginStart="10dp" app:layout_constraintLeft_toRightOf="@id/ivMNoticeImage" app:layout_constraintTop_toTopOf="parent" @@ -36,7 +36,7 @@ android:id="@+id/tvMNoticeContent" android:layout_width="0dp" android:layout_height="wrap_content" - android:textColor="#FF203555" + android:textColor="#CC203555" android:textSize="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/tvMNoticeTitle" @@ -52,7 +52,7 @@ android:layout_width="110dp" android:layout_height="110dp" android:text="查 看" - android:textColor="#1366FB" + android:textColor="#FF1366FB" android:textSize="20dp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" @@ -73,7 +73,7 @@ android:id="@+id/tvMNoticeTime" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#4A5B77" + android:textColor="#B34A5B77" android:textSize="18dp" app:layout_constraintTop_toTopOf="@id/tvMNoticeTitle" app:layout_constraintBottom_toBottomOf="@id/tvMNoticeTitle" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_summary.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_summary.xml index 4f9b1507ec..d8b8480c30 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_summary.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_summary.xml @@ -3,7 +3,7 @@ android:layout_width="450dp" android:layout_height="110dp" xmlns:app="http://schemas.android.com/apk/res-auto" - android:background="@color/color_white" + android:background="#FFFFFFFF" app:roundLayoutRadius="24dp" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:text="蘑菇小助手" android:textColor="#FF203555" - android:textSize="24dp" + android:textSize="25dp" android:layout_marginStart="10dp" app:layout_constraintLeft_toRightOf="@id/ivMSummaryImage" app:layout_constraintTop_toTopOf="parent" @@ -36,7 +36,7 @@ android:id="@+id/tvMSummaryContent" android:layout_width="0dp" android:layout_height="wrap_content" - android:textColor="#FF203555" + android:textColor="#CC203555" android:textSize="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/tvMSummaryTitle" @@ -50,7 +50,7 @@ android:layout_width="110dp" android:layout_height="110dp" android:text="查 看" - android:textColor="#1366FB" + android:textColor="#FF1366FB" android:textSize="20dp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" @@ -71,7 +71,7 @@ android:id="@+id/tvMSummaryTime" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#4A5B77" + android:textColor="#B34A5B77" android:textSize="18dp" app:layout_constraintTop_toTopOf="@id/tvMSummaryTitle" app:layout_constraintBottom_toBottomOf="@id/tvMSummaryTitle" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_v2x.xml index 552a42b559..1714adfa15 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_v2x.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_v2x.xml @@ -4,7 +4,7 @@ android:layout_width="450dp" android:layout_height="110dp" xmlns:app="http://schemas.android.com/apk/res-auto" - android:background="@color/color_white" + android:background="#FFFFFFFF" app:roundLayoutRadius="24dp" android:layout_marginTop="16dp" android:layout_marginBottom="16dp"> @@ -27,7 +27,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" android:textColor="#99203555" - android:textSize="20dp" + android:textSize="18dp" android:layout_marginEnd="20dp" /> @@ -44,8 +44,8 @@ android:ellipsize="end" android:textColor="#FF203555" android:textSize="25dp" - android:layout_marginStart="25dp" - android:layout_marginEnd="25dp" + android:layout_marginStart="20dp" + android:layout_marginEnd="20dp" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_m_msg_box_list.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_m_msg_box_list.xml index 1dfd4cf013..ffe09f8cfe 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_m_msg_box_list.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_m_msg_box_list.xml @@ -1,7 +1,7 @@