From de9e8dc5648950bbd215681e1aa175742100ed8e Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 26 Sep 2020 14:28:35 +0800 Subject: [PATCH 01/12] update callchat --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 741d0b3c42..f029ca38c1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -101,7 +101,7 @@ CRASHREPORT_NOOP_VERSION=2.0.0 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.8.4 +CARCHATTING_VERSION=1.8.5 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.4.1 # loglib From c9d2524d6b29bd5fa4228e222c2565ce1bb7d0aa Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sun, 27 Sep 2020 11:02:16 +0800 Subject: [PATCH 02/12] opt --- .idea/misc.xml | 2 +- .../extensions/entrance/EntranceFragment.java | 36 +++++++++++++++---- .../entrance/EntrancePresenter.java | 1 - .../extensions/net/GetConfigApiServices.java | 3 -- 4 files changed, 30 insertions(+), 12 deletions(-) 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/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 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; From a7f648b5fc4283280582475bef1b517a9fbb7184 Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 27 Sep 2020 11:52:46 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=BC=B9=E6=A1=86UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/window_road_event_detail.xml | 1 + modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml | 1 + modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml | 1 + modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml | 1 + 4 files changed, 4 insertions(+) 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 From 73378c9b02211c517f1ade4501b9dea2d5d3ec6f Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 27 Sep 2020 12:03:37 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=BC=B9=E6=A1=86UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo-module-v2x/src/main/res/layout/window_fault_help.xml | 1 + 1 file changed, 1 insertion(+) 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" /> From 6d424deae54e91d8ce91635b13d86a235f0dcd3a Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 27 Sep 2020 14:09:29 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=BC=B9=E6=A1=86UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml | 2 +- modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml index 94c233e74a..ad3974ab91 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground" + android:layout_height="wrap_content" android:background="@drawable/v2x_alert_window_bg" android:padding="@dimen/dp_25"> 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 c87bb64112..e0a9f57de8 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,5 +79,5 @@ 16px 20px - 8px + 6px From 4067f6a860127ece09c96d8b2e33d8b6dc31211e Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 27 Sep 2020 15:03:41 +0800 Subject: [PATCH 06/12] ui-m4 --- modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c87bb64112..a3d322e698 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,5 +79,5 @@ 16px 20px - 8px + 3px From ffdd4a003db073a791a539ac3e49a4db6fd440d3 Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 27 Sep 2020 15:11:23 +0800 Subject: [PATCH 07/12] ui-F --- modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 477387d351..16f90b3823 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 @@ -77,7 +77,6 @@ 158px 26px 25px - - 0px + 2px From 798c13dc1da82cad60e7a9dfc758fedc2e245c3a Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 28 Sep 2020 14:15:13 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E9=80=8F=E6=98=8E=E5=80=BC-=E5=AE=8C?= =?UTF-8?q?=E5=85=A8=E4=B8=8D=E9=80=8F=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ From 7d5251b6b28a9493894c5b516ffe556b1ef6d0b9 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 28 Sep 2020 16:09:26 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E5=BF=83=E5=BD=A2=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mogo-module-common/src/main/res/values/dimens.xml | 4 ++-- modules/mogo-module-common/src/main/res/values/styles.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 @@ 26.2500px -8px 8px - 16px - 20px + 20px + 16px 120px 150px 48px 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 @@