diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8116b81..1563bc1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -26,7 +26,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/app/src/main/java/com/mogo/cloud/RealTimeActivity.java b/app/src/main/java/com/mogo/cloud/RealTimeActivity.java
index 350ceea..f6005ec 100644
--- a/app/src/main/java/com/mogo/cloud/RealTimeActivity.java
+++ b/app/src/main/java/com/mogo/cloud/RealTimeActivity.java
@@ -8,12 +8,7 @@ import android.widget.Button;
 
 
 import com.mogo.cloud.passport.MoGoAiCloudClient;
-<<<<<<< HEAD
-import com.mogo.realtime.Interface.IRealTimeProvider;
-import com.mogo.realtime.Interface.MoGoAiCloudRealTime;
-=======
 import com.mogo.realtime.api.MoGoAiCloudRealTime;
->>>>>>> 17b3ed341e822ad073ace72a78b08f26214c0059
 import com.mogo.realtime.entity.MogoSnapshotSetData;
 import com.mogo.realtime.socket.IMogoCloudOnMsgListener;
 import com.mogo.utils.logger.Logger;
@@ -69,11 +64,11 @@ public class RealTimeActivity extends AppCompatActivity implements IMogoCloudOnM
 
     @Override
     public void onMsgSend(long id) {
-        Log.i(TAG, "send msg id : " + id);
+        Logger.i(TAG, "send msg id : " + id);
     }
 
     @Override
     public void onMsgReceived(MogoSnapshotSetData mogoSnapshotSetData) {
-        Log.i(TAG, "onMsgReceived ： " + mogoSnapshotSetData);
+        Logger.i(TAG, "onMsgReceived ： " + mogoSnapshotSetData);
     }
 }
diff --git a/gradle.properties b/gradle.properties
index df1f2f1..d13c991 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,20 +30,20 @@ PASSWORD=xintai2018
 RELEASE=true
 # AI CLOUD 云平台
 # 工具类
-MOGO_UTILS_VERSION=1.0.25-SNAPSHOT
+MOGO_UTILS_VERSION=1.0.26-SNAPSHOT
 # 网络请求
-MOGO_NETWORK_VERSION=1.0.25-SNAPSHOT
+MOGO_NETWORK_VERSION=1.0.26-SNAPSHOT
 # 网络DNS
-MOGO_HTTPDNS_VERSION=1.0.25-SNAPSHOT
+MOGO_HTTPDNS_VERSION=1.0.26-SNAPSHOT
 # 鉴权
-MOGO_PASSPORT_VERSION=1.0.25-SNAPSHOT
+MOGO_PASSPORT_VERSION=1.0.26-SNAPSHOT
 # 常链接
-MOGO_SOCKET_VERSION=1.0.25-SNAPSHOT
+MOGO_SOCKET_VERSION=1.0.26-SNAPSHOT
 # 数据采集
-MOGO_REALTIME_VERSION=1.0.25-SNAPSHOT
+MOGO_REALTIME_VERSION=1.0.26-SNAPSHOT
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.0.25-SNAPSHOT
+MOGO_TANLU_VERSION=1.0.26-SNAPSHOT
 # 直播推流
-MOGO_LIVE_VERSION=1.0.25-SNAPSHOT
+MOGO_LIVE_VERSION=1.0.26-SNAPSHOT
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.0.25-SNAPSHOT
+MOGO_TRAFFICLIVE_VERSION=1.0.26-SNAPSHOT
diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderDelegateManager.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderDelegateManager.java
index 874d344..33096ad 100644
--- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderDelegateManager.java
+++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/spi/RealTimeProviderDelegateManager.java
@@ -3,12 +3,8 @@ package com.mogo.realtime.spi;
 
 import com.elegant.spi.AbstractDelegateManager;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
-<<<<<<< HEAD
-import com.mogo.realtime.Interface.IRealTimeProvider;
 import com.mogo.utils.logger.Logger;
-=======
 import com.mogo.realtime.api.IRealTimeProvider;
->>>>>>> 17b3ed341e822ad073ace72a78b08f26214c0059
 
 /**
  * 提供RealTime SPI接口实例对象管理类