yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,483 Commits 1 Branch 0 Tags
80ec9bf5cc134743b52f7a4b4bb0f0d3183cd6c8
Commit Graph

10483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
zhongchao
905416610d add note 2022-09-26 15:27:46 +08:00
zhongchao
a690584760 fix bug of car color and biz config upper case 2022-09-26 15:00:46 +08:00
yangyakun
a3e71ce3f6 [2110] bus乘客端到站居中 2022-09-26 14:03:32 +08:00
zhongchao
b9660e2878 remove test code 2022-09-23 20:09:25 +08:00
renwj
850fa814bc [V2X][Road]施工占道事件触发后，标记道路颜色 2022-09-23 19:57:58 +08:00
wangmingjun
1f6f4e0ee6 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 19:25:10 +08:00
wangmingjun
d77993fdab [2.11.0/1.6.0] bus 司机端/乘客屏接口和UI调整 2022-09-23 19:24:41 +08:00
lixiaopeng
7943e2b57d 优化升级 2022-09-23 18:57:57 +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
lixiaopeng
7c36193fcd fixed conflict 2022-09-23 17:28:52 +08:00
zhongchao
f856d0fc23 add trace of cloud v2n 2022-09-23 16:44:43 +08:00
chenfufeng
1c2b42c5c8 [Feat]每10s司机屏同步一次数据到所有乘客屏 2022-09-23 14:41:59 +08:00
chenfufeng
4d0625d4c6 [Feat]优化自车到停止线的距离 2022-09-23 14:41:59 +08:00
chenfufeng
99b9d5acbe [Fix]解决自动驾驶过程中杀掉App再进入全览模式没有全局路径规划的数据 2022-09-23 14:41:59 +08:00
chenfufeng
f815c71c4d [Fix]解决美化模式时序问题 2022-09-23 14:41:59 +08:00
chenfufeng
d27b42c0a8 [Feat]修改摄像头视频的宽高度 2022-09-23 14:41:59 +08:00
chenfufeng
e2396364cf [Fix]解决KOOM处于DebugMode导致的Java崩溃问题 2022-09-23 14:41:59 +08:00
chenfufeng
1742d3e824 [Fix]忽略系统so的监控，暂时解决KOOM崩溃的问题 2022-09-23 14:41:59 +08:00
chenfufeng
d4937769f9 [Feat]乘客屏直连工控机 2022-09-23 14:41:59 +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
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