[2.15.0] fixed conflict

libraries/mogo-obu/src/main/java/com/zhidao/support/obu/ObuManager.java

@@ -18,6 +18,7 @@ import com.mogo.support.obu.model.MogoObuRsmWarningData;
 import com.mogo.support.obu.model.MogoObuRvWarningData;
 import com.mogo.support.obu.model.MogoObuSpatWarningData;
 import com.mogo.support.obu.model.MogoObuSystemBConfigData;
+import com.mogo.support.obu.model.MogoObuSystemStatusData;
 import com.mogo.support.obu.model.advance.AccFourAxes;
 import com.mogo.support.obu.model.advance.DateTime;
 import com.mogo.support.obu.model.advance.NodeId;
@@ -31,6 +32,7 @@ import com.mogo.support.obu.model.advance.VehControl;
 import com.mogo.support.obu.model.advance.VehSize;
 import com.mogo.support.obu.model.advance.VerticalLLV;
 import com.mogo.support.obu.model.advance.WarningData;
+import com.mogo.support.obu.model.result.BaseResult;
 import com.mogo.support.obu.option.MogoObuLog;
 import com.mogo.support.obu.option.MogoObuOptions;
 import com.mogo.support.obu.upgrade.OnUpgradeListener;
@@ -246,6 +248,17 @@ public class ObuManager {
         MogoObuManager.getInstance().unregisterTopic(topicIds);
     }
 
+    /**
+     * HV 数据推送周期
+     * 连接成功后调用生效，OBU重启失效
+     *
+     * @param pushCycle 周期 单位：ms 默认值：100ms
+     * @since 1.1.0
+     */
+    public void setHvInfoPushCycle(int pushCycle) {
+        MogoObuManager.getInstance().setHvInfoPushCycle(pushCycle);
+    }
+
     /**
      * OBU SDK 日志配置
      * 支持日志输出至LogCat和写入文件
@@ -328,6 +341,22 @@ public class ObuManager {
             }
         }
 
+        @Override
+        public void onMogoObuCallResult(BaseResult result) {
+            super.onMogoObuCallResult(result);
+            if (listener != null) {
+                listener.onObuCallResult(result);
+            }
+        }
+
+        @Override
+        public void onMogoObuSystemStatus(MogoObuSystemStatusData data) {
+            super.onMogoObuSystemStatus(data);
+            if (listener != null) {
+                listener.onObuSystemStatus(data);
+            }
+        }
+
         @Override
         public void onMogoObuHvBasics(MogoObuHvBasicsData data) {
             if (listener != null) {

libraries/mogo-obu/src/main/java/com/zhidao/support/obu/OnObuListener.java

@@ -3,6 +3,7 @@ package com.zhidao.support.obu;
 import com.mogo.support.obu.ObuScene;
 import com.mogo.support.obu.constants.Define;
 import com.mogo.support.obu.model.MogoObuSystemStatusData;
+import com.mogo.support.obu.model.result.BaseResult;
 
 import mogo.telematics.pad.MessagePad;
 
@@ -16,6 +17,14 @@ public interface OnObuListener {
      */
     void onConnectStatus(@Define.ConnectStatus int connectStatus);
 
+    /**
+     * OBU 函数调用 返回状态
+     *
+     * @param result 调用结果
+     * @since 1.0.0
+     */
+    void onObuCallResult(BaseResult result);
+
     /**
      * OBU 系统状态
      *