Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0

.idea/misc.xml

@@ -5,7 +5,7 @@
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
     </configurations>
   </component>
-  <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>
   <component name="ProjectType">

modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java

@@ -423,7 +423,6 @@ public class MogoServiceProvider implements IMogoModuleProvider,
         }
     }
 
-    @Override
     public IMogoMarkerClickListener getMarkerClickListener() {
         return null;
     }

modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerActivitiesScope.java

@@ -1,30 +1,30 @@
 
 package com.mogo.module.service.entity;
 
-import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
 
 @SuppressWarnings("unused")
 public class MarkerActivitiesScope {
 
-    @SerializedName("content")
-    private String mContent;
-    @SerializedName("isCheck")
-    private int mIsCheck;
+    @Expose
+    private String content;
+    @Expose
+    private int isCheck;
 
     public String getContent() {
-        return mContent;
+        return content;
     }
 
     public void setContent(String content) {
-        mContent = content;
+        this.content = content;
     }
 
     public int getIsCheck() {
-        return mIsCheck;
+        return isCheck;
     }
 
     public void setIsCheck(int isCheck) {
-        mIsCheck = isCheck;
+        this.isCheck = isCheck;
     }
 
 }

modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarChat.java

@@ -1,40 +1,40 @@
 
 package com.mogo.module.service.entity;
 
-import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
 
 @SuppressWarnings("unused")
 public class MarkerCarChat {
 
-    @SerializedName("location")
-    private MarkerLocation mLocation;
-    @SerializedName("type")
-    private String mType;
-    @SerializedName("userInfo")
-    private MarkerUserInfo mUserInfo;
+    @Expose
+    private MarkerLocation location;
+    @Expose
+    private String type;
+    @Expose
+    private MarkerUserInfo userInfo;
 
     public MarkerLocation getLocation() {
-        return mLocation;
+        return location;
     }
 
     public void setLocation(MarkerLocation location) {
-        mLocation = location;
+        this.location = location;
     }
 
     public String getType() {
-        return mType;
+        return type;
     }
 
     public void setType(String type) {
-        mType = type;
+        this.type = type;
     }
 
     public MarkerUserInfo getUserInfo() {
-        return mUserInfo;
+        return userInfo;
     }
 
     public void setUserInfo(MarkerUserInfo userInfo) {
-        mUserInfo = userInfo;
+        this.userInfo = userInfo;
     }
 
 }

modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCarInfo.java

@@ -1,30 +1,30 @@
 
 package com.mogo.module.service.entity;
 
-import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
 
 @SuppressWarnings("unused")
 public class MarkerCarInfo {
 
-    @SerializedName("carBrandLogoUrl")
-    private String mCarBrandLogoUrl;
-    @SerializedName("carTypeName")
-    private String mCarTypeName;
+    @Expose
+    private String carBrandLogoUrl;
+    @Expose
+    private String carTypeName;
 
     public String getCarBrandLogoUrl() {
-        return mCarBrandLogoUrl;
+        return carBrandLogoUrl;
     }
 
     public void setCarBrandLogoUrl(String carBrandLogoUrl) {
-        mCarBrandLogoUrl = carBrandLogoUrl;
+        this.carBrandLogoUrl = carBrandLogoUrl;
     }
 
     public String getCarTypeName() {
-        return mCarTypeName;
+        return carTypeName;
     }
 
     public void setCarTypeName(String carTypeName) {
-        mCarTypeName = carTypeName;
+        this.carTypeName = carTypeName;
     }
 
 }

modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerCardResult.java

@@ -2,50 +2,50 @@
 package com.mogo.module.service.entity;
 
 import java.util.List;
