From 0bfcebb0ebc596160b3afd2bd3a8485dadda0b4e Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 4 Jun 2020 18:07:15 +0800 Subject: [PATCH 1/5] update callChat version --- .idea/misc.xml | 2 +- gradle.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 707ee6e613..2dc54c489f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 830806c0d1..d3eb6fcc8e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,9 +60,9 @@ MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.0.0.0 # 探路 MOGO_MODULE_TANLU_VERSION=1.0.6.6 # 车聊聊 -CARCHATTING_VERSION=1.0.4-SNAPSHOT +CARCHATTING_VERSION=1.0.6-SNAPSHOT # 车聊聊接口 -CARCHATTINGPROVIDER_VERSION=1.0.4-SNAPSHOT +CARCHATTINGPROVIDER_VERSION=1.0.6-SNAPSHOT # 视频引导 MOGO_MODULE_GUIDESHOW_VERSION=1.0.2-SNAPSHOT # 视频引导接口 From ca500e6be331431807a4f79c52c778986d7941f2 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 9 Jun 2020 10:11:56 +0800 Subject: [PATCH 2/5] update the module version of v2x to 1.0.30.1-S --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5ea58fa136..a50041fa2c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -70,7 +70,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.0.20 +MOGO_MODULE_V2X_VERSION=1.0.30.1-SNAPSHOT # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.11 # 推送 From e383d564a9dec3b35b1afabf80e57c7d2a2b7c7e Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 9 Jun 2020 14:41:05 +0800 Subject: [PATCH 3/5] fix bug of NPE and changed the use_custom_navi is true in launcher channel --- app/build.gradle | 2 +- .../java/com/mogo/module/extensions/ExtensionsFragment.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d8ebdb280d..d6accd5150 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -86,7 +86,7 @@ android { // 是否启动位置服务 buildConfigField 'boolean', 'LAUNCH_LOCATION_SERVICE', 'true' // 是否使用自定义导航 - buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' + buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'true' // 是否作为 launcher 运行 buildConfigField 'boolean', 'IS_LAUNCHER', 'true' } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsFragment.java index e5254a81c6..11a34ffa20 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsFragment.java @@ -112,7 +112,9 @@ public class ExtensionsFragment extends MvpFragment< ExtensionsView, ExtensionsP @Override public void renderUserInfo(UserInfo userInfo) { - Logger.d(TAG, "renderUserInfo: " + userInfo); - GlideApp.with(getContext()).load(userInfo.getHeadImgurl()).circleCrop().into(mUserHeadImg); + if(userInfo != null){ + Logger.d(TAG, "renderUserInfo: " + userInfo); + GlideApp.with(getContext()).load(userInfo.getHeadImgurl()).circleCrop().into(mUserHeadImg); + } } } From 7ad289054f1ad327805a899cbaae1ceea00ae2ac Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 10 Jun 2020 10:12:50 +0800 Subject: [PATCH 4/5] fix bug of roadsearch listener --- app/build.gradle | 2 +- app/src/launcher/AndroidManifest.xml | 2 +- .../com/mogo/map/impl/amap/search/RoadSearchClient.java | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8d6d760db9..3bbdc8e59a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -88,7 +88,7 @@ android { // 是否使用自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'true' // 是否作为 launcher 运行 - buildConfigField 'boolean', 'IS_LAUNCHER', 'true' + buildConfigField 'boolean', 'IS_LAUNCHER', 'false' } // f系列-分体机全系列，未细分 f8xx{ diff --git a/app/src/launcher/AndroidManifest.xml b/app/src/launcher/AndroidManifest.xml index 759d90f0e5..d8fcc242a2 100644 --- a/app/src/launcher/AndroidManifest.xml +++ b/app/src/launcher/AndroidManifest.xml @@ -21,7 +21,7 @@ diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/RoadSearchClient.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/RoadSearchClient.java index 71ff552352..55dc81ad65 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/RoadSearchClient.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/RoadSearchClient.java @@ -59,9 +59,10 @@ public class RoadSearchClient implements IMogoRoadSearch, RouteSearch.OnRouteSea } } - RouteSearch.DriveRouteQuery searchQuery = new RouteSearch.DriveRouteQuery( fromAndTo, RouteSearch.DRIVING_SINGLE_SHORTEST, latLonPointWays, null, "" ); + RouteSearch.DriveRouteQuery searchQuery = new RouteSearch.DriveRouteQuery( fromAndTo, RouteSearch.DRIVING_MULTI_CHOICE_AVOID_CONGESTION, latLonPointWays, null, "" ); if ( mRouteSearch == null ) { mRouteSearch = new RouteSearch( context ); + mRouteSearch.setRouteSearchListener(this); } mRouteSearch.calculateDriveRouteAsyn( searchQuery ); } @@ -94,14 +95,18 @@ public class RoadSearchClient implements IMogoRoadSearch, RouteSearch.OnRouteSea return; } List< MogoLatLng > points = new ArrayList<>(); - + Logger.d(TAG,"onDriveRouteSearched i : " + i); if ( driveRouteResult == null || driveRouteResult.getPaths() == null || driveRouteResult.getPaths().isEmpty() ) { + Logger.d(TAG,"onDriveRouteSearched result is null"); mListener.onDrivePathSearched( null ); return; } DrivePath drivePath = driveRouteResult.getPaths().get( 0 ); + int size = driveRouteResult.getPaths().size(); + Logger.d(TAG,"onDriveRouteSearched driveRouteResult size : " + size); + List< DriveStep > steps = drivePath.getSteps(); if ( steps == null || steps.isEmpty() ) { mListener.onDrivePathSearched( null ); From 7ab058a8f5680295a36f58e7d7b8733ed608a90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 10 Jun 2020 18:14:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E7=89=88=E6=9C=AC?= 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 d907a78310..4276f34f28 100644 --- a/gradle.properties +++ b/gradle.properties @@ -70,7 +70,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.0.30.1-SNAPSHOT +MOGO_MODULE_V2X_VERSION=1.0.35 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.11 # 推送