Commit Graph

137 Commits

Author SHA1 Message Date
yangyakun
b24e2443f3 Merge branch 'dev_robotaxi-d_231205_6.2.6' into dev_robotaxi-d_231218_6.2.6
# Conflicts:
#	OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
2023-12-18 11:28:25 +08:00
zhongchao
360e3ac169 [6.2.4]merge 2023-12-14 15:28:45 +08:00
zhongchao
62fd8336d6 [6.2.4] code clean 2023-12-08 11:27:01 +08:00
zhongchao
2643dc2332 [6.2.4] code style 2023-12-07 17:31:35 +08:00
zhongchao
96304d6541 [6.2.4] fix sonarbug 2023-12-07 17:07:46 +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
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
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
aibingbing
a6cc6e7027 [sweeper运营&云控合并]refactor: 优化日志; 2023-11-09 16:33:56 +08:00
aibingbing
26dc901f8d [sweeper运营&云控合并]feat:修改版本V6.2.0;refactor: 为了避免在同一pad上反复安装可切换模式和不可切换模式的app, 这里加上判断; 2023-11-03 11:19:54 +08:00
aibingbing
2644a4b641 [sweeper运营&云控合并]refactor: 优化文案; 2023-11-01 11:36:32 +08:00
aibingbing
2ac50f7040 [sweeper运营&云控合并]feat:增加清扫云控&运营 关键节点日志,并补充日志内容; 2023-10-31 20:56:02 +08:00
aibingbing
6aa424c34e [sweeper运营&云控合并]feat: 增加运营面板的控制开关以及业务模式切换逻辑;feat:修改版本号V6.1.0;feat:增加业务模式切换的埋点; 2023-10-30 20:38:35 +08:00
zhongchao
5b910c2082 [sonar] fix sonar plm 2023-10-23 17:01:54 +08:00
zhongchao
2a3e01f66e [sonar] code bug 2023-10-19 16:28:25 +08:00
aibingbing
a215ccc112 [sweeper运营&云控合并]refactor: SweeperOperate & SweeperCloud 相同的代码提取common, 类名、layout、包名等加上operate/cloud前缀区分; 2023-10-18 19:35:49 +08:00
zhongchao
f044cf9a2f [sonar] add impl 2023-10-18 14:11:55 +08:00
aibingbing
de55548d2f [sweeper运营&云控合并]refactor: module name Sweeper->Driver, 删除gradle中与SweeperCloud有关的部分; 2023-10-18 11:09:33 +08:00
aibingbing
3da4860af5 [sweeper运营&云控合并]refactor: 合并Sweeper&SweeperCloud模块,使用不同包名区分,删除SweeperCloud模块,编译通过; 2023-10-17 19:45:08 +08:00
aibingbing
b0b4c72ed4 [sweeper运营&云控合并]refactor: 合并Sweeper&SweeperCloud模块,使用不同包名区分,删除SweeperCloud模块,编译通过; 2023-10-17 19:41:45 +08:00
zhongchao
6422c28d66 [robo_6.1.0_master] fix sweeper problem 2023-10-12 19:38:44 +08:00
zhongchao
cf747fc289 [3.4.0-map-sdk] remove unuse thread to call mapdata api and fix bug of invoke suspend func which call 2023-09-22 17:29:56 +08:00
zhongchao
b4c62dcba6 [3,4,0-map-sdk] merge 6.1.0 2023-09-20 18:37:46 +08:00
aibingbing
d694732689 [6.1.0] fix: 修复SweeperCloud的编译错误; 2023-09-20 12:49:25 +08:00
zhongchao
1ac05ffcd3 [3.4.0-map-sdk] merge 2023-09-20 09:56:00 +08:00
wangmingjun
6895b542ba [6.1.0] 兼容map版本刹车回调 2023-09-19 19:35:36 +08:00
zhongchao
24d572cea0 [3.4.0-map-sdk] merge sweep 2023-09-19 14:52:14 +08:00
zhongchao
a9a6dcdc06 [3.4.0-map-sdk] fix unmanunal and sweep map invoke 2023-09-19 14:28:22 +08:00
zhongchao
059b3cf777 [3.4.0-map-sdk] merge 6.1.0 2023-09-18 19:32:55 +08:00
zhongchao
4932c1d8a7 [3.4.0-map-sdk] code tyle 2023-09-13 18:31:30 +08:00
xinfengkun
76cdcf7e72 [610][adas]添加平行驾驶相关接口;能否启动自驾接口添加手刹状态判断;修改清扫车云控PB与平行驾驶PB共用 2023-09-12 14:25:24 +08:00
yangyakun
e53ee5e6ca Merge branch 'dev_robotaxi-d_230809_6.0.0' into 6.0.0merge2master
# Conflicts:
#	OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java
2023-09-11 17:43:17 +08:00
zhongchao
9f4df04133 [3.4.0-map-sdk] merge 2023-09-11 17:41:01 +08:00
zhongchao
04e787cbc6 [3.4.0] merge 2023-09-11 17:11:10 +08:00
zhongchao
72a3161562 merge 2023-09-11 16:31:44 +08:00
aibingbing
ff9234c025 [Sweeper] fix: 展示水量低时数据判断错误导致一直显示水量低问题; 2023-09-11 16:09:22 +08:00
yangyakun
3b11c7fd58 [6.0.0]
[autopilo]
[包修改]
2023-09-11 16:05:59 +08:00
zhongchao
b2aeb45b0e [6.0.0] code opt and update sdk of aicloud , map , plus kotlin union 2023-09-11 16:03:22 +08:00
zhongchao
c377ecc260 [6.0.0] log 2023-09-11 15:47:35 +08:00
xinfengkun
edcc2754f7 [600][adas][data-center]SSM定频接入;能否启动自驾兼容老版本;以及新版本、FSM、不同车型的兼容、不同域控版本兼容;处理数据中心能否启动自驾管理类 初始化调用获取域控连接状态导致的Netty重复初始化问题 2023-09-11 15:31:31 +08:00
pangfan
770360edf0 [6.0.0/5.0.0]MessagePad.Line新增lineName字段:各业务更新接口 2023-09-11 15:29:42 +08:00
aibingbing
b4ef6ca2fd [Sweeper] fix: 展示水量低时数据判断错误导致一直显示水量低问题; 2023-09-07 11:04:25 +08:00
yangyakun
5f043f6d3e [6.0.0]
[autopilo]
[包修改]
2023-09-01 11:24:17 +08:00
zhongchao
6bef1de3fc [3.4.0-map-sdk] update ,wait to test 2023-08-29 17:06:14 +08:00
zhongchao
22ec53bb2f [6.0.0] code opt and update sdk of aicloud , map , plus kotlin union 2023-08-25 13:30:43 +08:00
zhongchao
7865da2347 [3.4.0-map-sdk] wait to finish 2023-08-25 10:16:15 +08:00
zhongchao
cfbf18d5ff [6.0.0] log 2023-08-24 11:16:26 +08:00
xinfengkun
2a785fac32 [600][adas][data-center]SSM定频接入;能否启动自驾兼容老版本;以及新版本、FSM、不同车型的兼容、不同域控版本兼容;处理数据中心能否启动自驾管理类 初始化调用获取域控连接状态导致的Netty重复初始化问题 2023-08-17 17:50:20 +08:00