diff --git a/.idea/misc.xml b/.idea/misc.xml
index cd77a1f062..21e99e2dc0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index d112b8f989..62ed0959dc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -102,7 +102,7 @@ CRASHREPORT_NOOP_VERSION=2.0.0
 
 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=1.8.7
+CARCHATTING_VERSION=1.9.5
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.4.1
 # loglib
diff --git a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png
index a4ea109054..dbcd5f3dc6 100644
Binary files a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png and b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_choose.png differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_second.png b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_second.png
index 6e4cd579d9..f1d5a593b2 100644
Binary files a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_second.png and b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_second.png differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png
index a116ac63ce..9ec667a22d 100644
Binary files a/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png and b/modules/mogo-module-common/src/main/res/drawable-mdpi/icon_heart_unchoose.png differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png
index a62533c607..00515d93ff 100644
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png
index 84c49a0052..563562f554 100644
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png differ
diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png
index 79ae51a734..515f7d9753 100644
Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png differ
diff --git a/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
index f8513976c9..64b2c248b0 100644
--- a/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="heart_ratingbar_width">17px</dimen>
-    <dimen name="heart_ratingbar_height">14px</dimen>
+    <dimen name="heart_ratingbar_width">20px</dimen>
+    <dimen name="heart_ratingbar_height">16px</dimen>
     <dimen name="v2x_panel_loading_top">120px</dimen>
     <dimen name="v2x_share_btn_width">150px</dimen>
     <dimen name="v2x_share_btn_height">48px</dimen>
diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
index cff98ba677..50629b57dc 100644
--- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml
@@ -1054,8 +1054,8 @@
     <dimen name="sp_48">48px</dimen>
     <dimen name="module_common_shadow_width">-10px</dimen>
     <dimen name="module_common_shadow_width_pos">10px</dimen>
-    <dimen name="heart_ratingbar_width">31.9px</dimen>
-    <dimen name="heart_ratingbar_height">26px</dimen>
+    <dimen name="heart_ratingbar_width">36px</dimen>
+    <dimen name="heart_ratingbar_height">30px</dimen>
     <dimen name="v2x_panel_loading_top">300px</dimen>
     <dimen name="v2x_share_btn_width">281px</dimen>
     <dimen name="v2x_share_btn_height">90px</dimen>
diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml
index c0b7456f31..f84dd453b6 100644
--- a/modules/mogo-module-common/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values/dimens.xml
@@ -1045,8 +1045,8 @@
 	<dimen name="sp_48">26.2500px</dimen>
 	<dimen name="module_common_shadow_width">-8px</dimen>
 	<dimen name="module_common_shadow_width_pos">8px</dimen>
-	<dimen name="heart_ratingbar_width">16px</dimen>
-	<dimen name="heart_ratingbar_height">20px</dimen>
+	<dimen name="heart_ratingbar_width">20px</dimen>
+	<dimen name="heart_ratingbar_height">16px</dimen>
 	<dimen name="v2x_panel_loading_top">120px</dimen>
 	<dimen name="v2x_share_btn_width">150px</dimen>
 	<dimen name="v2x_share_btn_height">48px</dimen>
diff --git a/modules/mogo-module-common/src/main/res/values/styles.xml b/modules/mogo-module-common/src/main/res/values/styles.xml
index 122d4944f8..e12e13d325 100644
--- a/modules/mogo-module-common/src/main/res/values/styles.xml
+++ b/modules/mogo-module-common/src/main/res/values/styles.xml
@@ -18,10 +18,10 @@
 
 
     <style name="customHeartHeartRatingBarStyle" parent="@style/Widget.AppCompat.RatingBar">
-        <item name="android:minHeight">@dimen/heart_ratingbar_height</item>
-        <item name="android:maxHeight">@dimen/heart_ratingbar_height</item>
         <item name="android:maxWidth">@dimen/heart_ratingbar_width</item>
         <item name="android:minWidth">@dimen/heart_ratingbar_width</item>
