diff --git a/.idea/misc.xml b/.idea/misc.xml index 09cc32c567..733acb1920 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java index 013ab37442..6b3816382f 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java @@ -100,7 +100,8 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder { .setCoordinateType( MapParams.COORDINATETYPE_GCJ02 ) .setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D ) .setZoom( 20 ) - .setPointToCenter( 0.734375f, 0.5f ) +// .setPointToCenter( 0.734375f, 0.5f ) + .setPointToCenter( 0.5f, 0.5f ) //todo 2D模式下需要注意ADAS部分遮挡 .setStyleMode( MapParams.MAP_STYLE_NIGHT ), NavParams.Companion.init() ); MapAutoView mapAutoView = new MapAutoView(context); IMogoMapView mapView = new AMapViewWrapper(mapAutoView); diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java new file mode 100644 index 0000000000..8701beb42c --- /dev/null +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasAutoPilotManager.java @@ -0,0 +1,51 @@ +package com.mogo.module.adas; + +import android.content.Context; + +import com.mogo.module.adas.entity.AdasAutoPilotLocReceiverBean; +import com.mogo.module.common.MogoApisHandler; +import com.mogo.service.connection.IMogoOnMessageListener; + +public class AdasAutoPilotManager implements IMogoOnMessageListener { + + private static volatile AdasAutoPilotManager instance; + private static final byte[] obj = new byte[0]; + private static final int MSG_SOCKET_TYPE = 1; + private Context mContext; + + private AdasAutoPilotManager() { + + } + + public static AdasAutoPilotManager getInstance() { + if (instance == null) { + synchronized (obj) { + if (instance == null) { + instance = new AdasAutoPilotManager(); + } + } + } + return instance; + } + + public void initSocket(Context context) { + this.mContext = context; + MogoApisHandler.getInstance() + .getApis() + .getSocketManagerApi(mContext).registerOnMessageListener(MSG_SOCKET_TYPE, this); + } + + @Override + public Class target() { + return AdasAutoPilotLocReceiverBean.class; + } + + @Override + public void onMsgReceived(AdasAutoPilotLocReceiverBean adasAutoPilotLocReceiverBean) { + if (adasAutoPilotLocReceiverBean != null + && adasAutoPilotLocReceiverBean.getLat() != 0.0 + && adasAutoPilotLocReceiverBean.getLon() != 0.0) { + + } + } +} diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java index d4b8b69e37..4078d928d4 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java @@ -1,11 +1,12 @@ package com.mogo.module.adas; -import android.os.RemoteException; - import com.google.gson.Gson; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.data.BaseData; import com.mogo.commons.network.SubscribeImpl; +import com.mogo.module.adas.entity.AutonomousDriveStatusBean; +import com.mogo.module.adas.entity.ReportSiteBean; +import com.mogo.module.adas.entity.WarnMessageModel; import com.mogo.module.common.MogoApisHandler; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java index 4809eac748..05a495083f 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java @@ -6,7 +6,6 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.template.IProvider; import com.mogo.service.MogoServicePaths; import com.mogo.utils.logger.Logger; -import com.zhidao.autopilot.support.api.AutopilotServiceManage; import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel; import com.zhidao.support.adas.high.AdasManager; @@ -26,9 +25,9 @@ public class AdasProvider implements IProvider { @Override public void init(Context context) { Logger.d(TAG, "初始化 AdasProvider 模块"); - adasEventManager = new AdasEventManager(); initAdas(context, adasEventManager); + initAutoPilotBusiness(); } private void initAdas(Context context, AdasEventManager adasEventManager) { @@ -37,6 +36,10 @@ public class AdasProvider implements IProvider { AdasManager.getInstance().setOnAdasConnectStatusListener(adasEventManager); } + private void initAutoPilotBusiness() { + AdasAutoPilotManager.getInstance().initSocket(); + } + public void addAdasEventListener(AdasDataListener listener) { adasEventManager.addEventListener(listener); } @@ -61,7 +64,7 @@ public class AdasProvider implements IProvider { AdasManager.getInstance().aiCloudToAdasData(msg); } - public void cancelPolit() { + public void cancelPilot() { if (AdasManager.getInstance().isSocketConnect()) { AdasManager.getInstance().controlAutopilotCarHead(); } diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/AdasAutoPilotLocReceiverBean.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/AdasAutoPilotLocReceiverBean.java new file mode 100644 index 0000000000..39686ee7d4 --- /dev/null +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/AdasAutoPilotLocReceiverBean.java @@ -0,0 +1,69 @@ +package com.mogo.module.adas.entity; + +public class AdasAutoPilotLocReceiverBean { + + private int poiId; + private double lat; + private double lon; + private String poiAddress; + private long systemTime; + + public AdasAutoPilotLocReceiverBean(int poiId, double lat, double lon, String poiAddress, long systemTime) { + this.poiId = poiId; + this.lat = lat; + this.lon = lon; + this.poiAddress = poiAddress; + this.systemTime = systemTime; + } + + public int getPoiId() { + return poiId; + } + + public void setPoiId(int poiId) { + this.poiId = poiId; + } + + public double getLat() { + return lat; + } + + public void setLat(double lat) { + this.lat = lat; + } + + public double getLon() { + return lon; + } + + public void setLon(double lon) { + this.lon = lon; + } + + public String getPoiAddress() { + return poiAddress; + } + + public void setPoiAddress(String poiAddress) { + this.poiAddress = poiAddress; + } + + public long getSystemTime() { + return systemTime; + } + + public void setSystemTime(long systemTime) { + this.systemTime = systemTime; + } + + @Override + public String toString() { + return "AdasAutoPilotLocReceiverBean{" + + "poiId=" + poiId + + ", lat=" + lat + + ", lon=" + lon + + ", poiAddress='" + poiAddress + '\'' + + ", systemTime=" + systemTime + + '}'; + } +} diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AutonomousDriveStatusBean.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/AutonomousDriveStatusBean.java similarity index 95% rename from modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AutonomousDriveStatusBean.java rename to modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/AutonomousDriveStatusBean.java index 686ae78eb0..e4bba0a1e2 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AutonomousDriveStatusBean.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/AutonomousDriveStatusBean.java @@ -1,4 +1,4 @@ -package com.mogo.module.adas; +package com.mogo.module.adas.entity; /** * Created by XuYong on 2021/5/28 16:12 diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/ReportSiteBean.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/ReportSiteBean.java similarity index 94% rename from modules/mogo-module-adas/src/main/java/com/mogo/module/adas/ReportSiteBean.java rename to modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/ReportSiteBean.java index 76677e00ba..ed0f765e2e 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/ReportSiteBean.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/ReportSiteBean.java @@ -1,4 +1,4 @@ -package com.mogo.module.adas; +package com.mogo.module.adas.entity; /** * Created by XuYong on 2021/5/31 16:24 diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/WarnMessageModel.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/WarnMessageModel.java similarity index 93% rename from modules/mogo-module-adas/src/main/java/com/mogo/module/adas/WarnMessageModel.java rename to modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/WarnMessageModel.java index 451c20d381..ae6a6d8cab 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/WarnMessageModel.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/entity/WarnMessageModel.java @@ -1,4 +1,4 @@ -package com.mogo.module.adas; +package com.mogo.module.adas.entity; import com.zhidao.support.adas.high.bean.WarnMessageInfo; diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/view/DispatchRemindDialog.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/view/DispatchRemindDialog.java new file mode 100644 index 0000000000..a4223d9b35 --- /dev/null +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/view/DispatchRemindDialog.java @@ -0,0 +1,16 @@ +package com.mogo.module.adas.view; + +import android.content.Context; + +import androidx.annotation.NonNull; + +import com.mogo.module.adas.R; +import com.mogo.module.common.dialog.BaseFloatDialog; + +public class DispatchRemindDialog extends BaseFloatDialog { + + public DispatchRemindDialog(@NonNull Context context) { + super(context); + setContentView(R.layout.dialog_adas_dispatch_remind); + } +} diff --git a/modules/mogo-module-adas/src/main/res/layout/dialog_adas_dispatch_remind.xml b/modules/mogo-module-adas/src/main/res/layout/dialog_adas_dispatch_remind.xml new file mode 100644 index 0000000000..61a4490a43 --- /dev/null +++ b/modules/mogo-module-adas/src/main/res/layout/dialog_adas_dispatch_remind.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/modules/mogo-module-adas/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-adas/src/main/res/values-xhdpi-2560x1440/dimens.xml new file mode 100644 index 0000000000..1ad05815bc --- /dev/null +++ b/modules/mogo-module-adas/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -0,0 +1,6 @@ + + + 950px + 540px + 32px + \ No newline at end of file diff --git a/modules/mogo-module-adas/src/main/res/values/colors.xml b/modules/mogo-module-adas/src/main/res/values/colors.xml new file mode 100644 index 0000000000..16da9a9858 --- /dev/null +++ b/modules/mogo-module-adas/src/main/res/values/colors.xml @@ -0,0 +1,4 @@ + + + #1F9BFE + \ No newline at end of file diff --git a/modules/mogo-module-adas/src/main/res/values/dimens.xml b/modules/mogo-module-adas/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..1ad05815bc --- /dev/null +++ b/modules/mogo-module-adas/src/main/res/values/dimens.xml @@ -0,0 +1,6 @@ + + + 950px + 540px + 32px + \ No newline at end of file diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 6c1bcce43e..126ccc2719 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -874,7 +874,7 @@ public class MogoADASController implements IMogoADASController { public void cancelAutopilot() { //try { //AutopilotServiceManage.getInstance().cancelAutopilot(); - adasProvider.cancelPolit(); + adasProvider.cancelPilot(); //} catch (RemoteException e) { // e.printStackTrace(); //}