diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml index c3dae5f76a..827352b04a 100644 --- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml +++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml @@ -456,4 +456,7 @@ app:layout_constraintStart_toStartOf="parent" /> + \ No newline at end of file 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/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 55f99fed29..2ff011fd47 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -9,7 +9,7 @@ @null @null @color/app_window_background - false + true false @style/Animation diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneContainerView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneContainerView.kt new file mode 100644 index 0000000000..34e45cf2d7 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneContainerView.kt @@ -0,0 +1,25 @@ +package com.mogo.eagle.core.function.hmi.ui.bone + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.function.hmi.R + +class BoneContainerView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr) { + + init { + LayoutInflater.from(context).inflate(R.layout.view_bone_container, this, true) + initView() + } + + private fun initView() { + + } + + +} \ 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/bone/BoneTabLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTabLayout.kt new file mode 100644 index 0000000000..05d36f9254 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTabLayout.kt @@ -0,0 +1,35 @@ +package com.mogo.eagle.core.function.hmi.ui.bone + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.View +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.function.hmi.R +import kotlinx.android.synthetic.main.view_bone_tab.view.clBoneTabChild +import kotlinx.android.synthetic.main.view_bone_tab.view.clCarInfo +import kotlinx.android.synthetic.main.view_bone_tab.view.tbCarInfo + +class BoneTabLayout @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr) { + + init { + LayoutInflater.from(context).inflate(R.layout.view_bone_tab, this, true) + initView() + } + + private fun initView() { + tbCarInfo.setOnCheckedChangeListener { _, isChecked -> + if (isChecked){ + clBoneTabChild.visibility = View.VISIBLE + clCarInfo.visibility = View.VISIBLE + }else{ + clCarInfo.visibility = View.GONE + clBoneTabChild.visibility = View.GONE + } + } + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/bone_bg.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/bone_bg.png new file mode 100644 index 0000000000..327146e713 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/bone_bg.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/bone_tab_bg.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/bone_tab_bg.png new file mode 100644 index 0000000000..68bff3e346 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/bone_tab_bg.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_tab_car_info.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_tab_car_info.png new file mode 100644 index 0000000000..1a454cd10a Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_tab_car_info.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_tab_car_info_open.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_tab_car_info_open.png new file mode 100644 index 0000000000..823bc78ed4 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_tab_car_info_open.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/selector_tab_car_info.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/selector_tab_car_info.xml new file mode 100644 index 0000000000..65f01d24d5 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/selector_tab_car_info.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/view_bone_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml new file mode 100644 index 0000000000..28c5490eb3 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml @@ -0,0 +1,27 @@ + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml new file mode 100644 index 0000000000..93475586c3 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index a4e640e404..9663b6fecb 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -1034,12 +1034,14 @@ 1100dp 1114dp 1125dp + 1128dp 1170dp 1200dp 1250dp 1261dp 1300dp 1373dp + 1386dp 1600dp 1860dp 1920dp