yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,455 Commits 1 Branch 0 Tags
8528eac080e87dba960a673a0894de099d44ff39
Commit Graph

1493 Commits

Author SHA1 Message Date
wangmingjun
b113afe827 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 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
 2022-09-26 17:43:22 +08:00
wangmingjun
a952be6f5c 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-26 17:41:59 +08:00
yangyakun
bdb274fca2 [2110] 打开状态下自动清理过期选中的线路和 2022-09-26 16:04:16 +08:00
wangmingjun
80ec9bf5cc 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 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
 2022-09-26 15:36:54 +08:00
wangmingjun
8a52d5f36a [2.11.0/1.6.0] 1、bus司机端增加语音播报 2、bus司机端+乘客屏增加到站或即将到站动画 2022-09-26 15:32:09 +08:00
yangyakun
a3e71ce3f6 [2110] bus乘客端到站居中 2022-09-26 14:03:32 +08:00
wangmingjun
d77993fdab [2.11.0/1.6.0] bus 司机端/乘客屏接口和UI调整 2022-09-23 19:24:41 +08:00
yangyakun
f1fc6e6fe0 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 17:29:44 +08:00
yangyakun
b83f066a87 [2110] bus 登录背景页面、bus线路过长处理、 2022-09-23 17:29:14 +08:00
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
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
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
yangyakun
efb57d550c [2110] mock 接口 2022-09-22 11:23:06 +08:00
yangyakun
9f2e3ebcaf [2110] 判空 2022-09-22 11:17:25 +08:00
yangyakun
26c44b3ed7 [2110] 删除收车出车(样式改为账号信息)、当前任务面板一直展示 2022-09-22 10:51:41 +08:00
wangmingjun
a074324054 [2.11.0/1.6.0] bus司机端接口调整 2022-09-21 19:14:35 +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
wangmingjun
831f601ca3 [2.11.0/1.6.0] bus司机端，乘客屏路线面板调整 2022-09-21 16:39:40 +08:00
wangmingjun
18d1137627 [2.11.0/1.6.0] bus司机端，乘客屏路线面板调整 2022-09-21 12:04:45 +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
aibingbing
bbb467b0b1 [清扫车] refactor: remove unused TODOs ; 2022-09-20 19:26:46 +08:00
aibingbing
dbf43b9f01 [清扫车] fix: 修复 close 按钮文本截断问题； 2022-09-20 19:25:03 +08:00
aibingbing
8e2a356fbd [清扫车] fix: 修复因为没在主线程操作View导致的按钮样式问题； 2022-09-20 19:24:18 +08:00
zhongchao
5303103646 fix the logger add add func of vip check and take over 2022-09-20 15:56:26 +08:00
pangfan
fdf5d32ced Merge branch 'dev_robotaxi-d-app-module_2100_220816_2.10.0' into 'dev_robotaxi-d-app-module_2110_220915_2.11.0' 
Dev robotaxi d app module 2100 220816 2.10.0

See merge request zhjt/AndroidApp/MoGoEagleEye!208
 2022-09-20 06:27:35 +00:00
yangyakun
513df2b96a [2110] 任务列表样式修改 2022-09-20 14:26:53 +08:00
yangyakun
8648a9e533 [2110] 抽取taxi到common 2022-09-20 11:37:20 +08:00
yangyakun
fed0551edb Merge branch 'dev_robotaxi-d-app-module_2100_220816_2.10.0' into dev_robotaxi-d-app-module_2110_yangyakun_2.11.0 2022-09-19 11:14:26 +08:00
yangyakun
cb2d8faca7 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-19 11:14:18 +08:00
yangyakun
e94f0e941f [2110] 任务列表 2022-09-16 20:17:12 +08:00
bxb
df6111226e [2.10.0] 全部订单列表page分页从1开始 2022-09-16 15:50:12 +08:00