Merge branch 'qa_1.1.8' into qa_1.1.8_easy_mode

# Conflicts:
#	modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
#	skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml
This commit is contained in:
董宏宇
2020-11-30 18:03:47 +08:00
23 changed files with 17 additions and 21 deletions

1
.idea/gradle.xml generated
View File

@@ -74,7 +74,6 @@
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings>
</option>
</component>

View File

@@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7
######## 外部依赖引用
# 车聊聊
CARCHATTING_VERSION=1.8.9
CARCHATTING_VERSION=1.9.0
# 车聊聊接口
CARCHATTINGPROVIDER_VERSION=1.1.7
# loglib

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<gradient android:angle="135" android:endColor="#59000000" android:startColor="#59000000" android:type="linear" />
<gradient android:angle="135" android:endColor="#164079" android:startColor="#1363A4" android:type="linear" />
<corners android:radius="@dimen/module_ext_common_corner" />
</shape>
</item>

View File

@@ -480,6 +480,10 @@ public class MogoServices implements IMogoMapListener,
}
AutoPilotRemoteController.getInstance().start();
Intent intent = new Intent( "com.freedom.ser.ACTION" );
intent.addFlags( Intent.FLAG_INCLUDE_STOPPED_PACKAGES );
mContext.sendBroadcast( intent );
}
private void initLocationServiceProcess(Context context) {

View File

@@ -98,22 +98,16 @@ public class V2XEventPanelModuleProvider implements
@Override
public void showPanelWithSelectedItem(int item) {
if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) {
V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item);
}
V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item);
}
@Override
public void showPanel() {
if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) {
V2XEventPanelFragment.Companion.getInstance().showPanel();
}
V2XEventPanelFragment.Companion.getInstance().showPanel();
}
@Override
public void hidePanel() {
if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) {
V2XEventPanelFragment.Companion.getInstance().hidePanel();
}
V2XEventPanelFragment.Companion.getInstance().hidePanel();
}
}

View File

@@ -1,7 +1,7 @@
<?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_22"/>
<corners android:radius="@dimen/dp_30"/>
<gradient
android:startColor="#B35E6079"
android:endColor="#B33F4057"

View File

@@ -49,7 +49,7 @@
android:id="@+id/tagEventType"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_36"
android:layout_marginStart="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_36"
android:background="@drawable/bg_v2x_event_type_read"
@@ -87,7 +87,7 @@
android:id="@+id/llIllegalParkingLike"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_40"
android:layout_marginRight="@dimen/dp_40"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingUnLike"
app:layout_constraintTop_toTopOf="parent"
@@ -97,7 +97,7 @@
android:id="@+id/llIllegalParkingUnLike"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="26px"
android:layout_marginRight="@dimen/dp_40"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

View File

@@ -14,18 +14,17 @@
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_21"
android:layout_marginEnd="@dimen/dp_31"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:miv_borderColor="#4cffffff"
app:miv_borderColor="#3381A4DC"
app:miv_failureHolder="@drawable/icon_default_user_head"
app:miv_overlayImageId="@drawable/icon_default_user_head"
app:miv_placeHolder="@drawable/icon_default_user_head"
app:miv_shape="circle"
app:miv_shapeBorderWidth="@dimen/dp_4" />
app:miv_shapeBorderWidth="@dimen/dp_5" />
<TextView
android:id="@+id/tvFaultHelpName"
@@ -122,7 +121,7 @@
android:id="@+id/ivFaultHelpEventNavi"
android:layout_width="@dimen/module_v2x_event_button_size"
android:layout_height="@dimen/module_v2x_event_button_size"
android:layout_marginRight="26px"
android:layout_marginRight="@dimen/dp_40"
android:src="@drawable/selector_nav_history"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@@ -1,7 +1,7 @@
<?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_22"/>
<corners android:radius="@dimen/dp_30"/>
<gradient
android:startColor="#579EFF"

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB