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

1142 Commits

Author SHA1 Message Date
donghongyu
4cb32ec4a6 [dev_arch_opt_3.0] 
[Change]
[
1、合并3.0分支
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-22 17:56:14 +08:00
donghongyu
1e9d2d0006 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/model/SweeperOrderModel.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java
 2023-02-22 17:03:24 +08:00
bxb
87d30e4768 [清扫车]作业任务小地图和作业任务全览图布局搭建 2023-02-22 11:34:36 +08:00
zhongchao
68bf702467 [2.13.0-arch-opt] remove brake and turn 2023-02-21 20:11:18 +08:00
chenfufeng
eb12c0d4bc [2.14.0][Fix]解决Taxi乘客屏打包报错的问题 2023-02-21 17:12:35 +08:00
xinfengkun
961e1eb102 [opt3.0][adas lib] 自动驾驶启动统计对象下沉到adas-data中 2023-02-21 16:58:06 +08:00
zhongchao
06df5b98dd [2.13.0-arch-opt] update aiCloudsdk version 2023-02-20 22:16:09 +08:00
zhongchao
312744e4ee [2.13.0-arch-opt]analytics move to foundation 2023-02-20 19:10:32 +08:00
zhongchao
d5474743bf [2.13.0-arch-opt] v2x remove 2023-02-17 21:32:22 +08:00
zhongchao
df3e018c30 [2.13.0-arch-opt]v2x code style 2023-02-17 20:25:26 +08:00
donghongyu
cba1b8c1aa 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/model/SweeperOrderModel.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
 2023-02-17 14:23:49 +08:00
xinfengkun
e82bf1ca86 [1.9.0] 乘客屏版本注册自驾监听 
[2.13.2 ] Taxi乘客屏修改CallerSmpManager.startQueryV2XEvents();时机
 2023-02-17 13:52:39 +08:00
donghongyu
b4158cef3a [dev_arch_opt_3.0] 
[Change]
[
1、修改使用单次定位的调用，使用
 CallerChassisLocationWGS84ListenerManager.INSTANCE.getChassisLocationWGS84().getLatitude()
CallerChassisLocationWGS84ListenerManager.INSTANCE.getChassisLocationWGS84().getLongitude()
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-17 10:12:18 +08:00
zhongchao
0e000cf2d1 [2.13.0-arch-opt]turn light bug fix and add toggle debug view trigger 2023-02-16 21:02:10 +08:00
zhongchao
2b6f280ae0 [2.13.2-arch-opt] fix bug of limit 2023-02-16 19:46:12 +08:00
zhongchao
63204a14ad [2.13.0-arch-opt]fix bug 2023-02-16 18:37:52 +08:00
zhongchao
4bec76e02d [2.13.0-arch-opt] fix bug of thread problem and add new func obu fusion and warning union 2023-02-15 21:09:19 +08:00
renwj
e2707eaf33 [dev_arch_opt_3.0]优化顶视角切换逻辑 2023-02-15 19:54:24 +08:00
donghongyu
e2e75d96ae [dev_arch_opt_3.0] 
[Change]
[
1、解决分支版本冲突
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-15 16:53:36 +08:00
donghongyu
68512b8a93 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 2023-02-15 16:37:39 +08:00
donghongyu
a7ab13c4c1 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-02-15 16:25:34 +08:00
donghongyu
b572b1e999 [dev_arch_opt_3.0] 
[Change]
[
1、优化获取设备SN标志，设备序列号>AndroidID>随机ID
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-15 16:25:29 +08:00
zhongchao
7b85574d62 :[2.13.0-arch-opt] bug fix 2023-02-15 16:15:28 +08:00
zhongchao
84d1de4079 [2.13.0-arch-opt] local code opt 2023-02-14 20:48:42 +08:00
zhongchao
7a44fc53b4 [2.13.0-arch-opt] turn light view opt and fix noop fragment bug 2023-02-14 20:27:25 +08:00
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
zhongchao
4f25b0fd43 [2.13.0-arch-opt] merge 2.14.0 line id func 2023-02-14 15:17:40 +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