diff --git a/app/build.gradle b/app/build.gradle
index 101a12d2e0..d356c96e47 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
-apply from: rootProject.file('gradle/bytex/bytex.gradle')
+//apply from: rootProject.file('gradle/bytex/bytex.gradle')
Properties properties = new Properties()
properties.load(project.rootProject.file("gradle.properties").newDataInputStream())
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/MsgBoxTabView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/MsgBoxTabView.kt
index 654f3f930a..a101bb1135 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/MsgBoxTabView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/MsgBoxTabView.kt
@@ -75,7 +75,7 @@ class MsgBoxTabView @JvmOverloads constructor(
badCaseList = badCaseList?.let { ArrayList(it.reversed()) }
//通知
tvMsgNotice.setOnClickListener {
- tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
+ tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FF1BB7FF))
tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
@@ -96,7 +96,7 @@ class MsgBoxTabView @JvmOverloads constructor(
//FM信息
tvMsgFm.setOnClickListener {
tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
- tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
+ tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FF1BB7FF))
tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgNotice.background = null
@@ -116,7 +116,7 @@ class MsgBoxTabView @JvmOverloads constructor(
tvMsgIpcReport.setOnClickListener {
tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
- tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
+ tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FF1BB7FF))
tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgNotice.background = null
tvMsgFm.background = null
@@ -137,7 +137,7 @@ class MsgBoxTabView @JvmOverloads constructor(
tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
- tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
+ tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FF1BB7FF))
tvMsgNotice.background = null
tvMsgFm.background = null
tvMsgIpcReport.background = null
@@ -159,7 +159,7 @@ class MsgBoxTabView @JvmOverloads constructor(
when(MsgBoxConfig.getUserRecord()){
//通知消息
0 ->{
- tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
+ tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FF1BB7FF))
tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
@@ -178,7 +178,7 @@ class MsgBoxTabView @JvmOverloads constructor(
//FM消息
1->{
tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
- tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
+ tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FF1BB7FF))
tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgNotice.background = null
@@ -197,7 +197,7 @@ class MsgBoxTabView @JvmOverloads constructor(
2 ->{
tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
- tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
+ tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FF1BB7FF))
tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgNotice.background = null
tvMsgFm.background = null
@@ -216,7 +216,7 @@ class MsgBoxTabView @JvmOverloads constructor(
tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
- tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
+ tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FF1BB7FF))
tvMsgNotice.background = null
tvMsgFm.background = null
tvMsgIpcReport.background = null
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt
index 450a75a49c..8a938d2358 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt
@@ -172,7 +172,7 @@ class CameraListView : FrameLayout {
}
})
progressBar.indeterminateDrawable.colorFilter = PorterDuffColorFilter(
- ContextCompat.getColor(context, R.color.notice_blue),
+ ContextCompat.getColor(context, R.color.color_2B6EFF),
PorterDuff.Mode.MULTIPLY
)
// 后期可改为动态获取3s起始位置,暂时写死
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadCrossLiveView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadCrossLiveView.kt
index e657e6aaea..f643b8c018 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadCrossLiveView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadCrossLiveView.kt
@@ -20,7 +20,6 @@ import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAP
import com.mogo.eagle.core.utilcode.util.ThreadUtils
@@ -73,7 +72,7 @@ class RoadCrossLiveView @JvmOverloads constructor(
LayoutInflater.from(context).inflate(res, this, true)
initVideoPlayer()
roadCrossLivePB.indeterminateDrawable.colorFilter = PorterDuffColorFilter(
- ContextCompat.getColor(context, R.color.notice_blue),
+ ContextCompat.getColor(context, R.color.color_2B6EFF),
PorterDuff.Mode.MULTIPLY
)
roadCrossLiveClose.setOnClickListener {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadVideoDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadVideoDialog.kt
index 1d8f7c8d53..4c2b3e2fc8 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadVideoDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadVideoDialog.kt
@@ -63,7 +63,7 @@ class RoadVideoDialog(context: Context) : BaseFloatDialog(context), LifecycleObs
init {
setContentView(R.layout.road_video_dialog)
roadVideoPB.indeterminateDrawable.colorFilter = PorterDuffColorFilter(
- ContextCompat.getColor(context, R.color.notice_blue),
+ ContextCompat.getColor(context, R.color.color_2B6EFF),
PorterDuff.Mode.MULTIPLY
)
setCanceledOnTouchOutside(false)
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 6a7943bb7b..68f858319e 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
@@ -68,7 +68,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
badCaseList = badCaseList?.let { ArrayList(it.reversed()) }
//通知
tvMsgNotice.setOnClickListener {
- tvMsgNotice.setTextColor(resources.getColor(R.color.msg_box_title_color))
+ tvMsgNotice.setTextColor(resources.getColor(R.color.color_FF1BB7FF))
tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
@@ -89,7 +89,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
//FM信息
tvMsgFm.setOnClickListener {
tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgFm.setTextColor(resources.getColor(R.color.msg_box_title_color))
+ tvMsgFm.setTextColor(resources.getColor(R.color.color_FF1BB7FF))
tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
viewNoticeDivider.visibility = View.GONE
@@ -109,7 +109,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
tvMsgIpcReport.setOnClickListener {
tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgIpcReport.setTextColor(resources.getColor(R.color.msg_box_title_color))
+ tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FF1BB7FF))
tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
viewNoticeDivider.visibility = View.GONE
viewFmDivider.visibility = View.GONE
@@ -130,7 +130,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgBadCase.setTextColor(resources.getColor(R.color.msg_box_title_color))
+ tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FF1BB7FF))
viewNoticeDivider.visibility = View.GONE
viewFmDivider.visibility = View.GONE
viewIpcReportDivider.visibility = View.GONE
@@ -152,7 +152,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
when(MsgBoxConfig.getUserRecord()){
//通知消息
0 ->{
- tvMsgNotice.setTextColor(resources.getColor(R.color.msg_box_title_color))
+ tvMsgNotice.setTextColor(resources.getColor(R.color.color_FF1BB7FF))
tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
@@ -171,7 +171,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
//FM消息
1->{
tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgFm.setTextColor(resources.getColor(R.color.msg_box_title_color))
+ tvMsgFm.setTextColor(resources.getColor(R.color.color_FF1BB7FF))
tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
viewNoticeDivider.visibility = View.GONE
@@ -190,7 +190,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
2 ->{
tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgIpcReport.setTextColor(resources.getColor(R.color.msg_box_title_color))
+ tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FF1BB7FF))
tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
viewNoticeDivider.visibility = View.GONE
viewFmDivider.visibility = View.GONE
@@ -209,7 +209,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgBadCase.setTextColor(resources.getColor(R.color.msg_box_title_color))
+ tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FF1BB7FF))
viewNoticeDivider.visibility = View.GONE
viewFmDivider.visibility = View.GONE
viewIpcReportDivider.visibility = View.GONE
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt
index 498ca3e68d..63f4e35681 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt
@@ -161,7 +161,7 @@ class NoticeTrafficDialog : BaseFloatDialog, LifecycleObserver {
mRecyclerView?.layoutManager = staggeredGridLayoutManager
val gridLayoutDivider = NoticeTrafficInfoGridItemDivider(
1,
- mContext!!.resources.getColor(R.color.notice_check_dialog_bg_color)
+ mContext!!.resources.getColor(R.color.color_E63B4577)
)
mRecyclerView?.addItemDecoration(gridLayoutDivider)
} catch (e: Exception) {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.kt
index c3e4e39157..5472c39c41 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.kt
@@ -10,7 +10,6 @@ import android.widget.ImageView
import android.widget.TextView
import androidx.constraintlayout.widget.ConstraintLayout
import chassis.Chassis.GearPosition
-import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisStatesListener
@@ -65,18 +64,18 @@ class SteeringWheelView : ConstraintLayout, IMoGoChassisStatesListener {
tapPositionView = findViewById(R.id.tap_position)
steeringCircularV = findViewById(R.id.steering_circular)
steeringCircularV?.setBackWidth(8)
- steeringCircularV?.setBackColor(R.color.hmi_light_back_bg)
+ steeringCircularV?.setBackColor(R.color.color_1EBBCFF6)
steeringCircularV?.setProgress((0 * 100) / 360, 20)
- steeringCircularV?.setProgColor(R.color.hmi_light_blue, R.color.hmi_dark_blue)
+ steeringCircularV?.setProgColor(R.color.color_45D3FF, R.color.color_1B5BFF)
if (isTaxi(FunctionBuildConfig.appIdentityMode)) {
steeringCircularVAlpha = findViewById(R.id.steering_circular_alpha)
steeringCircularVAlpha?.setProgress((0 * 100) / 360, 20)
- steeringCircularV?.setProgColor(R.color.hmi_dark_blue, R.color.hmi_light_blue)
+ steeringCircularV?.setProgColor(R.color.color_1B5BFF, R.color.color_45D3FF)
steeringCircularVAlpha?.setBackWidth(8)
- steeringCircularVAlpha?.setBackColor(R.color.hmi_clear_00)
+ steeringCircularVAlpha?.setBackColor(R.color.color_00FFFFFF)
steeringCircularVAlpha?.setProgColor(
- R.color.hmi_light_blue_alpha_ff,
- R.color.hmi_light_blue_alpha_00
+ R.color.color_D93261B6,
+ R.color.color_D945D3FF
)
steeringCircularVAlpha?.setBlurMaskFilter(BlurMaskFilter.Blur.NORMAL, 12f)
}
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_dialog_btn.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_dialog_btn.xml
index 2423898178..da683dd2be 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_dialog_btn.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_dialog_btn.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_outer_taxi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_outer_taxi.xml
index 453850a0a8..e7db35fa54 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_outer_taxi.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_outer_taxi.xml
@@ -6,7 +6,7 @@
android:shape="ring"
android:thickness="7.2dp"
android:useLevel="false">
-
+
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_tab_car_no.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_tab_car_no.xml
index 3f9e78499a..bc61d59ccb 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_tab_car_no.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_tab_car_no.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_connect.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_connect.xml
index 56c302519f..7f585c0960 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_connect.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_connect.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_dialog_check_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_dialog_check_background.xml
index e2d70db4b2..4c8c5166ab 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_dialog_check_background.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/notice_dialog_check_background.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
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 204776a7be..04fa4d2cb3 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
@@ -11,7 +11,7 @@
android:layout_width="@dimen/dp_216"
android:layout_height="@dimen/dp_90"
android:text="通知"
- android:textColor="@color/msg_box_title_color"
+ android:textColor="@color/color_FF1BB7FF"
android:textSize="@dimen/sp_38"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml
index e9e5e1c5f2..7da0664702 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml
@@ -98,7 +98,7 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_marginBottom="@dimen/dp_150"
- android:background="@color/notice_traffic_line"
+ android:background="@color/color_555C7E"
app:layout_constraintBottom_toBottomOf="parent"
app:riv_corner_radius="@dimen/dp_20" />
@@ -106,7 +106,7 @@
android:id="@+id/traffic_middle_line"
android:layout_width="2dp"
android:layout_height="@dimen/dp_150"
- android:background="@color/notice_traffic_line"
+ android:background="@color/color_555C7E"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
@@ -118,7 +118,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="接 受"
- android:textColor="@color/notice_text_blue"
+ android:textColor="@color/color_1F9BFE"
android:textSize="@dimen/dp_50"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_push_top_banner.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_push_top_banner.xml
index d0c4759418..0ccd04e0e4 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_push_top_banner.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_push_top_banner.xml
@@ -85,7 +85,7 @@
android:focusable="true"
android:gravity="center"
android:text="查看"
- android:textColor="@color/notice_banner_blue"
+ android:textColor="@color/color_5A8EFD"
android:textSize="@dimen/dp_42"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@+id/notice_banner_line"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_acceleration_float.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_acceleration_float.xml
index 06a839f6fc..4b90148571 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_acceleration_float.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_acceleration_float.xml
@@ -16,7 +16,7 @@
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_msg_box_tab.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_msg_box_tab.xml
index f12243f0f8..dcdb54e8fd 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_msg_box_tab.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_msg_box_tab.xml
@@ -20,7 +20,7 @@
android:layout_width="@dimen/dp_154"
android:layout_height="@dimen/dp_113"
android:text="@string/msg_box_title_notice"
- android:textColor="@color/msg_box_tab_title_color"
+ android:textColor="@color/color_FF2EACFF"
android:textSize="@dimen/sp_40"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
index ced58732d4..b55f921c92 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
@@ -1,50 +1,49 @@
- #212831
-
- #2B6EFF
- #1F9BFE
- #5A8EFD
- #E63B4577
- #555C7E
- #256BFF
-
- #FF1BB7FF
- #FF2EACFF
-
#6200EE
#3700B3
#03DAC5
#000000
- #4D000000
- #3B4577
- #8F0005
- #1C1C1C
- #161618
- #2EACFF
- #FF0006
#0099dd
- #FFFFFF
+ #1C1C1C
+ #131415
+ #161618
+ #1B5BFF
+ #2B6EFF
#2C2E30
#2D3E5F
- #D4D8DC
- #50E8E4
+ #2E323A
+ #2EACFF
#252B3F
- #131415
+ #3B3D44
+ #3B4577
+ #45D3FF
+ #50E8E4
+ #5A8EFD
+ #555C7E
+ #8F0005
+ #FF0006
+ #FFFFFF
+ #D4D8DC
#B2BED9
#FF1943
- #3B3D44
- #2E323A
+ #00FFFFFF
+ #FF1BB7FF
+ #FF2EACFF
+ #E63B4577
#FF6E8EC9
#666C6C6C
#27FFFFFF
#1E111111
+ #1EBBCFF6
#FF213757
#335C71AB
#FF384D6E
#80FFFFFF
#CCFFFFFF
#E6FFFFFF
+ #D945D3FF
+ #D93261B6
#FF999900
#FFCC0000
@@ -60,28 +59,11 @@
#FF333333
#FFCCCCCC
- #3B4577
-
- #FFCEDCF7
-
- #FFFFA28B
- #FFDA1100
- #FF60FFD3
- #FF006D43
- #FFFFE198
- #FFFF9B00
- #45D3FF
- #1B5BFF
- #1EBBCFF6
- #D945D3FF
- #D93261B6
- #00FFFFFF
#FF343C63
#0043FF
#FF282F62
#FFFFFF
- #E63B4577
#FF005EA0
#FF1E32D9
@@ -97,7 +79,7 @@
#6A758D
#42464F
- #131415
+ #131415
#FF3B2D
#31FF56
#FFCD3D
diff --git a/core/mogo-core-res/src/main/res/layout/item_notice_video.xml b/core/mogo-core-res/src/main/res/layout/item_notice_video.xml
index 1b6f4c391b..fb761bb97f 100644
--- a/core/mogo-core-res/src/main/res/layout/item_notice_video.xml
+++ b/core/mogo-core-res/src/main/res/layout/item_notice_video.xml
@@ -90,7 +90,7 @@
android:layout_height="@dimen/notice_loading_bt"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
- android:indeterminateTint="#256BFF"
+ android:indeterminateTint="@color/color_256BFF"
android:visibility="gone" />