6a21e175b4
# Conflicts: # app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java # core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt # core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt # core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt # core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java # core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapPointCloudSubscriber.kt # core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt # gradle.properties # libraries/mogo-adas-data/src/main/proto/message_pad.proto # libraries/mogo-adas-data/src/main/proto/special_vehicle_task_cmd.proto # libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java # libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java # libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java # libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java
工控机PB文件 用于生成Java Bean
1. studio中*.proto文件中如果出现“Cannot resolve symbol 'xxxx'”提示
不影响正常编译，只影响美观以及无法在proto文件中跳转
1. setting> Languages & Frameworks>Protocol Buffers 取消选中Configure automatically
2. 点击加号选择proto文件所在路径（例如：\MoGoEagleEye\libraries\mogo-adas-data\src\main\proto） 点击OK
2. 遇到例如 MessagePad.Header 提示找不到的情况
不影响正常编译，只影响美观以及无法点击跳转
1. 选中mogo-adas-data
2. 点击Build> Make Moudle 'MoGoEagleEye.libraries.mogo-adas-data'