diff --git a/app/build.gradle b/app/build.gradle index f238912b93..b56c984701 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/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 e2458d54fc..246ee3aaa2 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 @@ -63,6 +63,7 @@ class RoadCrossLiveView @JvmOverloads constructor( init { val res = when (CallerSkinModeListenerManager.getMode()) { 0 -> R.layout.view_road_cross_live +// 0 -> R.layout.view_road_cross_live_light //todo test 1 -> R.layout.view_road_cross_live_light else -> R.layout.view_road_cross_live } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_close_nor_light.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_close_nor_light.png new file mode 100644 index 0000000000..9e3b259a2c Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_close_nor_light.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_nor_light.9.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_nor_light.9.png new file mode 100644 index 0000000000..7df8d70ba6 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_nor_light.9.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_empty.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_live_empty.xml similarity index 100% rename from core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_empty.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_live_empty.xml diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_live_light_empty.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_live_light_empty.xml new file mode 100644 index 0000000000..8e1b504558 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_live_light_empty.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_logo_light.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_logo_light.png new file mode 100644 index 0000000000..785575b64e Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_logo_light.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_automatic_exploration.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_automatic_exploration.xml index 55887ed5a8..7cb78dc4a3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_automatic_exploration.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_automatic_exploration.xml @@ -34,7 +34,7 @@ app:layout_constraintBottom_toBottomOf="@id/ivScan" app:layout_constraintStart_toEndOf="@id/ivScan" android:textSize="@dimen/sp_32" - android:textColor="@color/exploration_title" + android:textColor="@color/color_131415" android:text="@string/exploration_title" android:layout_marginStart="@dimen/dp_30" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live.xml index 2b14e7825f..af5958a3be 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live.xml @@ -11,7 +11,7 @@ android:layout_width="@dimen/dp_760" android:layout_height="@dimen/dp_428" android:layout_margin="@dimen/dp_20" - android:background="@drawable/bg_road_cross_empty" + android:background="@drawable/bg_road_cross_live_empty" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent"> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml index 77d9ef65f8..3a511c827b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml @@ -1,6 +1,72 @@ + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:background="@drawable/bg_nor_light"> + + + + + + + + + + + + + \ No newline at end of file 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 3c93ad9148..78849a18fc 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 @@ -25,6 +25,7 @@ #D4D8DC #50E8E4 #252B3F + #131415 #27FFFFFF #1E111111 #FF213757 @@ -89,6 +90,5 @@ #24313E #106FF0 #42464F - #131415 \ No newline at end of file