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

[V2X模块重构]代码提交

Browse Source 
[temp code]
This commit is contained in:
renwj
2021-12-31 10:20:48 +08:00
parent fafeed6d87
commit 9bb0e94a78
606 changed files with 30376 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/view/MapViewManager.kt
View File

@@ -126,7 +126,7 @@ class MapViewManager private constructor() {
markerLocation = markerLoc
}
val options = MogoMarkerOptions()
.`object`(markerEntity)
.data(markerEntity)
.icon((context.resources.getDrawable(R.mipmap.module_carchatting_caller) as BitmapDrawable).bitmap)
.latitude(markerEntity.markerLocation.lat)
.longitude(markerEntity.markerLocation.lon)

2
modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/MarkerDrawer.java
View File

@@ -84,7 +84,7 @@ class MarkerDrawer {
if (markerShowEntity == null || markerShowEntity.getMarkerLocation() == null) {
return null;
}
MogoMarkerOptions options = new MogoMarkerOptions().icon3DRes(icon3DRes).set3DMode(MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()).matchOnRoadSide(matchRoadSide).owner(markerShowEntity.getMarkerType()).zIndex(zIndex).object(markerShowEntity).latitude(markerShowEntity.getMarkerLocation().getLat()).longitude(markerShowEntity.getMarkerLocation().getLon());
MogoMarkerOptions options = new MogoMarkerOptions().icon3DRes(icon3DRes).set3DMode(MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()).matchOnRoadSide(matchRoadSide).owner(markerShowEntity.getMarkerType()).zIndex(zIndex).data(markerShowEntity).latitude(markerShowEntity.getMarkerLocation().getLat()).longitude(markerShowEntity.getMarkerLocation().getLon());
if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
Object bindObj = markerShowEntity.getBindObj();

2
modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
View File

@@ -407,7 +407,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
.owner(TYPE_MARKER_CLOUD_DATA)
.anchor(0.5f, 0.5f)
.rotate((float) data.getHeading())
.object(data)
.data(data)
.gps(true)
.controlAngle(true)
.position(new MogoLatLng(data.getWgslat(), data.getWgslon()));

4
modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java
View File

@@ -105,7 +105,7 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL
public IMogoMarker drawMarker(MarkerShowEntity markerShowEntity, int modeResType) {
MogoMarkerOptions options = new MogoMarkerOptions()
.object(markerShowEntity)
.data(markerShowEntity)
.latitude(markerShowEntity.getMarkerLocation().getLat())
.longitude(markerShowEntity.getMarkerLocation().getLon())
.setGps(true);
@@ -175,7 +175,7 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL
*/
public IMogoMarker drawStopLineMarker(MarkerShowEntity markerShowEntity) {
MogoMarkerOptions options = new MogoMarkerOptions()
.object(markerShowEntity)
.data(markerShowEntity)
.latitude(markerShowEntity.getMarkerLocation().getLat())
.longitude(markerShowEntity.getMarkerLocation().getLon())
.setGps(false);

4
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
View File

@@ -84,7 +84,7 @@ public class CameraLiveNoticeHelper implements IMogoCloudOnMsgListener {
if (!TextUtils.isEmpty(roadData.getRtmpUrl())) {
removeCameraMarker();
MogoMarkerOptions options = new MogoMarkerOptions()
.object(roadData)
.data(roadData)
.latitude(roadData.getLat())
.longitude(roadData.getLon());
options.anchor(0.5f, 0.5f);
@@ -114,7 +114,7 @@ public class CameraLiveNoticeHelper implements IMogoCloudOnMsgListener {
mMogoMarker.hideInfoWindow();
}
MogoMarkerOptions options = new MogoMarkerOptions()
.object(roadData)
.data(roadData)
.latitude(roadData.getLat())
.longitude(roadData.getLon());
options.anchor(0.5f, 0.5f);

2
modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java
View File

@@ -640,7 +640,7 @@ public class TanluManager implements IMogoMarkerClickListener,
markerShowEntityAnimation.setTextContent(address);
markerShowEntityAnimation.setMarkerType(ShareConstants.MODEL_NAME);
MogoMarkerOptions options = new MogoMarkerOptions()
.object(markerShowEntityAnimation)
.data(markerShowEntityAnimation)
.icon(bitmap)
.anchor(0.5f, 0.5f)
.latitude(lat)

4
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XHistoryBaseViewHolder.java
View File

@@ -1,6 +1,5 @@
package com.mogo.module.v2x.adapter.holder;
import android.util.Log;
import android.view.View;
import androidx.annotation.NonNull;
@@ -17,17 +16,14 @@ import com.mogo.map.navi.MogoNaviInfo;
import com.mogo.map.navi.MogoTraffic;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.MarkerLocation;
import com.mogo.module.common.entity.V2XEventZanData;
import com.mogo.module.v2x.V2XConst;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.utils.ChartingUtil;
import com.mogo.module.v2x.utils.RoadConditionUtils;
import com.mogo.module.v2x.utils.TrackUtils;
import com.mogo.module.v2x.utils.V2XSQLiteUtils;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.zhidao.carchattingprovider.CallChattingProviderConstant;
import com.zhidao.carchattingprovider.ICarsChattingProvider;
import com.zhidao.carchattingprovider.MogoDriverInfo;
import static com.mogo.module.v2x.V2XConst.MODULE_NAME;

1
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
View File

@@ -25,7 +25,6 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.mogo.glide.GlideRoundedCornersTransform;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.util.ArrayUtils;
import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
import com.mogo.module.common.animation.BezierAnimationView;
import com.mogo.module.common.entity.MarkerExploreWay;

2
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
View File

@@ -7,7 +7,7 @@ import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.constant.TimeConstants;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
import com.mogo.eagle.core.utilcode.util.ArrayUtils;
import com.mogo.eagle.core.utilcode.util.ViewUtilsayUtils;
import com.mogo.eagle.core.utilcode.util.TimeUtils;
import com.mogo.eagle.core.data.map.MogoLocation;
import com.mogo.map.search.geo.IMogoGeoSearchListener;

8
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
View File

@@ -257,7 +257,7 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
if (roadEventEntity.getLocation() != null) {
// 道路事件，或者水波纹扩散效果
MogoMarkerOptions optionsRipple = new MogoMarkerOptions()
.object(roadEventEntity)
.data(roadEventEntity)
.latitude(roadEventEntity.getLocation().getLat())
.longitude(roadEventEntity.getLocation().getLon());
optionsRipple.anchor(0.5f, 0.5f);
@@ -286,7 +286,7 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
optionsRipple.scale(0.4f);
mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple);
MogoMarkerOptions options = new MogoMarkerOptions().object(roadEventEntity)
MogoMarkerOptions options = new MogoMarkerOptions().data(roadEventEntity)
.latitude(roadEventEntity.getLocation().getLat()).longitude(roadEventEntity.getLocation().getLon());
options.anchor(0.5f, 0.5f);
options.icon3DRes(R.raw.special_vehicle);
@@ -448,7 +448,7 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
try {
if (markerShowEntity.getMarkerLocation() != null) {
MogoMarkerOptions options = new MogoMarkerOptions()
.object(markerShowEntity)
.data(markerShowEntity)
.latitude(markerShowEntity.getMarkerLocation().getLat())
.longitude(markerShowEntity.getMarkerLocation().getLon());
@@ -571,7 +571,7 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
if (roadEventEntity.getLocation() != null) {
// 道路事件，或者水波纹扩散效果
MogoMarkerOptions optionsRipple = new MogoMarkerOptions()
.object(roadEventEntity)
.data(roadEventEntity)
.latitude(roadEventEntity.getLocation().getLat())
.longitude(roadEventEntity.getLocation().getLon());
optionsRipple.anchor(0.5f, 0.5f);

2
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkMarker.java
View File

@@ -60,7 +60,7 @@ public class V2XIllegalParkMarker implements IV2XMarker<List<MarkerExploreWay>>
// 道路事件，或者水波纹扩散效果
MogoMarkerOptions optionsRipple = new MogoMarkerOptions()
.object(markerExploreWay)
.data(markerExploreWay)
.latitude(markerExploreWay.getLocation().getLat())
.longitude(markerExploreWay.getLocation().getLon());
optionsRipple.anchor(0.5f, 0.5f);