diff --git a/AudioDemo/entry/src/main/config.json b/AudioDemo/entry/src/main/config.json index a04efded8feef7c44f2bf41985b7a961a916bc35..7650a43e57c80ed0a51736d7f6e3f8ad8fa5c5bd 100644 --- a/AudioDemo/entry/src/main/config.json +++ b/AudioDemo/entry/src/main/config.json @@ -44,7 +44,7 @@ "name": "com.huawei.harmonyaudiodemo.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", - "label": "HarmonyAudioDemo", + "label": "$string:app_name", "type": "page", "launchType": "standard" } diff --git a/ComponentCodelab/entry/src/main/config.json b/ComponentCodelab/entry/src/main/config.json index 56635f1969dafbc4d02eb96880267ff9557251b5..d1bb29108aec2e5a86f814e26ce20321b3ddeefe 100644 --- a/ComponentCodelab/entry/src/main/config.json +++ b/ComponentCodelab/entry/src/main/config.json @@ -40,7 +40,7 @@ "name": "com.huawei.codelab.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", - "label": "ComponentCodelab", + "label": "$string:app_name", "type": "page", "launchType": "standard" } diff --git a/DistributedMail/entry/src/main/config.json b/DistributedMail/entry/src/main/config.json index 9d49bd38c2bc39d36eb178ec3fcfa1f893f9ea4f..46f55a533e4988ada9133a15a7ed15811dbce3d0 100644 --- a/DistributedMail/entry/src/main/config.json +++ b/DistributedMail/entry/src/main/config.json @@ -46,7 +46,7 @@ "name": "com.huawei.maildemo.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", - "label": "MailDemo", + "label": "$string:app_name", "type": "page", "launchType": "standard" } diff --git a/DistributedMapDemo/entry/src/main/config.json b/DistributedMapDemo/entry/src/main/config.json index 5a9813a1080feb7c1eaa9baeb9352e252c63008f..16ca9c9fdbc6d3d029aee6e60a3d16e8d84ee830 100644 --- a/DistributedMapDemo/entry/src/main/config.json +++ b/DistributedMapDemo/entry/src/main/config.json @@ -42,7 +42,7 @@ "name": "com.huawei.codelab.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", - "label": "DistributedMapDemo", + "label": "$string:app_name", "type": "page", "launchType": "standard" }, @@ -57,7 +57,7 @@ "name": "com.huawei.codelab.WatchAbility", "icon": "$media:icon", "description": "$string:watchmainability_description", - "label": "entry", + "label": "$string:app_name", "type": "page", "launchType": "standard" } diff --git a/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/util/HttpUtils.java b/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/util/HttpUtils.java index 1a8ea07e5cff04a43e82582aebaecf01ad939bc2..2cda4377f324d6337c46461189e5e9f23fca31f1 100644 --- a/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/util/HttpUtils.java +++ b/DistributedMapDemo/entry/src/main/java/com/huawei/codelab/util/HttpUtils.java @@ -33,16 +33,17 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.Proxy; import java.net.URL; +import java.net.URLConnection; import java.nio.charset.StandardCharsets; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; +import java.security.cert.X509Certificate; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; - -import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.X509TrustManager; /** * 网络请求管理类 @@ -140,7 +141,6 @@ public class HttpUtils { resultBuffer.append(tempLine); } if (callback != null) { - System.out.println("onSuccess:"); context.getUITaskDispatcher().syncDispatch(() -> callback.onSuccess(resultBuffer.toString())); } if (httpResponseCache != null) { @@ -237,4 +237,24 @@ public class HttpUtils { */ void onSuccess(String result); } + + /** + * MyX509TrustManager + * + * @since 2021-03-12 + */ + private static class MyX509TrustManager implements X509TrustManager { + @Override + public void checkClientTrusted(X509Certificate[] certificates, String authType) { + } + + @Override + public void checkServerTrusted(X509Certificate[] ax509certificate, String authType) { + } + + @Override + public X509Certificate[] getAcceptedIssuers() { + return null; + } + } } diff --git a/DistributedVideoCodelab/entry/src/main/config.json b/DistributedVideoCodelab/entry/src/main/config.json index 83bff4681882ae4ac3725899a624d22e824feef5..5fc8b42aef242053e7890c282a424e8fc6980ca2 100644 --- a/DistributedVideoCodelab/entry/src/main/config.json +++ b/DistributedVideoCodelab/entry/src/main/config.json @@ -44,7 +44,7 @@ "name": "ohos.codelabs.distributedvideo.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", - "label": "DistributedVideo", + "label": "$string:app_name", "type": "page", "launchType": "standard" }, @@ -57,7 +57,7 @@ "name": ".PlayerAbility", "icon": "$media:icon", "description": "$string:videodetailabilityslice_description", - "label": "SimplePlayer", + "label": "$string:video_detail", "type": "page", "launchType": "standard" }, diff --git a/DistributedVideoCodelab/entry/src/main/resources/base/element/string.json b/DistributedVideoCodelab/entry/src/main/resources/base/element/string.json index 80dc28cacfebf2757525f7574a186850fd3451cf..638216620726dbf7f9f3b9d52d88e81805591495 100644 --- a/DistributedVideoCodelab/entry/src/main/resources/base/element/string.json +++ b/DistributedVideoCodelab/entry/src/main/resources/base/element/string.json @@ -4,6 +4,10 @@ "name": "app_name", "value": "video" }, + { + "name": "video_detail", + "value": "video detail" + }, { "name": "mainability_description", "value": "hap sample empty page" diff --git a/EducationSystem/entry/src/main/config.json b/EducationSystem/entry/src/main/config.json index 4e30b167364590b2478f82a7f55f862d3b72d87a..9df55f8d54836b307190412864cc8bd984ab813c 100644 --- a/EducationSystem/entry/src/main/config.json +++ b/EducationSystem/entry/src/main/config.json @@ -46,7 +46,7 @@ "name": "com.huawei.codelab.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", - "label": "亲子早教系统", + "label": "$string:app_name", "type": "page", "launchType": "standard" }, diff --git a/HarmonyOSNewsClient/entry/src/main/config.json b/HarmonyOSNewsClient/entry/src/main/config.json index 4fbeffff7fb41d31d5a89758baa2a7f62641c450..e5aff32d2223d241f10d553d41b33d53baa3a000 100644 --- a/HarmonyOSNewsClient/entry/src/main/config.json +++ b/HarmonyOSNewsClient/entry/src/main/config.json @@ -46,7 +46,7 @@ "name": "com.huawei.codelab.NewsAbility", "icon": "$media:icon", "description": "$string:mainability_description", - "label": "NewsDemo", + "label": "$string:app_name", "type": "page", "launchType": "standard" }, diff --git a/ShoppingJs/entry/src/main/config.json b/ShoppingJs/entry/src/main/config.json index 8b16d1ec3afb72093a397b2c15b3f142c4eae241..e164614e744771ee0958276a0b9b08de0ff4d301 100644 --- a/ShoppingJs/entry/src/main/config.json +++ b/ShoppingJs/entry/src/main/config.json @@ -39,7 +39,7 @@ "name": "com.huawei.codelab.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", - "label": "codelab", + "label": "$string:app_name", "type": "page", "launchType": "standard" } diff --git a/SimpleVideoCodelab/entry/src/main/config.json b/SimpleVideoCodelab/entry/src/main/config.json index 3dbee1b6b0567aa83cf39c73daba5a4a81fcd15b..ea9dea11d3fe16a47cbc4f1b3a914a51989ee1f2 100644 --- a/SimpleVideoCodelab/entry/src/main/config.json +++ b/SimpleVideoCodelab/entry/src/main/config.json @@ -47,7 +47,7 @@ "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", - "label": "SimplePlayer", + "label": "$string:app_name", "type": "page", "launchType": "standard" }