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

Merge branch 'dev_robotaxi-d-app-module_270_220510_2.7.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_270_220510_2.7.0

Browse Source 
 Conflicts:
	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
This commit is contained in:
xinfengkun
2022-05-17 19:07:03 +08:00
parent 0ab8f2621f 29995744e9
commit 2f49770761
123 changed files with 3112 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
View File

@@ -1,6 +1,8 @@
package com.zhidao.support.adas.high;
import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_ADAS_SEND_GLOBAL_PATH;
import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_ADAS_SEND_SYSTEM_CMD;
import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_ADAS_START_AUTOPILOT;
import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_CONNECT_ADDRESS;
import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_INIT;
@@ -10,7 +12,6 @@ import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_LINK_LOG_CONNEC
import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT;
import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -789,6 +790,14 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
*
* @return boolean
*/
@ChainLog(
linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
linkCode = CHAIN_LINK_ADAS,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_SEND_GLOBAL_PATH,
paramIndexes = {-1},
clientPkFileName = "sn"
)
@Override
public boolean sendGlobalPathReq() {
MessagePad.GlobalPathReq req = MessagePad.GlobalPathReq
@@ -849,6 +858,14 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
* SystemCmdType。SYSTEMCMD_SHUT_DOWN 关机
* @return boolean
*/
@ChainLog(
linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
linkCode = CHAIN_LINK_ADAS,
endpoint = TracingConstants.Endpoint.PAD,
nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_SEND_SYSTEM_CMD,
paramIndexes = {0},
clientPkFileName = "sn"
)
@Override
public boolean sendSystemCmdReq(@NonNull MessagePad.SystemCmdType type) {
MessagePad.SystemCmdReq.Builder builder = MessagePad.SystemCmdReq.newBuilder();

2
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/chain/AdasChain.java
View File

@@ -16,4 +16,6 @@ public class AdasChain {
//operation by user
public static final String CHAIN_ALIAS_CODE_ADAS_START_AUTOPILOT = "CHAIN_ALIAS_CODE_ADAS_START_AUTOPILOT";
public static final String CHAIN_ALIAS_CODE_ADAS_SEND_GLOBAL_PATH = "CHAIN_ALIAS_CODE_ADAS_SEND_GLOBAL_PATH";
public static final String CHAIN_ALIAS_CODE_ADAS_SEND_SYSTEM_CMD = "CHAIN_ALIAS_CODE_ADAS_SEND_SYSTEM_CMD";
}

6
libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
View File

@@ -301,4 +301,10 @@ public interface IMogoMapUIController {
* @return
*/
float getAngle(double startLon, double startLat, double endLon, double endLat);
/**
* 获取当前道路方向
* @return angle
*/
Double getRoadAngle(Double lon,Double lat,float angle);
}

10
libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
View File

@@ -753,7 +753,11 @@ public class AMapViewWrapper implements IMogoMapView,
} else {
mIsFirstLocated = true;
mIsDelayed = false;
CallerLogger.INSTANCE.d(M_MAP + TAG, "同步定位：" + GsonUtils.toJson(location));
try {
CallerLogger.INSTANCE.d(M_MAP + TAG, "同步定位：" + GsonUtils.toJson(location));
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
@@ -1007,6 +1011,10 @@ public class AMapViewWrapper implements IMogoMapView,
return MapAutoApi.INSTANCE.getAngle(startLon, startLat, endLon, endLat);
}
@Override
public Double getRoadAngle(Double lon,Double lat,float angle) {
return MapDataApi.INSTANCE.getRoadRectInfo(lon, lat, angle).getAngle();
}
/**
* 加载3D模型

8
libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
View File

@@ -386,4 +386,12 @@ public class MogoMapUIController implements IMogoMapUIController {
}
return 0.0f;
}
@Override
public Double getRoadAngle(Double lon, Double lat, float angle) {
if (mDelegate != null) {
return mDelegate.getRoadAngle(lon, lat, angle);
}
return 0.0;
}
}

8
libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java
View File

@@ -324,4 +324,12 @@ public class AMapUIController implements IMogoMapUIController {
}
return 0;
}
@Override
public Double getRoadAngle(Double lon, Double lat, float angle) {
if (mClient != null) {
return mClient.getRoadAngle(lon, lat, angle);
}
return 0.0;
}
}