yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,626 Commits 1 Branch 0 Tags
e01cc67268fdea6fe591595a4926f133c8bc2973
Commit Graph

1116 Commits

Author SHA1 Message Date
bxb
e01cc67268 Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' of http://gitlab.zhidaoauto.com/zhjt/AndroidApp/MoGoEagleEye into dev_robosweeper-d_app-module_221230_1.1.0 2023-02-14 18:08:04 +08:00
bxb
cccf3bdb69 [清扫车]上装面板修改 2023-02-14 18:07:11 +08:00
donghongyu
190eca3493 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 2023-02-13 18:47:04 +08:00
zhongchao
21bde9d621 [2.13.0-arch-opt] pncview fix 2023-02-13 18:15:32 +08:00
bxb
1637c74630 [清扫车]准备出发按钮逻辑修改以及当前正在执行任务和大任务列表选取任务后子任务列表接口回调逻辑区分 2023-02-11 19:11:18 +08:00
bxb
c271e96695 [清扫车]人工驾驶子任务和结束任务弹窗相关逻辑添加 2023-02-11 17:00:13 +08:00
bxb
c0e172077f [清扫车]人工驾驶子任务弹窗布局添加 2023-02-11 16:59:31 +08:00
bxb
91eb6afe9f [清扫车]结束任务弹窗布局添加 2023-02-11 16:58:44 +08:00
bxb
d1ed8716fc [清扫车]获取主任务列表 子任务列表相关逻辑添加 2023-02-10 18:44:53 +08:00
bxb
99a09049fc [清扫车]运营任务相关接口和实体类添加 2023-02-10 18:43:34 +08:00
donghongyu
51b1673420 [dev_arch_opt_3.0] 
[Change]
[
1、解决Taxi乘客屏误删高德搜索依赖
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-09 20:46:52 +08:00
zhongchao
78849ef5d7 [2.13.0-arch-opt] mofang view and status bar opt , pnvView add catch in enum 2023-02-09 19:53:10 +08:00
zhongchao
fd2a92f8eb [2.13.0-arch-opt] cherry pick evey single file from 2.13.2,plus it's exhausted 2023-02-09 19:53:10 +08:00
bxb
80954b63f8 [清扫车]代码合并冲突修改 2023-02-08 17:04:08 +08:00
bxb
3ba25fff31 Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' of http://gitlab.zhidaoauto.com/zhjt/AndroidApp/MoGoEagleEye into dev_robosweeper-d_app-module_221230_1.1.0 
 Conflicts:
	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
 2023-02-08 16:02:01 +08:00
bxb
e6a7d291c6 [清扫车]上装逻辑修改 2023-02-08 15:56:38 +08:00
donghongyu
f567b4f971 [dev_arch_opt_3.0] 
[Change]
[
1、解决合并3.0的分支
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-08 15:37:16 +08:00
donghongyu
f4507a7d0f Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 
# Conflicts:
#	OCH/mogo-och-sweeper/build.gradle
#	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/BaseSweeperTabFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
#	OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
 2023-02-08 14:40:42 +08:00
zhongchao
8490801138 [2.13.0-arch-opt] move impl of modules from hmi to app 2023-02-07 22:12:04 +08:00
donghongyu
d8e2029fa5 [dev_arch_opt_3.0] 
[Change]
[
1、彻底解决地图跳变问题，原因是因为位置转变GCJ02时候将经纬度设置回去了，从而引起位置异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-07 20:57:49 +08:00
chenfufeng
7ae724c3f0 [Opt]小地图Fragment改为View 2023-02-07 16:29:55 +08:00
donghongyu
68f40db975 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java
 2023-02-07 15:47:18 +08:00
donghongyu
d0ce252b4d [dev_arch_opt_3.0] 
[Change]
[
1、删除废弃地图中的方法
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-07 15:44:58 +08:00
zhongchao
555bdc3bcb [2.13.0-arch_opt] sweep add map view 2023-02-07 15:06:33 +08:00
zhongchao
1548c607da [2.13.0-arch-opt] merge 2023-02-07 15:06:28 +08:00
zhongchao
a382fc36c1 [2.13.0-arhc-opt] merge 2023-02-07 15:00:25 +08:00
bxb
4e2dee116a [清扫车]清扫车上装模式逻辑修改 2023-02-06 21:02:14 +08:00
xinfengkun
a613dcd259 [adas lib]能否启动自驾以及启动命令下发后成功或失败统计优化 2023-02-06 16:20:27 +08:00
bxb
1f43e60bff Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' of http://gitlab.zhidaoauto.com/zhjt/AndroidApp/MoGoEagleEye into dev_robosweeper-d_app-module_221230_1.1.0 
 Conflicts:
	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt
 2023-02-03 18:21:10 +08:00
bxb
d616e4bc6d [清扫车]上装面板基本逻辑和人工驾驶地图添加 2023-02-03 18:19:17 +08:00
zhongchao
40e9fdb708 [2.13.0-arch-opt] merge 2023-02-02 20:59:42 +08:00
yangyakun
d032e77f6e dev_arch_opt_3.0]全局预览放入业务类中 2023-02-02 20:56:17 +08:00
donghongyu
111940123f [dev_arch_opt_3.0] 
[Change]
[
1、完成工控机数据和高德GPS地图数据的数据中心，以及工控机数据超时后的自动切换为高德地图GPS数据
定位监听已重构，CallerChassisLocationGCJ20ListenerManager---高的坐标系，CallerChassisLocationWGS84ListenerManager--高精坐标系，之前代码已修改，大家后续项目中根据需要进行订阅，如需控制频率可在订阅时
// 设置数据回调频率，单位HZ，1HZ的周期是1秒；50HZ的周期是1/50=0.02秒；10HZ的周期是1/10=0.1秒。
CallerChassisLocationWGS84ListenerManager.setListenerHz(Companion.functionName, 20)
CallerChassisLocationGCJ20ListenerManagersetListenerHz(Companion.functionName, 20)
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-02 19:24:38 +08:00
donghongyu
72bbf6b464 [dev_arch_opt_3.0] 
[Change]
[
1、解决红绿灯倒计时文字显示异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-01 20:20:49 +08:00
donghongyu
6bfef5fa43 [dev_arch_opt_3.0] 
[Change]
[
1、修复清扫车红绿灯展示
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-01 20:08:09 +08:00
donghongyu
fdecd41783 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 
# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt
 2023-02-01 19:41:41 +08:00
zhongchao
d7c5bf4e46 [2.13.0-arch-opt] fix bug of och-taxi xml 2023-02-01 18:19:31 +08:00
zhongchao
25663f087b [2.13.0-arch-opt] merge 2023-02-01 17:57:36 +08:00
xuxinchao
f9eeef8cb9 [Opt3.0]消息盒子 2023-02-01 16:26:53 +08:00
donghongyu
acd1b3b584 [dev_arch_opt_3.0] 
[Change]
[
1、修复依赖关系重复
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-31 18:53:35 +08:00
donghongyu
67e3fb6f6d Merge remote-tracking branch 'origin/dev_robosweeper-d_app-module_221230_1.1.0' into dev_robosweeper-d_app-module_221230_1.1.0 2023-01-31 17:55:15 +08:00
donghongyu
7ea53b06cc [dev_arch_opt_3.0] 
[Change]
[
1、修复限速合并冲突
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-31 17:55:08 +08:00
bxb
1bf71b4c38 [清扫车]任务列表切换到当前任务简单逻辑处理 2023-01-31 17:38:23 +08:00
donghongyu
417db47d77 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 
# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
#	OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
 2023-01-31 17:25:18 +08:00
donghongyu
c591a30752 [dev_arch_opt_3.0] 
[Change]
[
1、修复清扫车红绿灯View初始化异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-31 17:11:33 +08:00
xuxinchao
0a10c1876c [Opt3.0]消息盒子 2023-01-31 16:56:57 +08:00
zhongchao
d3f0ac654b [2.13.0-arch-opt] fix bug of limit speed and move view 2023-01-31 15:28:42 +08:00
donghongyu
6bc41b01fa [dev_arch_opt_3.0] 
[Change]
[
1、TODO 清扫车限速有问题
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-31 11:45:10 +08:00
zhongchao
66db271f6c [2.13.0-arch-opt] merg 2023-01-30 22:29:40 +08:00
zhongchao
d46c11767d [2.13.0-arch-opt] merg 2023-01-30 22:28:02 +08:00