[m1 1.0.0]
[空调设置除了温度调整其他搞定]
This commit is contained in:
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="@dimen/dp_44"/>
|
||||
<solid android:color="@color/bus_p_m1_CCFFFFFF"/>
|
||||
</shape>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/bus_p_function_aircondition_pattern_selected" android:state_checked="true"/>
|
||||
<item android:drawable="@drawable/bus_p_function_aircondition_pattern_select" android:state_checked="false"/>
|
||||
<item android:drawable="@drawable/bus_p_function_aircondition_pattern_select"/>
|
||||
</selector>
|
||||
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="@android:color/transparent"/>
|
||||
</shape>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="@dimen/dp_48"/>
|
||||
<solid android:color="@android:color/white"/>
|
||||
</shape>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/bus_p_function_aircondition_switch_selected" android:state_checked="true"/>
|
||||
<item android:drawable="@drawable/bus_p_function_aircondition_switch_select" android:state_checked="false"/>
|
||||
<item android:drawable="@drawable/bus_p_function_aircondition_switch_select"/>
|
||||
</selector>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:color="@android:color/white" android:state_checked="true"/>
|
||||
<item android:color="@color/bus_p_m1_47576E" android:state_checked="false"/>
|
||||
<item android:color="@color/bus_p_m1_47576E" />
|
||||
</selector>
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:color="@android:color/white" android:state_checked="true"/>
|
||||
<item android:color="#374968" android:state_checked="false"/>
|
||||
<item android:color="#374968" />
|
||||
<item android:color="@color/bus_p_m1_374968" android:state_checked="false"/>
|
||||
<item android:color="@color/bus_p_m1_374968" />
|
||||
</selector>
|
||||
@@ -81,12 +81,180 @@
|
||||
app:layout_constraintStart_toStartOf="@+id/gl_left"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/tv_aircondition_switch"
|
||||
android:text="打开空调"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/dp_76"
|
||||
android:background="@drawable/bus_p_function_aircondition_switch_selector"
|
||||
android:button="@null"
|
||||
app:layout_constraintWidth_percent="0.289"
|
||||
android:layout_marginTop="@dimen/dp_57"
|
||||
android:layout_marginBottom="@dimen/dp_17"
|
||||
android:drawableLeft="@drawable/bus_p_function_switch_left_selector"
|
||||
android:gravity="center"
|
||||
android:checked="true"
|
||||
android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
|
||||
android:textSize="@dimen/dp_24"
|
||||
app:layout_constraintBottom_toTopOf="@+id/tv_light_top_02"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="@+id/gl_right"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_chainStyle="packed" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_temperature_title"
|
||||
app:layout_constraintStart_toStartOf="@+id/tv_aircondition_switch"
|
||||
app:layout_constraintTop_toTopOf="@+id/v_temp"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/v_temp"
|
||||
android:textSize="@dimen/dp_24"
|
||||
android:textColor="@color/bus_p_m1_47576E"
|
||||
android:text="@string/bus_p_m1_temperature"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
<View
|
||||
android:id="@+id/v_temp"
|
||||
app:layout_constraintEnd_toEndOf="@+id/tv_aircondition_switch"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tv_aircondition_switch"
|
||||
android:layout_marginTop="@dimen/dp_41"
|
||||
android:background="@drawable/bus_p_function_aircondition_common_bg"
|
||||
app:layout_constraintWidth_percent="0.244"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/dp_60"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_aircondition_pattern_title"
|
||||
app:layout_constraintStart_toStartOf="@+id/tv_aircondition_switch"
|
||||
app:layout_constraintTop_toTopOf="@+id/rg_setting_pattern"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/rg_setting_pattern"
|
||||
android:text="设置"
|
||||
android:textSize="@dimen/dp_24"
|
||||
android:textColor="@color/bus_p_m1_47576E"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
<RadioGroup
|
||||
android:id="@+id/rg_setting_pattern"
|
||||
app:layout_constraintEnd_toEndOf="@+id/tv_aircondition_switch"
|
||||
app:layout_constraintTop_toBottomOf="@+id/v_temp"
|
||||
app:layout_constraintWidth_percent="0.244"
|
||||
android:background="@drawable/bus_p_function_aircondition_common_bg"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginTop="@dimen/dp_41"
|
||||
android:gravity="center"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/dp_60">
|
||||
<RadioButton
|
||||
android:id="@+id/rb_pattern_automatic"
|
||||
android:text="@string/bus_p_m1_automatic"
|
||||
android:gravity="center"
|
||||
android:textColor="@drawable/bus_p_function_airconditon_pattern_text_color_selector"
|
||||
android:layout_marginEnd="@dimen/dp_21"
|
||||
android:background="@drawable/bus_p_function_aircondition_pattern_selecotr"
|
||||
android:textSize="@dimen/dp_24"
|
||||
android:button="@null"
|
||||
android:checked="true"
|
||||
android:layout_width="@dimen/dp_59"
|
||||
android:layout_height="match_parent"/>
|
||||
<RadioButton
|
||||
android:text="@string/bus_p_m1_refrigeration"
|
||||
android:gravity="center"
|
||||
android:textSize="@dimen/dp_24"
|
||||
android:background="@drawable/bus_p_function_aircondition_pattern_selecotr"
|
||||
android:id="@+id/rb_pattern_refrigeration"
|
||||
android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
|
||||
android:layout_marginEnd="@dimen/dp_21"
|
||||
android:button="@null"
|
||||
android:layout_width="@dimen/dp_59"
|
||||
android:layout_height="match_parent"/>
|
||||
<RadioButton
|
||||
android:id="@+id/rb_pattern_heating"
|
||||
android:text="@string/bus_p_m1_heating"
|
||||
android:textSize="@dimen/dp_24"
|
||||
android:gravity="center"
|
||||
android:background="@drawable/bus_p_function_aircondition_pattern_selecotr"
|
||||
android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
|
||||
android:layout_marginEnd="@dimen/dp_21"
|
||||
android:button="@null"
|
||||
android:layout_width="@dimen/dp_59"
|
||||
android:layout_height="match_parent"/>
|
||||
<RadioButton
|
||||
android:id="@+id/rb_pattern_ventilate"
|
||||
android:text="@string/bus_p_m1_ventilate"
|
||||
android:background="@drawable/bus_p_function_aircondition_pattern_selecotr"
|
||||
android:gravity="center"
|
||||
android:textSize="@dimen/dp_24"
|
||||
android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
|
||||
android:button="@null"
|
||||
android:layout_width="@dimen/dp_59"
|
||||
android:layout_height="match_parent"/>
|
||||
|
||||
</RadioGroup>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_aircondition_wind_speed_title"
|
||||
app:layout_constraintStart_toStartOf="@+id/tv_aircondition_switch"
|
||||
app:layout_constraintTop_toTopOf="@+id/rg_setting_windspeed"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/rg_setting_windspeed"
|
||||
android:text="@string/bus_p_m1_wind_speed"
|
||||
android:textSize="@dimen/dp_24"
|
||||
android:textColor="@color/bus_p_m1_47576E"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
<RadioGroup
|
||||
android:id="@+id/rg_setting_windspeed"
|
||||
app:layout_constraintEnd_toEndOf="@+id/tv_aircondition_switch"
|
||||
app:layout_constraintTop_toBottomOf="@+id/rg_setting_pattern"
|
||||
app:layout_constraintWidth_percent="0.244"
|
||||
android:orientation="horizontal"
|
||||
android:background="@drawable/bus_p_function_aircondition_common_bg"
|
||||
android:layout_marginTop="@dimen/dp_41"
|
||||
android:gravity="center"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/dp_60">
|
||||
<RadioButton
|
||||
android:id="@+id/rb_wind_speed_low"
|
||||
android:text="@string/bus_p_m1_wind_speed_low"
|
||||
android:gravity="center"
|
||||
android:textColor="@drawable/bus_p_function_airconditon_pattern_text_color_selector"
|
||||
android:layout_marginEnd="@dimen/dp_44"
|
||||
android:background="@drawable/bus_p_function_aircondition_pattern_selecotr"
|
||||
android:textSize="@dimen/dp_24"
|
||||
android:checked="true"
|
||||
android:button="@null"
|
||||
android:layout_width="@dimen/dp_59"
|
||||
android:layout_height="match_parent"/>
|
||||
<RadioButton
|
||||
android:id="@+id/rb_wind_speed_middle"
|
||||
android:text="@string/bus_p_m1_wind_speed_middle"
|
||||
android:gravity="center"
|
||||
android:textSize="@dimen/dp_24"
|
||||
android:background="@drawable/bus_p_function_aircondition_pattern_selecotr"
|
||||
android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
|
||||
android:layout_marginEnd="@dimen/dp_44"
|
||||
android:button="@null"
|
||||
android:layout_width="@dimen/dp_59"
|
||||
android:layout_height="match_parent"/>
|
||||
<RadioButton
|
||||
android:id="@+id/rb_wind_speed_high"
|
||||
android:text="@string/bus_p_m1_wind_speed_high"
|
||||
android:gravity="center"
|
||||
android:textSize="@dimen/dp_24"
|
||||
android:background="@drawable/bus_p_function_aircondition_pattern_selecotr"
|
||||
android:textColor="@drawable/bus_p_function_airconditon_text_color_selector"
|
||||
android:button="@null"
|
||||
android:layout_width="@dimen/dp_59"
|
||||
android:layout_height="match_parent"/>
|
||||
</RadioGroup>
|
||||
|
||||
<androidx.constraintlayout.widget.Group
|
||||
android:id="@+id/g_aircondition_setting"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone"
|
||||
app:constraint_referenced_ids="iv_aircondition" />
|
||||
android:visibility="visible"
|
||||
app:constraint_referenced_ids="tv_aircondition_switch,tv_temperature_title,v_temp,tv_aircondition_pattern_title,rg_setting_pattern,tv_aircondition_wind_speed_title,rg_setting_windspeed" />
|
||||
<!--endregion-->
|
||||
|
||||
<!--region 灯光调整-->
|
||||
@@ -252,7 +420,7 @@
|
||||
android:layout_marginTop="@dimen/dp_24"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="visible"
|
||||
android:visibility="gone"
|
||||
app:constraint_referenced_ids="iv_voice,sb_voice_bar,tv_voice_title,iv_end_voice,iv_start_voice,tv_current_voice_value" />
|
||||
<!--endregion-->
|
||||
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
<color name="module_main_window_background_color">#212831</color>
|
||||
|
||||
<color name="bus_p_m1_203555">#203555</color>
|
||||
<color name="bus_p_m1_47576E">#47576E</color>
|
||||
<color name="bus_p_m1_374968">#374968</color>
|
||||
|
||||
|
||||
<color name="bus_p_m1_CCFFFFFF">#CCFFFFFF</color>
|
||||
</resources>
|
||||
15
OCH/mogo-och-bus-passenger/src/m1/res/values/strings.xml
Normal file
15
OCH/mogo-och-bus-passenger/src/m1/res/values/strings.xml
Normal file
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="bus_p_m1_refrigeration">制冷</string>
|
||||
<string name="bus_p_m1_heating">制热</string>
|
||||
<string name="bus_p_m1_ventilate">通风</string>
|
||||
<string name="bus_p_m1_automatic">自动</string>
|
||||
|
||||
<string name="bus_p_m1_temperature">温度</string>
|
||||
|
||||
<string name="bus_p_m1_wind_speed">风速</string>
|
||||
<string name="bus_p_m1_wind_speed_low">低</string>
|
||||
<string name="bus_p_m1_wind_speed_middle">中</string>
|
||||
<string name="bus_p_m1_wind_speed_high">高</string>
|
||||
|
||||
</resources>
|
||||
Reference in New Issue
Block a user