rc

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

gradle.properties

@@ -24,32 +24,32 @@ 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
-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_MODULE_COMMON_VERSION=1.1.0.1
-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_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_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.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
 
 
 ## 工程外部模块

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 infoId;
     private String type;//卡片类型,
+    /**
+     * @see MarkerPoiTypeEnum
+     */
+    private String poiType;
     private String sn;
     private MarkerLocation location;//位置信息
     private int direction;//方位角度
@@ -21,8 +25,9 @@ public class MarkerExploreWay implements Serializable {
     private String cityName;//:"城市名称",
     private double distance;//距离
     private MarkerUserInfo userInfo;//用户信息
-    private String poiType;
     private List<MarkerExploreWayItem> items;//视频地址和图片地址
+    //上报类型：1-用户上报，2-后台上报 3-三方上报
+    private String uploadType;
 
     public String getAddr() {
         if (TextUtils.isEmpty(addr)) {
@@ -123,35 +128,48 @@ public class MarkerExploreWay implements Serializable {
         this.userInfo = userInfo;
     }
 
-    public String getPoiType() {
-        return poiType;
-    }
-
-
     public String getInfoId() {
         return infoId;
     }
 
-    public MarkerExploreWay setInfoId( String infoId ) {
+    public void setInfoId(String infoId) {
         this.infoId = infoId;
-        return this;
+    }
+
+    public String getPoiType() {
+        return poiType;
+    }
+
+    public void setPoiType(String poiType) {
+        this.poiType = poiType;
+    }
+
+    public String getUploadType() {
+        return uploadType;
+    }
+
+    public void setUploadType(String uploadType) {
+        this.uploadType = uploadType;
     }
 
     @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 + '\'' +
+                ", poiType='" + poiType + '\'' +
                 ", sn='" + sn + '\'' +
-                ", type='" + type + '\'' +
+                ", location=" + location +
+                ", direction=" + direction +
+                ", canLive=" + canLive +
+                ", fileType=" + fileType +
+                ", addr='" + addr + '\'' +
+                ", generateTime=" + generateTime +
+                ", cityName='" + cityName + '\'' +
+                ", distance=" + distance +
                 ", userInfo=" + userInfo +
+                ", items=" + items +
+                ", uploadType='" + uploadType + '\'' +
                 '}';
     }
 }

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 {
 

modules/mogo-module-service/src/main/res/drawable/bg_map_marker_yellow_info.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <gradient
+        android:angle="0"
+        android:endColor="#FFCC00"
+        android:startColor="#FFA417" />
+    <corners android:radius="90dp" />
+
+    <padding
+        android:bottom="@dimen/dp_6"
+        android:left="@dimen/dp_6"
+        android:right="@dimen/dp_40"
+        android:top="@dimen/dp_6" />
+
+</shape >

modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_yellow.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/shape_id" >
+        <!-- 倒三角 -->
+        <rotate
+            android:fromDegrees="45"
+            android:pivotX="135%"
+            android:pivotY="15%"
+            android:toDegrees="45" >
+            <shape android:shape="rectangle" >
+                <solid android:color="#feb712" />
+            </shape >
+        </rotate >
+    </item >
+
+
+</layer-list >