-import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
 
 @SuppressWarnings("unused")
 public class MarkerCardResult {
 
-    @SerializedName("carChat")
-    private List<MarkerCarChat> mCarChat;
-    @SerializedName("exploreWay")
-    private List<MarkerExploreWay> mExploreWay;
-    @SerializedName("onlineCar")
-    private List<MarkerOnlineCar> mOnlineCar;
-    @SerializedName("shareMusic")
-    private List<MarkerShareMusic> mShareMusic;
+    @Expose
+    private List<MarkerCarChat> carChat;
+    @Expose
+    private List<MarkerExploreWay> exploreWay;
+    @Expose
+    private List<MarkerOnlineCar> onlineCar;
+    @Expose
+    private List<MarkerShareMusic> shareMusic;
 
     public List<MarkerCarChat> getCarChat() {
-        return mCarChat;
+        return carChat;
     }
 
     public void setCarChat(List<MarkerCarChat> carChat) {
-        mCarChat = carChat;
+        this.carChat = carChat;
     }
 
     public List<MarkerExploreWay> getExploreWay() {
-        return mExploreWay;
+        return exploreWay;
     }
 
     public void setExploreWay(List<MarkerExploreWay> exploreWay) {
-        mExploreWay = exploreWay;
+        this.exploreWay = exploreWay;
     }
 
     public List<MarkerOnlineCar> getOnlineCar() {
-        return mOnlineCar;
+        return onlineCar;
     }
 
     public void setOnlineCar(List<MarkerOnlineCar> onlineCar) {
-        mOnlineCar = onlineCar;
+        this.onlineCar = onlineCar;
     }
 
     public List<MarkerShareMusic> getShareMusic() {
-        return mShareMusic;
+        return shareMusic;
     }
 
     public void setShareMusic(List<MarkerShareMusic> shareMusic) {
-        mShareMusic = shareMusic;
+        this.shareMusic = shareMusic;
     }
 
 }

modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerDynamicData.java

@@ -1,40 +1,40 @@
 
 package com.mogo.module.service.entity;
 
