Commit Graph

960 Commits

Author SHA1 Message Date
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
lixiaopeng
6cc02ea531 [2.13.0] 添加魔方显示ui 2022-12-06 17:00:03 +08:00
donghongyu
0431a13e93 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-06 12:04:23 +08:00
chenfufeng
816f73b195 [2.13.0][Fix]解决父Window的Token无效导致的异常 2022-12-06 11:54:06 +08:00
zhongchao
2784611f37 [2.13.0] revert the layout of test 2022-12-05 17:13:31 +08:00
xuxinchao
0d2e5877a5 [2.13.0]fix消息盒子列表数据重复和排序错乱问题 2022-12-05 15:49:14 +08:00
zhongchao
701136d9e4 [2.13.0]remove unuse 2022-12-05 14:52:30 +08:00
donghongyu
6450d49bde 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-05 11:33:24 +08:00
xuxinchao
e4055dbcb9 [2.13.0]fix消息盒子闪退 2022-12-05 11:26:20 +08:00
donghongyu
85706ada0c [2.13.0]
[Change]
[修复单屏幕,在第二个屏幕启动act]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-12-05 10:57:17 +08:00
donghongyu
66b52b65bb 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-05 09:52:42 +08:00
donghongyu
7fed49aed7 [2.13.0]
[Change]
[修复merge]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-12-05 09:51:03 +08:00
xuxinchao
1e6580c421 [2.13.0]消息盒子 2022-12-05 08:56:58 +08:00
lixiaopeng
8a01b1f71d 2.13.0 fixed conflict 2022-12-04 20:04:07 +08:00
xuxinchao
3fc46fbcfc [2.13.0]消息盒子调整UI 2022-12-03 11:37:40 +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
zhongchao
095c926fb6 [2.13.0]fix bug of netty status of view and close the spi real time 2022-12-02 19:13:34 +08:00
chenfufeng
464bfe4f85 [2.13.0][Fix]解决工具弹窗闪的问题 2022-12-02 18:21:35 +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
xuxinchao
ac32867b0e [2.13.0]消息盒子乘客端UI调整 2022-12-02 14:21:37 +08:00
xuxinchao
fd0df21b3d [2.13.0]消息盒子调整入口位置 2022-12-02 12:40:35 +08:00
zhongchao
60094ced77 add socket status listener and remove unfitable code 2022-12-02 11:03:37 +08:00
xuxinchao
0620337a21 [2.13.0]消息盒子增加退出登录还原Tab操作记录 2022-12-02 09:56:56 +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
lixiaopeng
fcbb481e01 2.13.0 obu开关显示区域优化 2022-12-01 18:13:43 +08:00
xuxinchao
07c4d8ce7b [2.13.0]消息盒子 2022-12-01 18:10:50 +08:00
lixiaopeng
9e86296939 2.13.0 联调弱势交通 2022-12-01 17:41:14 +08:00
zhongchao
e646d4367b add config upload server 2022-12-01 17:38:16 +08:00
wangmingjun
92a954ddbc [2.13.0] taxi个人中心icon 跳这个 2022-12-01 17:29:55 +08:00
donghongyu
f729d33309 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 16:04:59 +08:00
xuxinchao
f5b6da69e3 [2.13.0]消息盒子 2022-12-01 16:02:14 +08:00
donghongyu
b4dc56bbbf [2.13.0]
[Change]
[修复判断车型的地方使用AppIdentityModeUtils提供的方法]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-12-01 15:28:53 +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
xuxinchao
8cb6dba885 [2.13.0]消息盒子 2022-12-01 15:08:00 +08:00
lixiaopeng
0f98d5b7f0 2.13.0 添加obu的限速功能,添加开关控制限速数据来源 2022-12-01 14:40:40 +08:00
chenfufeng
38096e1a2a [2.13.0][fix]解决读取消息盒子历史信息的Bug 2022-12-01 14:14:44 +08:00
donghongyu
d579d69c15 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 12:23:24 +08:00
chenfufeng
79e4767cc0 [2.13.0][fix]添加查询消息盒子历史数据 2022-12-01 11:53:23 +08:00
xuxinchao
3cd125dbb6 [2.13.0]消息盒子 2022-12-01 11:16:36 +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
xuxinchao
d13d4e8d9b [2.13.0]消息盒子 2022-12-01 10:15:02 +08:00
xuxinchao
576a0c6add [2.13.0]消息盒子 2022-11-30 23:32:00 +08:00
wangmingjun
55a29607c9 [2.13.0] 悬浮窗权限问题兼容 2022-11-30 19:47:32 +08:00
chenfufeng
86a579be69 [2.13.0][fix]解决首次安装Tts不生效的问题
原因:首次安装sn没有缓存到sp,然后Tts初始化时机比从后台获取要靠前
2022-11-30 14:19:07 +08:00
zhongchao
621c8f36d2 [2.13.0] fix bug of sn token invoke 2022-11-30 12:59:28 +08:00
zhongchao
ada76d3136 [2.13.0] reset the vip test code 2022-11-30 11:49:21 +08:00
zhongchao
2ce908ce3f [2.13.0] add test code of vip to xin chao 2022-11-30 11:18:05 +08:00
xuxinchao
2f9034a1ac [2.13.0]消息盒子司机端 2022-11-30 09:04:42 +08:00
zhongchao
d1e7a80119 [2.13.0] fix bug of traffic type enmu and update func of vip 2022-11-29 20:04:14 +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