yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,115 Commits 1 Branch 0 Tags
f5c5f1536c858bfdce24d79b667d56e656853571
Commit Graph

12115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
e8a5f2097d [m1] 
[1.1.2]
[merge error]
 2023-03-03 15:16:33 +08:00
yangyakun
a0bcbb5cb8 [m1] 
[1.1.2]
[dimension 修改]
 2023-03-03 14:56:52 +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
wangmingjun
8d0d82459f [M2] 处理偶现结束订单乘客屏不更新问题 2023-03-03 14:41:28 +08:00
donghongyu
60c33ac089 [dev_arch_opt_3.0] 
[Change]
[
1、解决少引用import android.content.Context
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-03-03 14:37:03 +08:00
donghongyu
292d491bac Merge remote-tracking branch 'origin/dev_arch_opt_3.0_back_camera' into dev_arch_opt_3.0_back_camera 2023-03-03 14:22:19 +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
5d794b1474 [M1 司机端] 修复到计时bug 2023-03-03 13:19:12 +08:00
renwj
3605f62e6c [dev_arch_opt_3.0]捕获aispeech相关崩溃 2023-03-03 12:21:30 +08:00
donghongyu
a8a0ff0ffd [dev_arch_opt_3.0] 
[Change]
[
1、修复多屏幕因连接屏幕树数量不够导致启动异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-03-03 12:19:25 +08:00
yangyakun
215f94f1c6 [m1] 
[1.1.2]
[打包过滤]
 2023-03-03 12:04:34 +08:00
zhongchao
6f76e38ec2 [2.13.0-arch-opt] fix bug of npc 2023-03-03 11:27:42 +08:00
yangyakun
96dc2b19c0 [m1] 
[1.1.2]
[引用问题]
 2023-03-03 09:19:05 +08:00
yangyakun
58acd2994b [m1] 
[1.1.2]
[业务BUSINESS_STRING包裹类修改]
 2023-03-03 08:42:22 +08:00
wangmingjun
c84f56a08b Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into 'dev_RoboBus_P_230220_1.0.1' 
Dev robobus m1 p app module 1.0.0 230112 1.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!642
 2023-03-02 13:52:45 +00:00
wangmingjun
3769f191c0 [M2] 处理轮询问题 2023-03-02 21:37:32 +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
wangmingjun
88112b522b [charter m1] tab阴影 2023-03-02 20:26:55 +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
f895626f8a [2.13.0-arch-opt] reset map version to release 2023-03-02 19:54:21 +08:00
zhongchao
3d7be57c71 [2.13.0-arch-opt] merge 2023-03-02 19:54:16 +08:00
wangmingjun
db8dd83c30 [charter m1] 轨迹下载修复 2023-03-02 19:52:24 +08:00
xuxinchao
730ee8c8df [dev_arch_opt_3.0]fix调试面板，点击打开历史，APP崩溃 2023-03-02 17:28:47 +08:00
wangmingjun
8ebc0268e0 [M2] 处理线程问题 2023-03-02 15:35:08 +08:00
wangmingjun
0b862f6363 [M2] 1、视频渲染方式 2、走马灯效果 2023-03-02 14:48:04 +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
xinfengkun
0e1c6e1aba [工控机监控] 修改清扫车不限制档位启动自动驾驶 2023-03-02 14:26:51 +08:00
zhongchao
e5d5af8d0a [2.13.0-arch-opt] remove default car binding 2023-03-02 12:02:53 +08:00
xuxinchao
ae38de2b46 [dev_arch_opt_3.0]更改MIS和DNS测试域名 2023-03-02 11:40:54 +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
wangmingjun
0466ef4ce9 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-01 21:56:11 +08:00
wangmingjun
98820f2f65 [charter m1]增加平行驾驶 2023-03-01 21:56:04 +08:00
yangyakun
eeff0d2e46 [m1] 
[1.1.2]
[tts 临时导入]
 2023-03-01 21:52:07 +08:00
yangyakun
ab8b257eeb 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-01 21:49:41 +08:00
yangyakun
105cf686b7 [m1] 
[1.0.2]
[动画结束前不显示背景]
 2023-03-01 21:49:21 +08:00
wangmingjun
979789b7e8 [charter m1]增加订单轮询 2023-03-01 21:33:06 +08:00
yangyakun
84c5a4b664 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-01 21:13:14 +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
yangyakun
822ceb71d5 [m1] 
[1.1.2]
[结束订单跳转到还车页面]
 2023-03-01 21:08:23 +08:00
yangyakun
a66d00efc3 [m1] 
[1.1.2]
[提前结束页面]
 2023-03-01 20:10:14 +08:00
chenfufeng
06d347c4ef [Opt3.0]全览地图默认不绘制起、终点 2023-03-01 19:41:00 +08:00
chenfufeng
15f0d4d27d [Opt3.0]全览地图默认不绘制起、终点 2023-03-01 19:39:17 +08:00
chenfufeng
de9f23cf20 [Opt3.0]默认不绘制起、终点 2023-03-01 19:27:10 +08:00