robin/waf-platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

换成单集群模式

Browse Source
This commit is contained in:
robin
2026-03-02 20:07:53 +08:00
parent 5d0b7c7e91
commit 2a76d1773d
432 changed files with 5681 additions and 5095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
EdgeHttpDNS/sdk/android/demo/src/androidTest/java/com/alibaba/ams/emas/demo/ExampleInstrumentedTest.kt → EdgeHttpDNS/sdk/android/demo/src/androidTest/java/com/newsdk/ams/emas/demo/ExampleInstrumentedTest.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo
package com.newsdk.ams.emas.demo
import android.support.test.InstrumentationRegistry
import android.support.test.runner.AndroidJUnit4
@@ -19,7 +19,7 @@ class ExampleInstrumentedTest {
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.alibaba.ams.emas.demo", appContext.packageName)
assertEquals("com.newsdk.ams.emas.demo", appContext.packageName)
}
}

18
EdgeHttpDNS/sdk/android/demo/src/main/AndroidManifest.xml
View File

@@ -6,7 +6,7 @@
<uses-permission android:name="android.permission.READ_BASIC_PHONE_STATE" />
<application
android:name="com.alibaba.ams.emas.demo.HttpDnsApplication"
android:name="com.newsdk.ams.emas.demo.HttpDnsApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
@@ -14,27 +14,27 @@
android:roundIcon="@mipmap/ic_launcher"
android:supportsRtl="true"
android:extractNativeLibs="true"
android:theme="@style/Theme.AlicloudHttpDnsDemo"
android:theme="@style/Theme.NewHttpDnsDemo"
android:usesCleartextTraffic="true">
<activity
android:name="com.alibaba.ams.emas.demo.ui.practice.HttpDnsWebviewGetActivity"
android:name="com.newsdk.ams.emas.demo.ui.practice.HttpDnsWebviewGetActivity"
android:exported="false"
android:theme="@style/Theme.AlicloudHttpDnsDemo.NoActionBar">
android:theme="@style/Theme.NewHttpDnsDemo.NoActionBar">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name="com.alibaba.ams.emas.demo.ui.info.list.ListActivity"
android:name="com.newsdk.ams.emas.demo.ui.info.list.ListActivity"
android:exported="false"
android:theme="@style/Theme.AlicloudHttpDnsDemo.NoActionBar">
android:theme="@style/Theme.NewHttpDnsDemo.NoActionBar">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name="com.alibaba.ams.emas.demo.MainActivity"
android:name="com.newsdk.ams.emas.demo.MainActivity"
android:exported="true"
android:label="@string/app_name">
<intent-filter>
@@ -47,9 +47,9 @@
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity android:name="com.alibaba.ams.emas.demo.ui.info.SdnsGlobalSettingActivity"
<activity android:name="com.newsdk.ams.emas.demo.ui.info.SdnsGlobalSettingActivity"
android:exported="false"
android:theme="@style/Theme.AlicloudHttpDnsDemo.NoActionBar" >
android:theme="@style/Theme.NewHttpDnsDemo.NoActionBar" >
<meta-data
android:name="android.app.lib_name"
android:value="" />

2
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/BatchResolveCacheHolder.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/BatchResolveCacheHolder.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo
package com.newsdk.ams.emas.demo
import org.json.JSONArray
import org.json.JSONException
import org.json.JSONObject

2
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/HttpDnsApplication.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/HttpDnsApplication.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo
package com.newsdk.ams.emas.demo
import android.app.Application

12
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/HttpDnsServiceHolder.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/HttpDnsServiceHolder.kt
View File

