yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,165 Commits 1 Branch 0 Tags
accdce8a7c461df53da5464ab9e91c6a2af2ad2c
Commit Graph

1767 Commits

Author SHA1 Message Date
bxb
accdce8a7c [sweeper-cloud]pad端根据工控机的连接状态，调用获取当前任务的接口，防止工控机断开连接时，pad未拉取到当前正在执行的任务 2023-05-18 17:20:47 +08:00
bxb
a7afc9db70 [sweeper-cloud]UI走查动画样式修改 2023-05-17 19:34:46 +08:00
bxb
e96ae72097 [sweeper-cloud]弹窗左右间距修改 2023-05-17 17:11:26 +08:00
bxb
d1e4df16d1 [sweeper-cloud]模拟云控大任务状态流转处理 2023-05-17 15:26:06 +08:00
bxb
07212a55aa [sweeper-cloud]子任务确认和大任务结束逻辑mock测试 2023-05-17 10:56:45 +08:00
bxb
95295c90c2 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-05-16 17:02:02 +08:00
bxb
4fae00fd4a [sweeper-cloud]pad端请求云控是否可以进入自驾逻辑处理 2023-05-16 17:01:48 +08:00
aibingbing
3c43d5ad5b Merge branch 'dev_sweeper-d_230423_3.1.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_sweeper-d_230423_3.1.0 2023-05-16 16:18:41 +08:00
aibingbing
2caaaa3135 [sweeper-cloud] feat: 增加 查询当前任务 云控接口mock ; 2023-05-16 16:16:29 +08:00
bxb
e7aa0f7b38 [sweeper-cloud]云控响应参数添加类型和时间戳打印 2023-05-16 11:29:27 +08:00
bxb
aff744f816 [sweeper-cloud]大任务正常结束逻辑处理以及大任务各种结束状态模拟处理 2023-05-13 19:18:55 +08:00
bxb
122e0bf686 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-05-10 19:49:05 +08:00
bxb
8d16bfd00d [sweeper-cloud]模拟获取当前正在执行的的任务逻辑处理 2023-05-10 19:48:52 +08:00
aibingbing
508339a095 fix: 为了避免自车定位提前结束任务导致的溜车问题，这里删除自车定位触发到站; 2023-05-10 18:28:10 +08:00
bxb
29650a6051 [sweeper-cloud]大任务正常结束和提前结束逻辑处理 2023-05-10 16:03:51 +08:00
bxb
b88a86d595 [sweeper-cloud] 云控子任务状态更新逻辑处理 2023-05-09 10:48:21 +08:00
bxb
7dc77457d2 [sweeper-cloud] 接取任务弹窗逻辑封装处理 2023-05-06 19:17:21 +08:00
bxb
a0e486988d [sweeper-cloud]通用加载中loading封装 2023-05-06 19:15:52 +08:00
bxb
55238dd0ed [sweeper-cloud] 接取云控任务确认弹窗逻辑处理 2023-05-05 17:19:17 +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
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
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
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
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
yangyakun
2df00c16ad [gradle] 
[多屏修改]
 2023-04-18 14:14:21 +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
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
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
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
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