Commit Graph

13134 Commits

Author SHA1 Message Date
xinfengkun
54ea3e3022 [dev_sweeper310][adas] 轨迹下载请求接口添加消息来源字段 2023-05-04 16:07:17 +08:00
xinfengkun
65c39167fd dev_sweeper310][adas]云控清扫车接收接口添加可空参数类型,添加未知类型回调 2023-05-04 15:16:12 +08:00
xinfengkun
1ce857a56f dev_sweeper310][adas]云控清扫车接收接口添加可空参数类型,添加未知类型回调 2023-05-04 15:15:19 +08:00
bxb
1c46f27af8 [sweeper-cloud] 清扫车获取云端正在执行的任务逻辑处理 2023-05-04 14:10:37 +08:00
bxb
9763ebdae7 [sweeper-cloud]pb回调部分代码修改 2023-04-28 11:34:25 +08:00
bxb
fb5f86fb82 [sweeper-cloud]调整任务面板间距问题 2023-04-27 10:59:47 +08:00
bxb
dfcf558109 [sweeper-cloud]解决代码合并冲突 2023-04-27 10:59:12 +08:00
bxb
d9a1c24945 Merge branch 'bxb/dev_sweeper-d_modify_domain_name' into dev_sweeper-d_230423_3.1.0
# Conflicts:
#	app/config/urlConfig.json
2023-04-26 18:12:56 +08:00
bxb
de81c7a414 Merge branch 'dev_sweeper-d_230423_3.1.0' of http://gitlab.zhidaoauto.com/SCA/L4HA/AndroidApp/MoGoEagleEye into dev_sweeper-d_230423_3.1.0 2023-04-26 17:57:24 +08:00
bxb
209020f4c0 [sweeper-cloud]删除清扫车无用的布局和部分代码 2023-04-26 17:56:01 +08:00
bxb
8c9ef04ac2 [sweeper-cloud]子任务列表布局搭建及其修改 2023-04-26 17:55:06 +08:00
bxb
538d77e58b [sweeper-cloud]弹窗公共UI布局搭建 2023-04-26 17:53:43 +08:00
xinfengkun
59db2bf7c4 [dev_sweeper310][adas]云控清扫车收发接口添加,添加接口使用说明 2023-04-26 17:05:19 +08:00
bxb
22c8e10708 [sweeper-cloud]合并凤坤的后置摄像头视频代码 2023-04-24 18:13:27 +08:00
bxb
2e796c4b4d [sweeper-cloud]清扫车云控需求module包名修改 2023-04-24 18:04:04 +08:00
yangyakun
25fd2a9cac [sweeper]
[3.1.0]
[分出两个module、对应的版本号]
2023-04-24 15:53:57 +08:00
yangyakun
8b0f19f5de [sweeper]
[3.1.0]
[分出两个module]
2023-04-24 15:50:38 +08:00
yangyakun
1fc922a8f3 [sweeper]
[3.1.0]
[文件迁移]
2023-04-24 15:09:58 +08:00
yangyakun
d6cc1dceb5 Merge branch 'dev_robobus_gradle_och_230317' into dev_sweeper-d_230423_3.1.0 2023-04-23 20:15:58 +08:00
yangyakun
38897b664f Merge branch 'release_robobus-p_230413_2.1.0.1' 2023-04-23 14:28:53 +08:00
yangyakun
d32d904239 Merge branch 'release_robobus-d_230413_3.1.0.1'
# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java
#	core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt
#	gradle.properties
2023-04-23 14:28:19 +08:00
yangyakun
430fa345d5 [gradle]
[动态版本号设置]
2023-04-21 11:29:10 +08:00
yangyakun
5ee4f8cd0f [gradle]
[shuttle 添加M2司机屏]
2023-04-21 11:00:23 +08:00
yangyakun
bc272eb63a [gradle]
[横竖屏配置]
2023-04-20 18:40:41 +08:00
yangyakun
bb87768dcc [gradle]
[横竖屏配置]
2023-04-20 16:31:45 +08:00
yangyakun
4068686048 [2.15。0]
[大理不需要公交模式]
2023-04-20 15:04:12 +08:00
yangyakun
e54364e668 Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus_gradle_och_230317 2023-04-20 14:33:03 +08:00
yangyakun
6a6c8b61a8 [gradle]
[广告配置]
2023-04-19 16:13:56 +08:00
yangyakun
668f8ec84f [gradle]
[gradle 整理]
2023-04-19 15:39:21 +08:00
xuxinchao
f907f24b6a Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus-p_230413_2.1.0 2023-04-19 11:42:16 +08:00
xuxinchao
0c4d329626 [dev_robobus-d_230413_3.1.0]消息盒子更改消息队列处理方式,队列方式 2023-04-19 11:41:18 +08:00
yangyakun
8db14739ae Merge branch 'dev_mine_3.2.0' into dev_robobus_gradle_och_230317 2023-04-19 11:27:33 +08:00
yangyakun
64e0cc8ed4 [公交模式乘客屏删除双屏逻辑] 2023-04-19 11:27:05 +08:00
wangmingjun
873e26f7d6 Merge branch 'dev_robobus-d_230413_3.1.0' into 'dev_robobus-p_230413_2.1.0'
Dev robobus d 230413 3.1.0

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!761
2023-04-19 03:07:54 +00:00
yangyakun
cc7a5e9560 Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus_gradle_och_230317
# Conflicts:
#	app/productFlavors/ochDriverM1.gradle
2023-04-19 11:07:14 +08:00
wangmingjun
f2cc1d1827 [3.1.0] dali/yantai online 司机端二维码链接修复 2023-04-19 11:06:09 +08:00
renwj
bf00ddcab3 [2.15.0] 优化UiThreadHandler和ThreadUtils往主线程消息队列添加消息的方式,添加最新和排队两种方式 2023-04-19 09:06:06 +08:00
yangyakun
8076f0d0fc Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus-p_230413_2.1.0 2023-04-18 18:13:22 +08:00
yangyakun
79af3a3317 [bugfix]
[车模被动态替换]
2023-04-18 16:47:40 +08:00
zhongchao
ef65f44fbb Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus-p_230413_2.1.0 2023-04-18 16:47:19 +08:00
zhongchao
bc2a57e05e [3.1.0]reject the stop and restart of socket 2023-04-18 16:43:12 +08:00
yangyakun
2df00c16ad [gradle]
[多屏修改]
2023-04-18 14:14:21 +08:00
chenfufeng
c7303eca7f [2.15.0][Fix]解决首次安装App时无法获得高德定位导致的高精地图缓存问题 2023-04-18 11:46:12 +08:00
chenfufeng
f8ebfe416c [2.15.0][Fix]解决首次安装App时无法获得高德定位导致的高精地图缓存问题 2023-04-18 11:44:59 +08:00
yangyakun
f50e31c9ef Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus_gradle_och_230317 2023-04-18 11:13:32 +08:00
wangmingjun
d0f2621773 Merge branch 'dev_robobus-d_230413_3.1.0' into 'dev_robobus-p_230413_2.1.0'
Dev robobus d 230413 3.1.0

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!760
2023-04-17 10:34:38 +00:00
xuxinchao
c3badacbbc [dev_robobus-d_230413_3.1.0]fix不处于平行驾驶状态下弱网也提示平行驾驶接管更改 2023-04-17 18:30:24 +08:00
yangyakun
1d0030f9dd [bugfix]
[视频源修改、添加双视频]
2023-04-17 17:22:32 +08:00
yangyakun
b7a83dbfbb [bugfix]
[删掉空格]
2023-04-17 16:33:07 +08:00
yangyakun
1f1989174f Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus-p_230413_2.1.0
# Conflicts:
#	OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
2023-04-17 15:16:03 +08:00