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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	gradle.properties
#	libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
#	modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt
This commit is contained in:
wangcongtao
2020-11-10 17:48:45 +08:00
parent 204ac49977 f19b12f06d
commit 1f766eb906
83 changed files with 1903 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/RoadTrafficSegment.java Normal file
View File

@@ -0,0 +1,38 @@
package com.mogo.module.common.entity;
import com.mogo.map.MogoLatLng;
import java.util.List;
public class RoadTrafficSegment {
//道路拥堵信息分级
private int status;
//分段道路拥堵经纬度点
private List<MogoLatLng> mogoLatLngList;
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public List<MogoLatLng> getMogoLatLngList() {
return mogoLatLngList;
}
public void setMogoLatLngList(List<MogoLatLng> mogoLatLngList) {
this.mogoLatLngList = mogoLatLngList;
}
@Override
public String toString() {
return "RoadTrafficSegment{" +
"status=" + status +
", mogoLatLngList=" + mogoLatLngList +
'}';
}
}

113
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/RoadTrafficStatus.java Normal file
View File

@@ -0,0 +1,113 @@
package com.mogo.module.common.entity;
import com.mogo.map.MogoLatLng;
import java.util.List;
/**
* 交通路况信息
*/
public class RoadTrafficStatus {
//角度
private int angle;
//行车信息描述
private String direction;
//道路名称
private String roadName;
//道路拥堵信息分级
private int status;
//道路拥堵长度
private int length;
//整条道路拥堵经纬度点
private List<MogoLatLng> mogoLatLngList;
//是否存在道路分段数据
private boolean segment;
//分段道路数据
private List<RoadTrafficSegment> roadTrafficSegmentList;
public int getAngle() {
return angle;
}
public void setAngle(int angle) {
this.angle = angle;
}
public String getDirection() {
return direction;
}
public void setDirection(String direction) {
this.direction = direction;
}
public String getRoadName() {
return roadName;
}
public void setRoadName(String roadName) {
this.roadName = roadName;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public int getLength() {
return length;
}
public void setLength(int length) {
this.length = length;
}
public List<MogoLatLng> getMogoLatLngList() {
return mogoLatLngList;
}
public void setMogoLatLngList(List<MogoLatLng> mogoLatLngList) {
this.mogoLatLngList = mogoLatLngList;
}
public boolean isSegment() {
return segment;
}
public void setSegment(boolean segment) {
this.segment = segment;
}
public List<RoadTrafficSegment> getRoadTrafficSegmentList() {
return roadTrafficSegmentList;
}
public void setRoadTrafficSegmentList(List<RoadTrafficSegment> roadTrafficSegmentList) {
this.roadTrafficSegmentList = roadTrafficSegmentList;
}
@Override
public String toString() {
return "RoadTrafficStatus{" +
"angle=" + angle +
", direction='" + direction + '\'' +
", roadName='" + roadName + '\'' +
", status=" + status +
", length=" + length +
", mogoLatLngList=" + mogoLatLngList +
", segment=" + segment +
", roadTrafficSegmentList=" + roadTrafficSegmentList +
'}';
}
}

26
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/UploadTrafficEntity.java Normal file
View File

@@ -0,0 +1,26 @@
package com.mogo.module.common.entity;
import java.util.List;
/**
* 上报路况服务Entity
*/
public class UploadTrafficEntity {
private List<RoadTrafficStatus> roadTrafficStatuses;
public List<RoadTrafficStatus> getRoadTrafficStatuses() {
return roadTrafficStatuses;
}
public void setRoadTrafficStatuses(List<RoadTrafficStatus> roadTrafficStatuses) {
this.roadTrafficStatuses = roadTrafficStatuses;
}
@Override
public String toString() {
return "UploadTrafficEntity{" +
"roadTrafficStatuses=" + roadTrafficStatuses +
'}';
}
}

12
modules/mogo-module-common/src/main/java/com/mogo/module/common/marker/PoiWrapper.java
View File

@@ -82,4 +82,16 @@ public class PoiWrapper {
public void setIconInfoUrl(String iconInfoUrl) {
this.iconInfoUrl = iconInfoUrl;
}
@Override
public String toString() {
return "PoiWrapper{" +
"poiType='" + poiType + '\'' +
", iconRes=" + iconRes +
", iconInfoRes=" + iconInfoRes +
", iconUrl='" + iconUrl + '\'' +
", iconInfoUrl='" + iconInfoUrl + '\'' +
", title='" + title + '\'' +
'}';
}
}

2
modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java
View File

@@ -80,6 +80,7 @@ public class CloudPoiManager {
String config = SharedPrefsMgr.getInstance(context).getString("SHARE_BUTTON_CONFIG", "");
if (!config.isEmpty()) {
List<PoiWrapper> configWrappers = GsonUtil.arrayFromJson(config, PoiWrapper.class);
Logger.d(TAG, "config: " + configWrappers);
if(configWrappers!=null) {
for (PoiWrapper wrapper : configWrappers) {
wrapper.setIconInfoRes(R.drawable.module_common_icon_map_marker_road_block_up2_white);
@@ -91,6 +92,7 @@ public class CloudPoiManager {
wrapper.setIconInfoRes(defWrapper.getIconInfoRes());
}
}
Logger.d(TAG, "put===" + wrapper);
poiWrapper.put(wrapper.getPoiType(), wrapper);
}
}else{

1
modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java
View File

@@ -230,7 +230,6 @@ public class CustomRatingBar extends LinearLayout {
layout.setMargins(0, 0, Math.round(elementPadding), 0);//设置每颗星星在线性布局的间距
imageView.setLayoutParams(layout);
imageView.setAdjustViewBounds(true);
imageView.setScaleType(ImageView.ScaleType.FIT_XY);
imageView.setImageDrawable(elementEmptyDrawable);
imageView.setMinimumWidth((int) elementWidth);
imageView.setMaxWidth((int) elementWidth);