From 5d42576fc3997684eae10f6e3b3bad7f8945f025 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Fri, 3 Nov 2023 17:08:36 +0800
Subject: [PATCH] [master] update socket version and extends config of heart
 beat interval

---
 .../cloud/passport/MoGoAiCloudClientConfig.java    | 14 ++++++++++++++
 foudations/mogo-socket/build.gradle                |  2 +-
 .../cloud/socket/third/ThirdSocketManager.java     |  3 ++-
 gradle.properties                                  |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java
index ec8fc15..2be4e2e 100644
--- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java
+++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java
@@ -94,6 +94,11 @@ public class MoGoAiCloudClientConfig {
      */
     private String socketTechUrl;
 
+    /**
+     * sdk中默认120秒，此处不设default=120
+     */
+    private long heartBeatInterval;
+
     /**
      * 是否打印日志
      */
@@ -286,6 +291,14 @@ public class MoGoAiCloudClientConfig {
         this.socketTechUrl = socketTechUrl;
     }
 
+    public long getHeartBeatInterval() {
+        return heartBeatInterval;
+    }
+
+    public void setHeartBeatInterval(long heartBeatInterval) {
+        this.heartBeatInterval = heartBeatInterval;
+    }
+
     /**
      * 获取当前网络环境
      *
@@ -522,6 +535,7 @@ public class MoGoAiCloudClientConfig {
                 ", passportUrl='" + passportUrl + '\'' +
                 ", socketBaseUrl='" + socketBaseUrl + '\'' +
                 ", socketTechUrl='" + socketTechUrl + '\'' +
+                ", heartBeatInterval='" + heartBeatInterval + '\'' +
                 ", isShowDebugLog=" + isShowDebugLog +
                 ", isShowNetDebugLog=" + isShowNetDebugLog +
                 ", isShowToastLog=" + isShowToastLog +
diff --git a/foudations/mogo-socket/build.gradle b/foudations/mogo-socket/build.gradle
index 37f7a13..74b1c5a 100644
--- a/foudations/mogo-socket/build.gradle
+++ b/foudations/mogo-socket/build.gradle
@@ -37,7 +37,7 @@ dependencies {
     implementation 'com.zhidao.socketsdk:socketsdk:2.1.4'
 
     // socket-for-sdk 长链 http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=48956182  外部SDK版本
-    api 'com.zhidao.socket:built-in-socket:1.0.31'
+    api 'com.zhidao.socket:built-in-socket:1.0.35'
 
 
     if (Boolean.valueOf(RELEASE)) {
diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java
index 53d7c3d..347e4bc 100644
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java
@@ -67,7 +67,8 @@ public class ThirdSocketManager implements Callback, ErrorCallback {
                 .setDebug(cloudClientConfig.isShowDebugLog())
                 .setCustomTechBaseUrl(cloudClientConfig.getSocketTechUrl())
                 .setCustomBaseUrl(cloudClientConfig.getSocketBaseUrl())
-                .setLocation(mLocation);
+                .setLocation(mLocation)
+                .setHeartBeat(cloudClientConfig.getHeartBeatInterval());
         SocketClient.getInstance().registerSocketCallback(this);
         SocketClient.getInstance().registerErrorCallback(this);
         SocketClient.getInstance().start(context);
diff --git a/gradle.properties b/gradle.properties
index 5f09890..c721df8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -33,7 +33,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
 USERNAME=xintai
 PASSWORD=xintai2018
 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本
-RELEASE=true
+RELEASE=false
 # AI CLOUD 云平台
 # 工具类
 MOGO_UTILS_VERSION=1.4.7.17