Commit Graph

486 Commits

Author SHA1 Message Date
donghongyu
c950c46303 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 2022-12-12 18:26:14 +08:00
wangmingjun
e3a7f09507 [2.13.0/1.8.0] 启动自驾埋点上传时清空脏数据 2022-12-12 17:50:47 +08:00
donghongyu
b29b16b820 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 2022-12-12 15:38:42 +08:00
wangmingjun
990cff2390 [2.13.0] bus接口请求错误重试
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
2022-12-12 14:53:53 +08:00
donghongyu
c85efcb9ee Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display
# Conflicts:
#	gradle.properties
2022-12-12 12:54:51 +08:00
pangfan
8363e4eb11 [2.12.6]启动自驾失败埋点优化:增加code 2022-12-08 19:43:07 +08:00
wangmingjun
1a1f808456 [2.13.0]bus开始任务前提示remove 2022-12-08 18:36:11 +08:00
wangmingjun
b215f61e2d [2.13.0]bus司机端到站bug修复 2022-12-08 18:08:13 +08:00
wangmingjun
3ce8d9e9fb [2.13.0]bus司机端到站bug修复 2022-12-08 15:00:01 +08:00
donghongyu
0a255a2bc3 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 2022-12-07 19:51:35 +08:00
yangyakun
44d876ab08 防止重复添加 2022-12-07 16:48:46 +08:00
donghongyu
69e450e2af Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
2022-12-07 10:39:24 +08:00
wangmingjun
53fae7f714 [2.13.0] taxi/bus onLocationChanged location null 2022-12-06 14:07:37 +08:00
donghongyu
feeecbb564 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display
# Conflicts:
#	app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt
2022-12-02 19:53:12 +08:00
wangmingjun
ba175c7290 [2.13.0] taxi/bus司机端 定位权限,长链接异常,网络异常定时提示 2022-12-02 18:13:36 +08:00
donghongyu
346bbfb0c2 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display
# Conflicts:
#	app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
#	foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
2022-12-02 17:35:53 +08:00
wangmingjun
10111ccb13 [2.13.0] bus任务开始前提醒删除逻辑 2022-12-02 16:29:15 +08:00
donghongyu
c0db312f04 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 2022-12-01 19:09:33 +08:00
zhongchao
e646d4367b add config upload server 2022-12-01 17:38:16 +08:00
donghongyu
d1c013603b Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display 2022-12-01 15:20:13 +08:00
wangmingjun
be671fb471 [2.13.0] taxi/bus add log 2022-12-01 12:25:10 +08:00
donghongyu
6d32688dd6 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display
# Conflicts:
#	app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt
2022-12-01 10:38:40 +08:00
wangmingjun
b325005fe6 [2.13.0] 各个业务端将定位监听接口改为 CallerMapLocationListenerManager IMoGoMapLocationListener 2022-11-30 14:57:21 +08:00
donghongyu
084a13f584 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
2022-11-29 18:06:42 +08:00
wangmingjun
8a78db5bef [2.13.0] bus 开始任务前提醒功能完成 2022-11-29 11:55:11 +08:00
donghongyu
5f1ecdd51f [2.13.0]
[Change]
[合并司机端、乘客端为一个应用,适用于异屏、异显、异交互]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-11-28 19:55:00 +08:00
wangmingjun
f070106fe0 [2.13.0] bus 开始任务任务前提醒 2022-11-28 18:35:13 +08:00
wangmingjun
4dff132dcf [2.13.0] 运营消息push调通 2022-11-23 15:54:43 +08:00
wangmingjun
a15ba31cef [2.13.0] taxi个人中心调整 2022-11-22 20:56:43 +08:00
yangyakun
857d3ee98c Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into dev_robouiadapter_20221118_yyk
# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
2022-11-22 09:57:35 +08:00
zhongchao
5389db47c4 [2.13.0] merge 2.13.0 branch 2022-11-21 18:32:51 +08:00
wangmingjun
ce215194dd [2.13.0] bus增加乘客核销长链接以及端上逻辑修改 2022-11-21 18:14:24 +08:00
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
wangmingjun
334627b3db [2.13.0] taxi/bus增加长链接msgType 2022-11-18 20:27:21 +08:00
yangyakun
014d4f0aa7 适配 2022-11-18 15:43:28 +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
wangmingjun
6ec0f08275 [2.12.0] taxi/bus 启动自驾埋点代码优化 2022-11-10 20:05:53 +08:00
zhongchao
2156d2cd18 wait 2022-11-10 16:54:26 +08:00
wangmingjun
1c94413930 [2.12.0] taxi/bus 美化模式下启动自驾失败,自动驾驶按钮状态不弹失败 2022-11-10 16:28:40 +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
089e2b9025 [2.12.0] 1、bus乘客屏断开司机端连接时候,轨迹计算结束 2、bus司机端乘客核销语音播报文字修改 2022-11-09 15:32:47 +08:00
zhongchao
7868bf626f Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_212-_221017_2.12.0_code_style_opt 2022-11-08 11:07:32 +08:00
zhongchao
fbe1801488 [2.12.0] local code style change 2022-11-08 11:03:10 +08:00
pangfan
453e0f2773 [2.12.0]增加"无法开启自驾前已知异常"埋点上报 2022-11-03 20:06:40 +08:00
wangmingjun
33a462aa1c [2.12.0] bus 添加外屏接口log 2022-11-03 15:09:46 +08:00
yangyakun
0bc581a394 [2.8.0-f] bus busp taxi 适配完成 2022-11-01 17:21:42 +08:00