Commit Graph

14204 Commits

Author SHA1 Message Date
bxb
fb5f86fb82 [sweeper-cloud]调整任务面板间距问题 2023-04-27 10:59:47 +08:00
bxb
dfcf558109 [sweeper-cloud]解决代码合并冲突 2023-04-27 10:59:12 +08:00
wangmingjun
b9a721faee [3.1.4] 更新司机端版本号 3.1.4 2023-04-26 19:33:25 +08:00
wangmingjun
77cc5e20b3 Merge branch 'dev_minibus-d_230425_3.2.0' into dev_robobus_d_3.2.0_4.14_local 2023-04-26 18:24:51 +08:00
wangmingjun
ab0ea94455 [3.2.0] 1、倒计时120s 2、类魔方功能加减速 3、三方同步opt 2023-04-26 18:23:14 +08:00
wangmingjun
c635c130e0 Merge branch 'dev_robobus-d_230425_3.1.4' into 'dev_robobus-p_230425_2.1.4'
[福州3.1.4] 更换司机端绑定二维码

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!765
2023-04-26 10:20:03 +00: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
yangyakun
78b7d3eff3 [charter]
[3.2.0]
[精确计算当前位置距离站点的距离]
2023-04-26 14:36:02 +08:00
wangmingjun
9aa257ef57 [福州3.1.4] 更换司机端绑定二维码 2023-04-26 11:59:34 +08:00
yangyakun
fcb84b69bf [charter]
[3.2.0]
[订单倒计时和到站时间分割]
2023-04-26 11:44:03 +08:00
yangyakun
1436df91f0 [charter]
[3.2.0]
[更精确的算角度]
2023-04-25 17:40:18 +08:00
yangyakun
1795d9162d [charter]
[3.2.0]
[选择线路从view拆到fragment]
2023-04-25 17:39:54 +08:00
wangmingjun
abfe287361 Merge branch 'dev_robobus-d_230425_3.1.4' into 'dev_robobus-p_230425_2.1.4'
Dev robobus d 230425 3.1.4

See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!764
2023-04-25 09:26:59 +00:00
wangmingjun
2370f20976 Merge branch 'dev_robobus-p_230425_2.1.4' into 'dev_robobus-d_230425_3.1.4'
# Conflicts:
#   gradle.properties
2023-04-25 09:26:44 +00:00
wangmingjun
e02f900d35 [福州2.1.4] 版本号升级为2.1.4 2023-04-25 17:23:05 +08:00
wangmingjun
b246984f99 [福州3.1.4] 版本号升级为3.1.4 2023-04-25 17:21:10 +08:00
pangfan
659a4807da [大理]release v3.1.2(HdMap sdk 2.12.1.1) 2023-04-25 17:11:44 +08:00
yangyakun
f3a45a5961 [charter]
[3.2.0]
[枚举修改无用code]
2023-04-24 21:08:24 +08:00
yangyakun
b6f4d87ca9 [login]
[3.2.0]
[登录获取经纬度 去掉监听直接获取值]
2023-04-24 21:07:22 +08:00
yangyakun
23d4e82e25 [charter]
[3.2.0]
[抽取go和靠边停车到view中]
2023-04-24 20:46:05 +08:00
yangyakun
219ffb65b3 [charter]
[3.2.0]
[位置迁移]
2023-04-24 20:41:37 +08:00
yangyakun
cb3f29336d [charter]
[3.2.0]
[车门操作统一到一个地方]
2023-04-24 19:45:10 +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
17f425a186 [bugfix]
[recycleview 居中问题]
2023-04-24 12:55:05 +08:00
yangyakun
5e66ff1e29 Merge branch 'dev_robobus_gradle_och_230317' into dev_mine_3.2.0_gradle 2023-04-24 10:55:31 +08:00
wangmingjun
8d7dfc01e0 [3.2.0] 减速-1.0,刹停-2.0, 复位0 2023-04-24 10:41:10 +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
zhongchao
f153fa9f21 [2.15.0] change range 2023-04-23 19:38:12 +08:00
wangmingjun
6ef77e4379 Merge branch 'master' into dev_robobus_d_3.2.0_4.14_local 2023-04-23 19:33:04 +08:00
wangmingjun
3a68e1736c [3.2.0] 调整包车司机端增加魔方功能层级 2023-04-23 19:32:14 +08:00
wangmingjun
cb01a2bfba [3.2.0] 包车司机端增加魔方功能 2023-04-23 19:31:04 +08:00
wangmingjun
51090f871e [3.2.0] taxi司机端按钮重影问题处理 2023-04-23 15:58:06 +08:00
renwj
eed3a270ba [2.15.0][增量升级] 移除无用的工具类 2023-04-23 15:19:47 +08:00
zhongchao
e199947d97 [2.15.0] adjust roma range to 3~2000 2023-04-23 14:33:12 +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
wangmingjun
56eedeb144 [3.2.0] 司机端增加魔方功能UI 2023-04-23 10:40:26 +08:00
yangyakun
3d38389e7f [2.15.0]
[订单消息透传]
2023-04-21 15:10:38 +08:00
lixiaopeng
aacc17446d [2.15.0] 优化obu升级 2023-04-21 14:51:38 +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