yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,968 Commits 1 Branch 0 Tags
8a75f3bb22f9df042a68da314f9efc573dcfe3c8
Commit Graph

872 Commits

Author SHA1 Message Date
zhongchao
ad2d2c2cdf [2.13.0-merge]yakun and code style 2022-11-21 18:07:52 +08:00
zhongchao
1fec32f633 merge 2022-11-21 14:47:53 +08:00
zhongchao
3d46df4d32 fix status bar 2022-11-21 12:49:27 +08:00
yangyakun
014d4f0aa7 适配 2022-11-18 15:43:28 +08:00
yangyakun
4be507613b StatusBar 高度计算 设置background后需要重新设置padding 2022-11-18 12:49:34 +08:00
yangyakun
1607c60435 Merge branch 'master' into dev_robouiadapter_1062_221117_1.6.2 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
#	OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt
#	OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
#	OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
#	OCH/mogo-och-taxi/src/main/res/layout/taxi_navi_view.xml
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
#	core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml
#	gradle.properties
 2022-11-18 10:36:15 +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
zhongchao
e52ba22a56 wait 2022-11-11 18:07:24 +08:00
lixiaopeng
9707137c21 修改设置速度按钮 2022-11-11 17:11:22 +08:00
yangyakun
0aadcd8763 [2.8.0-f] 资源整理 2022-11-11 15:12:17 +08:00
zhongchao
5489eed272 wait 2022-11-11 13:38:24 +08:00
zhongchao
2156d2cd18 wait 2022-11-10 16:54:26 +08:00
zhongchao
a836c31728 wait to finish 2022-11-10 10:54:57 +08:00
yangyakun
e75db415e7 [2.8.0-f] 方向盘向左时竖线bug 2022-11-10 10:45:05 +08:00
yangyakun
4cdcd9bad2 [2.8.0-f] 版本号修改、background影响paddin、图片适配 2022-11-09 17:15:00 +08:00
zhongchao
7868bf626f Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_212-_221017_2.12.0_code_style_opt 2022-11-08 11:07:32 +08:00
zhongchao
fbe1801488 [2.12.0] local code style change 2022-11-08 11:03:10 +08:00
yangyakun
7af1c2de2b [2.8.0-f] 图标适配 2022-11-04 16:00:33 +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
yangyakun
0bc581a394 [2.8.0-f] bus busp taxi 适配完成 2022-11-01 17:21:42 +08:00
zhongchao
7adb83e252 fit ui 2022-11-01 10:50:35 +08:00
yangyakun
baf5a1f168 [2.8.0-f] him ui适配 2022-10-31 21:27:10 +08:00
yangyakun
222a669502 [2.8.0-f] 加速度字体修改、 2022-10-31 19:39:18 +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
yangyakun
79e4606461 土司 AlertDialog 修改 2022-10-30 23:44:10 +08:00
yangyakun
20509fce0c [2.8.0-f] 屏幕适配 2022-10-28 20:44:07 +08:00
yangyakun
27f40d2d2c [2.8.0-f] 屏幕适配 2022-10-28 16:36:56 +08: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