Commit Graph

19 Commits

Author SHA1 Message Date
zhongchao
fbb15bcf47 [2.13.0] change the host const loc 2022-11-30 16:23:40 +08:00
zhongchao
0d6938262c [2.13.0] change the host location and fix bug of token problem 2022-11-30 16:23:40 +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
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
yangyakun
222a669502 [2.8.0-f] 加速度字体修改、 2022-10-31 19:39:18 +08:00
yangyakun
20509fce0c [2.8.0-f] 屏幕适配 2022-10-28 20:44:07 +08:00
yangyakun
ce216d4a7f [2.12.0-f] tts 部分 2022-10-26 17:56:56 +08:00
renwj
d2c35d07e4 [状态栏]优化CAN和RTK状态判断;RTK状态增加文字描述 2022-07-12 17:34:40 +08:00
renwj
430328ea7f [状态栏]Can数据状态获取逻辑优化 2022-05-27 17:01:06 +08:00
renwj
9150b3f40a [状态栏]状态栏需求代码提交
[状态栏]网络可访问状态获取
2022-05-26 22:22:44 +08:00
zhongchao
e1508a3f0f close route overlay log and fix draw data of route to pb style 2022-04-06 18:56:08 +08:00
zhongchao
55bc199f0d merge 2022-03-31 16:53:43 +08:00
zhongchao
a39f310331 merge 2022-03-22 10:07:10 +08:00
zhongchao
6102e55ed3 change the callerlogger 2022-03-14 21:50:16 +08:00
zhongchao
5886f4feb7 rebase 2022-03-11 20:04:11 +08:00
zhongchao
4554986f52 rebase 2022-03-11 19:52:39 +08:00