Commit Graph

11025 Commits

Author SHA1 Message Date
renwj
716b6257e4 [v2.13.0][状态栏]状态窗口部分状态上移 2022-11-23 16:56:31 +08:00
wangmingjun
4dff132dcf [2.13.0] 运营消息push调通 2022-11-23 15:54:43 +08:00
lixiaopeng
6218f37b89 213 优化 2022-11-23 13:44:10 +08:00
lixiaopeng
96268d37cb 213 pm修改需求 去掉个别标牌 2022-11-23 10:30:58 +08:00
lixiaopeng
60974e33a5 优化弱势交通 开关 2022-11-23 10:24:18 +08:00
lixiaopeng
e91fa29b16 213 添加obu 的标牌 2022-11-22 22:59:57 +08:00
yangyakun
b5f41184da TextView setTextSize 需要传递单位 2022-11-22 21:35:22 +08:00
wangmingjun
a15ba31cef [2.13.0] taxi个人中心调整 2022-11-22 20:56:43 +08:00
chenfufeng
0c0ff743bb [Feat]新增消息盒子数据中心 2022-11-22 16:32:41 +08:00
lixiaopeng
64c448a4d6 213 去掉测试写死的下载链接 2022-11-22 14:08:57 +08:00
zhongchao
ff6d53bc44 [2.13.0] code style 2022-11-22 11:43:15 +08:00
zhongchao
16f0076922 [2.13.0][jira-YHJSYHZNWL-1667] fix bug of blue tooth register problem 2022-11-22 11:41:51 +08:00
lixiaopeng
38e538a3aa 213 添加obu的开关 2022-11-22 11:12:27 +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
4753b94972 remove unuse 2022-11-22 09:06:03 +08:00
yangyakun
4677253e00 适配 2022-11-21 22:35:15 +08:00
zhongchao
a18bc05194 [2.13.0] merge problem 2022-11-21 20:51:10 +08:00
zhongchao
5389db47c4 [2.13.0] merge 2.13.0 branch 2022-11-21 18:32:51 +08:00
zhongchao
8a75f3bb22 [2.13.0] merge yakun and code style 2022-11-21 18:30:49 +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
zhongchao
b119e62fe5 .. 2022-11-21 12:49:50 +08:00
zhongchao
3d46df4d32 fix status bar 2022-11-21 12:49:27 +08:00
zhongchao
913beae87c fix bug of status bar 2022-11-21 12:47:26 +08:00
zhongchao
0ba6d8896e .. 2022-11-21 12:08:26 +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
4be507613b StatusBar 高度计算 设置background后需要重新设置padding 2022-11-18 12:49:34 +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
donghongyu
947fb0b8fb 「Fix」
1、修复自车位置没有被分发

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-11-17 20:26:16 +08:00
wangmingjun
3b21b3e5de Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2130_221116_2.13.0 2022-11-17 18:06:55 +08:00
wangmingjun
2934df3b45 [2.13.0] taxi增加送驾途中结束订单功能 2022-11-17 17:03:32 +08:00
donghongyu
44d2b47fa8 「Fix」
1、先关闭「获取数字版权管理设备ID」使用,创达机器没有与Google合作,系统阉割了导致启动卡死

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-11-17 17:03:16 +08:00
wangmingjun
82571c797b [2.12.0] taxi自动驾驶按钮增加点击状态 2022-11-17 16:15:39 +08:00
wangmingjun
5258d927e7 [2.13.0] app版本号升级2.13.0 2022-11-17 14:34:37 +08:00
wangmingjun
c26dee779b [2.13.0] taxi订单取消原因修改 2022-11-17 14:32:04 +08:00
lixiaopeng
1ec0c6189c Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into dev_robotaxi-d-app-module_2110_220915_2.11.0_cmdb 2022-11-16 21:49:06 +08:00
lixiaopeng
27e2aa93d9 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into dev_robotaxi-d-app-module_mogo-obu-sdk_220926_2.11.1_temp 2022-11-16 21:38:13 +08:00
lixiaopeng
dcf780ed55 同步212 版本 2022-11-15 19:05:33 +08:00
lixiaopeng
30a9c2507c obu 完善 同时兼容两种 obu能力 2022-11-15 17:36:53 +08:00
lixiaopeng
762f35f591 Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_2110_220915_2.11.0_cmdb 2022-11-15 14:52:03 +08:00
pangfan
2b38bf67c0 Merge remote-tracking branch 'origin/release_robotaxi-d-app-module_2120_221017_2.12.0.1'
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java
2022-11-15 11:23:39 +08:00
xinfengkun
5f972dd012 [change] 更新MAP2.10.0 监控事件 2022-11-14 15:43:26 +08:00
lixiaopeng
36253982e2 Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_2110_220915_2.11.0_cmdb 2022-11-14 09:59:00 +08:00
wangmingjun
10a9e7e3b1 Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into 'test_robotaxi-d-app-module_2120_221017_2.12.0.1'
Dev robotaxi d app module 2120 221017 2.12.0

See merge request zhjt/AndroidApp/MoGoEagleEye!364
2022-11-11 13:49:29 +00:00
wangmingjun
f12974f73c [2.12.0] taxi送驾高德导航优化 2022-11-11 21:48:51 +08:00
zhongchao
900213d694 [2.12.0]find the wu yu zi code and update log version 2022-11-11 19:16:53 +08:00
zhongchao
e52ba22a56 wait 2022-11-11 18:07:24 +08:00
lixiaopeng
9707137c21 修改设置速度按钮 2022-11-11 17:11:22 +08:00