yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,968 Commits 1 Branch 0 Tags
8a75f3bb22f9df042a68da314f9efc573dcfe3c8
Commit Graph

66 Commits

Author SHA1 Message Date
zhongchao
ad2d2c2cdf [2.13.0-merge]yakun and code style 2022-11-21 18:07:52 +08:00
zhongchao
1fec32f633 merge 2022-11-21 14:47:53 +08:00
yangyakun
1607c60435 Merge branch 'master' into dev_robouiadapter_1062_221117_1.6.2 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
#	OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt
#	OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
#	OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
#	OCH/mogo-och-taxi/src/main/res/layout/taxi_navi_view.xml
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
#	core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml
#	gradle.properties
 2022-11-18 10:36:15 +08:00
zhongchao
5489eed272 wait 2022-11-11 13:38:24 +08:00
zhongchao
a836c31728 wait to finish 2022-11-10 10:54:57 +08:00
wangmingjun
a9333e0123 [2.12.0] taxi/bus自动驾驶启动失败返回逻辑处理 2022-11-09 21:32:03 +08:00
wangmingjun
26da04fc37 [2.12.0] taxi-d/-p /bus-d 增加启动自驾失败埋点上传， 2022-11-09 20:00:08 +08:00
wangmingjun
3035d2ba86 [2.12.0] taxi-d/-p /bus-d 增加启动自驾失败埋点 2022-11-09 18:30:39 +08:00
wangmingjun
2225fed83a [2.12.0] taxi预约单关闭时候中断语音播报 2022-11-08 17:57:18 +08:00
yangyakun
0bc581a394 [2.8.0-f] bus busp taxi 适配完成 2022-11-01 17:21:42 +08:00
yangyakun
20509fce0c [2.8.0-f] 屏幕适配 2022-10-28 20:44:07 +08:00
zhongchao
16c7bd9755 add func of statusbar and func config wait to update 2022-10-26 18:59:08 +08:00
yangyakun
1b1ad39fe7 Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_2120_yyk_2.12.0 
# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
 2022-10-26 15:19:28 +08:00
wangmingjun
e20abe099b [2.12.0] bus司机端参数异常处理 2022-10-26 10:57:20 +08:00
yangyakun
79de6f731f [2.12.0-f] tts 级别 2022-10-25 17:58:48 +08:00
wangmingjun
022edb39b6 [2.12.0] common 增加轨迹计算新方法代码（暂不用） 2022-10-25 17:33:41 +08:00
yangyakun
4d0083968e Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_2120_yyk_2.12.0 
# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
 2022-10-24 16:22:32 +08:00
wangmingjun
295300c54f [2.12.0] taxi 司机端送驾高德导航 2022-10-23 16:21:41 +08:00
wangmingjun
413ea46fab [2.11.0] 1、bus到站接口请求容错处理 2、taxi乘客屏偶现崩溃处理 2022-10-20 14:18:38 +08:00
wangmingjun
1109917f73 [2.11.0 fix] bus司机端解决Map280版本到站密集问题， 只比对坐标前五位 2022-10-19 11:24:09 +08:00
yangyakun
15aacad278 Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into dev_robotaxi-d-app-module_2120_yyk_2.12.0 2022-10-18 15:56:53 +08:00
yangyakun
ebac03d7f2 [feature] 通过反射调整间隙 2022-10-17 18:04:11 +08:00
yangyakun
2d7970bfa0 [feature] 跑马灯 2022-10-17 11:39:17 +08:00
wangmingjun
040cc745dc [2.11.0 fix] 空指针异常 2022-10-14 13:19:36 +08:00
yangyakun
aa3594d75c [fix] 加上trycatch 2022-10-14 12:08:56 +08:00
wangmingjun
f5a1acbce8 [2.11.0 fix] 1、bus司机端 中间站启动自动驾驶动画bug 2、启动自驾档位异常区分taxi和bus 2022-10-13 15:55:46 +08:00
chenfufeng
0169a68d1e [Fix]解决司机屏连接工控机失败的问题 2022-10-12 20:07:42 +08:00
yangyakun
e62a9d7dbb [feature] 添加网络连接 token失效后获取3s 1s 2s 三次重试 2022-10-12 11:18:02 +08:00
wangmingjun
1e2f09fab7 [2.11.0] 1、增加开启自动驾驶工控异常拦截，以及埋点逻辑 2、优化bus美化模式 2022-10-11 18:50:57 +08:00
yangyakun
ca6ababced [fix] 更换上下文 2022-10-08 19:35:51 +08:00
yangyakun
5f3a464e11 [fix] 登录界面1s只展示1次 taxi 乘客端 视频播放进程和主进程关联解除 2022-09-29 17:03:54 +08:00
wangmingjun
9285c5fac7 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-28 17:53:07 +08:00
wangmingjun
500ee49449 [2.11.0/1.6.0] bus司机端/乘客端路线面板绿点闪烁调整 2022-09-28 17:52:57 +08:00
yangyakun
7ad9ebcb30 [fix] 登录界面和影音娱乐页面隐藏底部状态栏 2022-09-28 17:45:47 +08:00
yangyakun
625f246bc9 [2110] 地图版本回归等待高精地图发布 2022-09-28 15:38:27 +08:00
wangmingjun
bc93b06dc2 [2.11.0/1.6.0]bus司机端/乘客端动画调整，bus司机端语音播报调整 2022-09-26 19:47:37 +08:00
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
8a52d5f36a [2.11.0/1.6.0] 1、bus司机端增加语音播报 2、bus司机端+乘客屏增加到站或即将到站动画 2022-09-26 15:32:09 +08:00
wangmingjun
d77993fdab [2.11.0/1.6.0] bus 司机端/乘客屏接口和UI调整 2022-09-23 19:24:41 +08:00
yangyakun
b83f066a87 [2110] bus 登录背景页面、bus线路过长处理、 2022-09-23 17:29:14 +08:00
wangmingjun
31045baaf9 [2.11.0/1.6.0] och-module compileSdkVersion 2022-09-22 21:17:25 +08:00
yangyakun
efb57d550c [2110] mock 接口 2022-09-22 11:23:06 +08:00
yangyakun
26c44b3ed7 [2110] 删除收车出车(样式改为账号信息)、当前任务面板一直展示 2022-09-22 10:51:41 +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
wangmingjun
38c439830d [2.11.0] bus司机端路线面板优化 2022-09-20 19:48:39 +08:00
yangyakun
8648a9e533 [2110] 抽取taxi到common 2022-09-20 11:37:20 +08:00
yangyakun
e94f0e941f [2110] 任务列表 2022-09-16 20:17:12 +08:00
wangmingjun
91835a94e0 [2.10.0] taxi-d/taxi-p自动驾驶按钮动画优化 2022-09-05 15:13:05 +08:00
yangyakun
a2c5a46a96 [2.10.0] toast控制cod、设置dialogfragment 显示Androidx的问题 2022-08-31 16:24:21 +08:00