Commit Graph

1023 Commits

Author SHA1 Message Date
xinfengkun
81c5ef75c8 [fix]修改SSH账号密码 2022-03-15 16:25:20 +08:00
xinfengkun
3f7773c781 [fix]修复版本号显示不正确 2022-03-15 10:59:11 +08:00
zhongchao
6102e55ed3 change the callerlogger 2022-03-14 21:50:16 +08:00
xinfengkun
28b72c7cd9 Merge branch 'dev_robotaxi-d-app-module_260_220304_2.6.0_all_pb' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_260_220304_2.6.0_all_pb 2022-03-14 14:12:29 +08:00
zhongchao
d35700cb08 add log 2022-03-14 14:11:38 +08:00
xinfengkun
5a83497b2b 修改代码 2022-03-14 14:08:07 +08:00
xinfengkun
3ffcb4bd27 添加忽略,移除无用文件 2022-03-14 10:19:59 +08:00
zhongchao
981020b9b8 fix of pb files due to rebase problem 2022-03-11 20:21:29 +08:00
zhongchao
5886f4feb7 rebase 2022-03-11 20:04:11 +08:00
zhongchao
4554986f52 rebase 2022-03-11 19:52:39 +08:00
zhongchao
b16e7edbd3 rebase 2022-03-11 19:40:23 +08:00
xinfengkun
c6adf078ee 添加注释,删除无用log,AdasManager中添加工控机配置对象的获取方法 2022-03-11 17:22:14 +08:00
xinfengkun
ce84e2bb1f 与工控机联调完成 2022-03-10 19:04:45 +08:00
xinfengkun
45ff85d864 添加工控机测试程序 2022-03-10 13:03:06 +08:00
xinfengkun
ebebd635cf 与工控机通讯数据协议全部更改成PB格式 2022-03-09 19:15:32 +08:00
xinfengkun
ba720c405b [fixed]修复正在连接时断开失败问题,修复主动端看连接时固定IP轮序未停止问题 2022-03-03 16:28:58 +08:00
zhongchao
197a9e819a note the log of [fpgaSocket pb msg] 2022-03-02 19:53:47 +08:00
donghongyu
8d03fb2618 Merge branch 'dev_MogoAP_eagle-220_211207_8.0.17_merge' into dev_robotaxi-p-app_254_220228_2.5.4 2022-03-01 16:16:41 +08:00
donghongyu
a0f1b0feb0 Merge branch 'dev_MogoAP_eagle-220_211207_8.0.17_merge' into dev_robotaxi-p-app_254_220228_2.5.4
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/build.gradle
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/carcorder/CarcorderPreviewView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_carcorder_preview.xml
#	libraries/map-usbcamera/build.gradle
#	libraries/map-usbcamera/src/main/java/com/mogo/usbcamera/UVCCameraHelper.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/CameraDialog.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/DeviceFilter.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/IFrameCallback.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/Size.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/USBMonitor.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/USBVendorId.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/UVCCamera.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/common/AbstractUVCCameraHandler.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/common/UVCCameraHandler.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/common/UVCCameraHandlerMultiSurface.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/IAudioEncoder.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/IVideoEncoder.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/MediaAudioEncoder.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/MediaSurfaceEncoder.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/MediaVideoBufferEncoder.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/RecordParams.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/biz/AACEncodeConsumer.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/biz/H264EncodeConsumer.java
#	libraries/map-usbcamera/src/main/java/com/serenegiant/usb/encoder/biz/Mp4MediaMuxer.java
#	libraries/map-usbcamera/src/main/jniLibs/arm64-v8a/libUVCCamera.so
#	libraries/map-usbcamera/src/main/jniLibs/arm64-v8a/libjpeg-turbo1500.so
#	libraries/map-usbcamera/src/main/jniLibs/arm64-v8a/libusb100.so
#	libraries/map-usbcamera/src/main/jniLibs/arm64-v8a/libuvc.so
#	libraries/map-usbcamera/src/main/jniLibs/armeabi-v7a/libUVCCamera.so
#	libraries/map-usbcamera/src/main/jniLibs/armeabi-v7a/libjpeg-turbo1500.so
#	libraries/map-usbcamera/src/main/jniLibs/armeabi-v7a/libusb100.so
#	libraries/map-usbcamera/src/main/jniLibs/armeabi-v7a/libuvc.so
#	libraries/map-usbcamera/src/main/jniLibs/x86/libUVCCamera.so
#	libraries/map-usbcamera/src/main/jniLibs/x86/libjpeg-turbo1500.so
#	libraries/map-usbcamera/src/main/jniLibs/x86/libusb100.so
#	libraries/map-usbcamera/src/main/jniLibs/x86/libuvc.so
#	libraries/map-usbcamera/src/main/jniLibs/x86_64/libUVCCamera.so
#	libraries/map-usbcamera/src/main/jniLibs/x86_64/libjpeg-turbo1500.so
#	libraries/map-usbcamera/src/main/jniLibs/x86_64/libusb100.so
#	libraries/map-usbcamera/src/main/jniLibs/x86_64/libuvc.so
2022-03-01 16:12:57 +08:00
xinfengkun
de1f3e4f61 增加无限循环ping,增加相对应的链接状态 2022-03-01 16:12:08 +08:00
xinfengkun
c99c3aa8ac 更新ADAS连接方式,更新连接工控机回调 2022-02-28 20:02:40 +08:00
xinfengkun
149423c655 加入轮询工控机IP,优化连接代码 2022-02-28 19:10:42 +08:00
donghongyu
5562fc3068 Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1'
# Conflicts:
#	modules.txt
2022-02-24 18:43:10 +08:00
donghongyu
b9347a2fb5 Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge 2022-02-24 18:40:49 +08:00
donghongyu
2bc36e11aa Merge remote-tracking branch 'origin/dev_MogoAP_eagle-220_211207_8.0.17_merge' into dev_MogoAP_eagle-220_211207_8.0.17_merge 2022-02-24 17:47:38 +08:00
donghongyu
353e8492b9 [Change]
修改速度取值,更新行车记录仪代码。
DEMO必须依附于预览获取YUV数据,不符合需求,这里先接入直播,后续需要按照源码抽离直接通过USB获取YUV的服务

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-24 17:47:33 +08:00
lixiaopeng
60622ef131 fixed bugs 2022-02-24 16:43:50 +08:00
renwj
60a8a73ec3 [DebugView]Debug入口切换视角实现 2022-02-24 12:24:39 +08:00
renwj
d1245f13c8 [MapDataUpdate]升级sdk版本 2022-02-22 19:17:49 +08:00
donghongyu
0ebbc5760f [Change]
暂时关闭全链路统计日志,因为影响到了ADAS感知绘制

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-22 17:31:51 +08:00
zhongchao
5bc5c25228 merge 2022-02-21 20:40:16 +08:00
donghongyu
982dce12eb [Change]
开始编写行车记录仪后台服务

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-21 19:38:58 +08:00
donghongyu
94440566d7 [Change]
移除无用aar

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-17 20:07:25 +08:00
xinfengkun
0be79fb16b 添加备注,增加临时转发json方案,增强程序健壮性 2022-02-17 14:27:51 +08:00
xinfengkun
1b57ad0031 [fix]处理乘客端调用ws发送消息崩溃问题 2022-02-17 11:00:27 +08:00
donghongyu
2fede9c8a7 Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge 2022-02-16 19:44:08 +08:00
donghongyu
0554fe45ed [Change]
更改设置自车模型的时机

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-16 19:43:27 +08:00
donghongyu
99a7436b07 Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge
# Conflicts:
#	core/function-impl/mogo-core-function-map/build.gradle
2022-02-15 20:12:39 +08:00
donghongyu
183edda70e [Change]
升级高精地图版本,去掉光波效果,占用内存过大

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-15 20:08:22 +08:00
donghongyu
6069bd7c2d [Change]
关闭adas日志

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-15 19:57:11 +08:00
xinfengkun
fc732d72e5 修改action描述 2022-02-15 18:34:44 +08:00
donghongyu
86f5c2e212 [Change]
修复缩放为2D模式的bug

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-15 17:11:00 +08:00
donghongyu
7e23e65159 Merge remote-tracking branch 'origin/dev_MogoAP_eagle-220_211207_8.0.17_merge' into dev_MogoAP_eagle-220_211207_8.0.17_merge 2022-02-15 14:35:33 +08:00
xinfengkun
87d168a34d 整理log,合并多设备代码 2022-02-15 14:31:03 +08:00
donghongyu
69a0d6a3cc [Change]完成摄像头功能
Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
(cherry picked from commit b215dec486)
2022-02-15 14:26:50 +08:00
donghongyu
cdee266805 [Change]
开始USB摄像头的功能集成,还无法获取usb连接广播需要调试

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
(cherry picked from commit b10306fc45)
2022-02-15 14:26:43 +08:00
donghongyu
1ead45ac73 [Change]
加入usb-camera

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>

(cherry picked from commit 3f64bb093a)
Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-15 14:26:38 +08:00
donghongyu
134d494ec5 [Change]
创建USB-Camera sdk

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
(cherry picked from commit 986c3d46f5)
2022-02-15 14:25:52 +08:00
chenfufeng
ad0ca9c89e [Fix]解决Merge操作产生的问题 2022-02-14 16:28:22 +08:00
chenfufeng
0f7a2453d8 [Update]Adas多屏代码更改、Netty框架自定义协议并解决粘包/拆包问题 2022-02-14 16:06:37 +08:00