yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/mogo/launcher/MogoApplication.java
View File

@@ -30,7 +30,7 @@ public class MogoApplication extends AbsMogoApplication {
// MogoModulePaths.addModule( new MogoModule( DemoConstants.TAG, "CARD_DEMO" ) ); // MogoModulePaths.addModule( new MogoModule( DemoConstants.TAG, "CARD_DEMO" ) );
// MogoModulePaths.addModule( new MogoModule( Demo2Constants.TAG, "CARD_DEMO2" ) ); // MogoModulePaths.addModule( new MogoModule( Demo2Constants.TAG, "CARD_DEMO2" ) );
DebugConfig.setNetMode( DebugConfig.NET_MODE_QA ); DebugConfig.setNetMode( DebugConfig.NET_MODE_QA );
MogoModulePaths.addModule( new MogoModule( OnLineCarConstants.TAG, "CARD_TYPE_ROAD_ONLINECAR" ) ); MogoModulePaths.addModule( new MogoModule( OnLineCarConstants.TAG, OnLineCarConstants.MODULE_NAME ) );
MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, "CARD_TYPE_ROAD_CONDITION" ) ); MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, "CARD_TYPE_ROAD_CONDITION" ) );
MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) ); MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) );
MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) ); MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) );

28
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java
View File

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

2
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java
View File

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

6
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java
View File

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

15
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerOnlineCar.java
View File

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

15
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java
View File

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