diff --git a/.idea/misc.xml b/.idea/misc.xml
index 21e99e2dc0..cd77a1f062 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
-
+
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index f029ca38c1..d79c93cac5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -101,7 +101,7 @@ CRASHREPORT_NOOP_VERSION=2.0.0
######## 外部依赖引用
# 车聊聊
-CARCHATTING_VERSION=1.8.5
+CARCHATTING_VERSION=1.8.6
# 车聊聊接口
CARCHATTINGPROVIDER_VERSION=1.4.1
# loglib
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 c9de4dc5cb..49392a87a6 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
@@ -147,6 +147,8 @@ public class EntranceFragment extends MvpFragment {
@@ -396,10 +398,12 @@ public class EntranceFragment extends MvpFragment ONE_DAY_TIME) {
+ Logger.d(TAG, "--------1------");
isGreaterThanOneDay = true;
} else {
+ Logger.d(TAG, "--------2------");
isGreaterThanOneDay = false;
}
@@ -422,13 +426,24 @@ public class EntranceFragment extends MvpFragment ONE_DAY_TIME) {
SharedPrefsMgr.getInstance(getContext()).putLong(KEY_CLICK_SHARE_TIME, time);
SharedPrefsMgr.getInstance(getContext()).putInt(KEY_CLICK_SHARE_BUTTON, ++shareItemSum);
- AIAssist.getInstance(getContext()).speakTTSVoice(mClickShareVoiceStrings[1]);
+ if (shareItemSum == 1) {
+ AIAssist.getInstance(getContext()).speakTTSVoice(mClickShareVoiceStrings[1]);
+ } else {
+ AIAssist.getInstance(getContext()).speakTTSVoice(mClickShareVoiceStrings[0]);
+ }
} else {
Logger.e(TAG, " playShareGuideVoice else < ONE_DAY_TIME ");
}
@@ -507,9 +526,12 @@ public class EntranceFragment extends MvpFragment 200) {
- showSlideMapVoiceGuide();
+ if (isShowGuide && isGreaterThanOneDay()) {
+ if (motionEvent.getX() > 200) {
+ showSlideMapVoiceGuide();
+ }
}
+
break;
case MotionEvent.ACTION_MOVE:
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
index 0e9057feed..ab25f3a2ba 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
@@ -39,7 +39,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
-import static com.mogo.module.share.constant.ShareConstants.KEY_CLICK_SHARE_BUTTON;
import static com.mogo.module.share.constant.ShareConstants.KEY_SERVER_SHOW_DAY_COUNT;
/**
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/GetConfigApiServices.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/GetConfigApiServices.java
index f0c8bca6c4..ab3b78a18b 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/GetConfigApiServices.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/GetConfigApiServices.java
@@ -1,12 +1,9 @@
package com.mogo.module.extensions.net;
-import com.mogo.module.extensions.bean.CommonConfig;
import com.mogo.module.extensions.bean.CommonConfigResponse;
-import com.mogo.module.extensions.userinfo.UserInfoResponse;
import java.util.Map;
-import io.reactivex.Observable;
import io.reactivex.Single;
import retrofit2.http.GET;
import retrofit2.http.QueryMap;
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/window_fault_help.xml
index e96d3e9056..04ffc5cd62 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_fault_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_fault_help.xml
@@ -7,6 +7,7 @@
android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
android:orientation="vertical"
android:overScrollMode="never"
+ android:padding="@dimen/module_v2x_widow_top_gaps"
tools:itemCount="1"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/item_v2x_fault_help" />
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml
index 380e53446b..cb599e80c8 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml
@@ -12,6 +12,7 @@
android:minHeight="@dimen/module_v2x_event_window_height"
android:orientation="horizontal"
android:overScrollMode="never"
+ android:padding="@dimen/module_v2x_widow_top_gaps"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
index c99bf31c73..c87bb64112 100644
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -79,4 +79,5 @@
16px
20px
+ 8px
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 c99bf31c73..c87bb64112 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
@@ -79,4 +79,5 @@
16px
20px
+ 8px
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 53a5cae3b8..477387d351 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
@@ -78,5 +78,6 @@
26px
25px
+ 0px