yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,571 Commits 1 Branch 0 Tags
3cc9fbe4bf4a05461866417728d75cc09de91f2b
Commit Graph

8571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
donghongyu
3cc9fbe4bf [Change] 
合并小地图到地图模块

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-03-04 16:58:57 +08:00
donghongyu
b02481462e [Change] 
完成main转移

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-03-04 14:57:03 +08:00
wangmingjun
b382c54612 [Taxi -d v2.5.5] versionName -> 2.5.5 2022-03-03 20:24:49 +08:00
donghongyu
1ff9beb200 [Change] 
修复网约车模块加载异常

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-03-03 19:50:23 +08:00
chenfufeng
1656d7f688 [Fix]解决合并代码时乘客端初始化参数错误的问题 2022-03-03 18:28:18 +08:00
chenfufeng
b8b705e8a2 [Update]启用多屏功能 2022-03-03 17:51:02 +08:00
donghongyu
f2e8608e08 Merge branch 'dev_robotaxi-p-app_254_220228_2.5.4' 2022-03-03 16:51:50 +08:00
xinfengkun
9b7f04d015 Merge branch 'dev_robotaxi-p-app_254_220228_2.5.4' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-p-app_254_220228_2.5.4 2022-03-03 16:29:06 +08:00
xinfengkun
ba720c405b [fixed]修复正在连接时断开失败问题，修复主动端看连接时固定IP轮序未停止问题 2022-03-03 16:28:58 +08:00
donghongyu
93b0a23b8d Merge branch 'dev_robotaxi-p-app_254_220228_2.5.4' 2022-03-03 16:21:30 +08:00
donghongyu
7a5d86bad4 [Change] 
更改未知类型的模型

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-03-03 16:21:09 +08:00
donghongyu
2a71dd3ba6 Merge branch 'test_robotaxi-d-app-module_251_220125_2.5.1.1' into dev_robotaxi-p-app_254_220228_2.5.4 2022-03-03 10:28:37 +08:00
donghongyu
a086268748 Merge branch 'dev_robotaxi-p-app_254_220228_2.5.4' 2022-03-02 20:21:25 +08:00
zhongchao
37e53ff35d update log 2022-03-02 20:18:47 +08:00
zhongchao
197a9e819a note the log of [fpgaSocket pb msg] 2022-03-02 19:53:47 +08:00
donghongyu
fe79330014 [Change] 
迁移mogo-module-extensions到MoGoEagleEye.core.function-impl.mogo-core-function-monitoring

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-03-02 18:32:39 +08:00
zhongchao
1820610e42 fix bug of init time 2022-03-02 18:01:58 +08:00
lixiaopeng
ce09c619b8 opt 2022-03-02 17:03:52 +08:00
donghongyu
009aaf5d0a Merge branch 'dev_MogoAP_eagle-220_211207_8.0.17_merge' into dev_robotaxi-p-app_254_220228_2.5.4 2022-03-02 16:11:36 +08:00
lianglihui
c1c8a7224a 254 修改车前引导线绘制逻辑 以优化车前引导线展现效果 2022-03-02 14:15:14 +08:00
donghongyu
b07dd902d1 [Change] 
修复数字版权ID加密造成的卡顿

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-03-02 14:01:35 +08:00
zhongchao
10ff1c2e87 fix bug of log switch 2022-03-02 13:25:20 +08:00
donghongyu
d42aea7f6c [Change] 
增加数字版权ID

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-03-02 12:40:42 +08:00
donghongyu
1240e218f2 [Change] 
增加数字版权ID

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-03-02 11:41:09 +08:00
donghongyu
83999af729 [Change] 
拼接唯一标记信息

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-03-02 11:36:35 +08:00
donghongyu
d590eef2ac [Change] 
增加获取数字版权管理设备ID方法，解决因为系统升级等原因造成获取的SN被改变的问题

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
(cherry picked from commit 31a0fdd86d)
 2022-03-02 11:34:14 +08:00
donghongyu
f441e5051e [Change] 
增加说明

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-03-02 11:08:56 +08:00
donghongyu
bfcf5bc980 [Change] 
增加说明

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-03-02 10:49:33 +08:00
pangfan
78d6ca4682 [Bus/Taxi driver v2.5.4]versionname：2.5.4 2022-03-02 10:08:59 +08:00
xuxinchao
b1a5deec6c 工控机升级问题修复 
1、修复文字内容显示不全问题
2、修复工控机升级状态显示错误问题
 2022-03-01 19:58:14 +08:00
donghongyu
9a246de4bc [Change] 
修改未知类型模型

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-03-01 19:15:40 +08:00
donghongyu
33bb6d09af Merge branch 'dev_MogoAP_eagle-220_211207_8.0.17_merge' into dev_robotaxi-p-app_254_220228_2.5.4 2022-03-01 18:47:20 +08:00
donghongyu
e447fb1a3e [Change] 
增加未知类型绘制开关按钮
增加未知类型计数

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-03-01 18:46:47 +08:00
donghongyu
193f7f4c4b [Change] 
拼接唯一标记信息

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-03-01 17:18:56 +08:00
donghongyu
04374cbe9d [Change] 
拼接唯一标记信息

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-03-01 17:18:26 +08:00
zhongchao
7dba6a2e52 open chain and add log debug view 2022-03-01 17:12:10 +08:00
donghongyu
47461acde5 [Change] 
增加设备唯一标记上报参数

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-03-01 17:06: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