From 59af90ee3405d0a4415f013e3f579021bf1ab606 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 29 Dec 2020 17:39:44 +0800 Subject: [PATCH 1/3] add log --- .idea/gradle.xml | 1 + foudations/httpdns-mogo/build.gradle | 2 +- .../src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 426ff6b360..8efbfa420e 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -85,6 +85,7 @@ diff --git a/foudations/httpdns-mogo/build.gradle b/foudations/httpdns-mogo/build.gradle index bb7349607c..b54a1f2a00 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.8' + implementation 'com.mogo.httpdns:httpdns-helper:1.0.11' 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 f1396902f1..d556f51cc1 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 @@ -51,10 +51,12 @@ 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","all host: "); Map map = httpDnsHelper.getAllAddress(); - for (String key : map.keySet()) { - Logger.d("MogoHttpDns","key: "+key+" value: "+map.get(key)); + 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); From 618cc9a9bf237d18d143f19c458bfb9889ec3cfd Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 29 Dec 2020 19:01:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=BF=E6=8D=A2zhidaohulian=E4=B8=BAzhid?= =?UTF-8?q?aozhixing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- foudations/httpdns-mogo/build.gradle | 2 +- .../src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/foudations/httpdns-mogo/build.gradle b/foudations/httpdns-mogo/build.gradle index b54a1f2a00..549177f587 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.11' + implementation 'com.mogo.httpdns:httpdns-helper:1.0.13' 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..375771761f 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,6 +50,9 @@ public class MogoHttpDns implements IMogoHttpDns, HttpDns, OnAddressChangedListe @Override public void getHttpDnsIp(String host, int type, boolean useCache, IHttpDnsCallback callback) { + if (host.contains("zhidaohulian")) { + host = host.replace("zhidaohulian", "zhidaozhixing"); + } Logger.d("MogoHttpDns", "host: " + host + " type: " + type); Map map = httpDnsHelper.getAllAddress(); if(map != null) { From 19257eb00cbfb02bc8c1417caa94203c08a317f8 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 29 Dec 2020 19:24:11 +0800 Subject: [PATCH 3/3] opt http dns sdk --- foudations/httpdns-mogo/build.gradle | 2 +- .../src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java | 3 --- gradle.properties | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/foudations/httpdns-mogo/build.gradle b/foudations/httpdns-mogo/build.gradle index 549177f587..964b800da1 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.13' + implementation 'com.mogo.httpdns:httpdns-helper:1.0.14' 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 375771761f..d556f51cc1 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,9 +50,6 @@ public class MogoHttpDns implements IMogoHttpDns, HttpDns, OnAddressChangedListe @Override public void getHttpDnsIp(String host, int type, boolean useCache, IHttpDnsCallback callback) { - if (host.contains("zhidaohulian")) { - host = host.replace("zhidaohulian", "zhidaozhixing"); - } Logger.d("MogoHttpDns", "host: " + host + " type: " + type); Map map = httpDnsHelper.getAllAddress(); if(map != null) { diff --git a/gradle.properties b/gradle.properties index 1d4c2ce340..04aee2cfe7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -139,7 +139,7 @@ HTTPDNS_NOOP_VERSION = 2.0.12 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=2.2.45 +CARCHATTING_VERSION=2.2.60 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.8 # websocket