From 997924b9dd6978ef8b6153597a9d0e4098f22e26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 15:44:44 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAgps=E9=80=9F=E5=BA=A6=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b0ea862a92..02e0ed90ff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.39 +MOGO_MODULE_V2X_VERSION=1.1.40 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 146ad163687ecd0d538c4d6fbf849c1f00d05532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 16:04:32 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAgps=E9=80=9F=E5=BA=A6=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 02e0ed90ff..992c13b82a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.40 +MOGO_MODULE_V2X_VERSION=1.1.41 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 269d8aeab84f4407fa1fd6017936130ecc5711be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 16:33:22 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=81=9C=E8=BD=A6?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 992c13b82a..c2bf111f40 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.41 +MOGO_MODULE_V2X_VERSION=1.1.42 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 10f5fab86dd2a69c0521761cc319561e6563d3e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 17:43:01 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=9F=E5=BA=A6?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c2bf111f40..d6f97c1b24 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.42 +MOGO_MODULE_V2X_VERSION=1.1.43 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 86dfe9416775c2d3f73cdd4f0dd89d79aef5255b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 18:05:29 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d6f97c1b24..0d59a17e45 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.43 +MOGO_MODULE_V2X_VERSION=1.1.44 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From d351d527eee4d3e307a5928c1087096f2fd82ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 18:10:00 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=98=E5=82=A8?= =?UTF-8?q?=EF=BC=8C=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0d59a17e45..fb382210a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.44 +MOGO_MODULE_V2X_VERSION=1.1.45 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 972b6b0ab03261196bf15378ac48c71018b1faf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 19:27:42 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86=20=E3=80=90=E8=BF=9D=E7=AB=A0=E9=AB=98=E5=8F=91?= =?UTF-8?q?=E5=9C=B0=E3=80=91=E3=80=90=E8=B7=AF=E6=B5=8B=E3=80=91=E5=AE=9E?= =?UTF-8?q?=E8=BD=A6=E9=9D=99=E6=AD=A2=E7=8A=B6=E6=80=81=EF=BC=8C=E4=BB=8D?= =?UTF-8?q?=E4=BC=9A=E8=AF=AF=E8=A7=A6=E5=8F=91=E8=BF=9D=E7=AB=A0=E9=AB=98?= =?UTF-8?q?=E5=8F=91=E5=9C=B0=E5=9C=BA=E6=99=AF=20http://jira.zhidaohulian?= =?UTF-8?q?.com/browse/E85XJD-62?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fb382210a5..f18e313818 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.45 +MOGO_MODULE_V2X_VERSION=1.1.46 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 940b60fda7b908d29f40e88fb4bc7d2f57e6f4cd Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 29 Jun 2020 20:00:29 +0800 Subject: [PATCH 08/11] fixed bug --- gradle.properties | 2 +- .../src/main/java/com/mogo/module/share/ShareControl.java | 2 +- .../java/com/mogo/module/share/dialog/LaucherShareDialog.java | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index f18e313818..812587a61d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ MOGO_SERVICE_API_VERSION=1.2.1.9 MOGO_CONNECTION_VERSION=1.2.1.9 MOGO_MODULE_APPS_VERSION=1.2.1.9 MOGO_MODULE_NAVI_VERSION=1.2.1.9 -MOGO_MODULE_SHARE_VERSION=1.2.1.9 +MOGO_MODULE_SHARE_VERSION=1.2.1.10 MOGO_MODULE_COMMON_VERSION=1.2.1.9 MOGO_MODULE_MAIN_VERSION=1.2.1.9 MOGO_MODULE_MAP_VERSION=1.2.1.9 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 fabec3de0d..813a7e9252 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 @@ -295,7 +295,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo private void trackVoiceWithType(String type){ Map properties = new HashMap<>(); properties.put("type",type); - properties.put("from","2"); + properties.put("from","1"); AnalyticsUtils.track("v2x_share_type",properties); } diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index 30154abf9e..0a2e936abb 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -144,6 +144,7 @@ public class LaucherShareDialog extends BaseFloatDialog implements View.OnClickL // 事故 Logger.d(TAG,"点击事故"); sendShareReceiver(ShareConstants.TYPE_ACCIDENT); + trackWithType(ShareConstants.TYPE_ACCIDENT); dismiss(); } else if (id == R.id.tvConstruction) { // 道路施工 @@ -155,6 +156,7 @@ public class LaucherShareDialog extends BaseFloatDialog implements View.OnClickL // 实时路况 Logger.d(TAG,"点击实时路况"); sendShareReceiver(ShareConstants.TYPE_REAL_TIME_TRAFFIC); + trackWithType(ShareConstants.TYPE_REAL_TIME_TRAFFIC); dismiss(); } else if (id == R.id.tvStagnantWater) { // 道路积水 From 2ec7dc111f9c7b67fbebb452bdd5bd30cf2e1aed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 20:04:49 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86=20=E3=80=90=E8=BF=9D=E7=AB=A0=E9=AB=98=E5=8F=91?= =?UTF-8?q?=E5=9C=B0=E3=80=91=E5=85=B3=E9=97=AD=E6=B5=AE=E7=AA=97=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=BC=B9=E5=87=BA=E7=9A=84=E6=B5=AE?= =?UTF-8?q?=E7=AA=97=E4=B8=8D=E4=BC=9A=E5=9C=A820s=E5=90=8E=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=B6=88=E5=A4=B1=20http://jira.zhidaohulian.com/brow?= =?UTF-8?q?se/E85XJD-49?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f18e313818..d0dbeceb89 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.46 +MOGO_MODULE_V2X_VERSION=1.1.47 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From dd5b152f6c3b960f3d07fb8396bac880df11f47d Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 29 Jun 2020 20:16:06 +0800 Subject: [PATCH 10/11] opt --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a06d097f73..b7557966fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ MOGO_SERVICE_API_VERSION=1.2.1.9 MOGO_CONNECTION_VERSION=1.2.1.9 MOGO_MODULE_APPS_VERSION=1.2.1.9 MOGO_MODULE_NAVI_VERSION=1.2.1.9 -MOGO_MODULE_SHARE_VERSION=1.2.1.10 +MOGO_MODULE_SHARE_VERSION=1.2.1.18 MOGO_MODULE_COMMON_VERSION=1.2.1.9 MOGO_MODULE_MAIN_VERSION=1.2.1.9 MOGO_MODULE_MAP_VERSION=1.2.1.9 From ac439dbb99c7ffab054fff07c355b3a90a5ed6f2 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 30 Jun 2020 10:37:43 +0800 Subject: [PATCH 11/11] opt --- .../src/main/java/com/mogo/module/apps/AppFilterImpl.java | 4 ++++ modules/mogo-module-apps/src/main/res/values/strings.xml | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java index 1d0437d956..0043bcab25 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java @@ -6,6 +6,7 @@ import android.content.pm.PackageInfo; import com.mogo.module.apps.model.AppEnum; import com.mogo.module.apps.model.AppEnumHelper; +import com.mogo.module.common.utils.CarSeries; import java.util.Arrays; import java.util.HashMap; @@ -29,6 +30,9 @@ public class AppFilterImpl implements AppFilter { final String[] values = context.getResources().getStringArray( R.array.module_apps_array_filter_packages ); if ( values != null ) { mFilterPackages = Arrays.asList( values ); + if ( CarSeries.getSeries() != CarSeries.CAR_SERIES_F80X ) { + mFilterPackages.add( "com.android.settings" ); + } } } diff --git a/modules/mogo-module-apps/src/main/res/values/strings.xml b/modules/mogo-module-apps/src/main/res/values/strings.xml index bf172403d9..822303fed7 100644 --- a/modules/mogo-module-apps/src/main/res/values/strings.xml +++ b/modules/mogo-module-apps/src/main/res/values/strings.xml @@ -13,7 +13,6 @@ com.android.browser com.android.providers.downloads.ui com.zhidao.guide.lock - com.android.settings com.android.calculator2 com.nwd.guidebookskin com.iflytek.inputmethod.pad