From 63cf43d145ab5373466f7e836849a455d6c9df9b Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 12 Apr 2021 17:06:34 +0800 Subject: [PATCH] upgrade version --- gradle.properties | 20 ++++++++-------- ...oreWay.java => MarkerExploreWayCloud.java} | 24 +++++++++---------- ...em.java => MarkerExploreWayItemCloud.java} | 2 +- ...UserInfo.java => MarkerUserInfoCloud.java} | 2 +- .../com/mogo/cloud/tanlu/bean/RoadInfos.java | 6 ++--- ...Location.java => MarkerLocationCloud.java} | 2 +- 6 files changed, 28 insertions(+), 28 deletions(-) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/{MarkerExploreWay.java => MarkerExploreWayCloud.java} (87%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/{MarkerExploreWayItem.java => MarkerExploreWayItemCloud.java} (95%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/{MarkerUserInfo.java => MarkerUserInfoCloud.java} (98%) rename modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/location/{MarkerLocation.java => MarkerLocationCloud.java} (95%) diff --git a/gradle.properties b/gradle.properties index b744e3c..bf07572 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,23 +27,23 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -RELEASE=false +RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.0.67 +MOGO_UTILS_VERSION=1.0.69 # 网络请求 -MOGO_NETWORK_VERSION=1.0.67 +MOGO_NETWORK_VERSION=1.0.69 # 网络DNS -MOGO_HTTPDNS_VERSION=1.0.67 +MOGO_HTTPDNS_VERSION=1.0.69 # 鉴权 -MOGO_PASSPORT_VERSION=1.0.67 +MOGO_PASSPORT_VERSION=1.0.69 # 常链接 -MOGO_SOCKET_VERSION=1.0.67 +MOGO_SOCKET_VERSION=1.0.69 # 数据采集 -MOGO_REALTIME_VERSION=1.0.67 +MOGO_REALTIME_VERSION=1.0.69 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.0.67 +MOGO_TANLU_VERSION=1.0.69 # 直播推流 -MOGO_LIVE_VERSION=1.0.67 +MOGO_LIVE_VERSION=1.0.69 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.0.67 +MOGO_TRAFFICLIVE_VERSION=1.0.69 diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerExploreWay.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerExploreWayCloud.java similarity index 87% rename from modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerExploreWay.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerExploreWayCloud.java index 3e8e523..a23153e 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerExploreWay.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerExploreWayCloud.java @@ -2,7 +2,7 @@ package com.mogo.cloud.tanlu.bean; import android.text.TextUtils; -import com.mogo.cloud.tanlu.bean.location.MarkerLocation; +import com.mogo.cloud.tanlu.bean.location.MarkerLocationCloud; import java.io.Serializable; import java.util.List; @@ -13,13 +13,13 @@ import java.util.Objects; * @description * @since 2021/1/20 */ -public class MarkerExploreWay implements Serializable { +public class MarkerExploreWayCloud implements Serializable { private String infoId; private String type;//卡片类型, private String poiType; private String sn; - private MarkerLocation location;//位置信息 + private MarkerLocationCloud location;//位置信息 private int direction;//方位角度 private boolean canLive;//是否可直播（1为可直播，0不可直播） private int fileType;//是图片还是视频（1视频，0图片） @@ -27,8 +27,8 @@ public class MarkerExploreWay implements Serializable { private long generateTime;//时间戳 private String cityName;//:"城市名称", private double distance;//距离 - private MarkerUserInfo userInfo;//用户信息 - private List items;//视频地址和图片地址 + private MarkerUserInfoCloud userInfo;//用户信息 + private List items;//视频地址和图片地址 //上报类型：1-用户上报，2-后台上报 3-三方上报 private String uploadType; @@ -97,19 +97,19 @@ public class MarkerExploreWay implements Serializable { this.generateTime = generateTime; } - public List getItems() { + public List getItems() { return items; } - public void setItems(List items) { + public void setItems(List items) { this.items = items; } - public MarkerLocation getLocation() { + public MarkerLocationCloud getLocation() { return location; } - public void setLocation(MarkerLocation location) { + public void setLocation(MarkerLocationCloud location) { this.location = location; } @@ -129,11 +129,11 @@ public class MarkerExploreWay implements Serializable { this.type = type; } - public MarkerUserInfo getUserInfo() { + public MarkerUserInfoCloud getUserInfo() { return userInfo; } - public void setUserInfo(MarkerUserInfo userInfo) { + public void setUserInfo(MarkerUserInfoCloud userInfo) { this.userInfo = userInfo; } @@ -177,7 +177,7 @@ public class MarkerExploreWay implements Serializable { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - MarkerExploreWay that = (MarkerExploreWay) o; + MarkerExploreWayCloud that = (MarkerExploreWayCloud) o; return Objects.equals(infoId, that.infoId) && Objects.equals(type, that.type) && Objects.equals(poiType, that.poiType); diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerExploreWayItem.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerExploreWayItemCloud.java similarity index 95% rename from modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerExploreWayItem.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerExploreWayItemCloud.java index 237f43f..4b4e6d6 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerExploreWayItem.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerExploreWayItemCloud.java @@ -9,7 +9,7 @@ import java.io.Serializable; * @description * @since 2021/1/20 */ -public class MarkerExploreWayItem implements Serializable { +public class MarkerExploreWayItemCloud implements Serializable { private String thumbnail; private String url; private String content; diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerUserInfo.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerUserInfoCloud.java similarity index 98% rename from modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerUserInfo.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerUserInfoCloud.java index e5ad6df..424c7a4 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerUserInfo.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/MarkerUserInfoCloud.java @@ -10,7 +10,7 @@ import java.util.Calendar; * @description * @since 2021/1/20 */ -public class MarkerUserInfo implements Serializable { +public class MarkerUserInfoCloud implements Serializable { private String sn; private long userId; private String userName;//用户昵称 diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/RoadInfos.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/RoadInfos.java index d94f4b7..b373cec 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/RoadInfos.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/RoadInfos.java @@ -9,13 +9,13 @@ import java.util.List; */ public class RoadInfos{ - private List data; + private List data; - public List getData() { + public List getData() { return data; } - public void setData(List data) { + public void setData(List data) { this.data = data; } } diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/location/MarkerLocation.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/location/MarkerLocationCloud.java similarity index 95% rename from modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/location/MarkerLocation.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/location/MarkerLocationCloud.java index 66b7d84..f1dd662 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/location/MarkerLocation.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/tanlu/bean/location/MarkerLocationCloud.java @@ -11,7 +11,7 @@ import java.io.Serializable; * @author lixiaopeng * @since 2021/1/20 */ -public class MarkerLocation implements Serializable { +public class MarkerLocationCloud implements Serializable { private double lat;//纬度 private double lon;//经度 private double angle;//车头角度，可以没有