Commit Graph

16867 Commits

Author SHA1 Message Date
yangyakun
51c16b55d4 [6.2.6]
[bus_p]
[mv file]
2023-12-06 19:24:13 +08:00
xuxinchao
5fdf7a23cf Merge branch 'dev_robotaxi-d_231206_6.2.4' into dev_sweeper-d_231206_6.2.4 2023-12-06 18:56:09 +08:00
xuxinchao
cca0f22f61 [6.2.4]调整截图查看对话框关闭按钮位置 2023-12-06 18:45:37 +08:00
xuxinchao
7e65e5f476 [6.2.4]Bag包上传后,不可再查看截图,按钮置灰,上传成功后,删除当前Bag包截图 2023-12-06 18:37:55 +08:00
zhongchao
cd372f6b7a [6.2.4] fix trace log 2023-12-06 18:31:51 +08:00
zhongchao
cfbf4fca20 [6.2.4] add common of chain , versionCode 2023-12-06 17:49:42 +08:00
yangyakun
e3fffc0ac6 [6.2.4]
[bus_p_jl]
[mv file]
2023-12-06 17:42:09 +08:00
aibingbing
00c2239bda [清扫车] feat:清扫车 V6.2.4; 2023-12-06 17:24:28 +08:00
aibingbing
0ccb6fba04 Merge branch 'dev_robotaxi-d_231206_6.2.4' into 'dev_sweeper-d_231206_6.2.4'
Dev robotaxi d 231206 6.2.4

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!839
2023-12-06 09:22:34 +00:00
xuxinchao
6d3989f47d [6.2.4]补交被动录包截图填写信息 2023-12-06 16:56:59 +08:00
yangyakun
39863abe1e [6.2.4]
[shuttle_p_m2]
[turnlight]
2023-12-06 16:45:07 +08:00
zhongchao
9bda271c10 [6.2.4] union v2x and init trace file and extends trace of common param 2023-12-06 16:45:04 +08:00
xuxinchao
50613f6502 Merge branch 'dev_robotaxi-d_231201_6.2.4_dev' into dev_robotaxi-d_231206_6.2.4 2023-12-06 16:43:12 +08:00
yangyakun
420cecaf93 [6.2.4]
[shuttle_p_m2]
[move file]
2023-12-06 16:35:50 +08:00
xuxinchao
959d56f240 [6.2.4]录包截图增加信息 2023-12-06 16:34:42 +08:00
aibingbing
eac29e59c0 Merge branch 'dev_robotaxi-d_231201_6.2.2' into 'master'
[Publish] Taxi无人化 V6.2.2 自主算路验证

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!838
2023-12-06 07:31:43 +00:00
aibingbing
75bc00f935 [自主算路验证] fix: 选择灰度列表activity高度展示不全问题,原因是虚拟键盘的影响; 2023-12-06 14:56:44 +08:00
yangyakun
bfa28c1269 [6.2.4]
[bus、shuttle]
[结束任务时 取消自驾]
2023-12-06 14:54:09 +08:00
yangyakun
331e95de0d [6.2.6]
[shuttle-jl]
[rename]
2023-12-06 14:19:59 +08:00
yangyakun
d6ed5d59cb [6.2.6]
[shuttle-jl]
[灯UI och]
2023-12-06 13:50:27 +08:00
yangyakun
1b676d34a3 [6.2.6]
[shuttle-jl]
[切换位置]
2023-12-06 10:30:00 +08:00
xuxinchao
1a50197b76 [6.2.4]录包管理修改 2023-12-06 01:09:58 +08:00
xuxinchao
226c31cc41 [6.2.4]调整上报内容和PB 2023-12-05 20:14:08 +08:00
renwj
09b8d1eaeb [6.2.0][APM] docker版本只有release->debug或debug->release才置为true 2023-12-05 19:31:22 +08:00
yangyakun
4e107b54e7 [6.2.6]
[shuttle-jl]
[资源整理]
2023-12-05 19:08:02 +08:00
xuxinchao
5bb005753b [6.2.4]修复魔方启动录包和上报原因到工控机Bug 2023-12-05 16:58:51 +08:00
zhongchao
5b40018700 [6.2.4] fix bug of request in main thread 2023-12-05 14:30:10 +08:00
yangyakun
ae0c0cf7e6 [6.2.6]
[common]
[合并]
2023-12-05 11:37:14 +08:00
aibingbing
05ed63a358 Merge branch 'dev_robotaxi-d_231129_6.2.2_routing_verify' into dev_robotaxi-d_231201_6.2.2
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
2023-12-04 20:58:15 +08:00
xuxinchao
d716b618a7 [6.2.4]查看录包快照 2023-12-04 20:56:38 +08:00
aibingbing
9b4b7e99b6 [自主算路验证] refactor: 算路验证模式 高德导航距离,时间不准问题; 2023-12-04 20:15:35 +08:00
xuxinchao
c43cdbd15b [6.2.4]语音转文字结果呈现 2023-12-04 17:51:47 +08:00
aibingbing
f53b6ed553 [自主算路验证] feat: 增加 验证时起点和终点 高精地图Marker ; 2023-12-04 17:00:29 +08:00
yangyakun
dd520d77f0 Merge branch '6.2.0_merge_master' into 'master'
6.2.0 merge master

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!835
2023-12-04 08:45:44 +00:00
yangyakun
f6aca28b24 [6.2.0 -> master]
[冲突业务]
2023-12-04 16:40:19 +08:00
xuxinchao
87a2a1f227 [6.2.4]录包工具查看截图弹窗 2023-12-04 15:08:48 +08:00
xuxinchao
f1313600d9 [6.2.4]录包增加高精地图截图 2023-12-04 14:45:33 +08:00
renwj
7d040d2ae0 [6.2.4][蘑方] 添加长按键B执行录包功能 2023-12-04 12:05:41 +08:00
yangyakun
36e3342e64 Merge branch 'dev_robotaxi-d_231031_6.2.0' into 6.2.0_merge_master
# Conflicts:
#	core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
2023-12-04 11:53:10 +08:00
xuxinchao
264e68da17 [6.2.4]魔方触发主动录包 2023-12-04 11:03:39 +08:00
yangyakun
cce998c410 Merge branch 'release_robotaxi-d_231031_6.2.0.2' into 6.2.0_merge_master
# Conflicts:
#	OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperCloudTabFragment.java
#	OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java
#	OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java
#	OCH/sweeper/sweeper/build.gradle
#	OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java
#	app/script/functions/och.gradle
#	app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
#	core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
#	core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
2023-12-04 11:01:17 +08:00
xuxinchao
79f1279cae [6.2.4]自动化匹配包与问题描述,将录包原因同步给工控机 2023-12-04 10:34:08 +08:00
aibingbing
04e7e20c37 [自主算路验证] fix: 进行模式切换后 无人化页面 不能刷新问题,原因为Model,ViewModel,Fragment的绑定问题,当Fragment重建后绑定了新ViewModel, 同时Model是单例,但是Model绑定的ViewModel还是上一个,就会导致数据传递到ViewModel后不能正确传递给新Fragment;
refactor: TaskWithOrder equals 时字段问题;
refactor: 模式切换 和 登出 类似,有些变量需要同等重置;
2023-12-01 21:45:52 +08:00
aibingbing
cede3cf1cd Merge branch 'dev_robotaxi-d_231031_6.2.0' into dev_robotaxi-d_231129_6.2.2_routing_verify 2023-12-01 18:17:45 +08:00
renwj
d587c809de [6.2.0][技术优化] 代码逻辑优化 2023-12-01 18:04:07 +08:00
aibingbing
9a6af41952 [自主算路验证] fix: debug包不展示mock按钮; 2023-12-01 17:24:13 +08:00
aibingbing
79d5cb92a7 Merge branch 'dev_robotaxi-d_231031_6.2.0' into dev_robotaxi-d_231129_6.2.2_routing_verify 2023-12-01 16:30:26 +08:00
zhongchao
2bf65101ce [6.2.0] fix bug 2023-12-01 15:46:15 +08:00
aibingbing
45c4ac8652 Merge branch 'dev_robotaxi-d_231031_6.2.0' into dev_robotaxi-d_231129_6.2.2_routing_verify 2023-12-01 13:31:43 +08:00
zhongchao
39cb22cc59 [6.2.0] union the sp call 2023-12-01 11:48:25 +08:00