wangmingjun
|
4e123c5f6d
|
[2.11.0/1.6.0] bus司机屏选择运营任务显示"结束任务"
|
2022-09-23 13:09:58 +08:00 |
|
wangmingjun
|
7eb429e878
|
Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_2110_220915_2.11.0' into dev_robotaxi-d-app-module_2110_220915_2.11.0
|
2022-09-23 12:56:51 +08:00 |
|
wangmingjun
|
eba9d60df0
|
[2.11.0/1.6.0] bus司机端接口联调完成
|
2022-09-23 12:56:38 +08:00 |
|
zhongchao
|
1a50a2911b
|
remove note log and chainlog
|
2022-09-23 12:15:35 +08:00 |
|
zhongchao
|
bee1572295
|
add func of take over in condition
|
2022-09-23 12:04:03 +08:00 |
|
wangmingjun
|
317bbac2f7
|
[2.11.0/1.6.0] bus 司机端接口联调
|
2022-09-23 11:49:11 +08:00 |
|
wangmingjun
|
b159e1cf63
|
Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2110_220915_2.11.0
|
2022-09-23 10:55:20 +08:00 |
|
wangmingjun
|
cfc9147f05
|
[2.11.0/1.6.0] bus司机端BusOrderModer暂时注释chainLog(因方法参数改变导致打包失败)
|
2022-09-23 10:55:10 +08:00 |
|
yangyakun
|
21870c69ab
|
Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into dev_robotaxi-d-app-module_2110_yangyakun_2.11.0
|
2022-09-23 10:50:44 +08:00 |
|
yangyakun
|
52e740fae2
|
[2110] 登录后重新查询订单、线路少不用打开从低排列
|
2022-09-23 10:43:01 +08:00 |
|
wangmingjun
|
31045baaf9
|
[2.11.0/1.6.0] och-module compileSdkVersion
|
2022-09-22 21:17:25 +08:00 |
|
wangmingjun
|
e117afea9e
|
[2.11.0/1.6.0] bus司机端删除重复接口
|
2022-09-22 19:16:04 +08:00 |
|
wangmingjun
|
fafe3f914a
|
[2.11.0/1.6.0] bus司机端添加taskId
|
2022-09-22 19:10:47 +08:00 |
|
wangmingjun
|
32f5aa22ec
|
[2.11.0/1.6.0] bus乘客屏查询状态
|
2022-09-22 19:01:09 +08:00 |
|
lixiaopeng
|
1760e03065
|
merge
|
2022-09-22 18:39:20 +08:00 |
|
pangfan
|
0d981dd1d5
|
Merge branch '2.11.0-dev' into 2.11.0-wmj
# Conflicts:
# OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/BusServiceManager.java
# OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IBusApiService.java
# OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
# OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
|
2022-09-22 18:25:54 +08:00 |
|
wangmingjun
|
b90530ac2c
|
[2.11.0/1.6.0] taxi司机端，增加人工/自驾模式
|
2022-09-22 15:48:40 +08:00 |
|
zhongchao
|
d7f2c3dad1
|
add func of identify obj to filter source and add limit twice , demo mode in take over
|
2022-09-22 14:29:25 +08:00 |
|
yangyakun
|
efb57d550c
|
[2110] mock 接口
|
2022-09-22 11:23:06 +08:00 |
|
yangyakun
|
9f2e3ebcaf
|
[2110] 判空
|
2022-09-22 11:17:25 +08:00 |
|
yangyakun
|
a54961732f
|
Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into dev_robotaxi-d-app-module_2110_yangyakun_2.11.0
|
2022-09-22 10:53:09 +08:00 |
|
yangyakun
|
26c44b3ed7
|
[2110] 删除收车出车(样式改为账号信息)、当前任务面板一直展示
|
2022-09-22 10:51:41 +08:00 |
|
renwj
|
87f34a6dbc
|
[线程优化]升级版本
|
2022-09-22 10:20:12 +08:00 |
|
donghongyu
|
43ea5777e1
|
[Change]
A、还原改动
Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
|
2022-09-21 19:23:27 +08:00 |
|
wangmingjun
|
a074324054
|
[2.11.0/1.6.0] bus司机端接口调整
|
2022-09-21 19:14:35 +08:00 |
|
donghongyu
|
c3dff0f748
|
[Change]
A、将位置信息回调由高精地图回调，调整为直接将工控机数据回调给各个模块
Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
|
2022-09-21 19:10:21 +08:00 |
|
yangyakun
|
be06368b15
|
Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into dev_robotaxi-d-app-module_2110_yangyakun_2.11.0
# Conflicts:
# OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
# OCH/mogo-och-bus/src/main/res/values/colors.xml
# OCH/mogo-och-common-module/src/main/res/values/colors.xml
# OCH/mogo-och-common-module/src/main/res/values/styles.xml
|
2022-09-21 18:07:18 +08:00 |
|
yangyakun
|
93d5bae0b4
|
[2110] 账号登录登出、切换路线
|
2022-09-21 17:57:42 +08:00 |
|
yangyakun
|
7190b44544
|
Rename .java to .kt
|
2022-09-21 17:57:42 +08:00 |
|
wangmingjun
|
99763d236d
|
[2.11.0/1.6.0] bus司机端 接口调整
|
2022-09-21 17:35:42 +08:00 |
|
wangmingjun
|
8c31bb7320
|
[2.11.0/1.6.0] bus司机端任务切换
|
2022-09-21 16:51:10 +08:00 |
|
xinfengkun
|
815297b81d
|
Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2110_220915_2.11.0
|
2022-09-21 16:47:55 +08:00 |
|
xinfengkun
|
376aeae7f3
|
[change] 完善备注
|
2022-09-21 16:47:44 +08:00 |
|
wangmingjun
|
831f601ca3
|
[2.11.0/1.6.0] bus司机端，乘客屏路线面板调整
|
2022-09-21 16:39:40 +08:00 |
|
wangmingjun
|
09f3686968
|
Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2110_220915_2.11.0
|
2022-09-21 14:50:00 +08:00 |
|
lixiaopeng
|
1517497c78
|
opt
|
2022-09-21 14:49:22 +08:00 |
|
wangmingjun
|
18d1137627
|
[2.11.0/1.6.0] bus司机端，乘客屏路线面板调整
|
2022-09-21 12:04:45 +08:00 |
|
lixiaopeng
|
055d186b6d
|
修改升级接口
|
2022-09-21 11:13:34 +08:00 |
|
wangmingjun
|
78bf858c2a
|
[2.11.0/1.6.0] bus司机端，乘客屏路线面板调整
|
2022-09-20 20:59:05 +08:00 |
|
wangmingjun
|
113c0cac5e
|
Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2110_220915_2.11.0
|
2022-09-20 19:49:29 +08:00 |
|
wangmingjun
|
d355d98161
|
[1.6.0] bus乘客屏路线面板调整
|
2022-09-20 19:49:24 +08:00 |
|
wangmingjun
|
38c439830d
|
[2.11.0] bus司机端路线面板优化
|
2022-09-20 19:48:39 +08:00 |
|
zhongchao
|
f25f909efc
|
add func of take over view and fix bug of tts speak
|
2022-09-20 19:11:27 +08:00 |
|
zhongchao
|
b94325b343
|
fix bug
|
2022-09-20 16:12:08 +08:00 |
|
yangyakun
|
7ada4abc45
|
[2110] 账号信息
|
2022-09-20 16:00:02 +08:00 |
|
zhongchao
|
b343175773
|
..
|
2022-09-20 15:57:24 +08:00 |
|
zhongchao
|
82721757e5
|
test of vip has finished and through
|
2022-09-20 15:56:27 +08:00 |
|
zhongchao
|
9ab6f98ab9
|
wait to test
|
2022-09-20 15:56:27 +08:00 |
|
zhongchao
|
10c309d5e3
|
test
|
2022-09-20 15:56:26 +08:00 |
|
zhongchao
|
5303103646
|
fix the logger add add func of vip check and take over
|
2022-09-20 15:56:26 +08:00 |
|