Commit Graph

8535 Commits

Author SHA1 Message Date
donghongyu
04374cbe9d [Change]
拼接唯一标记信息

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-03-01 17:18:26 +08:00
donghongyu
e857f96694 [Change]
增加设备唯一标记上报参数

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-03-01 17:06:08 +08:00
donghongyu
fca18aedf3 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:53:33 +08:00
donghongyu
f3d97538a5 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-03-01 16:53:00 +08:00
donghongyu
591acbe443 [Change]
打开apm统计监控

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
(cherry picked from commit 3d404d73c5)
2022-03-01 16:52:46 +08:00
wangmingjun
f19841feb2 [Bus/Taxi -d v2.5.4] bus/taxi 增加升级提示小红点 2022-03-01 16:51:27 +08:00
donghongyu
6296888454 Merge remote-tracking branch 'origin/dev_robotaxi-p-app_254_220228_2.5.4' into dev_robotaxi-p-app_254_220228_2.5.4 2022-03-01 16:49:56 +08:00
donghongyu
3d404d73c5 [Change]
打开apm统计监控

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-03-01 16:49:46 +08:00
pangfan
43f1399cb8 Merge branch 'test_robobus-d-app-module_252_220215_2.5.2.1' into 'dev_robotaxi-p-app_254_220228_2.5.4'
Test robobus d app module 252 220215 2.5.2.1

See merge request zhjt/AndroidApp/MoGoEagleEye!9
2022-03-01 08:28:49 +00:00
pangfan
7494ab8dc6 Merge branch 'dev_robotaxi-p-app_254_220228_2.5.4' into 'test_robobus-d-app-module_252_220215_2.5.2.1'
# Conflicts:
#   test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java
2022-03-01 08:28:25 +00: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
70c19683a9 Merge branch 'dev_MogoAP_eagle-220_211207_8.0.17_merge' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_MogoAP_eagle-220_211207_8.0.17_merge 2022-03-01 16:12:22 +08:00
xinfengkun
de1f3e4f61 增加无限循环ping,增加相对应的链接状态 2022-03-01 16:12:08 +08:00
donghongyu
731932834a [Change]
增加README描述

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-03-01 15:54:30 +08:00
xinfengkun
76c857783d Merge branch 'dev_MogoAP_eagle-220_211207_8.0.17_merge' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_MogoAP_eagle-220_211207_8.0.17_merge 2022-03-01 15:14:35 +08:00
donghongyu
95c0c0c883 [Change]
增加README描述
调整依赖关系

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-03-01 11:47:21 +08:00
donghongyu
222491d70c [Change]
增加APM上报pad唯一标记

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-28 20:43:40 +08:00
donghongyu
5133e98130 [Change]
增加APM上报pad唯一标记

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-28 20:41:36 +08:00
xinfengkun
c99c3aa8ac 更新ADAS连接方式,更新连接工控机回调 2022-02-28 20:02:40 +08:00
donghongyu
548fd4ac03 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-28 19:33:01 +08:00
donghongyu
31a0fdd86d [Change]
增加获取数字版权管理设备ID方法,解决因为系统升级等原因造成获取的SN被改变的问题

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-28 19:32:51 +08:00
xuxinchao
393d4d2647 工控机升级
1、添加网约车小红点View回调、显示逻辑
2、修改鹰眼小红点大小
2022-02-28 19:21:44 +08:00
xinfengkun
668c9ae8a3 Merge branch 'dev_MogoAP_eagle-220_211207_8.0.17_merge' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_MogoAP_eagle-220_211207_8.0.17_merge 2022-02-28 19:10:51 +08:00
xinfengkun
149423c655 加入轮询工控机IP,优化连接代码 2022-02-28 19:10:42 +08:00
chenfufeng
44d984fa57 [Update]这个版本注释掉多屏功能 2022-02-28 18:45:07 +08:00
donghongyu
ae91a0a204 [Change]
关闭行车记录仪功能

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-28 18:15:01 +08:00
xuxinchao
3bb52e492f Merge branch 'dev_MogoAP_eagle-220_211207_8.0.17_merge' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_MogoAP_eagle-220_211207_8.0.17_merge 2022-02-28 16:33:43 +08:00
xuxinchao
70bfb8e1f1 修改工控机升级帮助类
1、去掉无用引用
2、添加@JvmStatic注解
3、优化代码
2022-02-28 16:32:58 +08:00
pangfan
ecff0ed925 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-28 16:31:38 +08:00
pangfan
95776f95a8 [v2.5.4]OCH: 司机/乘客-Taxi/Bus身份区分逻辑优化 2022-02-28 16:31:27 +08:00
chenfufeng
97aeac06ce [Update]Bus不显示设置自动驾驶速度的入口 2022-02-28 16:25:55 +08:00
chenfufeng
ecf7a6a83b [Update]Bus不显示设置自动驾驶速度的入口 2022-02-28 15:59:35 +08:00
donghongyu
be8f9b905a [Change]
增加身份工具类使用说明
AppIdentityModeUtils

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-28 15:45:53 +08:00
zhongchao
f52b441f3d update mogoaiCloudsdk version and add log check logic 2022-02-28 15:18:23 +08:00
lianglihui
fa972e7843 apm 用tag管理 hdmap sdk version 2022-02-28 14:47:24 +08:00
xuxinchao
c0451f5f7a upgrade fix bug
1、确认升级时,将角标设为“升级中”状态
2、优先判断“升级中”状态
2022-02-28 14:24:25 +08:00
donghongyu
64f886b741 [Change]
修改默认连接ip防止办公室冲突

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-25 18:16:53 +08:00
donghongyu
632bafabe5 [Change]
解决合并冲突

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-25 17:36:07 +08:00
donghongyu
eeaa016393 Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge
# Conflicts:
#	config.gradle
#	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.java
2022-02-25 17:28:47 +08:00
donghongyu
bee463ba0f Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into test_robobus-d-app-module_252_220215_2.5.2.1 2022-02-25 17:02:58 +08:00
donghongyu
0c1690afd6 [Change]
修改引导线配色

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-25 16:57:38 +08:00
donghongyu
618a8762ca [Change]
修复PAD与工控机断开没有重连的bug
修复引导线车辆尾拖现象

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-25 16:42:37 +08:00
donghongyu
9c1222577d [Change]
还原速度

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-25 16:29:28 +08:00
wangmingjun
899b826b5b [Bus Driver 2.5.2] bus 调试按钮"到站"启动 恢复到长按当前站点名称 2022-02-25 16:14:28 +08:00
renwj
5659c8347e [V2XSDK]恢复之前的版本 2022-02-25 16:04:21 +08:00
renwj
af19e8af6c [V2XSDK]更新V2XSDK版本 2022-02-25 15:05:41 +08:00
donghongyu
6f84a25fcb [Change]
增加了自动启动OTG直播功能

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-24 20:39:15 +08:00
donghongyu
172518deb4 [Change]
完成直播的功能接入,需要做成服务自启动

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-24 19:44:29 +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