yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,187 Commits 1 Branch 0 Tags
99d87e54c00a60c217196b05720c1935c4e3eb44
Commit Graph

157 Commits

Author SHA1 Message Date
yangyakun
6a54b17f13 [charter] 
[3.2.0]
[底部导航栏功能]
 2023-04-27 18:34:31 +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
zhongchao
78dfd5f83f [3.0.0]reload 3d res ,can't merge res of 3d 2023-04-13 18:33:15 +08:00
zhongchao
98599f0739 [3.0.0] cherry pick 2.15.0 func of map and fix bug of log 2023-04-13 18:06:54 +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
zhongchao
a83f586620 [3.0.0] replace 3D res and light invoke 2023-04-11 10:48:49 +08:00
donghongyu
faa191d8f9 「dev_robobus-d_230322_3.0.0」 
1、增加
    lintOptions {
        abortOnError false
    }
 2023-04-10 14:24:03 +08:00
yangyakun
fad8d4327c [map] 
[模型修改、高精地图版本升级]
 2023-03-30 16:34:16 +08:00
yangyakun
0a5221353f merge special relase to m1-p 2023-03-27 20:46:10 +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
wangmingjun
25e9a3acc3 [M2] M2车模替换 2023-03-08 15:48:40 +08:00
wangmingjun
667a0d4544 [charter] M1司机端 2023-02-25 19:37:52 +08:00
donghongyu
4cb32ec4a6 [dev_arch_opt_3.0] 
[Change]
[
1、合并3.0分支
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-22 17:56:14 +08:00
zhongchao
1548c607da [2.13.0-arch-opt] merge 2023-02-07 15:06:28 +08:00
xuxinchao
f9eeef8cb9 [Opt3.0]消息盒子 2023-02-01 16:26:53 +08:00
chenfufeng
13cebf3b06 [2.13.2][feat]新增全览V2X事件的日志 2023-01-30 11:10:04 +08:00
renwj
7ae3e13fab [dev_arch_opt_3.0][merge]合并2.13.2分支代码 2023-01-29 18:01:44 +08:00
lixiaopeng
b60fbb2613 合并2.13.2的obu验收相关功能 2023-01-29 17:23:41 +08:00
zhongchao
183c5b806f [2.13.2-arch-opt] remove unuse res of v2x 2023-01-13 15:18:34 +08:00
zhongchao
48f2acb590 [2.13.0-arch-opt] wait to pull 2023-01-13 15:18:34 +08:00
donghongyu
3a0d94e9a7 Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' into dev_arch_opt_3.0 
# Conflicts:
#	OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CallerLoggerUtils.kt
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
#	app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
#	core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
#	core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoHandAdasMsgManager.java
#	core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt
#	core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java
#	core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt
#	core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt
#	gradle.properties
#	libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java
 2023-01-09 18:42:03 +08:00
bxb
b26a0bb376 Merge branch 'master' into dev_robosweeper-d_app-module_221230_1.1.0 
# Conflicts:
#	gradle.properties
 2023-01-09 11:22:18 +08:00
pangfan
beb67528f4 Merge branch 'master' into 'release_robotaxi-d-app-module_2130_221116_2.13.0.1' 
# Conflicts:
#   gradle.properties
 2023-01-05 09:28:34 +00:00
zhongchao
22df250f6f [2.13.0-arch-opt] move dispatch to biz and remove gradle settings 2023-01-03 22:11:57 +08:00
donghongyu
29acd03197 [1.1.0] 
[Change]
[1、增加清扫车模型]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-03 19:55:30 +08:00
donghongyu
b15f4f6944 [1.1.0] 
[Change]
[1、增加清扫车模型]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-03 19:54:01 +08:00
donghongyu
ddeb1e306c [opt 3.0] 
[Change]
[1、打开视频播放音量
2、修复crashreport_upgrade加载异常]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-12-27 16:59:32 +08:00
donghongyu
1972616d44 [opt 3.0] 
[Change]
[1、增加多屏宣传视频播放功能]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-12-27 13:22:43 +08:00
lixiaopeng
d2a7461825 [2.13.0] 修改小巴车模型为带转向灯的，去掉bus不显示转向灯限制 2022-12-20 18:54:42 +08:00
lixiaopeng
69f4e2e4f3 [2.13.0] 优化事件图标 2022-12-08 18:15:42 +08:00
lixiaopeng
32ca3026d0 [2.13.0 优化obu显示] 2022-12-05 19:38:42 +08:00
lixiaopeng
8a01b1f71d 2.13.0 fixed conflict 2022-12-04 20:04:07 +08:00
chenfufeng
3df5edc79e [2.13.0]更新全览地图V2X事件气泡的样式 2022-12-01 16:00:41 +08:00
chenfufeng
8e3d7893d2 [2.13.0]全览地图V2X事件气泡逻辑更新 2022-12-01 15:02:21 +08:00
xuxinchao
576a0c6add [2.13.0]消息盒子 2022-11-30 23:32:00 +08:00
renwj
716b6257e4 [v2.13.0][状态栏]状态窗口部分状态上移 2022-11-23 16:56:31 +08:00
yangyakun
4677253e00 适配 2022-11-21 22:35:15 +08:00
zhongchao
8a75f3bb22 [2.13.0] merge yakun and code style 2022-11-21 18:30:49 +08:00
zhongchao
ad2d2c2cdf [2.13.0-merge]yakun and code style 2022-11-21 18:07:52 +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
zhongchao
5489eed272 wait 2022-11-11 13:38:24 +08:00
zhongchao
5322d03ec1 wait 2022-11-10 11:58:05 +08:00
yangyakun
9b8b052f75 [2.8.0-f] 图标适配 2022-11-02 16:51:59 +08:00
yangyakun
20509fce0c [2.8.0-f] 屏幕适配 2022-10-28 20:44:07 +08:00
lixiaopeng
3bd3ece6c4 修改cmdb接口 2022-10-20 14:32:43 +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