+        <item name="android:minHeight">@dimen/heart_ratingbar_height</item>
+        <item name="android:maxHeight">@dimen/heart_ratingbar_height</item>
         <item name="android:numStars">5</item>
         <item name="android:rating">1</item>
         <item name="android:stepSize">0.5</item>
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index fa878367f2..d1c15dc0bf 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -400,10 +400,8 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         long guideRecordTime = SharedPrefsMgr.getInstance(AbsMogoApplication.getApp()).getLong(getSPGuideRecord(), 0);
         Logger.d(TAG, " isGreaterThanOneDay interval = " + (System.currentTimeMillis() - guideRecordTime) + "---currentTime = " + System.currentTimeMillis() + "---guideRecordTime =" + guideRecordTime);
         if ((System.currentTimeMillis() - guideRecordTime) > ONE_DAY_TIME) {
-            Logger.d(TAG, "--------1------");
             isGreaterThanOneDay = true;
         } else {
-            Logger.d(TAG, "--------2------");
             isGreaterThanOneDay = false;
         }
 
diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
index e0ccc1e24d..bc7e325604 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -146,7 +146,7 @@
     <dimen name="module_entrance_id_uploading_height">58px</dimen>
     <dimen name="module_map_id_navi_next_info_distance_marginTop">3dp</dimen>
     <dimen name="module_map_id_navi_next_info_road_marginBottom">10px</dimen>
-    <dimen name="module_map_id_navi_next_info_road_marginBottom_small">4px</dimen>
+    <dimen name="module_map_id_navi_next_info_road_marginBottom_small">6px</dimen>
     <dimen name="module_map_id_navi_next_info_distance_marginStart">6px</dimen>
     <dimen name="module_ext_display_overview_icon_marginTop">10px</dimen>
 
diff --git a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml
index d27dfc19e4..707ac832c0 100644
--- a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml
@@ -17,7 +17,7 @@
     <dimen name="cards_container_shadow_dp_margin_top">319px</dimen>
 
     <dimen name="module_main_apps_fragment_container_width">110px</dimen>
-    <dimen name="module_main_apps_fragment_container_padding">10px</dimen>
+    <dimen name="module_main_apps_fragment_container_padding">6px</dimen>
     <dimen name="module_main_header_fragment_container_marginTop">15px</dimen>
     <dimen name="module_main_header_fragment_container_marginLeft">460px</dimen>
     <dimen name="module_main_id_entrance_fragment_container_marginLeft">444px</dimen>
diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml
index d27dfc19e4..707ac832c0 100644
--- a/modules/mogo-module-main/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values/dimens.xml
@@ -17,7 +17,7 @@
     <dimen name="cards_container_shadow_dp_margin_top">319px</dimen>
 
     <dimen name="module_main_apps_fragment_container_width">110px</dimen>
-    <dimen name="module_main_apps_fragment_container_padding">10px</dimen>
+    <dimen name="module_main_apps_fragment_container_padding">6px</dimen>
     <dimen name="module_main_header_fragment_container_marginTop">15px</dimen>
     <dimen name="module_main_header_fragment_container_marginLeft">460px</dimen>
     <dimen name="module_main_id_entrance_fragment_container_marginLeft">444px</dimen>
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
index a8f411f093..a05c8b67e9 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java
@@ -209,28 +209,29 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener,
         AIAssist.getInstance(mContext).registerUnWakeupCommand(UNWAKE_UPLOAD_REAL_TIME_TRAFFIC,
                 UPLOAD_REAL_TIME_TRAFFIC, ShareControl.this);
 
-        if (!DebugConfig.isLauncher()) {
-            ServiceApisManager.serviceApis.getStatusManagerApi().registerStatusChangedListener(TAG, StatusDescriptor.MAIN_PAGE_RESUME, new IMogoStatusChangedListener() {
-                @Override
-                public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
-                    if (!isTrue) {
-                        dismissShareDialog();
-                    }
+//        if (!DebugConfig.isLauncher()) {
+        ServiceApisManager.serviceApis.getStatusManagerApi().registerStatusChangedListener(TAG,
+                StatusDescriptor.MAIN_PAGE_RESUME, new IMogoStatusChangedListener() {
+            @Override
+            public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
+                if (!isTrue) {
+                    dismissShareDialog();
                 }
-            });
-        }
+            }
+        });
+//        }
 
 //        if (!DebugConfig.isLauncher()) {
         ServiceApisManager.serviceApis.getStatusManagerApi().registerStatusChangedListener(TAG,
                 StatusDescriptor.ACC_STATUS, new IMogoStatusChangedListener() {
-            @Override
-            public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
-                if (isTrue) {
-                    queryShareConfigRetryTime = 0;
-                    queryShareButtonConfig();
-                }
-            }
-        });
+                    @Override
+                    public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
+                        if (isTrue) {
+                            queryShareConfigRetryTime = 0;
+                            queryShareButtonConfig();
+                        }
+                    }
+                });
 
         // 获取分享框配置信息
         queryShareConfigRetryTime = 0;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
