Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0'

Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!523
This commit is contained in:
wangmingjun
2023-02-15 09:18:47 +00:00
30 changed files with 193 additions and 326 deletions

View File

@@ -1,42 +0,0 @@
package com.mogo.map;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.map.uicontroller.AMapUIController;
import com.mogo.map.uicontroller.IMogoMapUIController;
/**
* @author congtaowang
* @since 2020/12/9
* <p>
* 描述
*/
public class CustomMapApiBuilder {
private static final String TAG = "CustomMapApiBuilder";
private static CustomMapApiBuilder sApiBuilder;
private static CustomMapApiBuilder getApiBuilder() {
if (sApiBuilder == null) {
synchronized (CustomMapApiBuilder.class) {
if (sApiBuilder == null) {
CallerLogger.INSTANCE.d(TAG, "init");
sApiBuilder = new CustomMapApiBuilder();
}
}
}
return sApiBuilder;
}
public IMogoMapUIController getMapUIController() {
return AMapUIController.getInstance();
}
public static IMogoMapUIController getMapUIControllerDelegate() {
return getApiBuilder().getMapUIController();
}
public static void destroy() {
}
}

View File

@@ -8,6 +8,7 @@ import com.mogo.eagle.core.data.map.CenterLine;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.eagle.core.data.map.MogoLocation;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.map.uicontroller.AMapUIController;
import com.mogo.map.uicontroller.CarCursorOption;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.MapCameraPosition;
@@ -37,7 +38,7 @@ public class MogoMapUIController implements IMogoMapUIController {
private void initDelegate() {
if (mDelegate == null) {
mDelegate = CustomMapApiBuilder.getMapUIControllerDelegate();
mDelegate = AMapUIController.getInstance();
}
}

View File

@@ -755,7 +755,9 @@ public class ObuManager {
trackedObjectBuilder.setAltitude(vehBasics.getElevation());
trackedObjectBuilder.setSpeed(vehBasics.getSpeed());
trackedObjectBuilder.setHeading(vehBasics.getHeading());
trackedObjectBuilder.addTrackedSource(MessagePad.TrackedSource.newBuilder().setSource(2));
MessagePad.TrackedSource source = MessagePad.TrackedSource.newBuilder().setSource(2)
.addSubSource(MessagePad.SubSource.newBuilder().setSource(1).setId(vehBasics.getId())).build();
trackedObjectBuilder.addTrackedSource(source);
/**
* 0 未知车辆
* 1 特殊用途车辆