From f18586e102e88ae62ee5f447d18d00173e926b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 20 May 2020 15:57:22 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=8E=A2?= =?UTF-8?q?=E8=B7=AF=E6=95=B0=E6=8D=AEID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../common/entity/MarkerExploreWay.java | 30 ++++++++++++------- 2 files changed, 21 insertions(+), 11 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/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 073c45bee0..de2d743cca 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 @@ -10,6 +10,7 @@ import java.util.List; public class MarkerExploreWay implements Serializable { private String type;//卡片类型, + private String infoId; private String sn; private MarkerLocation location;//位置信息 private int direction;//方位角度 @@ -121,21 +122,30 @@ public class MarkerExploreWay implements Serializable { this.userInfo = userInfo; } + public String getInfoId() { + return infoId; + } + + public void setInfoId(String infoId) { + this.infoId = infoId; + } + @Override public String toString() { return "MarkerExploreWay{" + - "addr='" + addr + '\'' + - ", canLive=" + canLive + - ", cityName='" + cityName + '\'' + - ", direction=" + direction + - ", distance=" + distance + - ", fileType=" + fileType + - ", generateTime=" + generateTime + - ", items=" + items + - ", location=" + location + + "type='" + type + '\'' + + ", infoId='" + infoId + '\'' + ", sn='" + sn + '\'' + - ", type='" + type + '\'' + + ", location=" + location + + ", direction=" + direction + + ", canLive=" + canLive + + ", fileType=" + fileType + + ", addr='" + addr + '\'' + + ", generateTime=" + generateTime + + ", cityName='" + cityName + '\'' + + ", distance=" + distance + ", userInfo=" + userInfo + + ", items=" + items + '}'; } } From 873291c7019198424da431751d6059019ccc02e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 20 May 2020 16:00:17 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BA=86common=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index bf7b67a9c8..7a3c3bbf90 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=false +RELEASE=true # 模块版本 ## 工程内模块 MOGO_COMMONS_VERSION=1.1.0.1 @@ -38,7 +38,7 @@ MOGO_CONNECTION_VERSION=1.1.0.1 MOGO_MODULE_APPS_VERSION=1.1.0.1 MOGO_MODULE_NAVI_VERSION=1.1.0.1 MOGO_MODULE_SHARE_VERSION=1.1.0.1 -MOGO_MODULE_COMMON_VERSION=1.1.0.1 +MOGO_MODULE_COMMON_VERSION=1.1.0.2 MOGO_MODULE_MAIN_VERSION=1.1.0.1 MOGO_MODULE_MAP_VERSION=1.1.0.1 MOGO_MODULE_SERVICE_VERSION=1.1.0.1 From 684c02562451b3868713f20ef5e215abba30d35e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 20 May 2020 16:00:26 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BA=86common=E7=89=88?= =?UTF-8?q?=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 7a3c3bbf90..f2934055d4 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.1.0.1 From 855f9f64da01a0af863c9ba91ed031b4287c611b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 20 May 2020 16:07:01 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86poiType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../mogo/module/common/entity/MarkerExploreWay.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f2934055d4..25db21eb31 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ MOGO_CONNECTION_VERSION=1.1.0.1 MOGO_MODULE_APPS_VERSION=1.1.0.1 MOGO_MODULE_NAVI_VERSION=1.1.0.1 MOGO_MODULE_SHARE_VERSION=1.1.0.1 -MOGO_MODULE_COMMON_VERSION=1.1.0.2 +MOGO_MODULE_COMMON_VERSION=1.1.0.3 MOGO_MODULE_MAIN_VERSION=1.1.0.1 MOGO_MODULE_MAP_VERSION=1.1.0.1 MOGO_MODULE_SERVICE_VERSION=1.1.0.1 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 de2d743cca..5fa0fa1798 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 @@ -11,6 +11,10 @@ public class MarkerExploreWay implements Serializable { private String type;//卡片类型, private String infoId; + /** + * @see MarkerPoiTypeEnum + */ + private String poiType; private String sn; private MarkerLocation location;//位置信息 private int direction;//方位角度 @@ -130,11 +134,20 @@ public class MarkerExploreWay implements Serializable { this.infoId = infoId; } + public String getPoiType() { + return poiType; + } + + public void setPoiType(String poiType) { + this.poiType = poiType; + } + @Override public String toString() { return "MarkerExploreWay{" + "type='" + type + '\'' + ", infoId='" + infoId + '\'' + + ", poiType='" + poiType + '\'' + ", sn='" + sn + '\'' + ", location=" + location + ", direction=" + direction + From 958cac170c293e50af115d1ee959ba2492573046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 20 May 2020 16:15:20 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=20uploadType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- .../mogo/module/common/entity/MarkerExploreWay.java | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 25db21eb31..f58bd1883f 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=false +RELEASE=true # 模块版本 ## 工程内模块 MOGO_COMMONS_VERSION=1.1.0.1 @@ -38,7 +38,7 @@ MOGO_CONNECTION_VERSION=1.1.0.1 MOGO_MODULE_APPS_VERSION=1.1.0.1 MOGO_MODULE_NAVI_VERSION=1.1.0.1 MOGO_MODULE_SHARE_VERSION=1.1.0.1 -MOGO_MODULE_COMMON_VERSION=1.1.0.3 +MOGO_MODULE_COMMON_VERSION=1.1.0.4 MOGO_MODULE_MAIN_VERSION=1.1.0.1 MOGO_MODULE_MAP_VERSION=1.1.0.1 MOGO_MODULE_SERVICE_VERSION=1.1.0.1 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 5fa0fa1798..ad8f297160 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 @@ -26,6 +26,8 @@ public class MarkerExploreWay implements Serializable { private double distance;//距离 private MarkerUserInfo userInfo;//用户信息 private List items;//视频地址和图片地址 + //上报类型：1-用户上报，2-后台上报 3-三方上报 + private String uploadType; public String getAddr() { if (TextUtils.isEmpty(addr)) { @@ -142,6 +144,14 @@ public class MarkerExploreWay implements Serializable { this.poiType = poiType; } + public String getUploadType() { + return uploadType; + } + + public void setUploadType(String uploadType) { + this.uploadType = uploadType; + } + @Override public String toString() { return "MarkerExploreWay{" + @@ -159,6 +169,7 @@ public class MarkerExploreWay implements Serializable { ", distance=" + distance + ", userInfo=" + userInfo + ", items=" + items + + ", uploadType='" + uploadType + '\'' + '}'; } } From 826793a34af5bbe0fb0c489c76d57bb6721b5d71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 20 May 2020 17:03:13 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../main/java/com/mogo/module/service/network/RefreshBody.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f58bd1883f..8dada86a79 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ MOGO_CONNECTION_VERSION=1.1.0.1 MOGO_MODULE_APPS_VERSION=1.1.0.1 MOGO_MODULE_NAVI_VERSION=1.1.0.1 MOGO_MODULE_SHARE_VERSION=1.1.0.1 -MOGO_MODULE_COMMON_VERSION=1.1.0.4 +MOGO_MODULE_COMMON_VERSION=1.1.0.5 MOGO_MODULE_MAIN_VERSION=1.1.0.1 MOGO_MODULE_MAP_VERSION=1.1.0.1 MOGO_MODULE_SERVICE_VERSION=1.1.0.1 diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshBody.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshBody.java index 769aa2c6a1..d1a5384490 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshBody.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshBody.java @@ -19,6 +19,7 @@ public class RefreshBody { public String sn; public boolean onlyFocus; // 是否仅查询已关注的好友 public boolean onlySameCity; // 是否仅查询注册城市相同的同城用户 + public boolean viewPush; // 是否走V2X通道 ，true-401011，false -401001 public static class LatLon { From 060613690a7c0e01611adc7600c2e7443635db19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 20 May 2020 17:12:14 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=8D=87=E7=BA=A7=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 8dada86a79..085f5f07f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -41,7 +41,7 @@ MOGO_MODULE_SHARE_VERSION=1.1.0.1 MOGO_MODULE_COMMON_VERSION=1.1.0.5 MOGO_MODULE_MAIN_VERSION=1.1.0.1 MOGO_MODULE_MAP_VERSION=1.1.0.1 -MOGO_MODULE_SERVICE_VERSION=1.1.0.1 +MOGO_MODULE_SERVICE_VERSION=1.1.0.2 MOGO_MODULE_EXTENSIONS_VERSION=1.1.0.1 MOGO_MODULE_SEARCH_VERSION=1.1.0.1 MOGO_MODULE_BACK_VERSION=1.1.0.1 From 4a6c7ffd12c02e6cd53b446f46dfcf87a0dc9e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 20 May 2020 17:28:56 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gradle.properties b/gradle.properties index 085f5f07f4..cbd1f25a93 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,29 +27,29 @@ PASSWORD=xintai2018 RELEASE=true # 模块版本 ## 工程内模块 -MOGO_COMMONS_VERSION=1.1.0.1 -MOGO_UTILS_VERSION=1.1.0.1 -MAP_AMAP_VERSION=1.1.0.1 -MOGO_MAP_VERSION=1.1.0.1 -MOGO_MAP_API_VERSION=1.1.0.1 -MOGO_SERVICE_VERSION=1.1.0.1 -MOGO_SERVICE_API_VERSION=1.1.0.1 -MOGO_CONNECTION_VERSION=1.1.0.1 -MOGO_MODULE_APPS_VERSION=1.1.0.1 -MOGO_MODULE_NAVI_VERSION=1.1.0.1 -MOGO_MODULE_SHARE_VERSION=1.1.0.1 +MOGO_COMMONS_VERSION=1.1.0.2 +MOGO_UTILS_VERSION=1.1.0.2 +MAP_AMAP_VERSION=1.1.0.2 +MOGO_MAP_VERSION=1.1.0.2 +MOGO_MAP_API_VERSION=1.1.0.2 +MOGO_SERVICE_VERSION=1.1.0.2 +MOGO_SERVICE_API_VERSION=1.1.0.2 +MOGO_CONNECTION_VERSION=1.1.0.2 +MOGO_MODULE_APPS_VERSION=1.1.0.2 +MOGO_MODULE_NAVI_VERSION=1.1.0.2 +MOGO_MODULE_SHARE_VERSION=1.1.0.2 MOGO_MODULE_COMMON_VERSION=1.1.0.5 -MOGO_MODULE_MAIN_VERSION=1.1.0.1 -MOGO_MODULE_MAP_VERSION=1.1.0.1 -MOGO_MODULE_SERVICE_VERSION=1.1.0.2 -MOGO_MODULE_EXTENSIONS_VERSION=1.1.0.1 -MOGO_MODULE_SEARCH_VERSION=1.1.0.1 -MOGO_MODULE_BACK_VERSION=1.1.0.1 -MOGO_MODULE_GPS_SIMULATOR_VERSION=1.1.0.1 -MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.1.0.1 -MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.1.0.1 -MOGO_MODULE_AUTHORIZE_VERSION=1.1.0.1 -MOGO_MODULE_GUIDE_VERSION=1.1.0.1 +MOGO_MODULE_MAIN_VERSION=1.1.0.2 +MOGO_MODULE_MAP_VERSION=1.1.0.2 +MOGO_MODULE_SERVICE_VERSION=1.1.0.3 +MOGO_MODULE_EXTENSIONS_VERSION=1.1.0.2 +MOGO_MODULE_SEARCH_VERSION=1.1.0.2 +MOGO_MODULE_BACK_VERSION=1.1.0.2 +MOGO_MODULE_GPS_SIMULATOR_VERSION=1.1.0.2 +MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.1.0.2 +MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.1.0.2 +MOGO_MODULE_AUTHORIZE_VERSION=1.1.0.2 +MOGO_MODULE_GUIDE_VERSION=1.1.0.2 ## 工程外部模块