index b55f61e4f1..1129944f32 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
@@ -72,34 +72,27 @@ public class V2XScenarioManager implements IV2XScenarioManager {
                     if (mV2XScenario == null) {
                         switch (v2XMessageEntity.getType()) {
                             case V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING:
-                                hidOtherPanel();
                                 mV2XScenario = V2XRoadEventScenario.getInstance();
                                 break;
                             case V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING:
-                                hidOtherPanel();
                                 mV2XScenario = V2XSeekHelpScenario.getInstance();
                                 break;
                             case V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING:
-                                hidOtherPanel();
                                 mV2XScenario = V2XFatigueDrivingScenario.getInstance();
                                 break;
                             case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING:
-                                hidOtherPanel();
                                 mV2XScenario = V2XPushEventScenario.getInstance();
                                 break;
                             case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_LIVE_CAR_WARNING:
-                                hidOtherPanel();
                                 mV2XScenario = V2XPushLiveCarScenario.getInstance();
                                 break;
                             case V2XMessageEntity.V2XTypeEnum.ALERT_ANIMATION_WARNING:
-                                hidOtherPanel();
                                 mV2XScenario = V2XAnimationScenario.getInstance();
                                 break;
                             case V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP:
                                 mV2XScenario = V2XCarForHelpScenario.getInstance();
                                 break;
                             case V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING:
-                                hidOtherPanel();
                                 mV2XScenario = V2XIllegalParkScenario.getInstance();
                                 break;
                             default:
@@ -111,6 +104,9 @@ public class V2XScenarioManager implements IV2XScenarioManager {
 
                     // 展示最新的消息
                     if (mV2XScenario != null) {
+                        if (v2XMessageEntity.getType() != V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP) {
+                            hidOtherPanel();
+                        }
                         mV2XScenario.init(v2XMessageEntity);
                         mV2XScenarioSet.put(v2XMessageEntity.getType(), mV2XScenario);
                     }
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index a3d322e698..ad0a0074dd 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -72,7 +72,7 @@
     <dimen name="share_index_des_size">16px</dimen>
     <dimen name="share_empty_btn_padding">20px</dimen>
     <dimen name="shaer_refresh_padding">34px</dimen>
-    <dimen name="share_index_bottom_padding">15px</dimen>
+    <dimen name="share_index_bottom_padding">16px</dimen>
     <dimen name="share_btn_middle_padding">29px</dimen>
     <dimen name="v2x_panel_btn_translationY">-8px</dimen>
     <dimen name="module_v2x_panel_tab_height">84px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index 16f90b3823..5839a19128 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -70,7 +70,7 @@
     <dimen name="share_index_des_size">30px</dimen>
     <dimen name="share_empty_btn_padding">40px</dimen>
     <dimen name="shaer_refresh_padding">60px</dimen>
-    <dimen name="share_index_bottom_padding">36px</dimen>
+    <dimen name="share_index_bottom_padding">31px</dimen>
     <dimen name="share_btn_middle_padding">54px</dimen>
     <dimen name="v2x_panel_btn_translationY">-10px</dimen>
     <dimen name="v2x_panel_btn_image_width">114px</dimen>
diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-ldpi/module_carchatting_user_cover_bg_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-ldpi/module_carchatting_user_cover_bg_light.png
new file mode 100644
index 0000000000..bcddfcc01c
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-ldpi/module_carchatting_user_cover_bg_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-mdpi/module_carchatting_user_cover_bg_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-mdpi/module_carchatting_user_cover_bg_light.png
new file mode 100644
index 0000000000..bcddfcc01c
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-mdpi/module_carchatting_user_cover_bg_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-xhdpi/module_carchatting_user_cover_bg_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-xhdpi/module_carchatting_user_cover_bg_light.png
new file mode 100644
index 0000000000..08b2f94b17
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-xhdpi/module_carchatting_user_cover_bg_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
index 8790c3b9a1..cf7e43c2c0 100644
--- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
@@ -29,7 +29,7 @@
             <corners android:radius="@dimen/dp_26" />
             <gradient
                 android:angle="135"
-                android:endColor="#E6F5F5F5"
+                android:endColor="#F5F5F5"
                 android:startColor="#FFFFFF"
                 android:type="linear"
                 android:useLevel="true" />