From 053b695f9e9b51e96d68def0478b6c6c703c6308 Mon Sep 17 00:00:00 2001
From: tongchenfei <tonghenfei@zhidaoauto.com>
Date: Wed, 30 Dec 2020 14:25:17 +0800
Subject: [PATCH] opt

---
 foudations/httpdns-mogo/build.gradle                     | 2 +-
 .../src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java | 9 ++-------
 .../java/com/mogo/base/websocket/WebSocketManager.java   | 3 +++
 gradle.properties                                        | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/foudations/httpdns-mogo/build.gradle b/foudations/httpdns-mogo/build.gradle
index 964b800da1..6b662cab56 100644
--- a/foudations/httpdns-mogo/build.gradle
+++ b/foudations/httpdns-mogo/build.gradle
@@ -32,7 +32,7 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation rootProject.ext.dependencies.arouter
     annotationProcessor rootProject.ext.dependencies.aroutercompiler
-    implementation 'com.mogo.httpdns:httpdns-helper:1.0.14'
+    implementation 'com.mogo.httpdns:httpdns-helper:1.0.15'
 
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.httpdnsbase
diff --git a/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java b/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java
index d556f51cc1..64e4ffe141 100644
--- a/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java
+++ b/foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java
@@ -50,14 +50,8 @@ public class MogoHttpDns implements IMogoHttpDns, HttpDns, OnAddressChangedListe
 
     @Override
     public void getHttpDnsIp(String host, int type, boolean useCache, IHttpDnsCallback callback) {
-        Logger.d("MogoHttpDns", "host: " + host + " type: " + type);
+        Logger.d("MogoHttpDns", "getHttpDnsIp host: " + host + " type: " + type);
         Map<String,String> map = httpDnsHelper.getAllAddress();
-        if(map != null) {
-            Logger.d("MogoHttpDns", "all host: ");
-            for (String key : map.keySet()) {
-                Logger.d("MogoHttpDns", "key: " + key + "  value: " + map.get(key));
-            }
-        }
         if (useCache) {
             String address = httpDnsHelper.getHttpDnsCachedAddress(type, host);
             if (address != null) {
@@ -74,6 +68,7 @@ public class MogoHttpDns implements IMogoHttpDns, HttpDns, OnAddressChangedListe
 
     @Override
     public void addHttpDnsTtlCallback(String host, int type, IHttpDnsTtlCallback callback) {
+        Logger.d("MogoHttpDns","addHttpDnsTtlCallback: host: "+host+"  type: "+type);
         if (ttlCallbackMap.get(type + "-" + host) == null) {
             ttlCallbackMap.put(type + "-" + host, new ArrayList<IHttpDnsTtlCallback>());
         }
diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java
index 5e110bb8ea..1ad96357ef 100644
--- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java
+++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java
@@ -78,6 +78,9 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin
             @Override
             public void ttlIp(String url) {
                 Logger.d(TAG,"ttlIp url : " + url);
+                if(!WebSocketInstanceHolder.getClientProxy().isOpen()){
+                    return;
+                }
                 WebSocketInstanceHolder.getClientProxy().stop();
                 WebSocketInstanceHolder.getClientProxy().disConnect();
                 Logger.d(TAG,"ready to re initWebSocket : " + url);
diff --git a/gradle.properties b/gradle.properties
index 04aee2cfe7..542c574591 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -139,7 +139,7 @@ HTTPDNS_NOOP_VERSION = 2.0.12
 
 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=2.2.60
+CARCHATTING_VERSION=2.2.63
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.1.8
 # websocket