From 3e4a25499ea3cd0282a0dccecb38d2f5576b294a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 13 Jan 2020 16:49:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86Marker=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=B9=B6=E5=90=8C=E6=AD=A5=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86OnLine=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/launcher/MogoApplication.java | 2 +- .../common/entity/MarkerExploreWay.java | 28 ++++++------------- .../common/entity/MarkerExploreWayItem.java | 2 -- .../module/common/entity/MarkerLocation.java | 6 ++-- .../module/common/entity/MarkerOnlineCar.java | 15 ++-------- .../module/common/entity/MarkerUserInfo.java | 15 +++------- 6 files changed, 19 insertions(+), 49 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index a1edf28be0..4560907154 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -30,7 +30,7 @@ public class MogoApplication extends AbsMogoApplication { // MogoModulePaths.addModule( new MogoModule( DemoConstants.TAG, "CARD_DEMO" ) ); // MogoModulePaths.addModule( new MogoModule( Demo2Constants.TAG, "CARD_DEMO2" ) ); 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( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) ); MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) ); diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java index 32656bf949..51c6e88820 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java @@ -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 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; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java index 3f21de5aaa..9f367ee7fe 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java @@ -7,9 +7,7 @@ import java.io.Serializable; @SuppressWarnings("unused") public class MarkerExploreWayItem implements Serializable { - private String thumbnail; - private String url; public String getThumbnail() { diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java index 38715c15aa..519b644e0d 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerLocation.java @@ -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; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerOnlineCar.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerOnlineCar.java index 69f60c0db1..6ee700ecd0 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerOnlineCar.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerOnlineCar.java @@ -7,23 +7,14 @@ import java.util.List; @SuppressWarnings("unused") public class MarkerOnlineCar implements Serializable { - private List activitiesScope; - private MarkerCarInfo carInfo; - private String compatibility; - private MarkerDynamicData dynamicData; - private List hobbyData; - - private Long isFocus; - + private boolean isFocus; private MarkerLocation location; - private String type; - private MarkerUserInfo userInfo; public List 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; } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java index d1c4f79a1c..a817adba38 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerUserInfo.java @@ -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)) {