Commit Graph

3550 Commits

Author SHA1 Message Date
yangyakun
34ae08c5d4 [charter]
[3.2.0]
[不切换背景]
2023-04-27 20:59:18 +08:00
yangyakun
5815f2e974 [charter]
[3.2.0]
[底部导航栏功能]
2023-04-27 20:56:37 +08:00
yangyakun
6a54b17f13 [charter]
[3.2.0]
[底部导航栏功能]
2023-04-27 18:34:31 +08:00
yangyakun
0705256eed [charter]
[3.2.0]
2023-04-27 15:28:13 +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
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
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
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
yangyakun
78b7d3eff3 [charter]
[3.2.0]
[精确计算当前位置距离站点的距离]
2023-04-26 14:36:02 +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
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
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
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
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
yangyakun
23e6086cfc [2.15.0]
[订单消息透传]
2023-04-20 19:33:01 +08:00
wangmingjun
bee5ce2222 [3.2.0] 司机端增加魔方功能opt 2023-04-20 15:11:14 +08:00
yangyakun
d5712ad9a7 [2.15。0]
[全览地图、道路事件]
2023-04-20 14:23:29 +08:00
donghongyu
f29edcdb3a 「dev_opt_2.15.0」
1、开关关闭时,无论是否有视频流,均不展示(无占位);开关默认关闭
2023-04-19 11:40:55 +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
donghongyu
a7b61aa124 「dev_opt_2.15.0」
1、完成bus司机屏增加开关控制bus乘客屏展示视频流;
2023-04-18 20:58:19 +08:00
wangmingjun
8e341a0c70 [3.2.0] m1 司机端增加进站按钮,倒计时向上取整 2023-04-18 19:45:21 +08:00
donghongyu
4f27ee71d3 「dev_opt_2.15.0」
1、功能范围:bus司机屏增加开关;bus乘客屏展示视频流;

  交互&逻辑:在司机屏运营面板增加开关,用于控制是否展示视频位:

  开关开启时,有视频流的车辆持续常驻展示视频流,无视频流的车辆不展示(无占位);
  开关关闭时,无论是否有视频流,均不展示(无占位);开关默认关闭
  开关开启后,有视频流的展示位置如图所示常驻展示:
2023-04-18 17:20:36 +08:00
donghongyu
9800077f08 「dev_opt_2.15.0」
1、修复乘客屏pnc信息被直播遮挡问题
2023-04-18 16:55:11 +08:00
yangyakun
2df00c16ad [gradle]
[多屏修改]
2023-04-18 14:14:21 +08:00
wangmingjun
802ba870fb Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus_d_3.2.0_4.14_local 2023-04-18 11:26:31 +08:00
wangmingjun
c38f29e56f [3.2.0] m1 司机端增加绑定二维码 2023-04-18 11:15:28 +08:00