更新了Marker数据,并同步修复了OnLine模块

This commit is contained in:
董宏宇
2020-01-13 16:49:07 +08:00
parent a21088d5de
commit 3e4a25499e
6 changed files with 19 additions and 49 deletions

View File

@@ -7,29 +7,17 @@ import java.util.List;
@SuppressWarnings("unused")
public class MarkerExploreWay implements Serializable {
private String addr;
private Long canLive;
private boolean canLive;
private String cityName;
private Long direction;
private float direction;
private Long distance;
private Long fileType;
private Long generateTime;
private List<MarkerExploreWayItem> items;
private MarkerLocation location;
private String sn;
private String type;
private MarkerLocation location;
private String sn;
private MarkerUserInfo userInfo;
public String getAddr() {
@@ -40,11 +28,11 @@ public class MarkerExploreWay implements Serializable {
this.addr = addr;
}
public Long getCanLive() {
public boolean getCanLive() {
return canLive;
}
public void setCanLive(Long canLive) {
public void setCanLive(boolean canLive) {
this.canLive = canLive;
}
@@ -56,11 +44,11 @@ public class MarkerExploreWay implements Serializable {
this.cityName = cityName;
}
public Long getDirection() {
public float getDirection() {
return direction;
}
public void setDirection(Long direction) {
public void setDirection(float direction) {
this.direction = direction;
}

View File

@@ -7,9 +7,7 @@ import java.io.Serializable;
@SuppressWarnings("unused")
public class MarkerExploreWayItem implements Serializable {
private String thumbnail;
private String url;
public String getThumbnail() {

View File

@@ -8,7 +8,7 @@ import java.io.Serializable;
public class MarkerLocation implements Serializable {
private String address;
private float angle;
private Long angle;
private Double lat;
private Double lon;
@@ -20,11 +20,11 @@ public class MarkerLocation implements Serializable {
this.address = address;
}
public float getAngle() {
public Long getAngle() {
return angle;
}
public void setAngle(float angle) {
public void setAngle(Long angle) {
this.angle = angle;
}

View File

@@ -7,23 +7,14 @@ import java.util.List;
@SuppressWarnings("unused")
public class MarkerOnlineCar implements Serializable {
private List<MarkerActivitiesScope> activitiesScope;
private MarkerCarInfo carInfo;
private String compatibility;
private MarkerDynamicData dynamicData;
private List<MarkerHobbyDatum> hobbyData;
private Long isFocus;
private boolean isFocus;
private MarkerLocation location;
private String type;
private MarkerUserInfo userInfo;
public List<MarkerActivitiesScope> getActivitiesScope() {
@@ -66,11 +57,11 @@ public class MarkerOnlineCar implements Serializable {
this.hobbyData = hobbyData;
}
public Long getIsFocus() {
public boolean getIsFocus() {
return isFocus;
}
public void setIsFocus(Long isFocus) {
public void setIsFocus(boolean isFocus) {
this.isFocus = isFocus;
}

View File

@@ -1,7 +1,6 @@
package com.mogo.module.common.entity;
import android.text.TextUtils;
import java.io.Serializable;
@@ -10,19 +9,17 @@ import java.util.Calendar;
@SuppressWarnings("unused")
public class MarkerUserInfo implements Serializable {
private int age;
private String gender;
private String sn;
private String userHead;
private Long userId;
private String userName;
public void setAge(int age) {
this.age = age;
}
public String getAge() {
Calendar cal = Calendar.getInstance();
int year = cal.get(Calendar.YEAR);
@@ -73,10 +70,6 @@ public class MarkerUserInfo implements Serializable {
return ageString;
}
public void setAge(int age) {
this.age = age;
}
public int getGenderValue() {
if (!TextUtils.isEmpty(gender)) {
if ("".equals(gender)) {