merge
This commit is contained in:
@@ -4,7 +4,7 @@ plugins {
|
||||
}
|
||||
|
||||
android {
|
||||
namespace 'com.new.ams.httpdns'
|
||||
namespace 'com.trustapp.ams.httpdns'
|
||||
compileSdkVersion 34
|
||||
|
||||
defaultConfig {
|
||||
@@ -27,7 +27,7 @@ android {
|
||||
|
||||
dependencies {
|
||||
implementation 'androidx.annotation:annotation:1.8.0'
|
||||
implementation 'com.new.ams:new-android-httpdns:2.6.7'
|
||||
implementation 'com.newsdk.ams:new-android-httpdns:1.0.0'
|
||||
}
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
7075d8b26f9b8e2d5bcd1628273e8ba8
|
||||
@@ -0,0 +1 @@
|
||||
7dc0248c058c801e06d9b3d321a890bc78d45395
|
||||
@@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.newsdk.ams</groupId>
|
||||
<artifactId>new-android-crashdefend</artifactId>
|
||||
<version>0.0.6</version>
|
||||
<packaging>jar</packaging>
|
||||
</project>
|
||||
@@ -0,0 +1 @@
|
||||
c8d8a825deddeeb608496b28682ce876
|
||||
@@ -0,0 +1 @@
|
||||
e0cd9c0a4f47f109fe0f90056c4ec7b2f30193b7
|
||||
Binary file not shown.
@@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.newsdk.ams</groupId>
|
||||
<artifactId>new-android-httpdns</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<packaging>aar</packaging>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.newsdk.ams</groupId>
|
||||
<artifactId>new-android-logger</artifactId>
|
||||
<version>1.2.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.newsdk.ams</groupId>
|
||||
<artifactId>new-android-crashdefend</artifactId>
|
||||
<version>0.0.6</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.newsdk.ams</groupId>
|
||||
<artifactId>new-android-ipdetector</artifactId>
|
||||
<version>1.2.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
43dfc07ca50c7801fd89c9fcfb22f30d
|
||||
@@ -0,0 +1 @@
|
||||
664bfd1fa83b196ec3d9899f35cf2246a11f338c
|
||||
@@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.newsdk.ams</groupId>
|
||||
<artifactId>new-android-ipdetector</artifactId>
|
||||
<version>1.2.0</version>
|
||||
<packaging>aar</packaging>
|
||||
</project>
|
||||
@@ -0,0 +1 @@
|
||||
131cf2872ea4f53c89b0308a75fe3052
|
||||
@@ -0,0 +1 @@
|
||||
21f9551b4cec9963f62553f7a362adebae088244
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
2d05de8679bf77e4345d5ddd528a891d
|
||||
@@ -0,0 +1 @@
|
||||
26414cbb7afeba800fced49d24a7b78e50d1bcc6
|
||||
@@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.newsdk.ams</groupId>
|
||||
<artifactId>new-android-logger</artifactId>
|
||||
<version>1.2.0</version>
|
||||
<packaging>aar</packaging>
|
||||
</project>
|
||||
@@ -0,0 +1 @@
|
||||
6a34090adc017d9c10eaf7c31eb0b658
|
||||
@@ -0,0 +1 @@
|
||||
6d7307701e6ef50dbbaf9a1b6c43022b5d60a41e
|
||||
@@ -8,9 +8,9 @@ pluginManagement {
|
||||
|
||||
dependencyResolutionManagement {
|
||||
repositories {
|
||||
maven { url uri(new File(rootDir, 'libs/repo')) }
|
||||
google()
|
||||
mavenCentral()
|
||||
maven { url 'https://maven.aliyun.com/nexus/content/repositories/releases/' }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
package com.TrustAPP.ams.httpdns
|
||||
package com.trustapp.ams.httpdns
|
||||
|
||||
import android.content.Context
|
||||
import android.util.Log
|
||||
import androidx.annotation.NonNull
|
||||
import com.Trust.sdk.android.httpdns.HttpDns
|
||||
import com.Trust.sdk.android.httpdns.HttpDnsService
|
||||
import com.Trust.sdk.android.httpdns.InitConfig
|
||||
import com.Trust.sdk.android.httpdns.RequestIpType
|
||||
import com.Trust.sdk.android.httpdns.log.HttpDnsLog
|
||||
import com.newsdk.sdk.android.httpdns.HttpDns
|
||||
import com.newsdk.sdk.android.httpdns.HttpDnsService
|
||||
import com.newsdk.sdk.android.httpdns.InitConfig
|
||||
import com.newsdk.sdk.android.httpdns.RequestIpType
|
||||
import com.newsdk.sdk.android.httpdns.log.HttpDnsLog
|
||||
import io.flutter.embedding.engine.plugins.FlutterPlugin
|
||||
import io.flutter.plugin.common.MethodCall
|
||||
import io.flutter.plugin.common.MethodChannel
|
||||
@@ -268,7 +268,7 @@ class TrustAPPHttpDnsPlugin : FlutterPlugin, MethodCallHandler {
|
||||
try {
|
||||
desiredIPRankingMap?.let { map ->
|
||||
if (map.isNotEmpty()) {
|
||||
val beanClass = Class.forName("com.Trust.sdk.android.httpdns.ranking.IPRankingBean")
|
||||
val beanClass = Class.forName("com.newsdk.sdk.android.httpdns.ranking.IPRankingBean")
|
||||
val ctor = beanClass.getConstructor(String::class.java, Int::class.javaPrimitiveType)
|
||||
val list = ArrayList<Any>()
|
||||
map.forEach { (host, port) ->
|
||||
Reference in New Issue
Block a user