Conflicts: app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/ObuWarningDataMessage.java