yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jh' into dev

Browse Source
This commit is contained in:
liujing
2020-11-30 10:34:20 +08:00
parent dbc50ee7a5 514c31f4ee
commit 69c526f63b
14 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_normal.png → modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_pressed.png → modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

6
modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml Normal file
View File

@@ -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/selector_call_btn_pressed" android:state_pressed="true" />
<item android:drawable="@drawable/selector_call_btn_normal" android:state_pressed="false" />
<item android:drawable="@drawable/selector_call_btn_normal" />
</selector>

BIN
modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

6
modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/service_car_panel_call_pressed" android:state_pressed="true" />
<item android:drawable="@drawable/service_car_panel_call_normal" android:state_pressed="false" />
<item android:drawable="@drawable/service_car_panel_call_normal" />
</selector>

2
modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml
View File

@@ -62,7 +62,7 @@
android:layout_width="@dimen/modle_car_panel_call"
android:layout_height="@dimen/modle_car_panel_call"
android:layout_marginEnd="@dimen/modle_car_panel_call_margin"
android:background="@drawable/selector_service_car_panel_call"
android:background="@drawable/module_common_selector_call"
android:padding="@dimen/module_services_panel_item_detail_padding"
android:textColor="@color/module_services_panel_item_detail_textColor"
android:textSize="@dimen/module_services_panel_item_detail_textSize"

6
modules/mogo-module-v2x/src/main/res/drawable/selector_call_btn.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/v2x_call_select" android:state_pressed="true" />
<item android:drawable="@drawable/v2x_call_normal" android:state_pressed="false" />
<item android:drawable="@drawable/v2x_call_normal" />
</selector>

2
modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
View File

@@ -112,7 +112,7 @@
android:layout_width="@dimen/module_v2x_event_button_size"
android:layout_height="@dimen/module_v2x_event_button_size"
android:layout_marginEnd="@dimen/dp_40"
android:src="@drawable/selector_call_btn"
android:src="@drawable/module_common_selector_call"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi"

0
skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png → skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_light.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

0
skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png → skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_pressed_light.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

6
skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml Normal file
View File

@@ -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/selector_call_btn_pressed_light" android:state_pressed="true" />
<item android:drawable="@drawable/selector_call_btn_light" android:state_pressed="false" />
<item android:drawable="@drawable/selector_call_btn_light" />
</selector>

0
skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png → skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_light.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png → skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_pressed_light.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

6
skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/service_car_panel_call_pressed_light" android:state_pressed="true" />
<item android:drawable="@drawable/service_car_panel_call_normal_light" android:state_pressed="false" />
<item android:drawable="@drawable/service_car_panel_call_normal_light" />
</selector>