Commit Graph

1076 Commits

Author SHA1 Message Date
yangyakun
8814f5947d Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.java
#	OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt
2023-02-02 12:05:53 +08:00
donghongyu
3c8f69d83a [dev_arch_opt_3.0]
[Change]
[
1、修复刹车等异常@钟超
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-01 19:07:04 +08:00
donghongyu
57ee81a459 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-02-01 18:35:45 +08:00
donghongyu
4e9ca58409 [dev_arch_opt_3.0]
[Change]
[
1、增加控制定位HZ的回调用
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-01 18:35:39 +08:00
zhongchao
25663f087b [2.13.0-arch-opt] merge 2023-02-01 17:57:36 +08:00
lixiaopeng
2df96d3dac Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-02-01 16:52:31 +08:00
lixiaopeng
52bc276157 同步魔方的最新改动 2023-02-01 16:52:24 +08:00
xuxinchao
f9eeef8cb9 [Opt3.0]消息盒子 2023-02-01 16:26:53 +08:00
donghongyu
3211ef5956 [dev_arch_opt_3.0]
[Change]
[
1、拆分Obu数据回调接口,等待凤坤pb提交后在统一数据调用
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-01 14:06:58 +08:00
yangyakun
bc24620f7c Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/productFlavors/fPadLenovo.gradle
2023-02-01 12:54:53 +08:00
chenfufeng
f0d9f701ed [Feat]新增全览地图View 2023-02-01 11:20:39 +08:00
xuxinchao
6e94255d15 [opt3.0]消息盒子 2023-01-31 18:09:49 +08:00
xuxinchao
0a10c1876c [Opt3.0]消息盒子 2023-01-31 16:56:57 +08:00
chenfufeng
dcc98b078b [Opt3.0]新增StartUp模块并调整启动顺序 2023-01-31 15:32:17 +08:00
zhongchao
d3f0ac654b [2.13.0-arch-opt] fix bug of limit speed and move view 2023-01-31 15:28:42 +08:00
yangyakun
0714df0081 [gradle 渠道修改] 2023-01-31 14:52:21 +08:00
zhongchao
66db271f6c [2.13.0-arch-opt] merg 2023-01-30 22:29:40 +08:00
zhongchao
d46c11767d [2.13.0-arch-opt] merg 2023-01-30 22:28:02 +08:00
lixiaopeng
0b84b3855e 添加新的obu sdk日志的开关功能 2023-01-30 18:13:25 +08:00
lixiaopeng
4625895e42 fixed obu conflict 2023-01-30 18:02:03 +08:00
lixiaopeng
fa04ed406e 去掉老obu的功能,合并EventTypeEnumNew 2023-01-30 17:49:17 +08:00
donghongyu
dac6741055 [dev_arch_opt_3.0]
[Change]
[
1、迁移mogo-core-function-obu-mogo工程到MoGoEagleEye.core.function-impl.mogo-core-function-datacenter,后续进行数据及视图拆离
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-30 16:52:39 +08:00
yangyakun
4e9d237d3b Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
2023-01-30 15:12:39 +08:00
chenfufeng
a841735ac4 [2.13.2][Opt]查询性能监控的时机后置 2023-01-30 11:10:04 +08:00
chenfufeng
7cad199cfd [2.13.2][fix]解决数据库崩溃的问题 2023-01-30 11:10:04 +08:00
chenfufeng
ce2fdf57de [v2.13.2][Fix]解决Room崩溃问题 2023-01-30 11:10:04 +08:00
chenfufeng
982fa018c9 [Opt]优化耗时和降频刷新 2023-01-30 11:10:04 +08:00
zhongchao
6d3eeaca50 [2.13.0-arch-opt] merge 2023-01-30 10:47:39 +08:00
renwj
7ae3e13fab [dev_arch_opt_3.0][merge]合并2.13.2分支代码 2023-01-29 18:01:44 +08:00
lixiaopeng
2a9111c996 fixed conflict 2023-01-29 17:33:43 +08:00
lixiaopeng
b60fbb2613 合并2.13.2的obu验收相关功能 2023-01-29 17:23:41 +08:00
yangyakun
947517f98b Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-01-29 16:28:47 +08:00
zhongchao
8433d0c8de [2.13.0-arch-opt] hmi proxy replace to view 2023-01-29 16:25:06 +08:00
donghongyu
981b876a76 [dev_arch_opt_3.0]
[Change]
[
1、删除旧版本定位注册
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-28 18:40:32 +08:00
zhongchao
0e7664615f [2.13.0-arch-opt] clean 2023-01-25 23:24:52 +08:00
zhongchao
27044ebeee [2.13.0-arch-opt] remove relative of code 2023-01-25 23:15:54 +08:00
zhongchao
40d2977027 [2.13.0-arch-opt] fix bug of view long click 2023-01-25 23:14:49 +08:00
zhongchao
c011549e44 [2.13.0-arch-opt] merge 2023-01-25 23:14:44 +08:00
zhongchao
2265a5ffb8 [2.13.0-arch-opt] merge 2023-01-25 23:13:23 +08:00
wangmingjun
fca1b294b7 [merge] merge origin branch 2023-01-16 17:45:21 +08:00
wangmingjun
9b503829c3 [merge] 合并接驳车代码 2023-01-16 17:27:27 +08:00
donghongyu
3ae9cda2f7 [dev_arch_opt_3.0]
[Change]
[
1、修复合并Master冲突
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-16 14:23:25 +08:00
donghongyu
f10b9e94d4 Merge branch 'master' into dev_arch_opt_3.0
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
2023-01-16 11:43:46 +08:00
zhongchao
245bde74d2 [2.13.0-arch-opt] add note 2023-01-14 14:24:23 +08:00
donghongyu
dd8428fb97 [dev_arch_opt_3.0]
[Change]
[
1、修改了高精地图的设置外部坐标的方法
2、修改了基础、出租车、Bus小地图中的位置回调,使用IMoGoChassisLocationGCJ02Listener。
3、TODO 有些需要高德地图的地方需要改为使用IMoGoChassisLocationGCJ02Listener,WGS84的坐标使用IMoGoChassisLocationWGS84Listener
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-13 17:44:04 +08:00
zhongchao
183c5b806f [2.13.2-arch-opt] remove unuse res of v2x 2023-01-13 15:18:34 +08:00
zhongchao
d616dbb937 [2.13.0-arch-opt] remove res 2023-01-13 15:18:34 +08:00
chenfufeng
6dde7380b8 [2.13.2][Opt]查询性能监控的时机后置 2023-01-12 17:10:47 +08:00
chenfufeng
3ecbad5472 [2.13.2][fix]解决数据库崩溃的问题 2023-01-12 17:10:43 +08:00
chenfufeng
5180d3b6f9 [v2.13.2][Fix]解决Room崩溃问题 2023-01-12 17:10:38 +08:00