yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,844 Commits 1 Branch 0 Tags
81cbbafc00aeb3d9df6332efb95637d32015deff
Commit Graph

2579 Commits

Author SHA1 Message Date
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
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
wangmingjun
95f81150ba [3.2.0] m1 司机端确认路线改为一次确认 2023-04-17 16:41:37 +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
yangyakun
e0cac99c4d Merge remote-tracking branch 'origin/dev_robobus-d_230413_3.1.0' into dev_robobus-d_230413_3.1.0 2023-04-17 15:05:28 +08:00
wangmingjun
ae2e8fddbb Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus_d_3.2.0_4.14_local 2023-04-17 14:33:32 +08:00
wangmingjun
3a4867ee7c Merge branch 'dev_robobus-d_230413_3.1.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robobus-d_230413_3.1.0 2023-04-17 12:54:04 +08:00
wangmingjun
2fcd217c04 [3.1.0] m2路线id不同，清除全览轨迹 2023-04-17 12:53:56 +08:00
yangyakun
6203738612 [m2] 
[3.1.0]
[pnc]
 2023-04-17 12:19:10 +08:00
yangyakun
464ef23c54 [m2] 
[3.1.0]
[动画展示和隐藏]
 2023-04-17 11:23:30 +08:00
wangmingjun
19af6cdeee [merge] merge robobus-d 3.1.0 2023-04-14 17:46:12 +08:00
yangyakun
9936fb84ac [m2] 
[3.1.0]
[动画展示和隐藏]
 2023-04-14 17:23:12 +08:00
yangyakun
a0c1258d9f Merge remote-tracking branch 'origin/dev_robobus-p_230413_2.1.0' into dev_robobus-p_230413_2.1.0 2023-04-14 16:01:25 +08:00
yangyakun
1d49120170 [m2] 
[3.1.0]
[隐藏Ui]
 2023-04-14 16:01:15 +08:00
donghongyu
57d0ace65d Merge branch 'dev_opt_2.15.0' into dev_robotaxi-d_230412_2.15.0 2023-04-14 15:03:10 +08:00
wangmingjun
c70680db9d [3.1.0] M1处理自动驾驶按钮bug 2023-04-14 12:02:42 +08:00
yangyakun
67e5531d80 Merge branch 'dev_minibus-d_230322_3.0.0' into dev_robobus-d_230413_3.1.0 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt
#	OCH/mogo-och-bus/src/shuttle/java/com/mogo/och/bus/constant/URLConst.kt
#	OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
#	OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/presenter/BusPassengerPresenter.kt
#	OCH/mogo-och-common-module/build.gradle
#	OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java
#	app/config/tempConfig.json
#	app/config/urlConfig.json
#	core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt
#	gradle.properties
 2023-04-14 10:40:00 +08:00
wangmingjun
1076cccb77 [2.15.0] bus乘客屏增加同步路线信息 2023-04-13 20:09:49 +08:00
yangyakun
de89d77e49 [bugfix] 
[角标越界问题]
 2023-04-13 19:12:25 +08:00
yangyakun
059271cb86 [m2] 
[3.0.0]
[隐藏转向灯、添加伪圆角]
 2023-04-13 19:11:58 +08:00
wangmingjun
cd8bbc7ba0 [2.15.0] try-catch 选择任务数组越界情况 2023-04-13 17:26:12 +08:00