diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1f3d18c759..6249850d4f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -74,7 +74,6 @@
-
diff --git a/gradle.properties b/gradle.properties
index 777b379662..0531e07889 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -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
diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_applist_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_applist_pressed.png
new file mode 100644
index 0000000000..4c3886419e
Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_applist_pressed.png differ
diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_im_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_im_pressed.png
new file mode 100644
index 0000000000..759e1fc8c0
Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_im_pressed.png differ
diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_media_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_media_pressed.png
new file mode 100644
index 0000000000..6749f97683
Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_media_pressed.png differ
diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_navi_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_navi_pressed.png
new file mode 100644
index 0000000000..17db5042cc
Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_navi_pressed.png differ
diff --git a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_applist_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_applist_pressed.png
new file mode 100644
index 0000000000..4c3886419e
Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_applist_pressed.png differ
diff --git a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_im_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_im_pressed.png
new file mode 100644
index 0000000000..759e1fc8c0
Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_im_pressed.png differ
diff --git a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_media_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_media_pressed.png
new file mode 100644
index 0000000000..6749f97683
Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_media_pressed.png differ
diff --git a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_navi_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_navi_pressed.png
new file mode 100644
index 0000000000..17db5042cc
Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_navi_pressed.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml
index f2a8033f4b..e46aa1dcdd 100644
--- a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml
+++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml
@@ -2,7 +2,7 @@
-
-
+
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
index 0053d7f0f1..49470a79e3 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -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) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java
index d7e2dd62a7..d02de41af6 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java
@@ -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();
}
}
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
index 1885f84bd4..88fd3e48c6 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
index bb00ca4b09..c975f7af0a 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
@@ -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" />
-
+