Merge pull request #40 from lemondark/release/v4.10.0

release/v4.10.0

HttpDnsSample/HTTPDNS_Android_v4.10.0a_release/build.gradle

@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('HTTPDNS_Android_v4.10.0a_release.aar'))

HttpDnsSample/app/build.gradle

@@ -55,7 +55,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation project(path: ':HTTPDNS_Android_v4.9.2a_release')
+    implementation project(path: ':HTTPDNS_Android_v4.10.0a_release')
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

HttpDnsSample/app/src/main/res/xml/network_security_config.xml

@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="false">119.29.29.99</domain>
-        <domain includeSubdomains="false">119.29.29.98</domain>
-    </domain-config>
+    <base-config cleartextTrafficPermitted="true" />
 </network-security-config>

HttpDnsSample/build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     ext.kotlin_version = "1.3.72"
 
-    ext.subVersionName = '4.9.2'
+    ext.subVersionName = '4.10.0'
     def versionArr = subVersionName.toString().split(/\D/)
     ext.subVersionCode = Integer.valueOf(String.format('%d%02d%02d',
             versionArr[0].toInteger(), versionArr[1].toInteger(), versionArr[2].toInteger()))

HttpDnsSample/gradle.properties

@@ -20,19 +20,21 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 # normal
+#bugly_id
+BUGLY_ID="xxx"
 # atta_id
 ATTA_ID="xxx"
 # atta_token
 ATTA_TOKEN="xxx"
-# init IP
-HTTP_INIT_SERVER="xxx"
-HTTPS_INIT_SERVER="xxx"
-# http tolerance server ip
-HTTP_TOLERANCE_SERVER="xxx"
-# https tolerance server ip
-HTTPS_TOLERANCE_SERVER="xxx"
+# config init Ip
+HTTP_INIT_SERVER={"xxx", "xxx"}
+HTTPS_INIT_SERVER={"xxx", "xxx"}
+# http dns server ip
+HTTP_DNS_SERVER={"xxx", "xxx"}
+# https dns server ip
+HTTPS_DNS_SERVER={"xxx", "xxx"}
 # domain service domains
-DOMAIN_SERVICE_DOMAINS={"xxx"}
+DOMAIN_SERVICE_DOMAINS={"xxx", "xxx"}
 # domain service accout
 DOMAIN_SERVICE_ID="xxx"
 DOMSIN_SERVICE_KEY="xxx"
@@ -42,10 +44,10 @@ DOMAIN_SERVICE_TOKEN="xxx"
 INTL_ATTA_ID="xxx"
 # atta_token
 INTL_ATTA_TOKEN="xxx"
-# init IP,no https
-INTL_HTTP_INIT_SERVER="xxx"
-# http tolerance server ip
-INTL_HTTP_TOLERANCE_SERVER="xxx"
+# config init Ip,no https
+INTL_HTTP_INIT_SERVER={"xxx", "xxx"}
+# http dns server ip
+INTL_HTTP_DNS_SERVER={"xxx", "xxx"}
 # domain service domains
 INTL_DOMAIN_SERVICE_DOMAINS={"xxx", "xxx"}
 # domain service accout

HttpDnsSample/settings.gradle

@@ -1,3 +1,3 @@
-include ':HTTPDNS_Android_v4.9.2a_release'
+include ':HTTPDNS_Android_v4.10.0a_release'
 include ':app'
 rootProject.name = "dnsTest"