yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,951 Commits 1 Branch 0 Tags
27e2aa93d9ea73fa8d3ccf8f33082524add633f2
Commit Graph

855 Commits

Author SHA1 Message Date
lixiaopeng
27e2aa93d9 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into dev_robotaxi-d-app-module_mogo-obu-sdk_220926_2.11.1_temp 2022-11-16 21:38:13 +08:00
lixiaopeng
dcf780ed55 同步212 版本 2022-11-15 19:05:33 +08:00
pangfan
2b38bf67c0 Merge remote-tracking branch 'origin/release_robotaxi-d-app-module_2120_221017_2.12.0.1' 
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java
 2022-11-15 11:23:39 +08:00
zhongchao
900213d694 [2.12.0]find the wu yu zi code and update log version 2022-11-11 19:16:53 +08:00
lixiaopeng
9707137c21 修改设置速度按钮 2022-11-11 17:11:22 +08:00
chenfufeng
9f74e72cbc [Opt]语音TTS授权时机提前 2022-11-04 15:02:34 +08:00
zhongchao
39ececd4d7 fit android 10 about window focus in bar status 2022-11-03 15:34:03 +08:00
xuxinchao
1cba06d724 修改变道速度阈值限制文案 2022-11-03 15:27:07 +08:00
xuxinchao
bddb6a46ba 运营面板增加是否展示工控机异常上报弹窗控制按钮 2022-11-01 17:58:39 +08:00
zhongchao
7adb83e252 fit ui 2022-11-01 10:50:35 +08:00
zhongchao
7ab9116e72 fix status bar problem 2022-10-31 19:31:22 +08:00
pangfan
a68463a813 Merge branch 'master' into 'release_robotaxi-d-app-module_2110_220915_2.11.0.1' 
# Conflicts:
#   app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
#   core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
 2022-10-31 03:08:24 +00:00
zhongchao
30b3432cb1 .. 2022-10-28 14:38:53 +08:00
zhongchao
aac8940caa fix ui problem and wait to addnew ui 2022-10-27 19:48:00 +08:00
wangmingjun
704035eee3 Revert "Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into…" 
This reverts merge request !315
 2022-10-27 11:20:05 +00:00
xuxinchao
b31cbc58b1 运营面板布局修改 2022-10-27 17:04:50 +08:00
lianglihui
b7a5727beb 2.11.0 removew 蘑戒对音量键的映射 2022-10-27 16:37:58 +08:00
zhongchao
fa31960b9c fix bug of func config 2022-10-27 12:07:09 +08:00
zhongchao
e8ce634db3 add func of pnc warning func config 2022-10-26 18:59:09 +08:00
zhongchao
5fcd887dff .. 2022-10-26 18:59:09 +08:00
zhongchao
16c7bd9755 add func of statusbar and func config wait to update 2022-10-26 18:59:08 +08:00
yangyakun
1b1ad39fe7 Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_2120_yyk_2.12.0 
# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
 2022-10-26 15:19:28 +08:00
xinfengkun
6b5549d2f8 Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2120_221017_2.12.0 2022-10-26 11:34:16 +08:00
xinfengkun
9300baf426 [change] 更新行程信息接口 2022-10-26 11:34:02 +08:00
xuxinchao
6c64b74384 BadCase自定义Topic 2022-10-26 10:53:19 +08:00
yangyakun
79de6f731f [2.12.0-f] tts 级别 2022-10-25 17:58:48 +08:00
lixiaopeng
453c08d34b 删除魔戒的实现，添加操作魔方的约束 2022-10-25 17:23:02 +08:00
wangmingjun
a718188b99 Merge branch 'test_robotaxi-d-app-module_2110_220915_2.11.0.1' into dev_robotaxi-d-app-module_2120_221017_2.12.0 
# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
 2022-10-25 14:51:01 +08:00
yangyakun
80c085c4cb Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_2120_yyk_2.12.0 2022-10-24 16:40:13 +08:00
lixiaopeng
50fef032e9 添加施工占道预警下发工控机 2022-10-24 16:32:31 +08:00
yangyakun
4d0083968e Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_2120_yyk_2.12.0 
# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
 2022-10-24 16:22:32 +08:00
zhongchao
f98195788b merge 2022-10-24 11:15:57 +08:00
xuxinchao
49f6a5778e 工具箱调整速度设置 2022-10-24 10:23:24 +08:00
renwj
d14b2d3cb6 [Route]优化引导线绘制逻辑 
xx
 2022-10-21 18:08:54 +08:00
renwj
8b510d23d0 [CrashFix]由于系统配置更改导致Timer创建过多 2022-10-21 17:54:11 +08:00
xuxinchao
a5c2dcd843 SOP运营面板 2022-10-21 17:14:39 +08:00
xuxinchao
8d5af865d2 红路灯显示控制更改 2022-10-21 15:53:49 +08:00
xuxinchao
6b9dbbb8d2 扩大开启调试屏长按区域 2022-10-21 15:35:55 +08:00
lixiaopeng
c0ab0408b1 Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0_gkjpb' into dev_robotaxi-d-app-module_2120_221017_2.12.0 2022-10-21 10:20:28 +08:00
wangmingjun
058c6b922f Merge branch 'test_robotaxi-d-app-module_2110_220915_2.11.0.1' into 'dev_robotaxi-d-app-module_2120_221017_2.12.0' 
Test robotaxi d app module 2110 220915 2.11.0.1

See merge request zhjt/AndroidApp/MoGoEagleEye!294
 2022-10-20 11:39:35 +00:00
xuxinchao
8837bde8a5 BadCase录包 2022-10-20 19:37:20 +08:00
lixiaopeng
553b26da7d Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_2110_220915_2.11.0_gkjpb 2022-10-20 19:13:45 +08:00
xuxinchao
db18f69471 SOP面板 2022-10-20 18:00:28 +08:00
renwj
79e3c515a3 [V2X][Road]解决锥筒和气泡消失，但道路依然高亮的的情况 2022-10-20 17:13:49 +08:00
zhongchao
75533484ae fix bug of fun biz config 2022-10-20 16:24:31 +08:00
lixiaopeng
ada7044520 opt log 2022-10-20 14:52:33 +08:00
zhongchao
ba02f80f3d open the limit of take over 2022-10-20 13:15:13 +08:00
zhongchao
644789bd3b fix bug of ui 2022-10-19 14:48:16 +08:00
zhongchao
fc71e35270 fix ui problem of vip 2022-10-19 11:51:59 +08:00
zhongchao
49570aab23 🆕 add func of biz config in 2.11.0 2022-10-18 19:11:31 +08:00