Commit Graph

527 Commits

Author SHA1 Message Date
chenfufeng
a591dd4387 [3.2.0][opt]集成Matrix的TraceCanary模块 2023-04-27 17:50:58 +08:00
yangyakun
d32d904239 Merge branch 'release_robobus-d_230413_3.1.0.1'
# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java
#	core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt
#	gradle.properties
2023-04-23 14:28:19 +08:00
xuxinchao
f655da0bde [dev_robobus-d_230413_3.1.0]fix不处于平行驾驶状态下弱网也提示平行驾驶接管提示 2023-04-17 11:31:13 +08:00
donghongyu
7c9fc5fae5 Merge remote-tracking branch 'origin/dev_robobus-d_230322_3.0.0' into dev_robobus-d_230322_3.0.0 2023-04-13 13:11:53 +08:00
xuxinchao
4a9e96ee87 [dev_robobus-d_230322_3.0.0]接管提示调整 2023-04-11 11:53:23 +08:00
donghongyu
faa191d8f9 「dev_robobus-d_230322_3.0.0」
1、增加
    lintOptions {
        abortOnError false
    }
2023-04-10 14:24:03 +08:00
xuxinchao
22c03de59c [dev_robobus-d_230322_3.0.0]接管提示加入消息盒子 2023-04-10 00:03:34 +08:00
yangyakun
029f578c76 Merge remote-tracking branch 'origin/dev_robobus_network_weak_230323' into dev_robobus_network_weak_230323 2023-04-07 20:59:44 +08:00
yangyakun
7f67ea9027 [m2]
[3.0.0]
[广告视频从json配置文件获取视频]
2023-04-07 20:59:34 +08:00
xuxinchao
8426cd715d [dev_robobus-d_230322_3.0.0]消息盒子V2X布局调整 2023-04-04 19:26:07 +08:00
xuxinchao
2b584b3985 [dev_3.0.0]增加云南私服云通话长链配置、fix提升地图版本编译不通过问题 2023-03-31 20:41:07 +08:00
wangmingjun
ca1809bed7 [3.0.0] 司机端二维码 2023-03-29 18:16:29 +08:00
yangyakun
b0359c5627 [merge2master] 2023-03-28 17:32:58 +08:00
xuxinchao
26f49ac7cc [dev_robobus-d_230322_3.0.0]云调度和Bus乘客端消息盒子 2023-03-23 20:40:21 +08:00
donghongyu
ac8b4164ba [dev_arch_opt_3.0]
[Change]
[
1、修复在斑马线修改了高德坐标系的自车位置导致,其它地方监听异常。
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-03-17 18:18:52 +08:00
zhongchao
ccf4e05f62 [m1-p-1.1.0] debug setting view 2023-03-16 11:17:59 +08:00
wangmingjun
52053d7b90 Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0'
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!676
2023-03-14 11:02:32 +00:00
lixiaopeng
44081ab185 [dev_arch_opt_3.0] 修改图标 2023-03-14 18:58:24 +08:00
wangmingjun
b98e446bfe Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-03-14 14:27:38 +08:00
lixiaopeng
f09dd018e1 [dev_arch_opt_3.0] 优化图标 2023-03-14 11:51:01 +08:00
yangyakun
49d3a89027 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxBubbleView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxBubbleAdapter.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
2023-03-08 21:40:34 +08:00
xuxinchao
0a349896bc [opt-3.0]fix消息盒子气泡消息偶现未及时消除Bug 2023-03-08 20:08:09 +08:00
xuxinchao
5d05f0fded [opt-3.0]fix消息盒子车辆系统信息闪烁问题 2023-03-08 18:51:52 +08:00
lixiaopeng
2005201d04 [dev_arch_opt_3.0] 添加魔方toast控制,修改HDMAP 2023-03-08 16:40:26 +08:00
wangmingjun
39afcde96c Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0'
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!657
2023-03-07 16:33:22 +00:00
zhongchao
91547ae873 [2.13.0-arch-opt] func build change 2023-03-06 18:10:01 +08:00
wangmingjun
7bca36646f [M2] 找回telematicConstant类 2023-03-03 17:19:57 +08:00
wangmingjun
2d6bb763db [M2] 找回telematicConstant类 2023-03-03 15:31:23 +08:00
yangyakun
73082244c1 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/build.gradle
#	app/functions/och.gradle
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/ToggleDebugView.kt
2023-03-03 14:54:30 +08:00
zhongchao
3d7be57c71 [2.13.0-arch-opt] merge 2023-03-02 19:54:16 +08:00
lixiaopeng
3f7d93cc79 [dev_arch_opt_3.0] 优化消息盒子图标的显示 2023-03-02 11:13:42 +08:00
yangyakun
3c332847f7 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/productFlavors/fOchBusPassengerM1.gradle
2023-02-28 21:22:06 +08:00
zhongchao
85a6305319 [2.13.0-arch-opt] obu warning v2v and socket toast 2023-02-28 20:14:07 +08:00
xinfengkun
9216aa99f4 [opt3.0][mogo-adas]修改m1不能启动自动驾驶的档位 2023-02-28 18:15:12 +08:00
zhongchao
74d616c092 [2.13.0-arch-opt] add trace of httpdns and fix small map draw line 2023-02-28 10:45:11 +08:00
xinfengkun
e423e5b4ff Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-27 17:40:33 +08:00
xinfengkun
ec1a00b0b6 [m1][mogo-adas] 不能启动自动驾驶档位参数修改成BuildConfig可配置模式 2023-02-27 17:40:22 +08:00
yangyakun
645ebe1665 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	core/mogo-core-function-call/build.gradle
2023-02-24 18:51:07 +08:00
lixiaopeng
a6642b5a7c [dev_arch_opt_3.0] 联调完成obu升级功能 2023-02-24 17:54:36 +08:00
lixiaopeng
d058bcace0 优化obu升级逻辑 2023-02-24 17:32:37 +08:00
lixiaopeng
8275d7f192 和obu联调升级功能完成 2023-02-24 15:36:40 +08:00
zhongchao
a8c80e8095 [2.13.0-arch-opt] add v2x sdk foundation gradle setting 2023-02-23 16:38:55 +08:00
lixiaopeng
2d4e88394e 统一ip的调用 2023-02-23 14:52:49 +08:00
lixiaopeng
2efb14e5f5 调试升级接口 2023-02-23 14:43:00 +08:00
zhongchao
c6b57b00e7 [2.13.0-arch-opt] add trace log 2023-02-22 19:50:13 +08:00
zhongchao
dbb62bbe04 [2.13.0-arch-opt] remove unuse code and add trace log 2023-02-22 19:50:13 +08:00
xuxinchao
088be3f4fb [dev_arch_opt_3.0]录包工具三期 2023-02-22 18:44:33 +08:00
yangyakun
0d084aefc2 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java
2023-02-21 16:28:51 +08:00
zhongchao
7f96b416c8 [2.13.0-arch-opt] update socket reconnect and fix httpdns reconnect logic 2023-02-21 11:56:05 +08:00
yangyakun
511ed5fa71 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-20 19:28:36 +08:00