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

rc

Browse Source
This commit is contained in:
wangcongtao
2020-01-07 19:09:05 +08:00
parent c69a959b6a 8c6cca4dec
commit 3c921ff99b
50 changed files with 459 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ public class MarkerActivitiesScope {
@SerializedName("content")
private String mContent;
@SerializedName("isCheck")
private Long mIsCheck;
private int mIsCheck;
public String getContent() {
return mContent;
@@ -19,11 +19,11 @@ public class MarkerActivitiesScope {
mContent = content;
}
public Long getIsCheck() {
public int getIsCheck() {
return mIsCheck;
}
public void setIsCheck(Long isCheck) {
public void setIsCheck(int isCheck) {
mIsCheck = isCheck;
}

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

@@ -11,7 +11,7 @@ public class MarkerDynamicData {
@SerializedName("name")
private String mName;
@SerializedName("type")
private Long mType;
private int mType;
public String getId() {
return mId;
@@ -29,11 +29,11 @@ public class MarkerDynamicData {
mName = name;
}
public Long getType() {
public int getType() {
return mType;
}
public void setType(Long type) {
public void setType(int type) {
mType = type;
}

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

@@ -9,7 +9,7 @@ public class MarkerHobbyDatum {
@SerializedName("content")
private String mContent;
@SerializedName("isCheck")
private Long mIsCheck;
private int mIsCheck;
public String getContent() {
return mContent;
@@ -19,11 +19,11 @@ public class MarkerHobbyDatum {
mContent = content;
}
public Long getIsCheck() {
public int getIsCheck() {
return mIsCheck;
}
public void setIsCheck(Long isCheck) {
public void setIsCheck(int isCheck) {
mIsCheck = isCheck;
}

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

@@ -12,13 +12,13 @@ public class MarkerOnlineCar {
@SerializedName("carInfo")
private MarkerCarInfo mCarInfo;
@SerializedName("compatibility")
private Long mCompatibility;
private int mCompatibility;
@SerializedName("dynamicData")
private MarkerDynamicData mDynamicData;
@SerializedName("hobbyData")
private List<MarkerHobbyDatum> mHobbyData;
@SerializedName("isFocus")
private Long mIsFocus;
private int mIsFocus;
@SerializedName("location")
private MarkerLocation mLocation;
@SerializedName("type")
@@ -42,11 +42,11 @@ public class MarkerOnlineCar {
mCarInfo = carInfo;
}
public Long getCompatibility() {
public int getCompatibility() {
return mCompatibility;
}
public void setCompatibility(Long compatibility) {
public void setCompatibility(int compatibility) {
mCompatibility = compatibility;
}
@@ -66,11 +66,11 @@ public class MarkerOnlineCar {
mHobbyData = hobbyData;
}
public Long getIsFocus() {
public int getIsFocus() {
return mIsFocus;
}
public void setIsFocus(Long isFocus) {
public void setIsFocus(int isFocus) {
mIsFocus = isFocus;
}

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

@@ -7,7 +7,7 @@ import com.google.gson.annotations.SerializedName;
public class MarkerResponse {
@SerializedName("code")
private Long mCode;
private int mCode;
@SerializedName("msg")
private String mMsg;
@SerializedName("result")
@@ -15,11 +15,11 @@ public class MarkerResponse {
@SerializedName("sign")
private String mSign;
public Long getCode() {
public int getCode() {
return mCode;
}
public void setCode(Long code) {
public void setCode(int code) {
mCode = code;
}

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

@@ -9,7 +9,7 @@ public class MarkerShareMusic {
@SerializedName("id")
private String mId;
@SerializedName("likeNumber")
private Long mLikeNumber;
private int mLikeNumber;
@SerializedName("location")
private MarkerLocation mLocation;
@SerializedName("musicName")
@@ -29,11 +29,11 @@ public class MarkerShareMusic {
mId = id;
}
public Long getLikeNumber() {
public int getLikeNumber() {
return mLikeNumber;
}
public void setLikeNumber(Long likeNumber) {
public void setLikeNumber(int likeNumber) {
mLikeNumber = likeNumber;
}

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

@@ -7,31 +7,31 @@ import com.google.gson.annotations.SerializedName;
public class MarkerUserInfo {
@SerializedName("age")
private Long mAge;
private String mAge;
@SerializedName("gender")
private Long mGender;
private int mGender;
@SerializedName("sn")
private String mSn;
@SerializedName("userHead")
private String mUserHead;
@SerializedName("userId")
private Long mUserId;
private int mUserId;
@SerializedName("userName")
private String mUserName;
public Long getAge() {
public String getAge() {
return mAge;
}
public void setAge(Long age) {
public void setAge(String age) {
mAge = age;
}
public Long getGender() {
public int getGender() {
return mGender;
}
public void setGender(Long gender) {
public void setGender(int gender) {
mGender = gender;
}
@@ -51,11 +51,11 @@ public class MarkerUserInfo {
mUserHead = userHead;
}
public Long getUserId() {
public int getUserId() {
return mUserId;
}
public void setUserId(Long userId) {
public void setUserId(int userId) {
mUserId = userId;
}

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.2 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue_info.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.1 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.5 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green_info.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.7 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_purple.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.6 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_purple.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_purple_info.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.6 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_listen.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_misic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_news.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

15
modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue_info.xml Normal file
View File

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

15
modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green_info.xml Normal file
View File

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

15
modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple_info.xml Normal file
View File

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

17
modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml Normal file
View File

@@ -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="#256BFF" />
</shape >
</rotate >
</item >
</layer-list >

17
modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_green.xml Normal file
View File

@@ -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="#36B565" />
</shape >
</rotate >
</item >
</layer-list >

17
modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_purple.xml Normal file
View File

@@ -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="#C843FF" />
</shape >
</rotate >
</item >
</layer-list >

27
modules/mogo-module-service/src/main/res/layout/view_map_marker.xml
View File

@@ -1,15 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/dp_140"
android:layout_height="@dimen/dp_155"
android:background="@drawable/bg_map_marker_green"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical" >
<ImageView
android:id="@+id/ivBg"
android:layout_width="@dimen/dp_88"
android:layout_height="@dimen/dp_105"
android:layout_gravity="center"
android:src="@drawable/bg_map_marker_blue"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/ivIcon"
android:layout_width="@dimen/dp_76"
android:layout_height="@dimen/dp_76"
android:layout_gravity="center"
android:src="@drawable/icon_default" />
android:layout_marginTop="@dimen/dp_6"
android:src="@drawable/icon_default"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout >
</androidx.constraintlayout.widget.ConstraintLayout >

29
modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
View File

@@ -1,23 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_map_marker_green_info"
android:gravity="center_vertical"
android:orientation="horizontal" >
<ImageView
android:id="@+id/ivIcon"
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_80"
android:src="@drawable/icon_default" />
<TextView
android:id="@+id/tvMarkerContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_map_marker_blue_info"
android:drawableLeft="@drawable/icon_default"
android:drawablePadding="@dimen/dp_20"
android:gravity="center"
android:text="诗一样的女子"
android:textColor="#ffffff"
android:textSize="@dimen/sp_32" />
android:textSize="@dimen/sp_32"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout >
<ImageView
android:id="@+id/ivReverseTriangle"
android:layout_width="27dp"
android:layout_height="15dp"
android:src="@drawable/bg_shape_reverse_triangle_blue"
app:layout_constraintEnd_toEndOf="@+id/tvMarkerContent"
app:layout_constraintStart_toStartOf="@+id/tvMarkerContent"
app:layout_constraintTop_toBottomOf="@+id/tvMarkerContent" />
</androidx.constraintlayout.widget.ConstraintLayout >