diff --git a/httpdns_android_demo/build.gradle b/httpdns_android_demo/build.gradle index a9a5c3b..7cd7a2b 100644 --- a/httpdns_android_demo/build.gradle +++ b/httpdns_android_demo/build.gradle @@ -38,7 +38,7 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation "com.aliyun.ams:alicloud-android-httpdns:2.4.3" + implementation "com.aliyun.ams:alicloud-android-httpdns:2.5.0" implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.appcompat:appcompat:1.6.1' diff --git a/httpdns_android_demo/src/main/java/com/alibaba/httpdns/android/demo/practice/exoplayer/ExoPlayerCaseViewModel.kt b/httpdns_android_demo/src/main/java/com/alibaba/httpdns/android/demo/practice/exoplayer/ExoPlayerCaseViewModel.kt index 06f0e3e..fc7b20a 100644 --- a/httpdns_android_demo/src/main/java/com/alibaba/httpdns/android/demo/practice/exoplayer/ExoPlayerCaseViewModel.kt +++ b/httpdns_android_demo/src/main/java/com/alibaba/httpdns/android/demo/practice/exoplayer/ExoPlayerCaseViewModel.kt @@ -23,7 +23,7 @@ class ExoPlayerCaseViewModel(application: Application) : ResolveResultViewModel( lateinit var okHttpClient: OkHttpClient val playerUrl = SingleLiveData().apply { - value = "https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd" + value = "https://ams-sdk-public-assets.oss-cn-hangzhou.aliyuncs.com/file_example_MP4_640_3MG.mp4" } val showRequestAndResolveResult = SingleLiveData().apply { value = false } diff --git a/httpdns_android_demo/src/main/java/com/alibaba/httpdns/android/demo/practice/ipconn/IPConnCaseViewModel.kt b/httpdns_android_demo/src/main/java/com/alibaba/httpdns/android/demo/practice/ipconn/IPConnCaseViewModel.kt index 59943d6..23ffb13 100644 --- a/httpdns_android_demo/src/main/java/com/alibaba/httpdns/android/demo/practice/ipconn/IPConnCaseViewModel.kt +++ b/httpdns_android_demo/src/main/java/com/alibaba/httpdns/android/demo/practice/ipconn/IPConnCaseViewModel.kt @@ -36,7 +36,7 @@ class IPConnCaseViewModel(application: Application) : ResolveResultViewModel(app val responseStr = SingleLiveData().apply { value = "" } val ipConnUrl = SingleLiveData().apply { - value = "https://suggest.taobao.com/sug?code=utf-8&q=phone" + value = "https://ams-sdk-public-assets.oss-cn-hangzhou.aliyuncs.com/example-resources.txt" } val showRequestAndResolveResult = SingleLiveData().apply { value = false } diff --git a/httpdns_android_demo/src/main/java/com/alibaba/httpdns/android/demo/practice/okhttp/OkHttpCaseViewModel.kt b/httpdns_android_demo/src/main/java/com/alibaba/httpdns/android/demo/practice/okhttp/OkHttpCaseViewModel.kt index 732b068..b7b9db9 100644 --- a/httpdns_android_demo/src/main/java/com/alibaba/httpdns/android/demo/practice/okhttp/OkHttpCaseViewModel.kt +++ b/httpdns_android_demo/src/main/java/com/alibaba/httpdns/android/demo/practice/okhttp/OkHttpCaseViewModel.kt @@ -29,7 +29,7 @@ class OkHttpCaseViewModel(application: Application) : ResolveResultViewModel(app private var schemaType: SchemaType = SchemaType.HTTPS - val path = SingleLiveData().apply { value = "/document_detail/434554.html" } + val path = SingleLiveData().apply { value = "/example-resources.txt" } val showRequestAndResolveResult = SingleLiveData().apply { value = false } @@ -39,7 +39,7 @@ class OkHttpCaseViewModel(application: Application) : ResolveResultViewModel(app private var response: Response? = null fun initData() { - host.value = "help.aliyun.com" + host.value = "ams-sdk-public-assets.oss-cn-hangzhou.aliyuncs.com" okHttpClient = OkHttpClient.Builder() .connectionPool(ConnectionPool(0, 10 * 1000, TimeUnit.MICROSECONDS)) .hostnameVerifier { _, _ -> true } @@ -59,13 +59,14 @@ class OkHttpCaseViewModel(application: Application) : ResolveResultViewModel(app ) ) } + if (inetAddresses.isEmpty()) { log( this@OkHttpCaseViewModel, getApplication().getString(R.string.log_dns_resolve_fail) ) try { - val localResolveResult = Dns.SYSTEM.lookup("help.aliyun111.com") + val localResolveResult = Dns.SYSTEM.lookup(hostname) inetAddresses.addAll(localResolveResult) }catch (e: Exception) { log( @@ -125,7 +126,6 @@ class OkHttpCaseViewModel(application: Application) : ResolveResultViewModel(app response = Response(code, bodyStr) } } - } } diff --git a/httpdns_android_demo/src/main/res/layout/httpdns_fragment_exo_player_case.xml b/httpdns_android_demo/src/main/res/layout/httpdns_fragment_exo_player_case.xml index baf1958..4a46171 100644 --- a/httpdns_android_demo/src/main/res/layout/httpdns_fragment_exo_player_case.xml +++ b/httpdns_android_demo/src/main/res/layout/httpdns_fragment_exo_player_case.xml @@ -93,8 +93,7 @@ android:layout_height="wrap_content" android:text="@{viewModel.hostAndTime}" android:textColor="#3D3D3D" - android:textSize="12sp" - tools:text="www.aliyun.com (38ms)" /> + android:textSize="12sp"/> diff --git a/httpdns_android_demo/src/main/res/layout/httpdns_fragment_okhttp_case.xml b/httpdns_android_demo/src/main/res/layout/httpdns_fragment_okhttp_case.xml index a3ec94b..c17626f 100644 --- a/httpdns_android_demo/src/main/res/layout/httpdns_fragment_okhttp_case.xml +++ b/httpdns_android_demo/src/main/res/layout/httpdns_fragment_okhttp_case.xml @@ -188,7 +188,6 @@ android:id="@+id/tvHostAndTime" android:layout_width="wrap_content" android:layout_height="wrap_content" - tools:text="www.aliyun.com (38ms)" android:text="@{viewModel.hostAndTime}" android:textSize="12sp" android:textColor="#3D3D3D"/> diff --git a/httpdns_android_demo/src/main/res/layout/httpdns_fragment_resolve_result.xml b/httpdns_android_demo/src/main/res/layout/httpdns_fragment_resolve_result.xml index 5cc2ca6..e907a5b 100644 --- a/httpdns_android_demo/src/main/res/layout/httpdns_fragment_resolve_result.xml +++ b/httpdns_android_demo/src/main/res/layout/httpdns_fragment_resolve_result.xml @@ -219,7 +219,6 @@ android:id="@+id/tvHostAndTime" android:layout_width="wrap_content" android:layout_height="wrap_content" - tools:text="www.aliyun.com (38ms)" android:text="@{viewModel.hostAndTime}" android:textSize="12sp" android:textColor="#3D3D3D"/> diff --git a/httpdns_android_demo/src/main/res/layout/httpdns_fragment_webview_case.xml b/httpdns_android_demo/src/main/res/layout/httpdns_fragment_webview_case.xml index d55de38..1a25988 100644 --- a/httpdns_android_demo/src/main/res/layout/httpdns_fragment_webview_case.xml +++ b/httpdns_android_demo/src/main/res/layout/httpdns_fragment_webview_case.xml @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:paddingStart="2dp" android:paddingEnd="2dp" - android:text="@string/url_aliyun" /> + android:text="@string/url_web_example" /> @@ -123,8 +123,7 @@ android:layout_height="wrap_content" android:text="@{viewModel.hostAndTime}" android:textColor="#3D3D3D" - android:textSize="12sp" - tools:text="www.aliyun.com (38ms)" /> + android:textSize="12sp"/> %s域名已经被添加至预解析列表,请勿重复添加 要解析的域名 - 例如:help.aliyun.com + 例如:ams-sdk-public-assets.oss-cn-hangzhou.aliyuncs.com 要请求的接口 - 例如: /document_detail/434554.html + 例如: /example-resources.txt 解析并请求 域名不能为空 域名不能是IP地址 @@ -107,8 +107,8 @@ HTTPDNS\nIP直连\n最佳实践 HTTPDNS\nExoPlayer\n最佳实践 httpdns 未返回IP,走local dns - httpdns %s 解析结果 %s host:%s 解析失败 + httpdns %s 解析结果 %s SNI request error: %s SNI request response: %s requestUrl: %s @@ -117,12 +117,12 @@ 再按一次退出应用 输入内容为空 url输入 - 例如: http://www.aliyun.com - https://help.aliyun.com + 例如: https://ams-sdk-public-assets.oss-cn-hangzhou.aliyuncs.com/example-resources.txt + https://ams-sdk-public-assets.oss-cn-hangzhou.aliyuncs.com/example-resources.txt 加载URL url is empty 请输入正确的url 播放资源URL输入 - 例如: https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd + 例如: https://ams-sdk-public-assets.oss-cn-hangzhou.aliyuncs.com/file_example_MP4_640_3MG.mp4 播放