From 6845e50739651dd7e91e7b2e08928bb4aac397da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 23 Jun 2020 12:45:31 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BA=86V2X=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=BF=9D=E7=AB=A0=E5=81=9C=E8=BD=A6?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=A8=A1=E5=9D=97=EF=BC=8C29=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=B8=BA=E6=A8=A1=E6=8B=9F=E5=B9=B3=E5=8F=B0=E7=9A=84?= =?UTF-8?q?=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 33ed372823..bea8720b26 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.27 +MOGO_MODULE_V2X_VERSION=1.1.29 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 6e259273296c379f73b0f0a8ecc99b5df3880d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 23 Jun 2020 12:52:45 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BA=86V2X=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=BF=9D=E7=AB=A0=E5=81=9C=E8=BD=A6?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=A8=A1=E5=9D=97=EF=BC=8C30=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=B8=BA=E6=A8=A1=E6=8B=9F=E5=B9=B3=E5=8F=B0=E7=9A=84?= =?UTF-8?q?=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 bea8720b26..3f143843ab 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.29 +MOGO_MODULE_V2X_VERSION=1.1.30 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 34b9447a1ce448ce71a2d56bbfdb6320e1201293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 23 Jun 2020 15:23:36 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=88=A4?= =?UTF-8?q?=E6=96=ADMarkerExploreWay=E6=98=AF=E5=90=A6=E6=98=AF=E5=90=8C?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=AF=B9=E8=B1=A1=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/common/entity/MarkerExploreWay.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java index 255f74c6e3..946833bfff 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java @@ -5,6 +5,7 @@ import android.text.TextUtils; import java.io.Serializable; import java.util.List; +import java.util.Objects; @SuppressWarnings("unused") public class MarkerExploreWay implements Serializable { @@ -137,7 +138,7 @@ public class MarkerExploreWay implements Serializable { } public String getPoiType() { - if ( TextUtils.isEmpty( poiType ) ) { + if (TextUtils.isEmpty(poiType)) { return MarkerPoiTypeEnum.FOURS_BLOCK_UP; } return poiType; @@ -155,6 +156,21 @@ public class MarkerExploreWay implements Serializable { this.uploadType = uploadType; } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + MarkerExploreWay that = (MarkerExploreWay) o; + return Objects.equals(infoId, that.infoId) && + Objects.equals(type, that.type) && + Objects.equals(poiType, that.poiType); + } + + @Override + public int hashCode() { + return Objects.hash(infoId, type, poiType); + } + @Override public String toString() { return "MarkerExploreWay{" + From 62d09e35d93694d832c9255d748dac549265d331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 23 Jun 2020 15:32:49 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 56 +++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3f143843ab..bd59be8999 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,37 +24,37 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -RELEASE=false +RELEASE=true # 模块版本 ## 工程内模块 -MOGO_COMMONS_VERSION=1.2.1.8 -MOGO_UTILS_VERSION=1.2.1.8 -MAP_AMAP_VERSION=1.2.1.8 -MAP_AUTONAVI_VERSION=1.2.1.8 -MOGO_MAP_VERSION=1.2.1.8 -MOGO_MAP_API_VERSION=1.2.1.8 -MOGO_SERVICE_VERSION=1.2.1.8 -MOGO_SERVICE_API_VERSION=1.2.1.8 -MOGO_CONNECTION_VERSION=1.2.1.8 -MOGO_MODULE_APPS_VERSION=1.2.1.8 -MOGO_MODULE_NAVI_VERSION=1.2.1.8 -MOGO_MODULE_SHARE_VERSION=1.2.1.8 -MOGO_MODULE_COMMON_VERSION=1.2.1.8 -MOGO_MODULE_MAIN_VERSION=1.2.1.8 -MOGO_MODULE_MAP_VERSION=1.2.1.8 -MOGO_MODULE_SERVICE_VERSION=1.2.1.8 -MOGO_MODULE_EXTENSIONS_VERSION=1.2.1.8 -MOGO_MODULE_SEARCH_VERSION=1.2.1.8 -MOGO_MODULE_BACK_VERSION=1.2.1.8 -MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.1.8 -MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.1.8 -MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.1.8 -MOGO_MODULE_AUTHORIZE_VERSION=1.2.1.8 -MOGO_MODULE_GUIDE_VERSION=1.2.1.8 -MOGO_MODULE_MEDIA_VERSION=1.2.1.8 +MOGO_COMMONS_VERSION=1.2.1.9 +MOGO_UTILS_VERSION=1.2.1.9 +MAP_AMAP_VERSION=1.2.1.9 +MAP_AUTONAVI_VERSION=1.2.1.9 +MOGO_MAP_VERSION=1.2.1.9 +MOGO_MAP_API_VERSION=1.2.1.9 +MOGO_SERVICE_VERSION=1.2.1.9 +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_COMMON_VERSION=1.2.1.9 +MOGO_MODULE_MAIN_VERSION=1.2.1.9 +MOGO_MODULE_MAP_VERSION=1.2.1.9 +MOGO_MODULE_SERVICE_VERSION=1.2.1.9 +MOGO_MODULE_EXTENSIONS_VERSION=1.2.1.9 +MOGO_MODULE_SEARCH_VERSION=1.2.1.9 +MOGO_MODULE_BACK_VERSION=1.2.1.9 +MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.1.9 +MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.1.9 +MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.1.9 +MOGO_MODULE_AUTHORIZE_VERSION=1.2.1.9 +MOGO_MODULE_GUIDE_VERSION=1.2.1.9 +MOGO_MODULE_MEDIA_VERSION=1.2.1.9 -MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.2.1.8 -MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.8 +MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.2.1.9 +MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.9 ## 工程外部模块 From 51c22898c1b7608b8883d67df23324cc4fa57972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 23 Jun 2020 15:32:55 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=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 bd59be8999..9f81f6906a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,7 +24,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -RELEASE=true +RELEASE=false # 模块版本 ## 工程内模块 MOGO_COMMONS_VERSION=1.2.1.9 From 607a206b6868f7f5ff29cbeb082939eeec001c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 23 Jun 2020 16:41:01 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X?= 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 9f81f6906a..9825052485 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.30 +MOGO_MODULE_V2X_VERSION=1.1.31 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From ddfc0feea0fe81a5c17281338c14de3e31346321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 23 Jun 2020 18:01:06 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=EF=BC=8C=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=A8=A1=E6=8B=9F=E6=B5=8B=E8=AF=95=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=BF=9D=E7=AB=A0=E9=AB=98=E5=8F=91=E5=9C=B0?= 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 9825052485..0da936dbb3 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.31 +MOGO_MODULE_V2X_VERSION=1.1.33 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 343b0dbb10f6b900a85eacd3d0137d98cb0ed567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 23 Jun 2020 18:10:35 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=BF=9D?= =?UTF-8?q?=E7=AB=A0=E5=81=9C=E8=BD=A6=E6=95=B0=E6=8D=AE=E5=9F=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 2dc54c489f..707ee6e613 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 0da936dbb3..7d0643e5e4 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.33 +MOGO_MODULE_V2X_VERSION=1.1.34 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位