@@ -1,12 +1,12 @@
package com.alibaba.ams.emas.demo
package com.newsdk.ams.emas.demo
import android.content.Context
import android.text.TextUtils
import com.alibaba.ams.emas.demo.constant.KEY_ENABLE_AUTH_MODE
import com.alibaba.ams.emas.demo.constant.KEY_SECRET_KEY_SET_BY_CONFIG
import com.alibaba.sdk.android.httpdns.HttpDns
import com.alibaba.sdk.android.httpdns.HttpDnsService
import com.aliyun.ams.httpdns.demo.BuildConfig
import com.newsdk.ams.emas.demo.constant.KEY_ENABLE_AUTH_MODE
import com.newsdk.ams.emas.demo.constant.KEY_SECRET_KEY_SET_BY_CONFIG
import com.newsdk.sdk.android.httpdns.HttpDns
import com.newsdk.sdk.android.httpdns.HttpDnsService
import com.newsdk.ams.httpdns.demo.BuildConfig
/**
* @author allen.wy

6
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/MainActivity.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/MainActivity.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo
package com.newsdk.ams.emas.demo
import android.os.Bundle
import android.widget.Toast
@@ -6,8 +6,8 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.findNavController
import androidx.navigation.ui.AppBarConfiguration
import androidx.navigation.ui.setupActionBarWithNavController
import com.aliyun.ams.httpdns.demo.R
import com.aliyun.ams.httpdns.demo.databinding.ActivityMainBinding
import com.newsdk.ams.httpdns.demo.R
import com.newsdk.ams.httpdns.demo.databinding.ActivityMainBinding
import com.google.android.material.bottomnavigation.BottomNavigationView
class MainActivity : AppCompatActivity() {

2
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/PreResolveCacheHolder.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/PreResolveCacheHolder.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo
package com.newsdk.ams.emas.demo
import org.json.JSONArray
import org.json.JSONException

2
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/SingleLiveData.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/SingleLiveData.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo
package com.newsdk.ams.emas.demo
import android.util.Log
import androidx.annotation.MainThread

4
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/TtlCacheHolder.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/TtlCacheHolder.kt
View File

@@ -1,6 +1,6 @@
package com.alibaba.ams.emas.demo
package com.newsdk.ams.emas.demo
import com.alibaba.sdk.android.httpdns.CacheTtlChanger
import com.newsdk.sdk.android.httpdns.CacheTtlChanger
import org.json.JSONException
import org.json.JSONObject

8
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/Util.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/Util.kt
View File

@@ -1,9 +1,9 @@
package com.alibaba.ams.emas.demo
package com.newsdk.ams.emas.demo
import android.content.Context
import android.content.SharedPreferences
import com.alibaba.sdk.android.httpdns.ranking.IPRankingBean
import com.aliyun.ams.httpdns.demo.BuildConfig
import com.newsdk.sdk.android.httpdns.ranking.IPRankingBean
import com.newsdk.ams.httpdns.demo.BuildConfig
import org.json.JSONArray
import org.json.JSONException
import org.json.JSONObject
@@ -113,7 +113,7 @@ fun String?.toBlackList(): MutableList<String>? {
fun getAccountPreference(context: Context): SharedPreferences {
return context.getSharedPreferences(
"Aliyun_httpdns_${BuildConfig.ACCOUNT_ID}",
"New_httpdns_${BuildConfig.ACCOUNT_ID}",
Context.MODE_PRIVATE
)
}

2
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/constant/Constant.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/constant/Constant.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.constant
package com.newsdk.ams.emas.demo.constant
/**
* @author allen.wy

18
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/net/HttpURLConnectionRequest.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/net/HttpURLConnectionRequest.kt
View File

@@ -1,15 +1,15 @@
package com.alibaba.ams.emas.demo.net
package com.newsdk.ams.emas.demo.net
import android.content.Context
import android.util.Log
import com.alibaba.ams.emas.demo.HttpDnsServiceHolder
import com.alibaba.ams.emas.demo.readStringFrom
import com.alibaba.ams.emas.demo.ui.resolve.Response
import com.alibaba.sdk.android.httpdns.HTTPDNSResult
import com.alibaba.sdk.android.httpdns.HttpDnsCallback
import com.alibaba.sdk.android.httpdns.NetType
import com.alibaba.sdk.android.httpdns.RequestIpType
import com.alibaba.sdk.android.httpdns.net.HttpDnsNetworkDetector
import com.newsdk.ams.emas.demo.HttpDnsServiceHolder
import com.newsdk.ams.emas.demo.readStringFrom
import com.newsdk.ams.emas.demo.ui.resolve.Response
import com.newsdk.sdk.android.httpdns.HTTPDNSResult
import com.newsdk.sdk.android.httpdns.HttpDnsCallback
import com.newsdk.sdk.android.httpdns.NetType
import com.newsdk.sdk.android.httpdns.RequestIpType
import com.newsdk.sdk.android.httpdns.net.HttpDnsNetworkDetector
import java.io.BufferedReader
import java.io.InputStream
import java.io.InputStreamReader

4
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/net/IRequest.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/net/IRequest.kt
View File

@@ -1,6 +1,6 @@
package com.alibaba.ams.emas.demo.net
package com.newsdk.ams.emas.demo.net
import com.alibaba.ams.emas.demo.ui.resolve.Response
import com.newsdk.ams.emas.demo.ui.resolve.Response
/**
* @author allen.wy

14
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/net/OkHttpClientSingleton.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/net/OkHttpClientSingleton.kt
View File

@@ -1,13 +1,13 @@
package com.alibaba.ams.emas.demo.net
package com.newsdk.ams.emas.demo.net
import android.content.Context
import android.util.Log
import com.alibaba.ams.emas.demo.HttpDnsServiceHolder
import com.alibaba.sdk.android.httpdns.HTTPDNSResult
import com.alibaba.sdk.android.httpdns.HttpDnsCallback
import com.alibaba.sdk.android.httpdns.NetType
import com.alibaba.sdk.android.httpdns.RequestIpType
import com.alibaba.sdk.android.httpdns.net.HttpDnsNetworkDetector
import com.newsdk.ams.emas.demo.HttpDnsServiceHolder
import com.newsdk.sdk.android.httpdns.HTTPDNSResult
import com.newsdk.sdk.android.httpdns.HttpDnsCallback
import com.newsdk.sdk.android.httpdns.NetType
import com.newsdk.sdk.android.httpdns.RequestIpType
import com.newsdk.sdk.android.httpdns.net.HttpDnsNetworkDetector
import okhttp3.ConnectionPool
import okhttp3.Dns
import okhttp3.OkHttpClient

2
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/net/OkHttpLog.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/net/OkHttpLog.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.net
package com.newsdk.ams.emas.demo.net
import android.util.Log
import okhttp3.logging.HttpLoggingInterceptor

6
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/net/OkHttpRequest.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/net/OkHttpRequest.kt
View File

@@ -1,8 +1,8 @@
package com.alibaba.ams.emas.demo.net
package com.newsdk.ams.emas.demo.net
import android.content.Context
import com.alibaba.ams.emas.demo.ui.resolve.Response
import com.alibaba.sdk.android.httpdns.RequestIpType
import com.newsdk.ams.emas.demo.ui.resolve.Response
import com.newsdk.sdk.android.httpdns.RequestIpType
/**
* @author allen.wy

2
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/net/TLSSNISocketFactory.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/net/TLSSNISocketFactory.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.net
package com.newsdk.ams.emas.demo.net
import android.net.SSLCertificateSocketFactory
import android.os.Build

14
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/basic/BasicSettingFragment.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/basic/BasicSettingFragment.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.ui.basic
package com.newsdk.ams.emas.demo.ui.basic
import android.content.Intent
import android.os.Bundle
@@ -11,12 +11,12 @@ import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.AppCompatEditText
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
import com.alibaba.ams.emas.demo.constant.KEY_REGION
import com.alibaba.ams.emas.demo.getAccountPreference
import com.alibaba.ams.emas.demo.ui.info.list.ListActivity
import com.alibaba.ams.emas.demo.ui.info.list.kListItemTag
import com.aliyun.ams.httpdns.demo.R
import com.aliyun.ams.httpdns.demo.databinding.FragmentBasicSettingBinding
import com.newsdk.ams.emas.demo.constant.KEY_REGION
import com.newsdk.ams.emas.demo.getAccountPreference
import com.newsdk.ams.emas.demo.ui.info.list.ListActivity
import com.newsdk.ams.emas.demo.ui.info.list.kListItemTag
import com.newsdk.ams.httpdns.demo.R
import com.newsdk.ams.httpdns.demo.databinding.FragmentBasicSettingBinding
class BasicSettingFragment : Fragment(), IBasicShowDialog {

22
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/basic/BasicSettingViewModel.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/basic/BasicSettingViewModel.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.ui.basic
package com.newsdk.ams.emas.demo.ui.basic
import android.app.Application
import android.text.TextUtils
@@ -6,16 +6,16 @@ import android.util.Log
import android.widget.CompoundButton
import android.widget.Toast
import androidx.lifecycle.AndroidViewModel
import com.alibaba.ams.emas.demo.*
import com.alibaba.ams.emas.demo.constant.*
import com.alibaba.sdk.android.httpdns.HttpDns
import com.alibaba.sdk.android.httpdns.HttpDnsService
import com.alibaba.sdk.android.httpdns.InitConfig
import com.alibaba.sdk.android.httpdns.NotUseHttpDnsFilter
import com.alibaba.sdk.android.httpdns.RequestIpType
import com.alibaba.sdk.android.httpdns.log.HttpDnsLog
import com.aliyun.ams.httpdns.demo.BuildConfig
import com.aliyun.ams.httpdns.demo.R
import com.newsdk.ams.emas.demo.*
import com.newsdk.ams.emas.demo.constant.*
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.NotUseHttpDnsFilter
import com.newsdk.sdk.android.httpdns.RequestIpType
import com.newsdk.sdk.android.httpdns.log.HttpDnsLog
import com.newsdk.ams.httpdns.demo.BuildConfig
import com.newsdk.ams.httpdns.demo.R
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch

2
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/basic/IBasicShowDialog.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/basic/IBasicShowDialog.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.ui.basic
package com.newsdk.ams.emas.demo.ui.basic
/**
* @author allen.wy

8
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/info/InfoFragment.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/info/InfoFragment.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.ui.info
package com.newsdk.ams.emas.demo.ui.info
import android.content.Intent
import android.os.Bundle
@@ -8,9 +8,9 @@ import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
import com.alibaba.ams.emas.demo.ui.info.list.*
import com.aliyun.ams.httpdns.demo.BuildConfig
import com.aliyun.ams.httpdns.demo.databinding.FragmentInfoBinding
import com.newsdk.ams.emas.demo.ui.info.list.*
import com.newsdk.ams.httpdns.demo.BuildConfig
import com.newsdk.ams.httpdns.demo.databinding.FragmentInfoBinding
class InfoFragment : Fragment() {

18
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/info/InfoViewModel.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/info/InfoViewModel.kt
View File

@@ -1,16 +1,16 @@
package com.alibaba.ams.emas.demo.ui.info
package com.newsdk.ams.emas.demo.ui.info
import android.app.Application
import android.widget.Toast
import androidx.lifecycle.AndroidViewModel
import com.alibaba.ams.emas.demo.HttpDnsApplication
import com.alibaba.ams.emas.demo.HttpDnsServiceHolder
import com.alibaba.ams.emas.demo.SingleLiveData
import com.alibaba.ams.emas.demo.getAccountPreference
import com.alibaba.sdk.android.httpdns.NetType
import com.alibaba.sdk.android.httpdns.net.HttpDnsNetworkDetector
import com.aliyun.ams.httpdns.demo.BuildConfig
import com.aliyun.ams.httpdns.demo.R
import com.newsdk.ams.emas.demo.HttpDnsApplication
import com.newsdk.ams.emas.demo.HttpDnsServiceHolder
import com.newsdk.ams.emas.demo.SingleLiveData
import com.newsdk.ams.emas.demo.getAccountPreference
import com.newsdk.sdk.android.httpdns.NetType
import com.newsdk.sdk.android.httpdns.net.HttpDnsNetworkDetector
import com.newsdk.ams.httpdns.demo.BuildConfig
import com.newsdk.ams.httpdns.demo.R
class InfoViewModel(application: Application) : AndroidViewModel(application) {

10
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/info/SdnsGlobalSettingActivity.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/info/SdnsGlobalSettingActivity.kt
View File

@@ -1,12 +1,12 @@
package com.alibaba.ams.emas.demo.ui.info
package com.newsdk.ams.emas.demo.ui.info
import android.os.Bundle
import android.text.TextUtils
import androidx.appcompat.app.AppCompatActivity
import com.alibaba.ams.emas.demo.constant.KEY_SDNS_GLOBAL_PARAMS
import com.alibaba.ams.emas.demo.getAccountPreference
import com.aliyun.ams.httpdns.demo.R
import com.aliyun.ams.httpdns.demo.databinding.ActivitySdnsGlobalSettingBinding
import com.newsdk.ams.emas.demo.constant.KEY_SDNS_GLOBAL_PARAMS
import com.newsdk.ams.emas.demo.getAccountPreference
import com.newsdk.ams.httpdns.demo.R
import com.newsdk.ams.httpdns.demo.databinding.ActivitySdnsGlobalSettingBinding
import org.json.JSONException
import org.json.JSONObject

6
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/info/list/ListActivity.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/info/list/ListActivity.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.ui.info.list
package com.newsdk.ams.emas.demo.ui.info.list
import android.content.Context
import android.os.Bundle
@@ -16,8 +16,8 @@ import androidx.appcompat.widget.AppCompatEditText
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.aliyun.ams.httpdns.demo.R
import com.aliyun.ams.httpdns.demo.databinding.ActivityListBinding
import com.newsdk.ams.httpdns.demo.R
import com.newsdk.ams.httpdns.demo.databinding.ActivityListBinding
class ListActivity : AppCompatActivity(), ListAdapter.OnDeleteListener {

6
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/info/list/ListAdapter.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/info/list/ListAdapter.kt
View File

@@ -1,12 +1,12 @@
package com.alibaba.ams.emas.demo.ui.info.list
package com.newsdk.ams.emas.demo.ui.info.list
import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import com.aliyun.ams.httpdns.demo.R
import com.aliyun.ams.httpdns.demo.databinding.InfoListItemBinding;
import com.newsdk.ams.httpdns.demo.R
import com.newsdk.ams.httpdns.demo.databinding.InfoListItemBinding;
/**
* @author allen.wy

2
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/info/list/ListItem.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/info/list/ListItem.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.ui.info.list
package com.newsdk.ams.emas.demo.ui.info.list
/**
* @author allen.wy

2
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/info/list/ListItemType.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/info/list/ListItemType.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.ui.info.list
package com.newsdk.ams.emas.demo.ui.info.list
/**
* @author allen.wy

24
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/info/list/ListViewModel.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/info/list/ListViewModel.kt
View File

@@ -1,21 +1,21 @@
package com.alibaba.ams.emas.demo.ui.info.list
package com.newsdk.ams.emas.demo.ui.info.list
import android.app.Application
import android.content.SharedPreferences
import android.widget.Toast
import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.viewModelScope
import com.alibaba.ams.emas.demo.*
import com.alibaba.ams.emas.demo.TtlCacheHolder.toJsonString
import com.alibaba.ams.emas.demo.constant.KEY_BATCH_RESOLVE_HOST_LIST
import com.alibaba.ams.emas.demo.constant.KEY_HOST_BLACK_LIST
import com.alibaba.ams.emas.demo.constant.KEY_HOST_WITH_FIXED_IP
import com.alibaba.ams.emas.demo.constant.KEY_IP_RANKING_ITEMS
import com.alibaba.ams.emas.demo.constant.KEY_PRE_RESOLVE_HOST_LIST
import com.alibaba.ams.emas.demo.constant.KEY_TAGS
import com.alibaba.ams.emas.demo.constant.KEY_TTL_CHANGER
import com.alibaba.sdk.android.httpdns.ranking.IPRankingBean
import com.aliyun.ams.httpdns.demo.R
import com.newsdk.ams.emas.demo.*
import com.newsdk.ams.emas.demo.TtlCacheHolder.toJsonString
import com.newsdk.ams.emas.demo.constant.KEY_BATCH_RESOLVE_HOST_LIST
import com.newsdk.ams.emas.demo.constant.KEY_HOST_BLACK_LIST
import com.newsdk.ams.emas.demo.constant.KEY_HOST_WITH_FIXED_IP
import com.newsdk.ams.emas.demo.constant.KEY_IP_RANKING_ITEMS
import com.newsdk.ams.emas.demo.constant.KEY_PRE_RESOLVE_HOST_LIST
import com.newsdk.ams.emas.demo.constant.KEY_TAGS
import com.newsdk.ams.emas.demo.constant.KEY_TTL_CHANGER
import com.newsdk.sdk.android.httpdns.ranking.IPRankingBean
import com.newsdk.ams.httpdns.demo.R
import kotlinx.coroutines.launch
import org.json.JSONArray
import org.json.JSONException

6
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/practice/BestPracticeFragment.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/practice/BestPracticeFragment.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.ui.practice
package com.newsdk.ams.emas.demo.ui.practice
import android.content.Intent
import android.os.Bundle
@@ -8,8 +8,8 @@ import android.view.ViewGroup
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
import com.aliyun.ams.httpdns.demo.R
import com.aliyun.ams.httpdns.demo.databinding.FragmentBestPracticeBinding
import com.newsdk.ams.httpdns.demo.R
import com.newsdk.ams.httpdns.demo.databinding.FragmentBestPracticeBinding
/**
* @author allen.wy

16
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/practice/BestPracticeViewModel.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/practice/BestPracticeViewModel.kt
View File

@@ -1,16 +1,16 @@
package com.alibaba.ams.emas.demo.ui.practice
package com.newsdk.ams.emas.demo.ui.practice
import android.app.Application
import android.util.Log
import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.viewModelScope
import com.alibaba.ams.emas.demo.HttpDnsServiceHolder
import com.alibaba.ams.emas.demo.net.TLSSNISocketFactory
import com.alibaba.ams.emas.demo.readStringFrom
import com.alibaba.sdk.android.httpdns.NetType
import com.alibaba.sdk.android.httpdns.RequestIpType
import com.alibaba.sdk.android.httpdns.net.HttpDnsNetworkDetector
import com.Alibaba.sdk.android.tool.NetworkUtils
import com.newsdk.ams.emas.demo.HttpDnsServiceHolder
import com.newsdk.ams.emas.demo.net.TLSSNISocketFactory
import com.newsdk.ams.emas.demo.readStringFrom
import com.newsdk.sdk.android.httpdns.NetType
import com.newsdk.sdk.android.httpdns.RequestIpType
import com.newsdk.sdk.android.httpdns.net.HttpDnsNetworkDetector
import com.alibaba.sdk.android.tool.NetworkUtils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext

8
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/practice/HttpDnsWebviewGetActivity.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/practice/HttpDnsWebviewGetActivity.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.ui.practice
package com.newsdk.ams.emas.demo.ui.practice
import android.os.Bundle
import android.text.TextUtils
@@ -6,9 +6,9 @@ import android.util.Log
import android.view.MenuItem
import android.webkit.*
import androidx.appcompat.app.AppCompatActivity
import com.alibaba.ams.emas.demo.HttpDnsServiceHolder
import com.aliyun.ams.httpdns.demo.R
import com.aliyun.ams.httpdns.demo.databinding.ActivityHttpDnsWebviewBinding
import com.newsdk.ams.emas.demo.HttpDnsServiceHolder
import com.newsdk.ams.httpdns.demo.R
import com.newsdk.ams.httpdns.demo.databinding.ActivityHttpDnsWebviewBinding
import java.io.IOException
import java.net.*
import javax.net.ssl.*

2
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/practice/IBestPracticeShowDialog.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/practice/IBestPracticeShowDialog.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.ui.practice
package com.newsdk.ams.emas.demo.ui.practice
/**
* @author allen.wy

2
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/practice/SNISocketFactory.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/practice/SNISocketFactory.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.ui.practice
package com.newsdk.ams.emas.demo.ui.practice
import android.net.SSLCertificateSocketFactory
import java.net.InetAddress

2
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/resolve/IResolveShowDialog.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/resolve/IResolveShowDialog.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.ui.resolve
package com.newsdk.ams.emas.demo.ui.resolve
/**
* @author allen.wy

2
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/resolve/NetRequestType.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/resolve/NetRequestType.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.ui.resolve
package com.newsdk.ams.emas.demo.ui.resolve
/**
* @author allen.wy

14
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/resolve/ResolveFragment.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/resolve/ResolveFragment.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.ui.resolve
package com.newsdk.ams.emas.demo.ui.resolve
import android.os.Bundle
import android.text.TextUtils
@@ -8,11 +8,11 @@ import android.view.ViewGroup
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
import com.alibaba.ams.emas.demo.constant.KEY_RESOLVE_IP_TYPE
import com.alibaba.ams.emas.demo.constant.KEY_RESOLVE_METHOD
import com.alibaba.ams.emas.demo.getAccountPreference
import com.aliyun.ams.httpdns.demo.R
import com.aliyun.ams.httpdns.demo.databinding.FragmentResolveBinding
import com.newsdk.ams.emas.demo.constant.KEY_RESOLVE_IP_TYPE
import com.newsdk.ams.emas.demo.constant.KEY_RESOLVE_METHOD
import com.newsdk.ams.emas.demo.getAccountPreference
import com.newsdk.ams.httpdns.demo.R
import com.newsdk.ams.httpdns.demo.databinding.FragmentResolveBinding
import org.json.JSONException
import org.json.JSONObject
@@ -177,7 +177,7 @@ class ResolveFragment : Fragment(), IResolveShowDialog {
val builder = activity?.let { act -> AlertDialog.Builder(act) }
builder?.apply {
setTitle(R.string.select_resolve_method)
val items = arrayOf("鍚屾鏂规硶", "寮傛鏂规硶", "鍚屾闈為樆濉炴柟娉?)
val items = arrayOf("Sync", "Async", "Sync NonBlocking")
val preferences = activity?.let { getAccountPreference(it) }
var resolvedMethod = preferences?.getString(KEY_RESOLVE_METHOD, "getHttpDnsResultForHostSync(String host, RequestIpType type)").toString()

22
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/resolve/ResolveViewModel.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/resolve/ResolveViewModel.kt
View File

@@ -1,20 +1,20 @@
package com.alibaba.ams.emas.demo.ui.resolve
package com.newsdk.ams.emas.demo.ui.resolve
import android.app.Application
import android.util.Log
import android.widget.RadioGroup
import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.viewModelScope
import com.alibaba.ams.emas.demo.HttpDnsApplication
import com.alibaba.ams.emas.demo.SingleLiveData
import com.alibaba.ams.emas.demo.constant.KEY_RESOLVE_IP_TYPE
import com.alibaba.ams.emas.demo.constant.KEY_RESOLVE_METHOD
import com.alibaba.ams.emas.demo.constant.KEY_SDNS_RESOLVE
import com.alibaba.ams.emas.demo.getAccountPreference
import com.alibaba.ams.emas.demo.net.HttpURLConnectionRequest
import com.alibaba.ams.emas.demo.net.OkHttpRequest
import com.alibaba.sdk.android.httpdns.RequestIpType
import com.aliyun.ams.httpdns.demo.R
import com.newsdk.ams.emas.demo.HttpDnsApplication
import com.newsdk.ams.emas.demo.SingleLiveData
import com.newsdk.ams.emas.demo.constant.KEY_RESOLVE_IP_TYPE
import com.newsdk.ams.emas.demo.constant.KEY_RESOLVE_METHOD
import com.newsdk.ams.emas.demo.constant.KEY_SDNS_RESOLVE
import com.newsdk.ams.emas.demo.getAccountPreference
import com.newsdk.ams.emas.demo.net.HttpURLConnectionRequest
import com.newsdk.ams.emas.demo.net.OkHttpRequest
import com.newsdk.sdk.android.httpdns.RequestIpType
import com.newsdk.ams.httpdns.demo.R
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext

2
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/resolve/Response.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/resolve/Response.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.ui.resolve
package com.newsdk.ams.emas.demo.ui.resolve
/**
* @author allen.wy

2
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/ui/resolve/SchemaType.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/ui/resolve/SchemaType.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.ui.resolve
package com.newsdk.ams.emas.demo.ui.resolve
/**
* @author allen.wy

4
EdgeHttpDNS/sdk/android/demo/src/main/java/com/alibaba/ams/emas/demo/widget/SwipeLayout.kt → EdgeHttpDNS/sdk/android/demo/src/main/java/com/newsdk/ams/emas/demo/widget/SwipeLayout.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo.widget
package com.newsdk.ams.emas.demo.widget
import android.content.Context
import android.graphics.PointF
@@ -9,7 +9,7 @@ import android.view.ViewConfiguration
import android.view.ViewGroup
import android.widget.FrameLayout
import android.widget.Scroller
import com.aliyun.ams.httpdns.demo.R
import com.newsdk.ams.httpdns.demo.R
import java.lang.ref.WeakReference
import kotlin.math.abs

4
EdgeHttpDNS/sdk/android/demo/src/main/res/layout/activity_http_dns_webview.xml
View File

@@ -9,14 +9,14 @@
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/Theme.AlicloudHttpDnsDemo.AppBarOverlay">
android:theme="@style/Theme.NewHttpDnsDemo.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/webview_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/Theme.AlicloudHttpDnsDemo.PopupOverlay"
app:popupTheme="@style/Theme.NewHttpDnsDemo.PopupOverlay"
app:titleTextColor="@color/white"
app:navigationIcon="@drawable/ic_back"/>

6
EdgeHttpDNS/sdk/android/demo/src/main/res/layout/activity_list.xml
View File

@@ -4,19 +4,19 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.alibaba.ams.emas.demo.ui.info.list.ListActivity">
tools:context="com.newsdk.ams.emas.demo.ui.info.list.ListActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/Theme.AlicloudHttpDnsDemo.AppBarOverlay">
android:theme="@style/Theme.NewHttpDnsDemo.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/info_list_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/Theme.AlicloudHttpDnsDemo.PopupOverlay"
app:popupTheme="@style/Theme.NewHttpDnsDemo.PopupOverlay"
app:titleTextColor="@color/white"
app:navigationIcon="@drawable/ic_back"/>

4
EdgeHttpDNS/sdk/android/demo/src/main/res/layout/activity_sdns_global_setting.xml
View File

@@ -9,7 +9,7 @@
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/Theme.AlicloudHttpDnsDemo.AppBarOverlay"
android:theme="@style/Theme.NewHttpDnsDemo.AppBarOverlay"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/Theme.AlicloudHttpDnsDemo.PopupOverlay"
app:popupTheme="@style/Theme.NewHttpDnsDemo.PopupOverlay"
app:titleTextColor="@color/white"
app:navigationIcon="@drawable/ic_back"/>

4
EdgeHttpDNS/sdk/android/demo/src/main/res/layout/fragment_basic_setting.xml
View File

@@ -5,11 +5,11 @@
<data>
<import type="com.aliyun.ams.httpdns.demo.BuildConfig" />
<import type="com.newsdk.ams.httpdns.demo.BuildConfig" />
<variable
name="viewModel"
type="com.alibaba.ams.emas.demo.ui.basic.BasicSettingViewModel" />
type="com.newsdk.ams.emas.demo.ui.basic.BasicSettingViewModel" />
</data>
<androidx.coordinatorlayout.widget.CoordinatorLayout

2
EdgeHttpDNS/sdk/android/demo/src/main/res/layout/fragment_best_practice.xml
View File

@@ -6,7 +6,7 @@
<variable
name="viewModel"
type="com.alibaba.ams.emas.demo.ui.practice.BestPracticeViewModel" />
type="com.newsdk.ams.emas.demo.ui.practice.BestPracticeViewModel" />
</data>
<LinearLayout

6
EdgeHttpDNS/sdk/android/demo/src/main/res/layout/fragment_info.xml
View File

@@ -5,11 +5,11 @@
<data>
<import type="com.aliyun.ams.httpdns.demo.BuildConfig" />
<import type="com.newsdk.ams.httpdns.demo.BuildConfig" />
<variable
name="viewModel"
type="com.alibaba.ams.emas.demo.ui.info.InfoViewModel" />
type="com.newsdk.ams.emas.demo.ui.info.InfoViewModel" />
</data>
<androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -78,7 +78,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:textSize="15dp"
tools:text="com.aliyun.ams.httpdns.demo" />
tools:text="com.newsdk.ams.httpdns.demo" />
</LinearLayout>
</LinearLayout>

2
EdgeHttpDNS/sdk/android/demo/src/main/res/layout/fragment_resolve.xml
View File

@@ -7,7 +7,7 @@
<variable
name="viewModel"
type="com.alibaba.ams.emas.demo.ui.resolve.ResolveViewModel" />
type="com.newsdk.ams.emas.demo.ui.resolve.ResolveViewModel" />
</data>
<androidx.coordinatorlayout.widget.CoordinatorLayout

8
EdgeHttpDNS/sdk/android/demo/src/main/res/layout/info_list_item.xml
View File

@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<com.alibaba.ams.emas.demo.widget.SwipeLayout
<com.newsdk.ams.emas.demo.widget.SwipeLayout
android:id="@+id/host_and_port_or_ttl_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -106,9 +106,9 @@
android:textSize="17dp" />
</RelativeLayout>
</com.alibaba.ams.emas.demo.widget.SwipeLayout>
</com.newsdk.ams.emas.demo.widget.SwipeLayout>
<com.alibaba.ams.emas.demo.widget.SwipeLayout
<com.newsdk.ams.emas.demo.widget.SwipeLayout
android:id="@+id/host_fixed_ip_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -160,6 +160,6 @@
android:textSize="17dp" />
</RelativeLayout>
</com.alibaba.ams.emas.demo.widget.SwipeLayout>
</com.newsdk.ams.emas.demo.widget.SwipeLayout>
</LinearLayout>

8
EdgeHttpDNS/sdk/android/demo/src/main/res/navigation/mobile_navigation.xml
View File

@@ -7,25 +7,25 @@
<fragment
android:id="@+id/navigation_basic"
android:name="com.alibaba.ams.emas.demo.ui.basic.BasicSettingFragment"
android:name="com.newsdk.ams.emas.demo.ui.basic.BasicSettingFragment"
android:label="@string/title_basic"
tools:layout="@layout/fragment_basic_setting" />
<fragment
android:id="@+id/navigation_resolve"
android:name="com.alibaba.ams.emas.demo.ui.resolve.ResolveFragment"
android:name="com.newsdk.ams.emas.demo.ui.resolve.ResolveFragment"
android:label="@string/title_resolve"
tools:layout="@layout/fragment_resolve" />
<fragment
android:id="@+id/navigation_best_practice"
android:name="com.alibaba.ams.emas.demo.ui.practice.BestPracticeFragment"
android:name="com.newsdk.ams.emas.demo.ui.practice.BestPracticeFragment"
android:label="@string/title_best_practice"
tools:layout="@layout/fragment_best_practice" />
<fragment
android:id="@+id/navigation_information"
android:name="com.alibaba.ams.emas.demo.ui.info.InfoFragment"
android:name="com.newsdk.ams.emas.demo.ui.info.InfoFragment"
android:label="@string/title_info"
tools:layout="@layout/fragment_info" />
</navigation>

2
EdgeHttpDNS/sdk/android/demo/src/main/res/values-night/themes.xml
View File

@@ -1,6 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.Alicloudandroidsdkhttpdns_for_open_source" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="Theme.Newandroidsdkhttpdns_for_open_source" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_200</item>
<item name="colorPrimaryDark">@color/purple_700</item>

62
EdgeHttpDNS/sdk/android/demo/src/main/res/values-zh-rCN/strings.xml
View File

@@ -3,12 +3,12 @@
<string name="app_name">闃块噷浜慔ttpDNS瀹樻柟Demo</string>
<string name="title_basic">鍩虹璁剧疆</string>
<string name="title_resolve">HttpDNS瑙ｆ瀽</string>
<string name="title_best_practice">鏈€浣冲疄璺?/string>
<string name="title_best_practice">鏈€浣冲疄璺</string>
<string name="title_info">淇℃伅</string>
<string name="enable_auth_mode">寮€鍚壌鏉冩ā寮?/string>
<string name="enable_auth_mode">寮€鍚壌鏉冩ā寮</string>
<string name="secret_key_location">SecretKey閫氳繃config閰嶇疆</string>
<string name="enable_encrypt_mode">寮€鍚姞瀵嗘ā寮?/string>
<string name="enable_encrypt_mode">寮€鍚姞瀵嗘ā寮</string>
<string name="enable_expired_ip">鍏佽杩囨湡IP</string>
<string name="enable_local_cache">寮€鍚寔涔呭寲缂撳瓨IP</string>
<string name="cache_expire_time">缂撳瓨杩囨湡鏃堕棿</string>
@@ -19,11 +19,11 @@
<string name="enable_httpdns_log">鍏佽SDK鎵撳嵃鏃ュ織</string>
<string name="timeout">瓒呮椂鏃堕棿</string>
<string name="init_tip">璇峰厛鍒濆鍖朒ttpDns</string>
<string name="inited_httpdns">宸茬粡鍒濆鍖?/string>
<string name="inited_httpdns">宸茬粡鍒濆鍖</string>
<string name="china">涓浗</string>
<string name="china_hk">涓浗棣欐腐</string>
<string name="singapore">鏂板姞鍧?/string>
<string name="singapore">鏂板姞鍧</string>
<string name="germany">寰峰浗</string>
<string name="america">缇庡浗</string>
<string name="pre">棰勫彂</string>
@@ -31,72 +31,72 @@
<string name="select_region">閫夋嫨Region</string>
<string name="confirm">纭</string>
<string name="cancel">鍙栨秷</string>
<string name="timeout_hint">璇疯緭鍏ヨ秴鏃舵椂闂达紝姣涓哄崟浣?/string>
<string name="timeout_hint">璇疯緭鍏ヨ秴鏃舵椂闂达紝姣涓哄崟浣</string>
<string name="set_timeout">璁剧疆瓒呮椂</string>
<string name="timeout_empty">瓒呮椂鏃堕棿涓虹┖</string>
<string name="ip_probe_list">鎺㈡祴IP鍒楄〃</string>
<string name="ttl_cache_list">鑷畾涔塗TL缂撳瓨鍒楄〃</string>
<string name="host_fixed_ip_list">涓荤珯鍩熷悕鍒楄〃</string>
<string name="host_black_list">鍩熷悕榛戝悕鍗曞垪琛?/string>
<string name="host_black_list">鍩熷悕榛戝悕鍗曞垪琛</string>
<string name="sdns_global_params">鑷畾涔夎В鏋愬叏灞€鍙傛暟</string>
<string name="batch_resolve">鎵归噺瑙ｆ瀽鍩熷悕</string>
<string name="httpdns_sdk_version">HttpDNS鐗堟湰鍙?/string>
<string name="httpdns_sdk_version">HttpDNS鐗堟湰鍙</string>
<string name="unknown">鏈煡</string>
<string name="ip_stack">褰撳墠鎵€杩炴帴缃戠粶鐨勭綉缁滄爤绫诲瀷</string>
<string name="clear_host_cache">娓呯┖鎸囧畾鍩熷悕缂撳瓨</string>
<string name="clear_cache_hint">璇疯緭鍏ヨ娓呯┖缂撳瓨鐨勫煙鍚?/string>
<string name="clear_cache_hint">璇疯緭鍏ヨ娓呯┖缂撳瓨鐨勫煙鍚</string>
<string name="network_request_type">缃戠粶璇锋眰绫诲瀷</string>
<string name="async_resolve">寮傛瑙ｆ瀽鑾峰彇IP</string>
<string name="sdns_resolve">鑷畾涔夊煙鍚嶈В鏋?/string>
<string name="sdns_resolve">鑷畾涔夊煙鍚嶈В鏋</string>
<string name="ip_type">瑕佽В鏋愮殑IP绫诲瀷</string>
<string name="resolve_method">浣跨敤鐨勮В鏋愭柟娉?/string>
<string name="resolve_method">浣跨敤鐨勮В鏋愭柟娉</string>
<string name="request_num">骞跺彂璇锋眰娆℃暟</string>
<string name="select_resolve_ip_type">閫夋嫨IP绫诲瀷</string>
<string name="select_resolve_method">閫夋嫨瑙ｆ瀽鏂规硶</string>
<string name="select_request_num">閫夋嫨骞跺彂璇锋眰娆℃暟</string>
<string name="auto_get_ip_type">鑷姩鍒ゆ柇IP绫诲瀷</string>
<string name="add_pre_resolve">娣诲姞棰勮В鏋愬煙鍚?/string>
<string name="add_pre_resolve">娣诲姞棰勮В鏋愬煙鍚</string>
<string name="add_pre_resolve_hint">璇疯緭鍏ヨ棰勮В鏋愮殑鍩熷悕</string>
<string name="pre_resolve_list">棰勮В鏋愬煙鍚嶅垪琛?/string>
<string name="pre_resolve_list">棰勮В鏋愬煙鍚嶅垪琛</string>
<string name="add_tag">娣诲姞Tag</string>
<string name="pre_resolve_host_duplicate">%s鍩熷悕宸茬粡琚坊鍔犺嚦棰勮В鏋愬垪琛紝璇峰嬁閲嶅娣诲姞</string>
<string name="init_httpdns">鍒濆鍖朒ttpDns</string>
<string name="batch_resolve_list">鎵归噺瑙ｆ瀽鍩熷悕鍒楄〃</string>
<string name="add_batch_resolve_hint">璇疯緭鍏ヨ鎵归噺瑙ｆ瀽鐨勫煙鍚?/string>
<string name="add_batch_resolve">璇疯緭鍏ヨ鎵归噺瑙ｆ瀽鐨勫煙鍚?/string>
<string name="batch_resolve_host_duplicate">%s鍩熷悕宸茬粡琚坊鍔犺嚦鎵归噺瑙ｆ瀽鍒楄〃锛岃鍕块噸澶嶆坊鍔?/string>
<string name="add_batch_resolve_hint">璇疯緭鍏ヨ鎵归噺瑙ｆ瀽鐨勫煙鍚</string>
<string name="add_batch_resolve">璇疯緭鍏ヨ鎵归噺瑙ｆ瀽鐨勫煙鍚</string>
<string name="batch_resolve_host_duplicate">%s鍩熷悕宸茬粡琚坊鍔犺嚦鎵归噺瑙ｆ瀽鍒楄〃锛岃鍕块噸澶嶆坊鍔</string>
<string name="host">鍩熷悕锛?/string>
<string name="port">绔彛锛?/string>
<string name="host">鍩熷悕锛</string>
<string name="port">绔彛锛</string>
<string name="ttl">TTL鏃堕暱: </string>
<string name="add_host_fixed_ip_hint">璇疯緭鍏ヤ富绔欏煙鍚?/string>
<string name="add_host_fixed_ip_hint">璇疯緭鍏ヤ富绔欏煙鍚</string>
<string name="add_host_fixed_ip">娣诲姞涓荤珯鍩熷悕</string>
<string name="host_fixed_ip_empty">涓荤珯鍩熷悕涓虹┖</string>
<string name="host_fixed_ip_duplicate">%s涓荤珯鍩熷悕宸茬粡琚坊鍔狅紝璇峰嬁閲嶅娣诲姞</string>
<string name="add_tag_hint">璇疯緭鍏ユ爣绛?/string>
<string name="add_tag_hint">璇疯緭鍏ユ爣绛</string>
<string name="add_host_to_black_list_hint">璇疯緭鍏ヤ笉浣跨敤HttpDns瑙ｆ瀽鐨勫煙鍚?/string>
<string name="add_host_to_black_list">娣诲姞涓嶄娇鐢℉ttpDns鐨勫煙鍚?/string>
<string name="add_host_to_black_list_hint">璇疯緭鍏ヤ笉浣跨敤HttpDns瑙ｆ瀽鐨勫煙鍚</string>
<string name="add_host_to_black_list">娣诲姞涓嶄娇鐢℉ttpDns鐨勫煙鍚</string>
<string name="host_to_black_list_empty">鍩熷悕涓虹┖</string>
<string name="host_black_list_duplicate">%s鍩熷悕宸茬粡鍦ㄩ粦鍚嶅崟涓紝璇峰嬁閲嶅娣诲姞</string>
<string name="add_ip_probe_host_hint">璇疯緭鍏ユ帰娴婭P鐨勫煙鍚?/string>
<string name="add_ip_probe_port_hint">璇疯緭鍏ユ帰娴婭P鐨勭鍙?/string>
<string name="add_ip_probe_host_hint">璇疯緭鍏ユ帰娴婭P鐨勫煙鍚</string>
<string name="add_ip_probe_port_hint">璇疯緭鍏ユ帰娴婭P鐨勭鍙</string>
<string name="add_ip_probe">娣诲姞IP鎺㈡祴</string>
<string name="port_is_empty">绔彛鍙蜂负绌?/string>
<string name="ip_probe_item_duplicate">%s:%s宸茬粡琚坊鍔犺嚦IP鎺㈡祴鍒楄〃锛岃鍕块噸澶嶆坊鍔?/string>
<string name="port_is_empty">绔彛鍙蜂负绌</string>
<string name="ip_probe_item_duplicate">%s:%s宸茬粡琚坊鍔犺嚦IP鎺㈡祴鍒楄〃锛岃鍕块噸澶嶆坊鍔</string>
<string name="host_is_empty">鍩熷悕涓虹┖</string>
<string name="pre_resolve_host_is_empty">棰勮В鏋愮殑鍩熷悕涓虹┖</string>
<string name="batch_resolve_host_is_empty">鎵归噺瑙ｆ瀽鐨勫煙鍚嶄负绌?/string>
<string name="batch_resolve_host_is_empty">鎵归噺瑙ｆ瀽鐨勫煙鍚嶄负绌</string>
<string name="add_ttl_host_hint">璇疯緭鍏ョ紦瀛樼殑鍩熷悕</string>
<string name="add_ttl_ttl_hint">璇疯緭鍏ョ紦瀛樼殑ttl鏃堕棿锛屽崟浣嶏細绉?/string>
<string name="add_ttl_ttl_hint">璇疯緭鍏ョ紦瀛樼殑ttl鏃堕棿锛屽崟浣嶏細绉</string>
<string name="add_custom_ttl">娣诲姞鑷畾涔塗TL</string>
<string name="ttl_is_empty">TTL鏃堕棿涓虹┖</string>
<string name="ttl_is_not_number">璇疯緭鍏ユ纭牸寮忕殑TTL鏃堕暱</string>
@@ -118,13 +118,13 @@
<string name="input_the_request_api">瑕佽姹傜殑鎺ュ彛</string>
<string name="input_the_request_api_help_text">渚嬪: /document_detail/434554.html</string>
<string name="resolve_and_request">瑙ｆ瀽骞惰姹?/string>
<string name="resolve_and_request">瑙ｆ瀽骞惰姹</string>
<string name="resolve_host_empty">鍩熷悕涓嶈兘涓虹┖</string>
<string name="host_is_ip">鍩熷悕涓嶈兘鏄疘P鍦板潃</string>
<string name="host_illegal">璇疯緭鍏ユ纭牸寮忕殑鍩熷悕</string>
<string name="schema_type">Schema绫诲瀷</string>
<string name="httpdns_webview_best_practice">HttpDNS WebView 鎷︽埅GET璇锋眰</string>
<string name="httpdns_webview_post_best_practice">HttpDNS WebView POST璇锋眰閫氳繃Native鍙戦€?/string>
<string name="httpdns_webview_post_best_practice">HttpDNS WebView POST璇锋眰閫氳繃Native鍙戦€</string>
<string name="httpdns_sni">HttpDNS IP鐩磋繛鏂规</string>
<string name="ok">濂界殑</string>
@@ -133,6 +133,6 @@
<string name="sni_request">IP鐩磋繛鏂规</string>
<string name="tips">鎻愮ず</string>
<string name="network_not_connect">缃戠粶鏈繛鎺ワ紝璇锋鏌ョ綉缁?/string>
<string name="network_not_connect">缃戠粶鏈繛鎺ワ紝璇锋鏌ョ綉缁</string>
<string name="request_exception">璇锋眰寮傚父: %s</string>
</resources>

2
EdgeHttpDNS/sdk/android/demo/src/main/res/values/strings.xml
View File

@@ -1,5 +1,5 @@
<resources>
<string name="app_name">Alibaba Cloud HttpDNS Demo</string>
<string name="app_name">New Cloud HttpDNS Demo</string>
<string name="title_basic">Basic Settings</string>
<string name="title_resolve">HttpDNS Resolve</string>
<string name="title_best_practice">Best Practice</string>

8
EdgeHttpDNS/sdk/android/demo/src/main/res/values/themes.xml
View File

@@ -1,6 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.AlicloudHttpDnsDemo" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<style name="Theme.NewHttpDnsDemo" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/cloud_blue</item>
<item name="colorPrimaryDark">@color/cloud_blue</item>
@@ -9,12 +9,12 @@
<!-- Customize your theme here. -->
</style>
<style name="Theme.AlicloudHttpDnsDemo.NoActionBar">
<style name="Theme.NewHttpDnsDemo.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="Theme.AlicloudHttpDnsDemo.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="Theme.NewHttpDnsDemo.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="Theme.AlicloudHttpDnsDemo.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark" />
<style name="Theme.NewHttpDnsDemo.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark" />
</resources>

2
EdgeHttpDNS/sdk/android/demo/src/test/java/com/alibaba/ams/emas/demo/ExampleUnitTest.kt → EdgeHttpDNS/sdk/android/demo/src/test/java/com/newsdk/ams/emas/demo/ExampleUnitTest.kt
View File

@@ -1,4 +1,4 @@
package com.alibaba.ams.emas.demo
package com.newsdk.ams.emas.demo
import org.junit.Test