Merge branch 'jo' into dev

This commit is contained in:
liujing
2020-11-19 18:08:46 +08:00
7 changed files with 14 additions and 2 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

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/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>

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

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_talk_btn"
android:src="@drawable/selector_call_btn"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi"
app:layout_constraintTop_toTopOf="parent" />
@@ -122,7 +122,7 @@
android:layout_width="@dimen/module_v2x_event_button_size"
android:layout_height="@dimen/module_v2x_event_button_size"
android:layout_marginRight="26px"
android:src="@drawable/selector_nav_btn"
android:src="@drawable/selector_nav_history"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />