yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,461 Commits 1 Branch 0 Tags
4e123c5f6d74021b8a7e7e435c6610c8a782004d
Commit Graph

769 Commits

Author SHA1 Message Date
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
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
yangyakun
a09a1b5915 [fix] 第一次安装权限页面、没有完全启动关闭应用弹出两个登录页的bug 2022-09-16 12:26:52 +08:00
wangmingjun
9a7cfca997 [2.10.0] taxi后门按钮 2022-09-15 22:14:21 +08:00
wangmingjun
398b7e4324 [2.10.0] taxi/bus司机端增加setIgnoreConditionDraw 2022-09-15 15:36:54 +08:00
yangyakun
be56b6a073 Merge branch 'dev_robotaxi-d-app-module_2100_220816_2.10.0' into dev_robotaxi-d-app-module_2110_220914_2.11.0 2022-09-14 19:20:16 +08:00
wangmingjun
c22a967e1e [2.10.0] taxi司机端,订单到站清除左下角地图路线 2022-09-14 18:10:55 +08:00
yangyakun
b06b855faf [biz] 登录页面展示sn 2022-09-14 18:05:25 +08:00
renwj
53172adfae Revert "[状态栏]添加日志追踪循迹状态延时更新" 
This reverts commit 39593df458.
 2022-09-14 17:52:46 +08:00
yangyakun
4717484c98 [biz] 乘客端添加小程序支付提示 2022-09-14 11:38:39 +08:00
renwj
39593df458 [状态栏]添加日志追踪循迹状态延时更新 2022-09-14 11:07:45 +08:00
wangmingjun
bb89e4672e [2.10.0] taxi司机端，解决前往乘客上车点里程显示bug 2022-09-09 20:01:19 +08:00
wangmingjun
bf2f02a5c5 [2.10.0] bus司机端切换路线时清除原路线起终点 2022-09-09 18:28:50 +08:00
yangyakun
f1b86b2acf [fix] 防止页面重复弹出 2022-09-09 15:22:26 +08:00