Commit Graph

2753 Commits

Author SHA1 Message Date
wangmingjun
3194c67f26 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-08 15:49:56 +08:00
wangmingjun
25e9a3acc3 [M2] M2车模替换 2023-03-08 15:48:40 +08:00
wangmingjun
96256811a9 [M2] 1、视频下载优化 2023-03-08 15:34:38 +08:00
lixiaopeng
bc3b3f1a48 [dev_arch_opt_3.0] 优化cmdb存储 2023-03-08 09:59:24 +08:00
yangyakun
2e35de029e Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-08 09:56:30 +08:00
yangyakun
dadf330a2c [shuttle]
[方向盘修改]
2023-03-08 09:36:48 +08:00
wangmingjun
39afcde96c Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0'
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!657
2023-03-07 16:33:22 +00:00
aibingbing
390eec6ec9 refactor: 金旅星辰乘客屏 修改成双屏,并播放宣传视频; 2023-03-07 22:59:36 +08:00
yangyakun
8322522c0d [m1]
[1.1.2]
[添加车型 金旅 判断]
2023-03-07 22:21:14 +08:00
chenfufeng
fca708154c [Opt3.0]优化自车是否走过轨迹点的逻辑 2023-03-07 20:30:48 +08:00
chenfufeng
a044812042 [Opt3.0]优化自车是否走过轨迹点的逻辑 2023-03-07 20:30:21 +08:00
lixiaopeng
0dd42173a4 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-03-07 19:07:46 +08:00
lixiaopeng
a6d82645f5 [dev_arch_opt_3.0] 去掉下载通知栏提示,调试面板添加车信息数据展示 2023-03-07 19:07:37 +08:00
zhongchao
d1cd2a0c3f [2.13.0-arch-opt] Volatile 2023-03-07 19:03:32 +08:00
xuxinchao
c6cf58f77a [opt3.0]HttpDNS接口扩列 2023-03-07 17:38:16 +08:00
lixiaopeng
591c3c2339 [dev_arch_opt_3.0] 优化运营面板 2023-03-07 16:25:58 +08:00
xuxinchao
84eb439850 [m1]消息盒子增加停车预告运营消息 2023-03-07 14:45:18 +08:00
zhongchao
91547ae873 [2.13.0-arch-opt] func build change 2023-03-06 18:10:01 +08:00
renwj
e18e871ee5 [dev_arch_opt_3.0] 移除无用代码,减小包体积 2023-03-06 17:03:24 +08:00
renwj
f9b91f6722 Revert "[dev_arch_opt_3.0][减小包体积] 移除无用的代码; 将abi改成armeabi-v7a"
This reverts commit b8d9e549bf.
2023-03-06 17:00:03 +08:00
xinfengkun
e7ea7ae9f4 [opt3.0_back_camera] 福田清扫车后摄像头数据接收 2023-03-06 16:26:23 +08:00
zhongchao
c95013f792 [2.13.0-arch-opt] close scene tag change invoke 2023-03-06 15:27:22 +08:00
renwj
b8d9e549bf [dev_arch_opt_3.0][减小包体积] 移除无用的代码; 将abi改成armeabi-v7a 2023-03-06 15:12:21 +08:00
wangmingjun
082930ec9e [shuttle/charter] 解决司机端小地图车标问题 2023-03-06 11:21:53 +08:00
aibingbing
acaaac6b30 refactor: 网络状态 新增是否是以太网的判断; 2023-03-05 14:34:23 +08:00
wangmingjun
eaae7a4033 Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0'
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!652
2023-03-03 15:05:33 +00:00
zhongchao
6018926211 [2.13.0-arch-opt] thread change to main 2023-03-03 18:16:18 +08:00
zhongchao
835a547ad8 [2.13.0-arch-opt] code opt 2023-03-03 18:16:18 +08:00
wangmingjun
f5c5f1536c Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
#	app/build.gradle
#	app/functions/och.gradle
#	app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
2023-03-03 17:29:34 +08:00
wangmingjun
7bca36646f [M2] 找回telematicConstant类 2023-03-03 17:19:57 +08:00
lixiaopeng
cc7591f918 [dev_arch_opt_3.0] 优化代码 2023-03-03 17:02:36 +08:00
lixiaopeng
0bc8b79b73 [dev_arch_opt_3.0] 去掉运营面板无用的开关控制 2023-03-03 16:33:43 +08:00
wangmingjun
8a1616f94a Merge branch 'dev_RoboBus_P_230220_1.0.1' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0'
# Conflicts:
#   app/build.gradle
2023-03-03 07:34:23 +00:00
wangmingjun
2d6bb763db [M2] 找回telematicConstant类 2023-03-03 15:31:23 +08:00
yangyakun
73082244c1 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/build.gradle
#	app/functions/och.gradle
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt
2023-03-03 14:54:30 +08:00
donghongyu
aea12d173a [dev_arch_opt_3.0]
[Change]
[
1、修复多屏幕因连接屏幕树数量不够导致启动异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-03-03 14:21:50 +08:00
wangmingjun
25e81e96e8 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0
# Conflicts:
#	app/build.gradle
#	app/functions/och.gradle
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt
2023-03-02 21:06:00 +08:00
donghongyu
1080307662 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-03-02 20:06:30 +08:00
donghongyu
5bde1bc81e [dev_arch_opt_3.0]
[Change]
[
1、修复多屏幕因连接屏幕树数量不够导致启动异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-03-02 20:06:23 +08:00
zhongchao
3d7be57c71 [2.13.0-arch-opt] merge 2023-03-02 19:54:16 +08:00
xuxinchao
730ee8c8df [dev_arch_opt_3.0]fix调试面板,点击打开历史,APP崩溃 2023-03-02 17:28:47 +08:00
donghongyu
321876e1fd Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-03-02 14:37:49 +08:00
donghongyu
d94e0c405b [dev_arch_opt_3.0]
[Change]
[
1、增加清扫车多屏幕支持
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-03-02 14:36:50 +08:00
zhongchao
e5d5af8d0a [2.13.0-arch-opt] remove default car binding 2023-03-02 12:02:53 +08:00
lixiaopeng
b1d0c3af09 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-03-02 11:15:52 +08:00
lixiaopeng
3f7d93cc79 [dev_arch_opt_3.0] 优化消息盒子图标的显示 2023-03-02 11:13:42 +08:00
yangyakun
93932684a8 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-01 21:12:46 +08:00
chenfufeng
15f0d4d27d [Opt3.0]全览地图默认不绘制起、终点 2023-03-01 19:39:17 +08:00
lixiaopeng
5f4a69588d Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-03-01 19:26:59 +08:00
lixiaopeng
4d67e7400f [dev_arch_opt_3.0] add log 2023-03-01 19:26:51 +08:00