wangmingjun
|
f5c5f1536c
|
Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0
# Conflicts:
# OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
# app/build.gradle
# app/functions/och.gradle
# app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
|
2023-03-03 17:29:34 +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 |
|
donghongyu
|
60c33ac089
|
[dev_arch_opt_3.0]
[Change]
[
1、解决少引用import android.content.Context
]
Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
|
2023-03-03 14:37:03 +08:00 |
|
renwj
|
3605f62e6c
|
[dev_arch_opt_3.0]捕获aispeech相关崩溃
|
2023-03-03 12:21:30 +08:00 |
|
wangmingjun
|
25e81e96e8
|
Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.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-02 21:06:00 +08:00 |
|
zhongchao
|
3d7be57c71
|
[2.13.0-arch-opt] merge
|
2023-03-02 19:54:16 +08:00 |
|
wangmingjun
|
0b862f6363
|
[M2] 1、视频渲染方式 2、走马灯效果
|
2023-03-02 14:48:04 +08:00 |
|
xinfengkun
|
9216aa99f4
|
[opt3.0][mogo-adas]修改m1不能启动自动驾驶的档位
|
2023-02-28 18:15:12 +08:00 |
|
wangmingjun
|
7ea3604ad2
|
Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0'
Dev robobus m1 p app module 1.0.0 230112 1.0.0
See merge request zhjt/AndroidApp/MoGoEagleEye!626
|
2023-02-27 13:01:22 +00: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 |
|
wangmingjun
|
667a0d4544
|
[charter] M1司机端
|
2023-02-25 19:37:52 +08:00 |
|
yangyakun
|
f6e749a2ac
|
Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0
|
2023-02-25 10:33:06 +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 |
|
yangyakun
|
c45d0e7840
|
[m1]
[1.1.2]
[m1 页面]
|
2023-02-23 21:51:36 +08:00 |
|
zhongchao
|
dbb62bbe04
|
[2.13.0-arch-opt] remove unuse code and add trace log
|
2023-02-22 19:50:13 +08:00 |
|
wangmingjun
|
9454d547b6
|
Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0'
Dev arch opt 3.0
See merge request zhjt/AndroidApp/MoGoEagleEye!581
|
2023-02-21 12:41:05 +00:00 |
|
zhongchao
|
db8bb54efa
|
[2.13.0-arch-opt] ..
|
2023-02-21 20:11:18 +08:00 |
|
wangmingjun
|
41e23861af
|
Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
# core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java
|
2023-02-20 10:39:15 +08:00 |
|
zhongchao
|
d5474743bf
|
[2.13.0-arch-opt] v2x remove
|
2023-02-17 21:32:22 +08:00 |
|
zhongchao
|
df3e018c30
|
[2.13.0-arch-opt]v2x code style
|
2023-02-17 20:25:26 +08:00 |
|
yangyakun
|
09485a49dc
|
[m1]
[1.0.2]
[添加状态栏替换开关]
|
2023-02-16 17:04:11 +08:00 |
|
wangmingjun
|
355eef7d09
|
[M2] M2 接驳司机端车模型暂时设置小巴车
|
2023-02-16 11:54:14 +08:00 |
|
wangmingjun
|
f2ba02ad59
|
Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0'
Dev arch opt 3.0
See merge request zhjt/AndroidApp/MoGoEagleEye!523
|
2023-02-15 09:18:47 +00:00 |
|
zhongchao
|
7b85574d62
|
:[2.13.0-arch-opt] bug fix
|
2023-02-15 16:15:28 +08:00 |
|
yangyakun
|
bfe65e75eb
|
Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
|
2023-02-15 10:18:54 +08:00 |
|
zhongchao
|
32991f784d
|
[2.13.0-arch-opt] binding car add config
|
2023-02-14 18:50:49 +08:00 |
|
yangyakun
|
96f33bc3df
|
Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
|
2023-02-07 16:57:41 +08:00 |
|
zhongchao
|
a382fc36c1
|
[2.13.0-arhc-opt] merge
|
2023-02-07 15:00:25 +08:00 |
|
yangyakun
|
fcffab4db0
|
Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
|
2023-02-06 18:50:17 +08:00 |
|
renwj
|
390aa3ef9e
|
[dev_arch_opt_3.0][leakfix]生命周期对象销毁时,直接将匿名内部类引用的字段置null
|
2023-02-06 14:30:24 +08:00 |
|
renwj
|
21d6c665f3
|
[dev_arch_opt_3.0][leakfix]修正由于匿名Runnable对象引用外部类引用造成的内存泄漏
|
2023-02-03 17:31:45 +08:00 |
|
yangyakun
|
d032e77f6e
|
dev_arch_opt_3.0]全局预览放入业务类中
|
2023-02-02 20:56:17 +08:00 |
|
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 |
|
renwj
|
0a4b0be72a
|
[dev_arch_opt_3.0]移除无用代码
|
2023-02-02 10:34:06 +08:00 |
|
zhongchao
|
25663f087b
|
[2.13.0-arch-opt] merge
|
2023-02-01 17:57:36 +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
|
dcc98b078b
|
[Opt3.0]新增StartUp模块并调整启动顺序
|
2023-01-31 15:32:17 +08:00 |
|
zhongchao
|
d46c11767d
|
[2.13.0-arch-opt] merg
|
2023-01-30 22:28:02 +08:00 |
|
renwj
|
2baf4aa785
|
[dev_arch_opt_3.0][fix]修正因位置回调重构造成的v2x事件不显示问题
|
2023-01-30 19:11:16 +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 |
|
yangyakun
|
b9213fee35
|
[1.0.0]
[m1]
[适配+部分页面]
|
2023-01-30 12:08:59 +08:00 |
|
renwj
|
a353fcb025
|
[dev_arch_opt_3.0]线程优化相关初始化代码回退
|
2023-01-30 11:01:13 +08:00 |
|
zhongchao
|
6d3eeaca50
|
[2.13.0-arch-opt] merge
|
2023-01-30 10:47:39 +08:00 |
|
renwj
|
4e8f8f0864
|
[dev_arch_opt_3.0]修正编译和运行时异常
|
2023-01-30 10:34:39 +08:00 |
|
renwj
|
7ae3e13fab
|
[dev_arch_opt_3.0][merge]合并2.13.2分支代码
|
2023-01-29 18:01:44 +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 |
|
zhongchao
|
c011549e44
|
[2.13.0-arch-opt] merge
|
2023-01-25 23:14:44 +08:00 |
|
xuxinchao
|
429e232c99
|
[dev_arch_opt_3.0]
[Change]
[
1、更改接口地址将需要进行DNS转换的接口和部分通用接口统一由服务端进行中转解析
]
|
2023-01-19 16:24:02 +08:00 |
|