yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,867 Commits 1 Branch 0 Tags
94de2bf3222c627008277f40e93d51543e8a9eff
Commit Graph

3550 Commits

Author SHA1 Message Date
yangyakun
a907f2a96f [m1] 
[1.0.0]
[视频播放]
 2023-02-12 11:59:08 +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
yangyakun
eee29a65eb [m1] 
[1.0.0]
[订单逻辑添加]
 2023-02-11 14:49:41 +08:00
yangyakun
0c046cbe76 [m1] 
[1.0.0]
[订单、速度]
 2023-02-11 12:57:09 +08:00
wangmingjun
1d58953bef [M2] opt 2023-02-10 19:52:57 +08:00
wangmingjun
bb3d44e452 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-10 19:37:43 +08:00
wangmingjun
77c49061a9 [M2] 1、图/视频轮播优化 2023-02-10 19:37:34 +08:00
bxb
d1ed8716fc [清扫车]获取主任务列表 子任务列表相关逻辑添加 2023-02-10 18:44:53 +08:00
bxb
99a09049fc [清扫车]运营任务相关接口和实体类添加 2023-02-10 18:43:34 +08:00
yangyakun
dee933fe9d Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-10 15:13:16 +08:00
yangyakun
e6413c71c7 [m1] 
[1.0.0]
[添加日志]
 2023-02-10 15:02:03 +08:00
yangyakun
6d7f7309c6 [m1] 
[1.0.0]
[回写并展示禁止再向底盘传递数据]
 2023-02-09 23:42:54 +08:00
wangmingjun
bc0f8e8ec4 [M2] 1、图/视频轮播opt 2、m2竖屏 2023-02-09 20:59:18 +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
yangyakun
c388eec1f0 [m1] 
[1.0.0]
[暖风机禁止温度选择、关闭空调状态设置温度、设置、风速 不进行数据传递]
 2023-02-09 18:30:45 +08:00
wangmingjun
b4199874cf [M2] M2 广告模块opt 2023-02-09 15:48:48 +08:00
yangyakun
2f524d2ed0 [m1] 
[1.0.0]
[灯光会写完成]
 2023-02-09 15:38:42 +08:00
yangyakun
5edd005b30 [m1] 
[1.0.0]
[瞬间点击触发]
 2023-02-09 15:06:30 +08:00
zhongchao
0d13d80aa5 [2.14.0] add func of line id upload 2023-02-09 15:06:21 +08:00
wangmingjun
d850462bff Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' 
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!512
 2023-02-09 03:27:24 +00: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
yangyakun
3caf13d71b [m1] 
[1.0.0]
[距离ui]
 2023-02-08 00:30:49 +08:00
yangyakun
71b66d87c7 [m1] 
[1.0.0]
[och delete IMogoStatusChangedListener,add Map view and debugview toggle]
 2023-02-07 22:13:20 +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
zhongchao
fbd15b4db0 [2.13.3] add func btn of roma style change 2023-02-07 21:08:34 +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
xuxinchao
87543b9696 [2.14.0]BadCase三期-录包管理 2023-02-07 20:15:48 +08:00
yangyakun
4d70be9cad Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-07 16:58:12 +08:00
yangyakun
96f33bc3df Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-07 16:57:41 +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
xinfengkun
7fdd6dae57 [adas lib]能否启动自驾以及启动命令下发后成功或失败统计优化 2023-02-07 14:51:42 +08:00
bxb
4e2dee116a [清扫车]清扫车上装模式逻辑修改 2023-02-06 21:02:14 +08:00
wangmingjun
bf171e25bd [M2] M2 图片+视频轮播opt 2023-02-06 21:01:23 +08:00
wangmingjun
eb929dec00 [M2] M2 行程信息UI初稿 2023-02-06 19:38:28 +08:00
wangmingjun
95e41e4e94 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' of http://gitlab.zhidaoauto.com/zhjt/AndroidApp/MoGoEagleEye into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-06 19:37:36 +08:00
yangyakun
fcffab4db0 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-06 18:50:17 +08:00