-import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
 
 @SuppressWarnings("unused")
 public class MarkerDynamicData {
 
-    @SerializedName("id")
-    private String mId;
-    @SerializedName("name")
-    private String mName;
-    @SerializedName("type")
-    private int mType;
+    @Expose
+    private Long id;
+    @Expose
+    private String name;
+    @Expose
+    private Long type;
 
-    public String getId() {
-        return mId;
+    public Long getId() {
+        return id;
     }
 
-    public void setId(String id) {
-        mId = id;
+    public void setId(Long id) {
+        this.id = id;
     }
 
     public String getName() {
-        return mName;
+        return name;
     }
 
     public void setName(String name) {
-        mName = name;
+        this.name = name;
     }
 
-    public int getType() {
-        return mType;
+    public Long getType() {
+        return type;
     }
 
-    public void setType(int type) {
-        mType = type;
+    public void setType(Long type) {
+        this.type = type;
     }
 
 }

modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWay.java

@@ -2,130 +2,130 @@
 package com.mogo.module.service.entity;
 
 import java.util.List;
-import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
 
 @SuppressWarnings("unused")
 public class MarkerExploreWay {
 
-    @SerializedName("addr")
-    private String mAddr;
-    @SerializedName("canLive")
-    private Long mCanLive;
-    @SerializedName("cityName")
-    private String mCityName;
-    @SerializedName("direction")
-    private Long mDirection;
-    @SerializedName("distance")
-    private Long mDistance;
-    @SerializedName("fileType")
-    private Long mFileType;
-    @SerializedName("generateTime")
-    private Long mGenerateTime;
-    @SerializedName("items")
-    private List<MarkerExploreWayItem> mItems;
-    @SerializedName("location")
-    private MarkerLocation mLocation;
-    @SerializedName("sn")
-    private String mSn;
-    @SerializedName("type")
-    private String mType;
-    @SerializedName("userInfo")
-    private MarkerUserInfo mUserInfo;
+    @Expose
+    private String addr;
+    @Expose
+    private Long canLive;
+    @Expose
+    private String cityName;
+    @Expose
+    private Long direction;
+    @Expose
+    private Long distance;
+    @Expose
+    private Long fileType;
+    @Expose
+    private Long generateTime;
+    @Expose
+    private List<MarkerExploreWayItem> items;
+    @Expose
+    private MarkerLocation location;
+    @Expose
+    private String sn;
+    @Expose
+    private String type;
+    @Expose
+    private MarkerUserInfo userInfo;
 
     public String getAddr() {
-        return mAddr;
+        return addr;
     }
 
     public void setAddr(String addr) {
-        mAddr = addr;
+        this.addr = addr;
     }
 
     public Long getCanLive() {
-        return mCanLive;
+        return canLive;
     }
 
     public void setCanLive(Long canLive) {
-        mCanLive = canLive;
+        this.canLive = canLive;
     }
 
     public String getCityName() {
-        return mCityName;
+        return cityName;
     }
 
     public void setCityName(String cityName) {
-        mCityName = cityName;
+        this.cityName = cityName;
     }
 
     public Long getDirection() {
-        return mDirection;
+        return direction;
     }
 
     public void setDirection(Long direction) {
-        mDirection = direction;
+        this.direction = direction;
     }
 
     public Long getDistance() {
-        return mDistance;
+        return distance;
     }
 
     public void setDistance(Long distance) {
-        mDistance = distance;
+        this.distance = distance;
     }
 
     public Long getFileType() {
-        return mFileType;
+        return fileType;
     }
 
     public void setFileType(Long fileType) {
-        mFileType = fileType;
+        this.fileType = fileType;
     }
 
     public Long getGenerateTime() {
-        return mGenerateTime;
+        return generateTime;
     }
 
     public void setGenerateTime(Long generateTime) {
-        mGenerateTime = generateTime;
+        this.generateTime = generateTime;
     }
 
     public List<MarkerExploreWayItem> getItems() {
-        return mItems;
+        return items;
     }
 
     public void setItems(List<MarkerExploreWayItem> items) {
-        mItems = items;
+        this.items = items;
     }
 
     public MarkerLocation getLocation() {
-        return mLocation;
+        return location;
     }
 
     public void setLocation(MarkerLocation location) {
-        mLocation = location;
+        this.location = location;
     }
 
     public String getSn() {
-        return mSn;
+        return sn;
     }
 
     public void setSn(String sn) {
-        mSn = sn;
+        this.sn = sn;
     }
 
     public String getType() {
-        return mType;
+        return type;
     }
 
     public void setType(String type) {
-        mType = type;
+        this.type = type;
     }
 
     public MarkerUserInfo getUserInfo() {
-        return mUserInfo;
+        return userInfo;
     }
 
     public void setUserInfo(MarkerUserInfo userInfo) {
-        mUserInfo = userInfo;
+        this.userInfo = userInfo;
     }
 
 }

modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerExploreWayItem.java

@@ -1,30 +1,30 @@
 
 package com.mogo.module.service.entity;
 
-import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
 
 @SuppressWarnings("unused")
 public class MarkerExploreWayItem {
 
-    @SerializedName("thumbnail")
-    private String mThumbnail;
-    @SerializedName("url")
-    private String mUrl;
+    @Expose
+    private String thumbnail;
+    @Expose
+    private String url;
 
     public String getThumbnail() {
-        return mThumbnail;
+        return thumbnail;
     }
 
     public void setThumbnail(String thumbnail) {
-        mThumbnail = thumbnail;
+        this.thumbnail = thumbnail;
     }
 
     public String getUrl() {
-        return mUrl;
+        return url;
     }
 
     public void setUrl(String url) {
-        mUrl = url;
+        this.url = url;
     }
 
 }

modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerHobbyDatum.java

@@ -1,30 +1,30 @@
 
 package com.mogo.module.service.entity;
 
-import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
 
 @SuppressWarnings("unused")
 public class MarkerHobbyDatum {
 
-    @SerializedName("content")
-    private String mContent;
-    @SerializedName("isCheck")
-    private int mIsCheck;
+    @Expose
+    private String content;
+    @Expose
+    private int isCheck;
 
     public String getContent() {
-        return mContent;
+        return content;
     }
 
     public void setContent(String content) {
-        mContent = content;
+        this.content = content;
     }
 
     public int getIsCheck() {
-        return mIsCheck;
+        return isCheck;
     }
 
     public void setIsCheck(int isCheck) {
-        mIsCheck = isCheck;
+        this.isCheck = isCheck;
     }
 
 }

modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerLocation.java

@@ -1,50 +1,50 @@
 
 package com.mogo.module.service.entity;
 
-import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
 
 @SuppressWarnings("unused")
 public class MarkerLocation {
 
-    @SerializedName("address")
-    private String mAddress;
-    @SerializedName("angle")
-    private String mAngle;
-    @SerializedName("lat")
-    private double mLat;
-    @SerializedName("lon")
-    private double mLon;
+    @Expose
+    private String address;
+    @Expose
+    private Double angle;
+    @Expose
+    private Double lat;
+    @Expose
+    private Double lon;
 
     public String getAddress() {
-        return mAddress;
+        return address;
     }
 
     public void setAddress(String address) {
-        mAddress = address;
+        this.address = address;
     }
 
-    public String getAngle() {
-        return mAngle;
+    public Double getAngle() {
+        return angle;
     }
 
-    public void setAngle(String angle) {
-        mAngle = angle;
+    public void setAngle(Double angle) {
+        this.angle = angle;
     }
 
-    public double getLat() {
-        return mLat;
+    public Double getLat() {
+        return lat;
     }
 
-    public void setLat(double lat) {
-        mLat = lat;
+    public void setLat(Double lat) {
+        this.lat = lat;
     }
 
-    public double getLon() {
-        return mLon;
+    public Double getLon() {
+        return lon;
     }
 
-    public void setLon(double lon) {
-        mLon = lon;
+    public void setLon(Double lon) {
+        this.lon = lon;
     }
 
 }

modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerOnlineCar.java

@@ -2,100 +2,100 @@
 package com.mogo.module.service.entity;
 
 import java.util.List;
-import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
 
 @SuppressWarnings("unused")
 public class MarkerOnlineCar {
 
-    @SerializedName("activitiesScope")
-    private List<MarkerActivitiesScope> mActivitiesScope;
-    @SerializedName("carInfo")
-    private MarkerCarInfo mCarInfo;
-    @SerializedName("compatibility")
-    private int mCompatibility;
-    @SerializedName("dynamicData")
-    private MarkerDynamicData mDynamicData;
-    @SerializedName("hobbyData")
-    private List<MarkerHobbyDatum> mHobbyData;
-    @SerializedName("isFocus")
-    private int mIsFocus;
-    @SerializedName("location")
-    private MarkerLocation mLocation;
-    @SerializedName("type")
-    private String mType;
-    @SerializedName("userInfo")
-    private MarkerUserInfo mUserInfo;
+    @Expose
+    private List<MarkerActivitiesScope> activitiesScope;
+    @Expose
+    private MarkerCarInfo carInfo;
+    @Expose
+    private String compatibility;
+    @Expose
+    private MarkerDynamicData dynamicData;
+    @Expose
+    private List<MarkerHobbyDatum> hobbyData;
+    @Expose
+    private Long isFocus;
+    @Expose
+    private MarkerLocation location;
+    @Expose
+    private String type;
+    @Expose
+    private MarkerUserInfo userInfo;
 
     public List<MarkerActivitiesScope> getActivitiesScope() {
-        return mActivitiesScope;
+        return activitiesScope;
     }
 
     public void setActivitiesScope(List<MarkerActivitiesScope> activitiesScope) {
-        mActivitiesScope = activitiesScope;
+        this.activitiesScope = activitiesScope;
     }
 
     public MarkerCarInfo getCarInfo() {
-        return mCarInfo;
+        return carInfo;
     }
 
     public void setCarInfo(MarkerCarInfo carInfo) {
-        mCarInfo = carInfo;
+        this.carInfo = carInfo;
     }
 
-    public int getCompatibility() {
-        return mCompatibility;
+    public String getCompatibility() {
+        return compatibility;
     }
 
-    public void setCompatibility(int compatibility) {
-        mCompatibility = compatibility;
+    public void setCompatibility(String compatibility) {
+        this.compatibility = compatibility;
     }
 
     public MarkerDynamicData getDynamicData() {
-        return mDynamicData;
+        return dynamicData;
     }
 
     public void setDynamicData(MarkerDynamicData dynamicData) {
-        mDynamicData = dynamicData;
+        this.dynamicData = dynamicData;
     }
 
     public List<MarkerHobbyDatum> getHobbyData() {
-        return mHobbyData;
+        return hobbyData;
     }
 
     public void setHobbyData(List<MarkerHobbyDatum> hobbyData) {
-        mHobbyData = hobbyData;
+        this.hobbyData = hobbyData;
     }
 
-    public int getIsFocus() {
-        return mIsFocus;
+    public Long getIsFocus() {
+        return isFocus;
     }
 
-    public void setIsFocus(int isFocus) {
-        mIsFocus = isFocus;
+    public void setIsFocus(Long isFocus) {
+        this.isFocus = isFocus;
     }
 
     public MarkerLocation getLocation() {
-        return mLocation;
+        return location;
     }
 
     public void setLocation(MarkerLocation location) {
-        mLocation = location;
+        this.location = location;
     }
 
     public String getType() {
-        return mType;
+        return type;
     }
 
     public void setType(String type) {
-        mType = type;
+        this.type = type;
     }
 
     public MarkerUserInfo getUserInfo() {
-        return mUserInfo;
+        return userInfo;
     }
 
     public void setUserInfo(MarkerUserInfo userInfo) {
-        mUserInfo = userInfo;
+        this.userInfo = userInfo;
     }
 
 }

modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerResponse.java

@@ -1,59 +1,50 @@
 
 package com.mogo.module.service.entity;
 
-import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
 
 @SuppressWarnings("unused")
 public class MarkerResponse {
 
-    @SerializedName("code")
-    private int mCode;
-    @SerializedName("msg")
-    private String mMsg;
-    @SerializedName("result")
-    private MarkerCardResult mResult;
-    @SerializedName("sign")
-    private String mSign;
+    @Expose
+    private Long code;
+    @Expose
+    private String msg;
+    @Expose
+    private MarkerCardResult result;
+    @Expose
+    private String sign;
 
-    public int getCode() {
-        return mCode;
+    public Long getCode() {
+        return code;
     }
 
-    public void setCode(int code) {
-        mCode = code;
+    public void setCode(Long code) {
+        this.code = code;
     }
 
     public String getMsg() {
-        return mMsg;
+        return msg;
     }
 
     public void setMsg(String msg) {
-        mMsg = msg;
+        this.msg = msg;
     }
 
     public MarkerCardResult getResult() {
-        return mResult;
+        return result;
     }
 
     public void setResult(MarkerCardResult result) {
-        mResult = result;
+        this.result = result;
     }
 
     public String getSign() {
-        return mSign;
+        return sign;
     }
 
     public void setSign(String sign) {
-        mSign = sign;
+        this.sign = sign;
     }
 
-    @Override
-    public String toString() {
-        return "MarkerResponse{" +
-                "mCode=" + mCode +
-                ", mMsg='" + mMsg + '\'' +
-                ", mResult=" + mResult +
-                ", mSign='" + mSign + '\'' +
-                '}';
-    }
 }

modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerShareMusic.java

@@ -1,80 +1,80 @@
 
 package com.mogo.module.service.entity;
 
-import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
 
 @SuppressWarnings("unused")
 public class MarkerShareMusic {
 
-    @SerializedName("id")
-    private String mId;
-    @SerializedName("likeNumber")
-    private int mLikeNumber;
-    @SerializedName("location")
-    private MarkerLocation mLocation;
-    @SerializedName("musicName")
-    private String mMusicName;
-    @SerializedName("shareContentText")
-    private String mShareContentText;
-    @SerializedName("type")
-    private String mType;
-    @SerializedName("userInfo")
-    private MarkerUserInfo mUserInfo;
+    @Expose
+    private Long id;
+    @Expose
+    private Long likeNumber;
+    @Expose
+    private MarkerLocation location;
+    @Expose
+    private String musicName;
+    @Expose
+    private String shareContentText;
+    @Expose
+    private String type;
+    @Expose
+    private MarkerUserInfo userInfo;
 
-    public String getId() {
-        return mId;
+    public Long getId() {
+        return id;
     }
 
-    public void setId(String id) {
-        mId = id;
+    public void setId(Long id) {
+        this.id = id;
     }
 
-    public int getLikeNumber() {
-        return mLikeNumber;
+    public Long getLikeNumber() {
+        return likeNumber;
     }
 
-    public void setLikeNumber(int likeNumber) {
-        mLikeNumber = likeNumber;
+    public void setLikeNumber(Long likeNumber) {
+        this.likeNumber = likeNumber;
     }
 
     public MarkerLocation getLocation() {
-        return mLocation;
+        return location;
     }
 
     public void setLocation(MarkerLocation location) {
-        mLocation = location;
+        this.location = location;
     }
 
     public String getMusicName() {
-        return mMusicName;
+        return musicName;
     }
 
     public void setMusicName(String musicName) {
-        mMusicName = musicName;
+        this.musicName = musicName;
     }
 
     public String getShareContentText() {
-        return mShareContentText;
+        return shareContentText;
     }
 
     public void setShareContentText(String shareContentText) {
-        mShareContentText = shareContentText;
+        this.shareContentText = shareContentText;
     }
 
     public String getType() {
-        return mType;
+        return type;
     }
 
     public void setType(String type) {
-        mType = type;
+        this.type = type;
     }
 
     public MarkerUserInfo getUserInfo() {
-        return mUserInfo;
+        return userInfo;
     }
 
     public void setUserInfo(MarkerUserInfo userInfo) {
-        mUserInfo = userInfo;
+        this.userInfo = userInfo;
     }
 
 }

modules/mogo-module-service/src/main/java/com/mogo/module/service/entity/MarkerUserInfo.java

@@ -1,33 +1,33 @@
 
 package com.mogo.module.service.entity;
 
-import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
 
 import java.util.Calendar;
 
 @SuppressWarnings("unused")
 public class MarkerUserInfo {
 
-    @SerializedName("age")
-    private int mAge;
-    @SerializedName("gender")
-    private int mGender;
-    @SerializedName("sn")
-    private String mSn;
-    @SerializedName("userHead")
-    private String mUserHead;
-    @SerializedName("userId")
-    private int mUserId;
-    @SerializedName("userName")
-    private String mUserName;
+    @Expose
+    private int age;
+    @Expose
+    private String gender;
+    @Expose
+    private String sn;
+    @Expose
+    private String userHead;
+    @Expose
+    private Long userId;
+    @Expose
+    private String userName;
 
     public String getAge() {
         Calendar cal = Calendar.getInstance();
         int year = cal.get(Calendar.YEAR);
 
         //2020-30=1990
-        int age = year - mAge;
-        String ageStr = "" + age;
+        int ageDiffer = year - age;
+        String ageStr = "" + ageDiffer;
         char[] ageChars = ageStr.toCharArray();
 
         //1990
@@ -72,47 +72,47 @@ public class MarkerUserInfo {
     }
 
     public void setAge(int age) {
-        mAge = age;
+        this.age = age;
     }
 
-    public int getGender() {
-        return mGender;
+    public String getGender() {
+        return gender;
     }
 
-    public void setGender(int gender) {
-        mGender = gender;
+    public void setGender(String gender) {
+        this.gender = gender;
     }
 
     public String getSn() {
-        return mSn;
+        return sn;
     }
 
     public void setSn(String sn) {
-        mSn = sn;
+        this.sn = sn;
     }
 
     public String getUserHead() {
-        return mUserHead;
+        return userHead;
     }
 
     public void setUserHead(String userHead) {
-        mUserHead = userHead;
+        this.userHead = userHead;
     }
 
-    public int getUserId() {
-        return mUserId;
+    public Long getUserId() {
+        return userId;
     }
 
-    public void setUserId(int userId) {
-        mUserId = userId;
+    public void setUserId(Long userId) {
+        this.userId = userId;
     }
 
     public String getUserName() {
-        return mUserName;
+        return userName;
     }
 
     public void setUserName(String userName) {
-        mUserName = userName;
+        this.userName = userName;
     }
 
 }