Merge branch 'hawkEye_live' of http://gitlab.zhidaoauto.com/ITC/Apps/MoGoAiCloudSdk into hawkEye_live

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

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<MarkerExploreWayItem> items;//视频地址和图片地址
+    private MarkerUserInfoCloud userInfo;//用户信息
+    private List<MarkerExploreWayItemCloud> items;//视频地址和图片地址
     //上报类型：1-用户上报，2-后台上报 3-三方上报
     private String uploadType;
 
@@ -97,19 +97,19 @@ public class MarkerExploreWay implements Serializable {
         this.generateTime = generateTime;
     }
 
-    public List<MarkerExploreWayItem> getItems() {
+    public List<MarkerExploreWayItemCloud> getItems() {
         return items;
     }
 
-    public void setItems(List<MarkerExploreWayItem> items) {
+    public void setItems(List<MarkerExploreWayItemCloud> 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);

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;

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;//用户昵称

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<MarkerExploreWay> data;
+    private List<MarkerExploreWayCloud> data;
 
-    public List<MarkerExploreWay> getData() {
+    public List<MarkerExploreWayCloud> getData() {
         return data;
     }
 
-    public void setData(List<MarkerExploreWay> data) {
+    public void setData(List<MarkerExploreWayCloud> data) {
         this.data = data;
     }
 }

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;//车头角度，可以没有