From aa4eb6500bcb26d55e55a9e1eaf639830d664e97 Mon Sep 17 00:00:00 2001
From: guojin26 <guojin26@huawei.com>
Date: Fri, 6 Aug 2021 15:47:20 +0800
Subject: [PATCH 1/2] fix warnings

Signed-off-by: guojin26 <guojin26@huawei.com>
---
 .../samples/aifunctionset/bean/AsrBean.java   | 12 +---
 .../aifunctionset/slice/AiMainSlice.java      |  2 +-
 .../slice/DocumentCorrectionSlice.java        |  6 +-
 .../slice/IMIntentRecognitionSlice.java       |  2 -
 .../slice/ImageSuperResolutionSlice.java      |  6 +-
 .../slice/SpeechRecognitionSlice.java         | 14 ++--
 .../slice/TextImageSuperResolutionSlice.java  |  6 +-
 .../slice/TextRecognitionSlice.java           |  7 +-
 .../slice/TextToSpeechSlice.java              |  4 +-
 .../aifunctionset/utils/WidgetHelper.java     |  5 +-
 .../main/resources/base/element/string.json   | 64 +++++++++++++++++
 .../base/layout/document_correction_slice.xml |  2 +-
 .../layout/image_super_resolution_slice.xml   |  2 +-
 .../main/resources/base/layout/main_slice.xml | 26 +++----
 .../base/layout/qr_code_generation_slice.xml  |  2 +-
 .../base/layout/speech_recognition_slice.xml  |  4 +-
 .../text_image_superresolution_slice.xml      |  2 +-
 .../base/layout/text_recognition_slice.xml    |  2 +-
 .../base/layout/text_to_speech_slice.xml      |  4 +-
 .../base/layout/word_segmentation_slice.xml   |  4 +-
 .../service/MyAccessibilityService.java       | 60 ++++++----------
 .../slice/KeyPressEventSlice.java             |  4 +-
 README.md                                     | 15 ++++
 README_zh.md                                  | 15 ++++
 .../slice/MainAbilitySlice.java               |  6 +-
 .../main/resources/base/element/string.json   | 20 ++++++
 .../base/layout/main_ability_slice.xml        | 10 +--
 .../samples/orm/slice/OrmContextSlice.java    |  4 +-
 .../PreferencesInternalAbility.java           |  8 +--
 .../samples/preferences/utils/LogUtil.java    | 10 ---
 .../src/main/js/default/pages/login/login.js  |  4 --
 .../src/main/js/default/pages/main/main.js    |  5 +-
 .../main/js/default/pages/splash/splash.js    |  5 --
 .../search/slice/MainAbilitySlice.java        |  2 +-
 .../samples/search/utils/SearchUtils.java     |  7 +-
 .../batteryinfo/slice/MainAbilitySlice.java   |  5 +-
 .../main/resources/base/element/string.json   |  8 +++
 .../base/layout/main_ability_slice.xml        |  4 +-
 .../compass/slice/PageAbilitySlice.java       |  2 +-
 .../location/slice/MainAbilitySlice.java      | 26 +++----
 .../main/resources/base/element/string.json   | 16 +++++
 .../base/layout/main_ability_slice.xml        |  8 +--
 .../setting/slice/MainAbilitySlice.java       |  2 +-
 .../main/resources/base/element/string.json   | 16 +++++
 .../base/layout/main_ability_slice.xml        |  8 +--
 .../java/ohos/samples/audio/MainAbility.java  |  8 +--
 .../audio/slice/AudioRecorderSlice.java       |  6 +-
 .../main/resources/base/element/string.json   | 40 +++++++++++
 .../layout/audio_recorder_slice_layout.xml    |  4 +-
 .../base/layout/main_ability_slice.xml        |  6 +-
 .../base/layout/player_slice_layout.xml       |  4 +-
 .../short_sound_player_slice_layout.xml       |  4 +-
 .../samples/audioplayer/AVPlayClient.java     | 24 +++----
 .../samples/audioplayer/AVPlayService.java    | 14 ++--
 .../audioplayer/model/AVElementManager.java   |  2 +-
 .../samples/audioplayer/utils/LogUtil.java    | 10 ---
 .../audioplayer/utils/ThreadPoolManager.java  |  2 +-
 .../main/resources/base/element/string.json   |  8 +++
 .../base/layout/main_play_layout.xml          |  5 +-
 .../base/layout/online_play_layout.xml        |  2 +-
 .../java/ohos/samples/camera/MainAbility.java | 12 ++--
 .../ohos/samples/camera/TakePhotoAbility.java | 27 ++++----
 .../samples/camera/VideoRecordAbility.java    | 25 ++++---
 .../camera/slice/MainAbilitySlice.java        | 10 ++-
 .../main/resources/base/element/string.json   |  8 +++
 .../base/layout/main_ability_slice.xml        |  4 +-
 .../pixelmap/slice/MainAbilitySlice.java      |  4 +-
 .../main/resources/base/element/string.json   | 20 ++++++
 .../base/layout/main_ability_slice.xml        | 10 +--
 .../videoplayer/slice/MainAbilitySlice.java   | 38 ++++-------
 .../samples/videoplayer/utils/LogUtil.java    | 20 ------
 .../videoplayer/utils/ThreadPoolManager.java  |  4 +-
 .../utils/VideoElementManager.java            |  2 +-
 .../videoplayer/utils/VideoPlayerPlugin.java  |  6 +-
 .../main/resources/base/element/string.json   | 20 ++++++
 .../base/layout/main_ability_slice.xml        | 10 +--
 .../samples/bluetooth/BluetoothPlugin.java    |  7 +-
 .../adapter/BluetoothItemProvider.java        |  2 +-
 .../ohos/samples/bluetooth/utils/LogUtil.java | 20 ------
 .../main/resources/base/layout/slice_main.xml |  4 +-
 .../distributedclient/DevicePlugin.java       | 26 ++-----
 .../provider/DeviceProvider.java              | 12 ++--
 .../slice/MainAbilitySlice.java               |  6 +-
 .../distributedserver/RemoteAbility.java      | 14 ++--
 .../main/resources/base/element/string.json   |  8 +++
 .../resources/base/layout/dialog_layout.xml   |  2 +-
 .../resources/base/layout/main_layout.xml     |  2 +-
 .../devices/provider/DeviceProvider.java      | 10 +--
 .../devices/slice/MainAbilitySlice.java       |  4 +-
 .../ohos/samples/devices/utils/LogUtil.java   | 10 ---
 .../main/resources/base/element/string.json   | 16 +++++
 .../main/resources/base/layout/list_item.xml  |  4 +-
 .../resources/base/layout/main_layout.xml     | 10 +--
 .../ohos/samples/nfcsample/utils/LogUtil.java | 30 --------
 .../main/resources/base/element/string.json   |  4 ++
 .../base/layout/main_ability_slice.xml        |  2 +-
 .../slice/HttpCacheSlice.java                 |  1 -
 .../slice/NetRequestSlice.java                |  2 +-
 .../slice/SocketClientSlice.java              |  2 +-
 .../slice/SocketServerSlice.java              | 13 ++--
 .../main/resources/base/element/string.json   | 36 ++++++++++
 .../base/layout/http_cache_slice.xml          |  2 +-
 .../base/layout/main_ability_slice.xml        |  8 +--
 .../base/layout/net_request_slice.xml         |  4 +-
 .../base/layout/socket_client_slice.xml       |  4 +-
 .../base/layout/socket_server_slice.xml       |  2 +-
 .../java/ohos/samples/wlan/ItemProvider.java  |  4 +-
 .../ohos/samples/wlan/slice/P2pSlice.java     |  3 +-
 .../main/resources/base/element/string.json   | 68 +++++++++++++++++++
 .../base/layout/feature_slice_layout.xml      |  8 +--
 .../base/layout/main_ability_slice.xml        |  8 +--
 .../base/layout/p2p_slice_layout.xml          | 10 +--
 .../layout/untrusted_config_slice_layout.xml  |  4 +-
 .../layout/wlan_notification_slice_layout.xml |  4 +-
 .../datasecurity/slice/MainAbilitySlice.java  | 17 ++---
 .../main/resources/base/element/string.json   | 20 ++++++
 .../base/layout/main_ability_slice.xml        | 10 +--
 .../slice/MainAbilitySlice.java               | 11 ++-
 .../facerecognition/utils/ThreadPoolUtil.java |  4 +-
 .../main/resources/base/element/string.json   | 16 +++++
 .../resources/base/layout/dialog_layout.xml   |  2 +-
 .../base/layout/main_ability_slice.xml        |  6 +-
 .../permissionapp/slice/MainAbilitySlice.java |  4 +-
 .../permissionapp/utils/Constants.java        |  5 --
 .../main/resources/base/element/string.json   | 20 ++++++
 .../base/layout/main_ability_slice.xml        | 10 +--
 .../eventhandler/slice/MainAbilitySlice.java  | 16 ++---
 .../main/resources/base/element/string.json   | 12 ++++
 .../base/layout/main_ability_slice.xml        |  6 +-
 .../taskmanager/slice/MainAbilitySlice.java   | 63 ++++++++---------
 .../main/resources/base/element/string.json   | 32 +++++++++
 .../base/layout/main_ability_slice.xml        | 16 ++---
 132 files changed, 849 insertions(+), 602 deletions(-)

diff --git a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/bean/AsrBean.java b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/bean/AsrBean.java
index d4a53aeee8..26725d3f89 100644
--- a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/bean/AsrBean.java
+++ b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/bean/AsrBean.java
@@ -24,8 +24,6 @@ import java.util.List;
 public class AsrBean {
     private List<Result> result;
 
-    private String resultType;
-
     public void setResult(List<Result> result) {
         this.result = result;
     }
@@ -34,18 +32,10 @@ public class AsrBean {
         return result;
     }
 
-    public void setResultType(String resultType) {
-        this.resultType = resultType;
-    }
-
-    public String getResultType() {
-        return resultType;
-    }
-
     /**
      * Speech recognition result
      */
-    public class Result {
+    public static class Result {
         private double confidence;
 
         private String ori_word;
diff --git a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/AiMainSlice.java b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/AiMainSlice.java
index 46d9efacae..ecfe841f61 100644
--- a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/AiMainSlice.java
+++ b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/AiMainSlice.java
@@ -25,7 +25,7 @@ import ohos.agp.components.ComponentContainer;
  * AiMainSlice
  */
 public class AiMainSlice extends AbilitySlice {
-    private AbilitySlice[] sliceArray = {
+    private final AbilitySlice[] sliceArray = {
         new TextRecognitionSlice(), new ImageSuperResolutionSlice(), new DocumentCorrectionSlice(),
         new QRCodeGenerationSlice(), new TextImageSuperResolutionSlice(), new WordSegmentationSlice(),
         new PartOfSpeechTaggingSlice(), new AssistantIntentionRecognitionSlice(), new IMIntentRecognitionSlice(),
diff --git a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/DocumentCorrectionSlice.java b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/DocumentCorrectionSlice.java
index 97581be19e..23fe95948c 100644
--- a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/DocumentCorrectionSlice.java
+++ b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/DocumentCorrectionSlice.java
@@ -38,8 +38,6 @@ import ohos.media.image.PixelMap;
 public class DocumentCorrectionSlice extends BaseSlice {
     private static final String IMAGE_PATH = "entry/resources/rawfile/doc_check.png";
 
-    private Image originalImage;
-
     private Image outImage;
 
     private IDocRefine docRefine;
@@ -54,7 +52,7 @@ public class DocumentCorrectionSlice extends BaseSlice {
     }
 
     private void initComponents() {
-        originalImage = (Image) findComponentById(ResourceTable.Id_image);
+        Image originalImage = (Image) findComponentById(ResourceTable.Id_image);
         outImage = (Image) findComponentById(ResourceTable.Id_out_image);
         Component startButton = findComponentById(ResourceTable.Id_start);
         startButton.setClickedListener(this::doSuperResolution);
@@ -89,7 +87,7 @@ public class DocumentCorrectionSlice extends BaseSlice {
         aiTitle.setText("Document Correction");
     }
 
-    private ConnectionCallback connectionCallback = new ConnectionCallback() {
+    private final ConnectionCallback connectionCallback = new ConnectionCallback() {
         @Override
         public void onServiceConnect() {
             LogUtil.info(getLocalClassName(), "Service connect succeeded");
diff --git a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/IMIntentRecognitionSlice.java b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/IMIntentRecognitionSlice.java
index 32b048e96c..b9e0f6601f 100644
--- a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/IMIntentRecognitionSlice.java
+++ b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/IMIntentRecognitionSlice.java
@@ -34,8 +34,6 @@ import java.util.Map;
 public class IMIntentRecognitionSlice extends BaseSlice {
     private TextField inputText;
 
-    private Component startParse;
-
     private TextField outText;
 
     private boolean initEngineResult;
diff --git a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/ImageSuperResolutionSlice.java b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/ImageSuperResolutionSlice.java
index bd953b90b8..b57dfcd56b 100644
--- a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/ImageSuperResolutionSlice.java
+++ b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/ImageSuperResolutionSlice.java
@@ -37,8 +37,6 @@ import ohos.media.image.PixelMap;
 public class ImageSuperResolutionSlice extends BaseSlice {
     private static final String IMAGE_PATH = "entry/resources/rawfile/super_image.png";
 
-    private Image originalImage;
-
     private Image outImage;
 
     private IImageSuperResolution imageSuperResolution;
@@ -53,7 +51,7 @@ public class ImageSuperResolutionSlice extends BaseSlice {
     }
 
     private void initComponents() {
-        originalImage = (Image) findComponentById(ResourceTable.Id_image);
+        Image originalImage = (Image) findComponentById(ResourceTable.Id_image);
         outImage = (Image) findComponentById(ResourceTable.Id_out_image);
         Component startButton = findComponentById(ResourceTable.Id_start);
         startButton.setClickedListener(this::doSuperResolution);
@@ -87,7 +85,7 @@ public class ImageSuperResolutionSlice extends BaseSlice {
         aiTitle.setText("Image Super Resolution");
     }
 
-    private ConnectionCallback connectionCallback = new ConnectionCallback() {
+    private final ConnectionCallback connectionCallback = new ConnectionCallback() {
         @Override
         public void onServiceConnect() {
             LogUtil.info(getLocalClassName(), "Service connect succeeded");
diff --git a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/SpeechRecognitionSlice.java b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/SpeechRecognitionSlice.java
index da7a1ee7b3..b2d9dac6da 100644
--- a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/SpeechRecognitionSlice.java
+++ b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/SpeechRecognitionSlice.java
@@ -69,13 +69,9 @@ public class SpeechRecognitionSlice extends BaseSlice {
 
     private String result;
 
-    private AsrIntent asrIntent;
-
     private String wavCachePath;
 
-    private String pcmCachePath;
-
-    private EventHandler handler = new EventHandler(EventRunner.current()) {
+    private final EventHandler handler = new EventHandler(EventRunner.current()) {
         @Override
         protected void processEvent(InnerEvent event) {
             switch (event.eventId) {
@@ -107,7 +103,7 @@ public class SpeechRecognitionSlice extends BaseSlice {
 
     private void initData() {
         wavCachePath = new File(getFilesDir(), "asr_test.wav").getPath();
-        pcmCachePath = new File(getFilesDir(), "asr_date_conversion.pcm").getPath();
+        String pcmCachePath = new File(getFilesDir(), "asr_date_conversion.pcm").getPath();
         writeToDisk(RAW_AUDIO_WAV, wavCachePath);
         writeToDisk(RAW_AUDIO_PCM, pcmCachePath);
     }
@@ -147,7 +143,7 @@ public class SpeechRecognitionSlice extends BaseSlice {
     private void initAIEngine() {
         asrClient = AsrClient.createAsrClient(this).orElse(null);
         if (asrClient != null) {
-            asrIntent = new AsrIntent();
+            AsrIntent asrIntent = new AsrIntent();
             useDefaultAsrIntent(asrIntent);
             asrIntent.setAudioSourceType(AsrIntent.AsrAudioSrcType.ASR_SRC_TYPE_PCM);
             asrClient.init(asrIntent, asrListener);
@@ -183,7 +179,7 @@ public class SpeechRecognitionSlice extends BaseSlice {
         }
     }
 
-    private AsrListener asrListener = new AsrListener() {
+    private final AsrListener asrListener = new AsrListener() {
         @Override
         public void onInit(PacMap pacMap) {
             result = pacMap.getString(AsrResultKey.RESULTS_RECOGNITION);
@@ -202,7 +198,7 @@ public class SpeechRecognitionSlice extends BaseSlice {
 
         @Override
         public void onBufferReceived(byte[] bytes) {
-            LogUtil.info(TAG, "onRmsChanged :" + bytes.toString());
+            LogUtil.info(TAG, "onRmsChanged :" + new String(bytes));
         }
 
         @Override
diff --git a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/TextImageSuperResolutionSlice.java b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/TextImageSuperResolutionSlice.java
index 91c2a12d32..e3dbbc6e58 100644
--- a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/TextImageSuperResolutionSlice.java
+++ b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/TextImageSuperResolutionSlice.java
@@ -37,8 +37,6 @@ import ohos.media.image.PixelMap;
 public class TextImageSuperResolutionSlice extends BaseSlice {
     private static final String IMAGE_PATH = "entry/resources/rawfile/super_text.png";
 
-    private Image originalImage;
-
     private Image outImage;
 
     private ITxtImageSuperResolution txtImageSuperResolution;
@@ -53,7 +51,7 @@ public class TextImageSuperResolutionSlice extends BaseSlice {
     }
 
     private void initComponents() {
-        originalImage = (Image) findComponentById(ResourceTable.Id_image);
+        Image originalImage = (Image) findComponentById(ResourceTable.Id_image);
         outImage = (Image) findComponentById(ResourceTable.Id_out_image);
         Component startButton = findComponentById(ResourceTable.Id_start);
         startButton.setClickedListener(this::doSuperResolution);
@@ -86,7 +84,7 @@ public class TextImageSuperResolutionSlice extends BaseSlice {
         aiTitle.setText("Text Image Super Resolution");
     }
 
-    private ConnectionCallback connectionCallback = new ConnectionCallback() {
+    private final ConnectionCallback connectionCallback = new ConnectionCallback() {
         @Override
         public void onServiceConnect() {
             LogUtil.info(getLocalClassName(), "Service connect succeeded");
diff --git a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/TextRecognitionSlice.java b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/TextRecognitionSlice.java
index 41ce9f80f8..d8dc837637 100644
--- a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/TextRecognitionSlice.java
+++ b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/TextRecognitionSlice.java
@@ -30,7 +30,6 @@ import ohos.ai.cv.common.VisionManager;
 import ohos.ai.cv.text.ITextDetector;
 import ohos.ai.cv.text.Text;
 import ohos.ai.cv.text.TextConfiguration;
-import ohos.ai.cv.text.TextDetectType;
 import ohos.media.image.PixelMap;
 
 /**
@@ -39,8 +38,6 @@ import ohos.media.image.PixelMap;
 public class TextRecognitionSlice extends BaseSlice {
     private static final String IMAGE_PATH = "entry/resources/rawfile/text_recognition.png";
 
-    private Image originalImage;
-
     private TextField outText;
 
     private ITextDetector textDetector;
@@ -54,7 +51,7 @@ public class TextRecognitionSlice extends BaseSlice {
     }
 
     private void initComponents() {
-        originalImage = (Image) findComponentById(ResourceTable.Id_image);
+        Image originalImage = (Image) findComponentById(ResourceTable.Id_image);
         outText = (TextField) findComponentById(ResourceTable.Id_out_text);
         Component startButton = findComponentById(ResourceTable.Id_start);
         startButton.setClickedListener(this::doSuperResolution);
@@ -87,7 +84,7 @@ public class TextRecognitionSlice extends BaseSlice {
         aiTitle.setText("Text Recognition");
     }
 
-    private ConnectionCallback connectionCallback = new ConnectionCallback() {
+    private final ConnectionCallback connectionCallback = new ConnectionCallback() {
         @Override
         public void onServiceConnect() {
             LogUtil.info(getLocalClassName(), "Service connect succeeded");
diff --git a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/TextToSpeechSlice.java b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/TextToSpeechSlice.java
index 9e891d4806..8ad2b2c79c 100644
--- a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/TextToSpeechSlice.java
+++ b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/slice/TextToSpeechSlice.java
@@ -44,7 +44,7 @@ public class TextToSpeechSlice extends BaseSlice {
 
     private TextField inputText;
 
-    private EventHandler handler = new EventHandler(EventRunner.current()) {
+    private final EventHandler handler = new EventHandler(EventRunner.current()) {
         @Override
         protected void processEvent(InnerEvent event) {
             initTTSEngine();
@@ -91,7 +91,7 @@ public class TextToSpeechSlice extends BaseSlice {
         }
     }
 
-    private TtsListener ttsListener = new TtsListener() {
+    private final TtsListener ttsListener = new TtsListener() {
         @Override
         public void onEvent(int eventType, PacMap pacMap) {
             if (eventType == TtsEvent.CREATE_TTS_CLIENT_SUCCESS) {
diff --git a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/utils/WidgetHelper.java b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/utils/WidgetHelper.java
index b7cc2333a0..f84336a8f4 100644
--- a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/utils/WidgetHelper.java
+++ b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/utils/WidgetHelper.java
@@ -36,15 +36,14 @@ public final class WidgetHelper {
      * @return PixelMap pixelMap
      */
     public static PixelMap getPixelMapFromRaw(Context context, String path) {
-        PixelMap pixelMap = null;
         try {
             RawFileEntry rawFileEntry = context.getResourceManager().getRawFileEntry(path);
             Resource resource = rawFileEntry.openRawFile();
             ImageSource imageSource = ImageSource.create(resource, new ImageSource.SourceOptions());
-            pixelMap = imageSource.createPixelmap(null);
+            return imageSource.createPixelmap(null);
         } catch (IOException e) {
             LogUtil.error("getPixelMapFromRaw", "IOException :" + e.toString());
         }
-        return pixelMap;
+        return null;
     }
 }
diff --git a/AI/AIFunctionSet/entry/src/main/resources/base/element/string.json b/AI/AIFunctionSet/entry/src/main/resources/base/element/string.json
index cb51c43fe4..5877d2b2c1 100644
--- a/AI/AIFunctionSet/entry/src/main/resources/base/element/string.json
+++ b/AI/AIFunctionSet/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,70 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "start",
+      "value": "Start"
+    },
+    {
+      "name": "text_recognition",
+      "value": "Text Recognition"
+    },
+    {
+      "name": "image_super_resolution",
+      "value": "Image Super Resolution"
+    },
+    {
+      "name": "document_correction",
+      "value": "Document Correction"
+    },
+    {
+      "name": "qc_code",
+      "value": "QRCode Generation"
+    },
+    {
+      "name": "text_image_super_resolution",
+      "value": "Text Image Super Resolution"
+    },
+    {
+      "name": "word_segmentation",
+      "value": "Word Segmentation"
+    },
+    {
+      "name": "part_of_speech_tagging",
+      "value": "Part Of Speech Tagging"
+    },
+    {
+      "name": "assistant",
+      "value": "Assistant Intention Recognition"
+    },
+    {
+      "name": "im_intent",
+      "value": "IM Intent Recognition"
+    },
+    {
+      "name": "keyword",
+      "value": "Keyword Extraction"
+    },
+    {
+      "name": "entity",
+      "value": "Entity Identification"
+    },
+    {
+      "name": "speech_recognition",
+      "value": "Speech Recognition"
+    },
+    {
+      "name": "text_to_speech",
+      "value": "Text To Speech"
+    },
+    {
+      "name": "file_path",
+      "value": "File Path：/data/user/0/ohos.samples.ai/files/asr_test.wav"
+    },
+    {
+      "name": "enter_keyword_tips",
+      "value": "Please enter a keyword"
     }
   ]
 }
\ No newline at end of file
diff --git a/AI/AIFunctionSet/entry/src/main/resources/base/layout/document_correction_slice.xml b/AI/AIFunctionSet/entry/src/main/resources/base/layout/document_correction_slice.xml
index 3aaf67d5ed..1a6bb56cc4 100644
--- a/AI/AIFunctionSet/entry/src/main/resources/base/layout/document_correction_slice.xml
+++ b/AI/AIFunctionSet/entry/src/main/resources/base/layout/document_correction_slice.xml
@@ -30,7 +30,7 @@
         ohos:id="$+id:start"
         ohos:height="35vp"
         ohos:width="240vp"
-        ohos:text="Start"
+        ohos:text="$string:start"
         ohos:margin="10vp"
         ohos:text_size="16fp"
         ohos:background_element="$graphic:button_bg"/>
diff --git a/AI/AIFunctionSet/entry/src/main/resources/base/layout/image_super_resolution_slice.xml b/AI/AIFunctionSet/entry/src/main/resources/base/layout/image_super_resolution_slice.xml
index e5d7eb134a..43dabfbb72 100644
--- a/AI/AIFunctionSet/entry/src/main/resources/base/layout/image_super_resolution_slice.xml
+++ b/AI/AIFunctionSet/entry/src/main/resources/base/layout/image_super_resolution_slice.xml
@@ -32,7 +32,7 @@
         ohos:height="35vp"
         ohos:width="240vp"
         ohos:background_element="$graphic:button_bg"
-        ohos:text="Start"
+        ohos:text="$string:start"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
 
diff --git a/AI/AIFunctionSet/entry/src/main/resources/base/layout/main_slice.xml b/AI/AIFunctionSet/entry/src/main/resources/base/layout/main_slice.xml
index 7db9500e46..dd4b8c161b 100644
--- a/AI/AIFunctionSet/entry/src/main/resources/base/layout/main_slice.xml
+++ b/AI/AIFunctionSet/entry/src/main/resources/base/layout/main_slice.xml
@@ -29,7 +29,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="Text Recognition"
+            ohos:text="$string:text_recognition"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#FF000000"
             ohos:text_size="17fp"/>
@@ -50,7 +50,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="Image Super Resolution"
+            ohos:text="$string:image_super_resolution"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#FF000000"
             ohos:text_size="17fp"/>
@@ -71,7 +71,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="Document Correction"
+            ohos:text="$string:document_correction"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#FF000000"
             ohos:text_size="17fp"/>
@@ -92,7 +92,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="QRCode Generation"
+            ohos:text="$string:qc_code"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#FF000000"
             ohos:text_size="17fp"/>
@@ -113,7 +113,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="Text Image Super Resolution"
+            ohos:text="$string:text_image_super_resolution"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#FF000000"
             ohos:text_size="17fp"/>
@@ -134,7 +134,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="Word Segmentation"
+            ohos:text="$string:word_segmentation"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#FF000000"
             ohos:text_size="17fp"/>
@@ -155,7 +155,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="Part Of Speech Tagging"
+            ohos:text="$string:part_of_speech_tagging"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#FF000000"
             ohos:text_size="17fp"/>
@@ -176,7 +176,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="Assistant Intention Recognition"
+            ohos:text="$string:assistant"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#FF000000"
             ohos:text_size="17fp"/>
@@ -197,7 +197,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="IM Intent Recognition"
+            ohos:text="$string:im_intent"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#FF000000"
             ohos:text_size="17fp"/>
@@ -218,7 +218,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="Keyword Extraction"
+            ohos:text="$string:keyword"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#FF000000"
             ohos:text_size="17fp"/>
@@ -239,7 +239,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="Entity Identification"
+            ohos:text="$string:entity"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#FF000000"
             ohos:text_size="17fp"/>
@@ -260,7 +260,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="Speech Recognition"
+            ohos:text="$string:speech_recognition"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#FF000000"
             ohos:text_size="17fp"/>
@@ -281,7 +281,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="Text To Speech"
+            ohos:text="$string:text_to_speech"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#FF000000"
             ohos:text_size="17fp"/>
diff --git a/AI/AIFunctionSet/entry/src/main/resources/base/layout/qr_code_generation_slice.xml b/AI/AIFunctionSet/entry/src/main/resources/base/layout/qr_code_generation_slice.xml
index 1ce0bed369..036ec56a73 100644
--- a/AI/AIFunctionSet/entry/src/main/resources/base/layout/qr_code_generation_slice.xml
+++ b/AI/AIFunctionSet/entry/src/main/resources/base/layout/qr_code_generation_slice.xml
@@ -32,7 +32,7 @@
         ohos:height="35vp"
         ohos:width="240vp"
         ohos:background_element="$graphic:button_bg"
-        ohos:text="Start"
+        ohos:text="$string:start"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
 
diff --git a/AI/AIFunctionSet/entry/src/main/resources/base/layout/speech_recognition_slice.xml b/AI/AIFunctionSet/entry/src/main/resources/base/layout/speech_recognition_slice.xml
index 58f526e42e..3e158a803d 100644
--- a/AI/AIFunctionSet/entry/src/main/resources/base/layout/speech_recognition_slice.xml
+++ b/AI/AIFunctionSet/entry/src/main/resources/base/layout/speech_recognition_slice.xml
@@ -28,7 +28,7 @@
         ohos:left_margin="10vp"
         ohos:padding="10vp"
         ohos:right_margin="10vp"
-        ohos:text="File Path：/data/user/0/ohos.samples.ai/files/asr_test.wav"
+        ohos:text="$string:file_path"
         ohos:text_size="16fp"/>
 
     <Button
@@ -37,7 +37,7 @@
         ohos:width="240vp"
         ohos:background_element="$graphic:button_bg"
         ohos:margin="10vp"
-        ohos:text="Start"
+        ohos:text="$string:start"
         ohos:text_size="16fp"/>
 
     <TextField
diff --git a/AI/AIFunctionSet/entry/src/main/resources/base/layout/text_image_superresolution_slice.xml b/AI/AIFunctionSet/entry/src/main/resources/base/layout/text_image_superresolution_slice.xml
index 2da2f04b19..ed4e80481c 100644
--- a/AI/AIFunctionSet/entry/src/main/resources/base/layout/text_image_superresolution_slice.xml
+++ b/AI/AIFunctionSet/entry/src/main/resources/base/layout/text_image_superresolution_slice.xml
@@ -30,7 +30,7 @@
         ohos:id="$+id:start"
         ohos:height="35vp"
         ohos:width="240vp"
-        ohos:text="Start"
+        ohos:text="$string:start"
         ohos:margin="5vp"
         ohos:text_size="16fp"
         ohos:background_element="$graphic:button_bg"/>
diff --git a/AI/AIFunctionSet/entry/src/main/resources/base/layout/text_recognition_slice.xml b/AI/AIFunctionSet/entry/src/main/resources/base/layout/text_recognition_slice.xml
index 642136719c..da05f8be1a 100644
--- a/AI/AIFunctionSet/entry/src/main/resources/base/layout/text_recognition_slice.xml
+++ b/AI/AIFunctionSet/entry/src/main/resources/base/layout/text_recognition_slice.xml
@@ -32,7 +32,7 @@
         ohos:width="240vp"
         ohos:background_element="$graphic:button_bg"
         ohos:margin="20vp"
-        ohos:text="Start"
+        ohos:text="$string:start"
         ohos:text_size="16fp"/>
 
     <TextField
diff --git a/AI/AIFunctionSet/entry/src/main/resources/base/layout/text_to_speech_slice.xml b/AI/AIFunctionSet/entry/src/main/resources/base/layout/text_to_speech_slice.xml
index c784950071..bd39c6c964 100644
--- a/AI/AIFunctionSet/entry/src/main/resources/base/layout/text_to_speech_slice.xml
+++ b/AI/AIFunctionSet/entry/src/main/resources/base/layout/text_to_speech_slice.xml
@@ -26,7 +26,7 @@
         ohos:width="match_parent"
         ohos:background_element="$graphic:textfield_bg"
         ohos:focusable="focus_adaptable"
-        ohos:hint="Please enter a keyword"
+        ohos:hint="$string:enter_keyword_tips"
         ohos:left_margin="10vp"
         ohos:padding="10vp"
         ohos:right_margin="10vp"
@@ -39,6 +39,6 @@
         ohos:width="240vp"
         ohos:background_element="$graphic:button_bg"
         ohos:margin="15vp"
-        ohos:text="Start"
+        ohos:text="$string:start"
         ohos:text_size="16fp"/>
 </DirectionalLayout>
\ No newline at end of file
diff --git a/AI/AIFunctionSet/entry/src/main/resources/base/layout/word_segmentation_slice.xml b/AI/AIFunctionSet/entry/src/main/resources/base/layout/word_segmentation_slice.xml
index f44ffe19db..a19b1ca629 100644
--- a/AI/AIFunctionSet/entry/src/main/resources/base/layout/word_segmentation_slice.xml
+++ b/AI/AIFunctionSet/entry/src/main/resources/base/layout/word_segmentation_slice.xml
@@ -26,7 +26,7 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:background_element="$graphic:textfield_bg"
-        ohos:hint="Please enter a keyword"
+        ohos:hint="$string:enter_keyword_tips"
         ohos:left_margin="10vp"
         ohos:padding="10vp"
         ohos:right_margin="10vp"
@@ -39,7 +39,7 @@
         ohos:width="240vp"
         ohos:background_element="$graphic:button_bg"
         ohos:margin="20vp"
-        ohos:text="Start"
+        ohos:text="$string:start"
         ohos:text_size="16fp"/>
 
     <TextField
diff --git a/AccessibilityService/AccessibilityService/entry/src/main/java/ohos/samples/accessibilityservice/service/MyAccessibilityService.java b/AccessibilityService/AccessibilityService/entry/src/main/java/ohos/samples/accessibilityservice/service/MyAccessibilityService.java
index 020c49f4d1..e92290e3e6 100644
--- a/AccessibilityService/AccessibilityService/entry/src/main/java/ohos/samples/accessibilityservice/service/MyAccessibilityService.java
+++ b/AccessibilityService/AccessibilityService/entry/src/main/java/ohos/samples/accessibilityservice/service/MyAccessibilityService.java
@@ -24,11 +24,11 @@ import ohos.global.resource.NotExistException;
 import ohos.global.resource.WrongTypeException;
 import ohos.multimodalinput.event.KeyEvent;
 import ohos.samples.accessibilityservice.ResourceTable;
+import ohos.samples.accessibilityservice.slice.KeyPressEventSlice;
 import ohos.samples.accessibilityservice.tts.TtsManager;
 import ohos.samples.accessibilityservice.utils.LogUtils;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Optional;
 
@@ -51,35 +51,31 @@ public class MyAccessibilityService extends AccessibleAbility {
         int eventType = accessibilityEventInfo.getAccessibilityEventType();
         int windowType = accessibilityEventInfo.getWindowChangeTypes();
         LogUtils.info(TAG, "onAccessibilityEvent,enventType=" + eventType + "windowType" + windowType);
-        switch (eventType) {
-            case AccessibilityEventInfo.TYPE_VIEW_CLICKED_EVENT:
-                LogUtils.info(TAG, "type view clicked");
-                ArrayList<CharSequence> contentList = accessibilityEventInfo.getContentList();
-                try {
-                    Element element = getContext().getResourceManager()
-                            .getElement(ResourceTable.String_string_button_perform_click);
-                    String string = element.getString();
-                    for (CharSequence content : contentList) {
-                        LogUtils.info(TAG, "type view clicked,content:" + content.toString() + ",string:" + string);
-                        if (content.toString().equals(string)) {
-                            LogUtils.info(TAG, "type view clicked,content:equals");
-                            TtsManager.getInstance().speakText(content.toString(), null);
-                            performCommonAction(AccessibleAbility.GLOBAL_ACTION_HOME);
-                        }
+        if (AccessibilityEventInfo.TYPE_VIEW_CLICKED_EVENT == eventType) {
+            LogUtils.info(TAG, "type view clicked");
+            ArrayList<CharSequence> contentList = accessibilityEventInfo.getContentList();
+            try {
+                Element element = getContext().getResourceManager()
+                        .getElement(ResourceTable.String_string_button_perform_click);
+                String string = element.getString();
+                for (CharSequence content : contentList) {
+                    LogUtils.info(TAG, "type view clicked,content:" + content.toString() + ",string:" + string);
+                    if (content.toString().equals(string)) {
+                        LogUtils.info(TAG, "type view clicked,content:equals");
+                        TtsManager.getInstance().speakText(content.toString(), null);
+                        performCommonAction(AccessibleAbility.GLOBAL_ACTION_HOME);
                     }
-                } catch (IOException | NotExistException | WrongTypeException e) {
-                    LogUtils.error(TAG, "type view clicked,Exception:" + e.getMessage());
                 }
-                break;
-            default:
-                break;
+            } catch (IOException | NotExistException | WrongTypeException e) {
+                LogUtils.error(TAG, "type view clicked,Exception:" + e.getMessage());
+            }
         }
         switch (windowType) {
             case AccessibilityEventInfo.WINDOWS_CHANGE_ADDED:
                 Optional<AccessibilityInfo> accessibilityInfo = getRootAccessibilityInfo();
                 String bundleName = accessibilityInfo.get().getBundleName().toString();
                 LogUtils.info(TAG, "WINDOWS_CHANGE_ADDED:" + bundleName);
-                if (bundleName.equals(BUNDLE_NAME) && isInSpecialApp == false) {
+                if (bundleName.equals(BUNDLE_NAME) && !isInSpecialApp) {
                     isInSpecialApp = true;
                     LogUtils.info(TAG, "You are in the " + bundleName);
                     runUIThread(() -> new ToastDialog(getContext()).setText("You are in the " + BUNDLE_NAME).show());
@@ -120,26 +116,10 @@ public class MyAccessibilityService extends AccessibleAbility {
         if (isNeedCustomVolumeKey) {
             if (keyEvent.getKeyCode() == KeyEvent.KEY_VOLUME_DOWN || keyEvent.getKeyCode() == KeyEvent.KEY_VOLUME_UP) {
                 if (keyEvent.getKeyCode() == KeyEvent.KEY_VOLUME_DOWN && keyEvent.isKeyDown()) {
-                    runUIThread(() -> {
-                        try {
-                            Class mClass = Class.forName("ohos.samples.accessibilityservice.slice.KeyPressEventSlice");
-                            mClass.getDeclaredMethod("scrollDown").invoke(mClass.newInstance(), new Object[]{});
-                        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException
-                                | ClassNotFoundException | InstantiationException e) {
-                            LogUtils.error(TAG, "KEY_VOLUME_DOWN error:" + e.getMessage());
-                        }
-                    });
+                    runUIThread(KeyPressEventSlice::scrollDown);
                 }
                 if (keyEvent.getKeyCode() == KeyEvent.KEY_VOLUME_UP && keyEvent.isKeyDown()) {
-                    runUIThread(() -> {
-                        try {
-                            Class mClass = Class.forName("ohos.samples.accessibilityservice.slice.KeyPressEventSlice");
-                            mClass.getDeclaredMethod("scrollUp").invoke(mClass.newInstance(), new Object[]{});
-                        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException
-                                | ClassNotFoundException | InstantiationException e) {
-                            LogUtils.error(TAG, "KEY_VOLUME_UP error:" + e.getMessage());
-                        }
-                    });
+                    runUIThread(KeyPressEventSlice::scrollUp);
                 }
                 return true;
             }
diff --git a/AccessibilityService/AccessibilityService/entry/src/main/java/ohos/samples/accessibilityservice/slice/KeyPressEventSlice.java b/AccessibilityService/AccessibilityService/entry/src/main/java/ohos/samples/accessibilityservice/slice/KeyPressEventSlice.java
index cab0cb1fc3..e5765989b4 100644
--- a/AccessibilityService/AccessibilityService/entry/src/main/java/ohos/samples/accessibilityservice/slice/KeyPressEventSlice.java
+++ b/AccessibilityService/AccessibilityService/entry/src/main/java/ohos/samples/accessibilityservice/slice/KeyPressEventSlice.java
@@ -44,7 +44,7 @@ public class KeyPressEventSlice extends AbilitySlice {
     /**
      * scrollUp
      */
-    public void scrollUp() {
+    public static void scrollUp() {
         LogUtils.info(TAG, "scrollUp");
         if (tabList != null && tabList.getSelectedTabIndex() > 0) {
             tabList.selectTabAt(tabList.getSelectedTabIndex() - 1);
@@ -54,7 +54,7 @@ public class KeyPressEventSlice extends AbilitySlice {
     /**
      * scrollDown
      */
-    public void scrollDown() {
+    public static void scrollDown() {
         LogUtils.info(TAG, "scrollDown");
         if (tabList != null && tabList.getSelectedTabIndex() < tabList.getTabCount() - 1) {
             tabList.selectTabAt(tabList.getSelectedTabIndex() + 1);
diff --git a/README.md b/README.md
index aa50d07a98..a67add36ff 100755
--- a/README.md
+++ b/README.md
@@ -22,7 +22,22 @@ We provide a series of app samples to help you quickly get familiar with the API
 3.  The following app samples can run on OpenHarmony, and other app samples can run only on HarmonyOS:
     -   common/Clock
     -   common/JsHelloWorld
+    -   common/DistributeCalc
+    -   common/ECG
+    -   common/Flashlight
     -   ability/JsDistributedMusicPlayer
+    -   common/DistributeCalc
+    -   UI/AtomicLayout
+    -   UI/Badge
+    -   UI/chart
+    -   UI/JsAnimationStyle
+    -   UI/Picker
+    -   UI/Popup
+    -   UI/RefreshContainer
+    -   UI/Stack
+    -   UI/StepNavigator
+    -   UI/Swiper
+    -   UI/Tabs
 
 
 ## Repositories Involved<a name="section741114082513"></a>
diff --git a/README_zh.md b/README_zh.md
index 97181dbd69..8b1638af3d 100755
--- a/README_zh.md
+++ b/README_zh.md
@@ -22,7 +22,22 @@
 3.  以下路径下的应用示例支持在OpenHarmony上运行，其余应用示例仅支持在HarmonyOS上运行。
     -   common/Clock
     -   common/JsHelloWorld
+    -   common/DistributeCalc
+    -   common/ECG
+    -   common/Flashlight
     -   ability/JsDistributedMusicPlayer
+    -   common/DistributeCalc
+    -   UI/AtomicLayout
+    -   UI/Badge
+    -   UI/chart
+    -   UI/JsAnimationStyle
+    -   UI/Picker
+    -   UI/Popup
+    -   UI/RefreshContainer
+    -   UI/Stack
+    -   UI/StepNavigator
+    -   UI/Swiper
+    -   UI/Tabs
 
 
 ## 相关仓<a name="section741114082513"></a>
diff --git a/data/DistributedPictures/entry/src/main/java/ohos/samples/distributedpictures/slice/MainAbilitySlice.java b/data/DistributedPictures/entry/src/main/java/ohos/samples/distributedpictures/slice/MainAbilitySlice.java
index cf34ae3d6b..a6ec5cc358 100644
--- a/data/DistributedPictures/entry/src/main/java/ohos/samples/distributedpictures/slice/MainAbilitySlice.java
+++ b/data/DistributedPictures/entry/src/main/java/ohos/samples/distributedpictures/slice/MainAbilitySlice.java
@@ -108,7 +108,7 @@ public class MainAbilitySlice extends AbilitySlice {
     }
 
     private void copyPicToDistributedDir() {
-        writeToDistributedDir("entry/resources/rawfile/icon.png", distributedFile);
+        writeToDistributedDir(distributedFile);
         File file = new File(distributedFile);
         if (file.exists()) {
             showTip(this, "shared success");
@@ -122,8 +122,8 @@ public class MainAbilitySlice extends AbilitySlice {
         toastDialog.show();
     }
 
-    private void writeToDistributedDir(String rawFilePathString, String targetFilePath) {
-        RawFileEntry rawFileEntry = getResourceManager().getRawFileEntry(rawFilePathString);
+    private void writeToDistributedDir(String targetFilePath) {
+        RawFileEntry rawFileEntry = getResourceManager().getRawFileEntry("entry/resources/rawfile/icon.png");
         try (FileOutputStream output = new FileOutputStream(new File(targetFilePath))) {
             Resource resource = rawFileEntry.openRawFile();
             byte[] cache = new byte[CACHE_SIZE];
diff --git a/data/DistributedPictures/entry/src/main/resources/base/element/string.json b/data/DistributedPictures/entry/src/main/resources/base/element/string.json
index e05de56594..e0c6f3ebc1 100644
--- a/data/DistributedPictures/entry/src/main/resources/base/element/string.json
+++ b/data/DistributedPictures/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,26 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "local_pictures",
+      "value": "Local Pictures"
+    },
+    {
+      "name": "share_to_distributed_dir",
+      "value": "Share Local Picture To Distributed Dir"
+    },
+    {
+      "name": "refresh",
+      "value": "Refresh"
+    },
+    {
+      "name": "delete",
+      "value": "Delete"
+    },
+    {
+      "name": "remote_picture",
+      "value": "Remote Pictures"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/DistributedPictures/entry/src/main/resources/base/layout/main_ability_slice.xml b/data/DistributedPictures/entry/src/main/resources/base/layout/main_ability_slice.xml
index 65e082e822..7e3abe42af 100644
--- a/data/DistributedPictures/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/data/DistributedPictures/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -33,7 +33,7 @@
             ohos:height="match_content"
             ohos:width="match_content"
             ohos:padding="8vp"
-            ohos:text="Local Pictures"
+            ohos:text="$string:local_pictures"
             ohos:text_size="15fp"/>
 
         <Image
@@ -57,7 +57,7 @@
             ohos:width="match_parent"
             ohos:background_element="#55000055"
             ohos:padding="5vp"
-            ohos:text="Share Local Picture To Distributed Dir"
+            ohos:text="$string:share_to_distributed_dir"
             ohos:text_size="15fp"/>
 
         <DirectionalLayout
@@ -72,7 +72,7 @@
                 ohos:width="0vp"
                 ohos:background_element="#55000055"
                 ohos:padding="5vp"
-                ohos:text="Refresh"
+                ohos:text="$string:refresh"
                 ohos:text_size="15fp"
                 ohos:weight="1"/>
 
@@ -83,7 +83,7 @@
                 ohos:background_element="#55000055"
                 ohos:left_margin="10vp"
                 ohos:padding="5vp"
-                ohos:text="Delete"
+                ohos:text="$string:delete"
                 ohos:text_size="15fp"
                 ohos:weight="1"/>
         </DirectionalLayout>
@@ -101,7 +101,7 @@
             ohos:height="match_content"
             ohos:width="match_content"
             ohos:padding="8vp"
-            ohos:text="Remote Pictures"
+            ohos:text="$string:remote_picture"
             ohos:text_size="15fp"/>
 
         <Image
diff --git a/data/ORM/entry/src/main/java/ohos/samples/orm/slice/OrmContextSlice.java b/data/ORM/entry/src/main/java/ohos/samples/orm/slice/OrmContextSlice.java
index 0cf15be886..e77bff3946 100644
--- a/data/ORM/entry/src/main/java/ohos/samples/orm/slice/OrmContextSlice.java
+++ b/data/ORM/entry/src/main/java/ohos/samples/orm/slice/OrmContextSlice.java
@@ -52,8 +52,6 @@ public class OrmContextSlice extends AbilitySlice {
 
     private DatabaseHelper helper;
 
-    private Component upgradeButton;
-
     private Preferences preferences;
 
     @Override
@@ -70,7 +68,7 @@ public class OrmContextSlice extends AbilitySlice {
         if (componentText instanceof Text) {
             logText = (Text) componentText;
         }
-        upgradeButton = findComponentById(ResourceTable.Id_upgrade_button);
+        Component upgradeButton = findComponentById(ResourceTable.Id_upgrade_button);
         upgradeButton.setClickedListener(this::upgrade);
         findComponentById(ResourceTable.Id_insert_button).setClickedListener(this::insert);
         findComponentById(ResourceTable.Id_update_button).setClickedListener(this::update);
diff --git a/data/Preferences/entry/src/main/java/ohos/samples/preferences/PreferencesInternalAbility.java b/data/Preferences/entry/src/main/java/ohos/samples/preferences/PreferencesInternalAbility.java
index 701f3f044c..40cb564786 100644
--- a/data/Preferences/entry/src/main/java/ohos/samples/preferences/PreferencesInternalAbility.java
+++ b/data/Preferences/entry/src/main/java/ohos/samples/preferences/PreferencesInternalAbility.java
@@ -33,9 +33,7 @@ import ohos.rpc.RemoteException;
 import ohos.utils.zson.ZSONObject;
 
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * Internal Ability
@@ -95,7 +93,7 @@ public class PreferencesInternalAbility extends AceInternalAbility {
                 checkLoginStatus(reply);
                 break;
             case SUBSCRIBE:
-                subscribe(data, reply, option);
+                subscribe(reply, option);
                 break;
             case GET_BACKGROUND_COLOR:
                 getBackgroundColor(reply);
@@ -169,9 +167,7 @@ public class PreferencesInternalAbility extends AceInternalAbility {
         reply.writeString(ZSONObject.toZSONString(saveResult));
     }
 
-    private void subscribe(MessageParcel data, MessageParcel reply, MessageOption option) {
-        Set<IRemoteObject> remoteObjectHandlers = new HashSet<>();
-        remoteObjectHandlers.add(data.readRemoteObject());
+    private void subscribe(MessageParcel reply, MessageOption option) {
         Map<String, Object> subscribeResult = new HashMap<>();
         subscribeResult.put(Constants.CODE, SUCCESS);
         subscribeResult.put(Constants.DATA, Constants.SUCCESS);
diff --git a/data/Preferences/entry/src/main/java/ohos/samples/preferences/utils/LogUtil.java b/data/Preferences/entry/src/main/java/ohos/samples/preferences/utils/LogUtil.java
index 12df1c06df..214b44b658 100644
--- a/data/Preferences/entry/src/main/java/ohos/samples/preferences/utils/LogUtil.java
+++ b/data/Preferences/entry/src/main/java/ohos/samples/preferences/utils/LogUtil.java
@@ -56,16 +56,6 @@ public class LogUtil {
         HiLog.info(LABEL_LOG, String.format(Locale.ROOT, LOG_FORMAT, tag, msg));
     }
 
-    /**
-     * Print warn log
-     *
-     * @param tag log tag
-     * @param msg log message
-     */
-    public static void warn(String tag, String msg) {
-        HiLog.warn(LABEL_LOG, String.format(Locale.ROOT, LOG_FORMAT, tag, msg));
-    }
-
     /**
      * Print error log
      *
diff --git a/data/Preferences/entry/src/main/js/default/pages/login/login.js b/data/Preferences/entry/src/main/js/default/pages/login/login.js
index d51e3f120a..a735acc3a7 100644
--- a/data/Preferences/entry/src/main/js/default/pages/login/login.js
+++ b/data/Preferences/entry/src/main/js/default/pages/login/login.js
@@ -16,10 +16,6 @@
 import prompt from "@system.prompt";
 import router from "@system.router";
 
-const injectRef = Object.getPrototypeOf(global) || global;
-
-injectRef.regeneratorRuntime = require("@babel/runtime/regenerator");
-
 export default {
     data: {
         userID: "",
diff --git a/data/Preferences/entry/src/main/js/default/pages/main/main.js b/data/Preferences/entry/src/main/js/default/pages/main/main.js
index cd7fe330e8..e5c12b319e 100644
--- a/data/Preferences/entry/src/main/js/default/pages/main/main.js
+++ b/data/Preferences/entry/src/main/js/default/pages/main/main.js
@@ -15,12 +15,9 @@
 
 import prompt from "@system.prompt";
 
-const injectRef = Object.getPrototypeOf(global) || global;
-
-injectRef.regeneratorRuntime = require("@babel/runtime/regenerator");
-
 export default {
     data: {
+        lastSelectedColor:null,
         selectedColor: "#ffffff",
         appliedColor: "#ffffff",
         tempVar: true,
diff --git a/data/Preferences/entry/src/main/js/default/pages/splash/splash.js b/data/Preferences/entry/src/main/js/default/pages/splash/splash.js
index a1ef85c2b0..f0b1fea04f 100644
--- a/data/Preferences/entry/src/main/js/default/pages/splash/splash.js
+++ b/data/Preferences/entry/src/main/js/default/pages/splash/splash.js
@@ -15,10 +15,6 @@
 
 import router from "@system.router";
 
-const injectRef = Object.getPrototypeOf(global) || global;
-
-injectRef.regeneratorRuntime = require("@babel/runtime/regenerator");
-
 export default {
     data: {
         loginStatus: false,
@@ -171,7 +167,6 @@ export default {
     },
     onChanged: async function (checked) {
         try {
-            var that = this;
             var actionData = {};
             actionData.checkState = checked ? 1 : 0;
             var action = {};
diff --git a/data/Search/entry/src/main/java/ohos/samples/search/slice/MainAbilitySlice.java b/data/Search/entry/src/main/java/ohos/samples/search/slice/MainAbilitySlice.java
index e875842370..2d5fca3162 100644
--- a/data/Search/entry/src/main/java/ohos/samples/search/slice/MainAbilitySlice.java
+++ b/data/Search/entry/src/main/java/ohos/samples/search/slice/MainAbilitySlice.java
@@ -104,7 +104,7 @@ public class MainAbilitySlice extends AbilitySlice {
         Component btnSearchByPage = findComponentById(ResourceTable.Id_btnSearchByPage);
         btnSearchByPage.setClickedListener(this::searchByPage);
 
-        Component searchComponent = findComponentById(ResourceTable.Id_searchResult);;
+        Component searchComponent = findComponentById(ResourceTable.Id_searchResult);
         if (searchComponent instanceof Text) {
             searchResult = (Text) searchComponent;
         }
diff --git a/data/Search/entry/src/main/java/ohos/samples/search/utils/SearchUtils.java b/data/Search/entry/src/main/java/ohos/samples/search/utils/SearchUtils.java
index 3eef5411f8..2a4c2cd092 100644
--- a/data/Search/entry/src/main/java/ohos/samples/search/utils/SearchUtils.java
+++ b/data/Search/entry/src/main/java/ohos/samples/search/utils/SearchUtils.java
@@ -26,6 +26,7 @@ import ohos.utils.zson.ZSONObject;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -281,14 +282,14 @@ public class SearchUtils {
         filter1.put(CommonItem.IDENTIFIER, new ZSONArray(Arrays.asList(0, 1, 2, 3, 4, 5))); // The index is also hit if its value is 0 , 1, 2, 3, 4 or 5 for the CommonItem.IDENTIFIER field.
         filterCondition.add(filter1);
         ZSONObject filter2 = new ZSONObject();
-        filter2.put("tag", new ZSONArray(Arrays.asList("position")));
-        filter2.put(CommonItem.TITLE, new ZSONArray(Arrays.asList("position"))); // An index is hit if the value of the tag or CommonItem.TITLE field is position.
+        filter2.put("tag", new ZSONArray(Collections.singletonList("position")));
+        filter2.put(CommonItem.TITLE, new ZSONArray(Collections.singletonList("position"))); // An index is hit if the value of the tag or CommonItem.TITLE field is position.
         filterCondition.add(filter2);
         zsonObject.put(SearchParameter.FILTER_CONDITION, filterCondition); // An index is hit only if both the first and second conditions are met.
 
         // SearchParameter.DEVICE_ID_LIST indicates the device ID list. Indexes with the specified IDs are hit.
         ZSONObject deviceId = new ZSONObject();
-        deviceId.put("device_id", new ZSONArray(Arrays.asList("localDeviceId"))); // Specify the local device.
+        deviceId.put("device_id", new ZSONArray(Collections.singletonList("localDeviceId"))); // Specify the local device.
         zsonObject.put(SearchParameter.DEVICE_ID_LIST, deviceId);
 
         // Start a search by specifying the value range of a specified index field.
diff --git a/device/BatteryInfo/entry/src/main/java/ohos/samples/batteryinfo/slice/MainAbilitySlice.java b/device/BatteryInfo/entry/src/main/java/ohos/samples/batteryinfo/slice/MainAbilitySlice.java
index d3ee81782f..b56f4d2eeb 100644
--- a/device/BatteryInfo/entry/src/main/java/ohos/samples/batteryinfo/slice/MainAbilitySlice.java
+++ b/device/BatteryInfo/entry/src/main/java/ohos/samples/batteryinfo/slice/MainAbilitySlice.java
@@ -60,9 +60,8 @@ public class MainAbilitySlice extends AbilitySlice {
 
     private void initComponents() {
         batteryInfoText = (Text) findComponentById(ResourceTable.Id_battery_level_result);
-        findComponentById(ResourceTable.Id_get_battery_level).setClickedListener(listener -> {
-            batteryInfoText.setText(getBatteryInfo());
-        });
+        findComponentById(ResourceTable.Id_get_battery_level)
+                .setClickedListener(listener -> batteryInfoText.setText(getBatteryInfo()));
         Button subscribeBatteryChange = (Button) findComponentById(ResourceTable.Id_subscribe_battery_level_change);
         subscribeBatteryChange.setClickedListener(listener -> {
             if (!isSubscribedBatteryChange) {
diff --git a/device/BatteryInfo/entry/src/main/resources/base/element/string.json b/device/BatteryInfo/entry/src/main/resources/base/element/string.json
index cfcd62df9d..717bc6c060 100644
--- a/device/BatteryInfo/entry/src/main/resources/base/element/string.json
+++ b/device/BatteryInfo/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,14 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "get_battery_level",
+      "value": "Get Battery Level"
+    },
+    {
+      "name": "subscribe_battery_level",
+      "value": "Subscribe Battery Level"
     }
   ]
 }
\ No newline at end of file
diff --git a/device/BatteryInfo/entry/src/main/resources/base/layout/main_ability_slice.xml b/device/BatteryInfo/entry/src/main/resources/base/layout/main_ability_slice.xml
index 0c26cce069..0ab9f8d728 100644
--- a/device/BatteryInfo/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/device/BatteryInfo/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -24,7 +24,7 @@
         ohos:height="40vp"
         ohos:top_margin="50vp"
         ohos:layout_alignment="horizontal_center"
-        ohos:text="Get Battery Level"
+        ohos:text="$string:get_battery_level"
         ohos:text_size="20vp"
         ohos:text_color="#ffffffff"
         ohos:background_element="$graphic:bg"/>
@@ -35,7 +35,7 @@
         ohos:height="40vp"
         ohos:top_margin="50vp"
         ohos:layout_alignment="horizontal_center"
-        ohos:text="Subscribe Battery Level"
+        ohos:text="$string:subscribe_battery_level"
         ohos:text_size="20vp"
         ohos:text_color="#ffffffff"
         ohos:background_element="$graphic:bg"/>
diff --git a/device/Compass/entry/src/main/java/ohos/samples/compass/slice/PageAbilitySlice.java b/device/Compass/entry/src/main/java/ohos/samples/compass/slice/PageAbilitySlice.java
index 118326c024..be1c6f7dd4 100644
--- a/device/Compass/entry/src/main/java/ohos/samples/compass/slice/PageAbilitySlice.java
+++ b/device/Compass/entry/src/main/java/ohos/samples/compass/slice/PageAbilitySlice.java
@@ -56,7 +56,7 @@ public class PageAbilitySlice extends AbilitySlice {
 
     private ICategoryOrientationDataCallback categoryOrientationDataCallback;
 
-    private EventHandler handler = new EventHandler(EventRunner.current()) {
+    private final EventHandler handler = new EventHandler(EventRunner.current()) {
         @Override
         protected void processEvent(InnerEvent event) {
             compassAngleText.setText(getRotation(degree));
diff --git a/device/Location/entry/src/main/java/ohos/samples/location/slice/MainAbilitySlice.java b/device/Location/entry/src/main/java/ohos/samples/location/slice/MainAbilitySlice.java
index 2fcc5ae557..de090a3663 100644
--- a/device/Location/entry/src/main/java/ohos/samples/location/slice/MainAbilitySlice.java
+++ b/device/Location/entry/src/main/java/ohos/samples/location/slice/MainAbilitySlice.java
@@ -54,14 +54,12 @@ public class MainAbilitySlice extends AbilitySlice {
 
     private static final String PERM_LOCATION = "ohos.permission.LOCATION";
 
-    private LocatorResult locatorResult = new LocatorResult();
+    private final LocatorResult locatorResult = new LocatorResult();
 
     private Context context;
 
     private Locator locator;
 
-    private RequestParam requestParam;
-
     private GeoConvert geoConvert;
 
     private List<GeoAddress> gaList;
@@ -110,7 +108,7 @@ public class MainAbilitySlice extends AbilitySlice {
         geoAddressInfoText.append("CountryName : " + locationDetails.getCountryName());
     }
 
-    private EventHandler handler = new EventHandler(EventRunner.current()) {
+    private final EventHandler handler = new EventHandler(EventRunner.current()) {
         @Override
         protected void processEvent(InnerEvent event) {
             if (event.eventId == EVENT_ID) {
@@ -121,15 +119,15 @@ public class MainAbilitySlice extends AbilitySlice {
 
     private void register(Context ability) {
         context = ability;
-        requestPermission(PERM_LOCATION);
+        requestPermission();
     }
 
     private void registerLocationEvent() {
-        if (hasPermissionGranted(PERM_LOCATION)) {
+        if (hasPermissionGranted()) {
             int timeInterval = 0;
             int distanceInterval = 0;
             locator = new Locator(context);
-            requestParam = new RequestParam(RequestParam.PRIORITY_ACCURACY, timeInterval, distanceInterval);
+            RequestParam requestParam = new RequestParam(RequestParam.PRIORITY_ACCURACY, timeInterval, distanceInterval);
             locator.startLocating(requestParam, locatorResult);
         }
     }
@@ -140,13 +138,13 @@ public class MainAbilitySlice extends AbilitySlice {
         }
     }
 
-    private boolean hasPermissionGranted(String permission) {
-        return context.verifySelfPermission(permission) == IBundleManager.PERMISSION_GRANTED;
+    private boolean hasPermissionGranted() {
+        return context.verifySelfPermission(PERM_LOCATION) == IBundleManager.PERMISSION_GRANTED;
     }
 
-    private void requestPermission(String permission) {
-        if (context.verifySelfPermission(permission) != IBundleManager.PERMISSION_GRANTED) {
-            context.requestPermissionsFromUser(new String[] {permission}, 0);
+    private void requestPermission() {
+        if (context.verifySelfPermission(PERM_LOCATION) != IBundleManager.PERMISSION_GRANTED) {
+            context.requestPermissionsFromUser(new String[] {PERM_LOCATION}, 0);
         }
     }
 
@@ -188,7 +186,7 @@ public class MainAbilitySlice extends AbilitySlice {
         }
     }
 
-    private boolean fillGeoInfo(LocationBean locationDetails, double geoLatitude, double geoLongitude) {
+    private void fillGeoInfo(LocationBean locationDetails, double geoLatitude, double geoLongitude) {
         if (geoConvert == null) {
             geoConvert = new GeoConvert();
         }
@@ -198,13 +196,11 @@ public class MainAbilitySlice extends AbilitySlice {
                 if (!gaList.isEmpty()) {
                     GeoAddress geoAddress = gaList.get(0);
                     setGeo(locationDetails, geoAddress);
-                    return true;
                 }
             } catch (IllegalArgumentException | IOException e) {
                 HiLog.error(LABEL_LOG, "%{public}s", "fillGeoInfo exception");
             }
         }
-        return false;
     }
 
     private void setGeo(LocationBean locationDetails, GeoAddress geoAddress) {
diff --git a/device/Location/entry/src/main/resources/base/element/string.json b/device/Location/entry/src/main/resources/base/element/string.json
index 6d7e386baa..0cd87513b7 100644
--- a/device/Location/entry/src/main/resources/base/element/string.json
+++ b/device/Location/entry/src/main/resources/base/element/string.json
@@ -11,6 +11,22 @@
     {
       "name": "reason_description",
       "value": "location sample get permisssion"
+    },
+    {
+      "name": "start_location",
+      "value": "Start Location"
+    },
+    {
+      "name": "stop_location",
+      "value": "Stop Location"
+    },
+    {
+      "name": "location_info",
+      "value": "Location Info"
+    },
+    {
+      "name": "geo_address_info",
+      "value": " Geo Address Info"
     }
   ]
 }
\ No newline at end of file
diff --git a/device/Location/entry/src/main/resources/base/layout/main_ability_slice.xml b/device/Location/entry/src/main/resources/base/layout/main_ability_slice.xml
index fb063fc11a..abc97ab35c 100644
--- a/device/Location/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/device/Location/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -26,7 +26,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Start Location"
+        ohos:text="$string:start_location"
         ohos:text_alignment="center"
         ohos:text_size="16fp"
         ohos:top_margin="10vp"/>
@@ -39,7 +39,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Stop Location"
+        ohos:text="$string:stop_location"
         ohos:text_alignment="center"
         ohos:text_size="16fp"
         ohos:top_margin="10vp"/>
@@ -47,7 +47,7 @@
     <Text
         ohos:height="35vp"
         ohos:width="match_parent"
-        ohos:text="Location Info"
+        ohos:text="$string:location_info"
         ohos:text_alignment="center"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
@@ -64,7 +64,7 @@
     <Text
         ohos:height="35vp"
         ohos:width="match_parent"
-        ohos:text="Geo Address Info"
+        ohos:text="$string:geo_address_info"
         ohos:text_alignment="center"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
diff --git a/device/Setting/entry/src/main/java/ohos/samples/setting/slice/MainAbilitySlice.java b/device/Setting/entry/src/main/java/ohos/samples/setting/slice/MainAbilitySlice.java
index 534d417ec3..7f92c9a617 100644
--- a/device/Setting/entry/src/main/java/ohos/samples/setting/slice/MainAbilitySlice.java
+++ b/device/Setting/entry/src/main/java/ohos/samples/setting/slice/MainAbilitySlice.java
@@ -69,7 +69,7 @@ public class MainAbilitySlice extends AbilitySlice {
         setAirplaneModeStatus(SystemSettings.getValue(dataAbilityHelper, SystemSettings.General.AIRPLANE_MODE_STATUS));
     }
 
-    private IDataAbilityObserver dataAbilityObserver = new IDataAbilityObserver() {
+    private final IDataAbilityObserver dataAbilityObserver = new IDataAbilityObserver() {
         @Override
         public void onChange() {
             String wifiFormat = SystemSettings.getValue(dataAbilityHelper, SystemSettings.Wireless.WIFI_STATUS);
diff --git a/device/Setting/entry/src/main/resources/base/element/string.json b/device/Setting/entry/src/main/resources/base/element/string.json
index 7b0b2bdff2..93b14e3eae 100644
--- a/device/Setting/entry/src/main/resources/base/element/string.json
+++ b/device/Setting/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,22 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "get_system_config",
+      "value": "Get System Config"
+    },
+    {
+      "name": "wifi_status",
+      "value": "wifi_status : "
+    },
+    {
+      "name": "bluetooth_status",
+      "value": "Bluetooth Status : "
+    },
+    {
+      "name": "airplane_status",
+      "value": "Airplane Mode Status : "
     }
   ]
 }
\ No newline at end of file
diff --git a/device/Setting/entry/src/main/resources/base/layout/main_ability_slice.xml b/device/Setting/entry/src/main/resources/base/layout/main_ability_slice.xml
index 67ee907dde..61b8b3e18d 100644
--- a/device/Setting/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/device/Setting/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -23,7 +23,7 @@
     <Text
         ohos:height="35vp"
         ohos:width="match_parent"
-        ohos:text="Get System Config"
+        ohos:text="$string:get_system_config"
         ohos:text_alignment="center"
         ohos:text_size="22fp"
         ohos:top_margin="30vp"/>
@@ -38,7 +38,7 @@
             ohos:height="match_content"
             ohos:width="match_content"
             ohos:left_padding="15vp"
-            ohos:text="WIFI Status : "
+            ohos:text="$string:wifi_status"
             ohos:text_size="16fp"/>
 
         <Text
@@ -58,7 +58,7 @@
             ohos:height="match_content"
             ohos:width="match_content"
             ohos:left_padding="15vp"
-            ohos:text="Bluetooth Status : "
+            ohos:text="$string:bluetooth_status"
             ohos:text_size="16fp"/>
 
         <Text
@@ -78,7 +78,7 @@
             ohos:height="match_content"
             ohos:width="match_content"
             ohos:left_padding="15vp"
-            ohos:text="Airplane Mode Status : "
+            ohos:text="$string:airplane_status"
             ohos:text_size="16fp"/>
 
         <Text
diff --git a/media/Audio/entry/src/main/java/ohos/samples/audio/MainAbility.java b/media/Audio/entry/src/main/java/ohos/samples/audio/MainAbility.java
index 44a1bc16e5..b85f3d7ce8 100644
--- a/media/Audio/entry/src/main/java/ohos/samples/audio/MainAbility.java
+++ b/media/Audio/entry/src/main/java/ohos/samples/audio/MainAbility.java
@@ -30,8 +30,6 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * Mainability
@@ -52,11 +50,9 @@ public class MainAbility extends Ability {
         String[] permissions = {
             SystemPermission.WRITE_USER_STORAGE, SystemPermission.MICROPHONE
         };
-        List<String> permissionFiltered = Arrays.stream(permissions)
-            .filter(permission -> verifySelfPermission(permission) != IBundleManager.PERMISSION_GRANTED)
-            .collect(Collectors.toList());
 
-        requestPermissionsFromUser(permissionFiltered.toArray(new String[permissionFiltered.size()]), 0);
+        requestPermissionsFromUser(Arrays.stream(permissions)
+                .filter(permission -> verifySelfPermission(permission) != IBundleManager.PERMISSION_GRANTED).toArray(String[]::new), 0);
     }
 
     @Override
diff --git a/media/Audio/entry/src/main/java/ohos/samples/audio/slice/AudioRecorderSlice.java b/media/Audio/entry/src/main/java/ohos/samples/audio/slice/AudioRecorderSlice.java
index 034c27dc4b..8454c7bbfa 100644
--- a/media/Audio/entry/src/main/java/ohos/samples/audio/slice/AudioRecorderSlice.java
+++ b/media/Audio/entry/src/main/java/ohos/samples/audio/slice/AudioRecorderSlice.java
@@ -63,7 +63,7 @@ public class AudioRecorderSlice extends AbilitySlice {
 
     private Text pathText;
 
-    private AudioCapturerCallback callback = new AudioCapturerCallback() {
+    private final AudioCapturerCallback callback = new AudioCapturerCallback() {
         @Override
         public void onCapturerConfigChanged(List<AudioCapturerConfig> configs) {
             HiLog.info(LABEL_LOG, "%{public}s", "on capturer config changed");
@@ -126,7 +126,7 @@ public class AudioRecorderSlice extends AbilitySlice {
             isRecording = false;
             recordButton.setText("Start");
             showTips("Stop record");
-            pathText.setText("Path:" + getFilesDir() + File.separator + "record.mp3");
+            pathText.setText("Path:" + getFilesDir() + File.separator + "record.pcm");
         }
     }
 
@@ -141,7 +141,7 @@ public class AudioRecorderSlice extends AbilitySlice {
 
     private void runRecord() {
         getGlobalTaskDispatcher(TaskPriority.DEFAULT).asyncDispatch(() -> {
-            file = new File(getFilesDir() + File.separator + "record.mp3");
+            file = new File(getFilesDir() + File.separator + "record.pcm");
             try (FileOutputStream outputStream = new FileOutputStream(file)) {
                 byte[] bytes = new byte[BUFFER_SIZE];
                 while (audioCapturer.read(bytes, 0, bytes.length) != -1) {
diff --git a/media/Audio/entry/src/main/resources/base/element/string.json b/media/Audio/entry/src/main/resources/base/element/string.json
index a677b58e11..78e2dd5700 100644
--- a/media/Audio/entry/src/main/resources/base/element/string.json
+++ b/media/Audio/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,46 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "sound_recorder",
+      "value": "Sound Recorder"
+    },
+    {
+      "name": "record",
+      "value": "Record"
+    },
+    {
+      "name": "player",
+      "value": "Player"
+    },
+    {
+      "name": "recorder",
+      "value": "Recorder"
+    },
+    {
+      "name": "short_sound_palyer",
+      "value": "Short Sound Player"
+    },
+    {
+      "name": "sound_player",
+      "value": "Sound Player"
+    },
+    {
+      "name": "play",
+      "value": "Play"
+    },
+    {
+      "name": "play_music_sound",
+      "value": "Play Music Sound"
+    },
+    {
+      "name": "play_tone_sound",
+      "value": "Play Tone Sound"
+    },
+    {
+      "name": "play_system_sound",
+      "value": "Play System Sound"
     }
   ]
 }
\ No newline at end of file
diff --git a/media/Audio/entry/src/main/resources/base/layout/audio_recorder_slice_layout.xml b/media/Audio/entry/src/main/resources/base/layout/audio_recorder_slice_layout.xml
index 211cb9e749..02b1dafa83 100644
--- a/media/Audio/entry/src/main/resources/base/layout/audio_recorder_slice_layout.xml
+++ b/media/Audio/entry/src/main/resources/base/layout/audio_recorder_slice_layout.xml
@@ -21,7 +21,7 @@
     <Text
         ohos:id="$+id:title_text"
         ohos:text_size="16fp"
-        ohos:text="Sound Recorder"
+        ohos:text="$string:sound_recorder"
         ohos:top_margin="10vp"
         ohos:text_alignment="center"
         ohos:height="match_content"
@@ -37,7 +37,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Record"
+        ohos:text="$string:record"
         ohos:text_color="#000000"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
diff --git a/media/Audio/entry/src/main/resources/base/layout/main_ability_slice.xml b/media/Audio/entry/src/main/resources/base/layout/main_ability_slice.xml
index 757854044b..7bf77b6cf1 100644
--- a/media/Audio/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/media/Audio/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -26,7 +26,7 @@
         ohos:element_right="$media:ic_arrow_right"
         ohos:left_padding="14vp"
         ohos:padding="10vp"
-        ohos:text="Player"
+        ohos:text="$string:play"
         ohos:text_alignment="left"
         ohos:text_size="16vp"
         ohos:top_margin="10vp"/>
@@ -38,7 +38,7 @@
         ohos:element_right="$media:ic_arrow_right"
         ohos:left_padding="14vp"
         ohos:padding="10vp"
-        ohos:text="Recorder"
+        ohos:text="$string:recorder"
         ohos:text_alignment="left"
         ohos:text_size="16vp"
         ohos:top_margin="10vp"/>
@@ -50,7 +50,7 @@
         ohos:element_right="$media:ic_arrow_right"
         ohos:left_padding="14vp"
         ohos:padding="10vp"
-        ohos:text="Short Sound Player"
+        ohos:text="$string:short_sound_palyer"
         ohos:text_alignment="left"
         ohos:text_size="16vp"
         ohos:top_margin="10vp"/>
diff --git a/media/Audio/entry/src/main/resources/base/layout/player_slice_layout.xml b/media/Audio/entry/src/main/resources/base/layout/player_slice_layout.xml
index 842b972a9a..6bbed90b4d 100644
--- a/media/Audio/entry/src/main/resources/base/layout/player_slice_layout.xml
+++ b/media/Audio/entry/src/main/resources/base/layout/player_slice_layout.xml
@@ -22,7 +22,7 @@
     <Text
         ohos:id="$+id:title_text"
         ohos:text_size="16fp"
-        ohos:text="Sound Player"
+        ohos:text="$string:sound_player"
         ohos:top_margin="10vp"
         ohos:text_alignment="center"
         ohos:height="match_content"
@@ -36,7 +36,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Play"
+        ohos:text="$string:play"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
 </DirectionalLayout>
\ No newline at end of file
diff --git a/media/Audio/entry/src/main/resources/base/layout/short_sound_player_slice_layout.xml b/media/Audio/entry/src/main/resources/base/layout/short_sound_player_slice_layout.xml
index 004d315eff..41482f5fb4 100644
--- a/media/Audio/entry/src/main/resources/base/layout/short_sound_player_slice_layout.xml
+++ b/media/Audio/entry/src/main/resources/base/layout/short_sound_player_slice_layout.xml
@@ -28,7 +28,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Play Music Sound"
+        ohos:text="$string:play_music_sound"
         ohos:text_size="16vp"
         ohos:top_margin="10vp"/>
 
@@ -42,7 +42,7 @@
         ohos:top_margin="20vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Play Tone Sound"
+        ohos:text="$string:play_tone_sound"
         ohos:text_size="16vp"/>
 
     <Button
diff --git a/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/AVPlayClient.java b/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/AVPlayClient.java
index 7b44589bb4..df863b6573 100644
--- a/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/AVPlayClient.java
+++ b/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/AVPlayClient.java
@@ -15,18 +15,12 @@
 
 package ohos.samples.audioplayer;
 
+import ohos.agp.components.*;
 import ohos.samples.audioplayer.utils.LogUtil;
 
 import ohos.aafwk.ability.Ability;
 import ohos.aafwk.content.Intent;
 import ohos.aafwk.content.Operation;
-import ohos.agp.components.Button;
-import ohos.agp.components.Component;
-import ohos.agp.components.ComponentContainer;
-import ohos.agp.components.LayoutScatter;
-import ohos.agp.components.ListContainer;
-import ohos.agp.components.RecycleItemProvider;
-import ohos.agp.components.Text;
 import ohos.bundle.ElementName;
 import ohos.bundle.IBundleManager;
 import ohos.media.common.AVMetadata;
@@ -131,7 +125,7 @@ public class AVPlayClient extends Ability {
     /**
      * create the list of audios
      */
-    class AVElementItemProvider extends RecycleItemProvider {
+    class AVElementItemProvider extends BaseItemProvider {
         @Override
         public int getCount() {
             return avElementList.size();
@@ -149,9 +143,9 @@ public class AVPlayClient extends Ability {
 
         @Override
         public Component getComponent(int position, Component component, ComponentContainer componentContainer) {
-            final Object item = avElementList.get(position);
-            if (component == null && item instanceof AVElement) {
-                String itemText = ((AVElement) item).getAVDescription().getTitle().toString();
+            final AVElement item = avElementList.get(position);
+            if (component == null && item != null) {
+                String itemText = item.getAVDescription().getTitle().toString();
                 Text text = (Text) LayoutScatter.getInstance(AVPlayClient.this)
                     .parse(ResourceTable.Layout_list_item, null, false);
                 text.setText(itemText);
@@ -160,9 +154,9 @@ public class AVPlayClient extends Ability {
                 return component;
             }
         }
-    };
+    }
 
-    private AVConnectionCallback avConnectionCallback = new AVConnectionCallback() {
+    private final AVConnectionCallback avConnectionCallback = new AVConnectionCallback() {
         @Override
         public void onConnected() {
             LogUtil.info(TAG + "-AVConnectionCallback", "onConnected");
@@ -183,7 +177,7 @@ public class AVPlayClient extends Ability {
         }
     };
 
-    private AVControllerCallback avControllerCallback = new AVControllerCallback() {
+    private final AVControllerCallback avControllerCallback = new AVControllerCallback() {
         @Override
         public void onAVMetadataChanged(AVMetadata metadata) {
             // this will be called with avSession.setAVMetadata() called on service.
@@ -250,7 +244,7 @@ public class AVPlayClient extends Ability {
         }
     };
 
-    private AVSubscriptionCallback avSubscriptionCallback = new AVSubscriptionCallback() {
+    private final AVSubscriptionCallback avSubscriptionCallback = new AVSubscriptionCallback() {
         @Override
         public void onAVElementListLoaded(String parentId, List<AVElement> children) {
             // this will be called with onLoadAVElementList() called on service.
diff --git a/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/AVPlayService.java b/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/AVPlayService.java
index b1d7398d87..93ee88777f 100644
--- a/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/AVPlayService.java
+++ b/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/AVPlayService.java
@@ -68,7 +68,7 @@ public class AVPlayService extends AVBrowserService {
 
     private Player player;
 
-    private Timer timer = new Timer();
+    private final Timer timer = new Timer();
 
     private ProgressTimerTask progressTimerTask;
 
@@ -149,7 +149,7 @@ public class AVPlayService extends AVBrowserService {
         LogUtil.info(TAG, "onLoadAVElement");
     }
 
-    private AVSessionCallback avSessionCallback = new AVSessionCallback() {
+    private final AVSessionCallback avSessionCallback = new AVSessionCallback() {
         @Override
         public void onPlay() {
             super.onPlay();
@@ -182,7 +182,7 @@ public class AVPlayService extends AVBrowserService {
             super.onPlayNext();
             LogUtil.info(TAG + "-AVSessionCallback", "onPlayNext");
             AVDescription next = avElementManager.getNextAVElement().get().getAVDescription();
-            play(next, 0);
+            play(next);
         }
 
         @Override
@@ -190,17 +190,17 @@ public class AVPlayService extends AVBrowserService {
             super.onPlayPrevious();
             LogUtil.info(TAG + "-AVSessionCallback", "onPlayPrevious");
             AVDescription previous = avElementManager.getPreviousAVElement().get().getAVDescription();
-            play(previous, 0);
+            play(previous);
         }
 
-        private void play(AVDescription description, int position) {
+        private void play(AVDescription description) {
             if (player == null) {
                 player = new Player(getApplicationContext());
             }
             player.reset();
             player.setSource(new Source(description.getMediaUri().toString()));
             player.prepare();
-            player.rewindTo(position);
+            player.rewindTo(0);
             player.play();
 
             AVPlaybackState avPlaybackState = new AVPlaybackState.Builder().setAVPlaybackState(
@@ -235,7 +235,7 @@ public class AVPlayService extends AVBrowserService {
                 case AVPlaybackState.PLAYBACK_STATE_NONE: {
                     avElementManager.setCurrentAVElement(uri);
                     AVDescription current = avElementManager.getCurrentAVElement().getAVDescription();
-                    play(current, 0);
+                    play(current);
                     break;
                 }
                 default:
diff --git a/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/model/AVElementManager.java b/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/model/AVElementManager.java
index b1e2bb677a..4bc8505049 100644
--- a/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/model/AVElementManager.java
+++ b/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/model/AVElementManager.java
@@ -38,7 +38,7 @@ import java.util.Optional;
 public class AVElementManager {
     private static final String TAG = AVElementManager.class.getSimpleName();
 
-    private List<AVElement> avElements = new ArrayList<>();
+    private final List<AVElement> avElements = new ArrayList<>();
 
     private AVElement current;
 
diff --git a/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/utils/LogUtil.java b/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/utils/LogUtil.java
index 0828d52cba..c62fc2cadb 100644
--- a/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/utils/LogUtil.java
+++ b/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/utils/LogUtil.java
@@ -33,16 +33,6 @@ public class LogUtil {
     private LogUtil() {
     }
 
-    /**
-     * Print debug log
-     *
-     * @param tag log tag
-     * @param msg log message
-     */
-    public static void debug(String tag, String msg) {
-        HiLog.debug(LABEL_LOG, LOG_FORMAT, tag, msg);
-    }
-
     /**
      * Print info log
      *
diff --git a/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/utils/ThreadPoolManager.java b/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/utils/ThreadPoolManager.java
index fbbcd2f20f..22f1019db9 100644
--- a/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/utils/ThreadPoolManager.java
+++ b/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/utils/ThreadPoolManager.java
@@ -39,7 +39,7 @@ public class ThreadPoolManager {
     private ThreadPoolManager() {
         if (executor == null) {
             executor = new ThreadPoolExecutor(CORE_POOL_SIZE, MAXIMUM_POOL_SIZE, KEEP_ALIVE, TimeUnit.SECONDS,
-                new ArrayBlockingQueue<Runnable>(20), Executors.defaultThreadFactory(),
+                    new ArrayBlockingQueue<>(20), Executors.defaultThreadFactory(),
                 new ThreadPoolExecutor.AbortPolicy());
         }
     }
diff --git a/media/AudioPlayer/entry/src/main/resources/base/element/string.json b/media/AudioPlayer/entry/src/main/resources/base/element/string.json
index dacfceeb43..aacba5c5e3 100644
--- a/media/AudioPlayer/entry/src/main/resources/base/element/string.json
+++ b/media/AudioPlayer/entry/src/main/resources/base/element/string.json
@@ -27,6 +27,14 @@
     {
       "name": "jump",
       "value": "TO PLAY ONLINE AUDIO"
+    },
+    {
+      "name": "slash",
+      "value": "/"
+    },
+    {
+      "name": "http",
+      "value": "https://"
     }
   ]
 }
\ No newline at end of file
diff --git a/media/AudioPlayer/entry/src/main/resources/base/layout/main_play_layout.xml b/media/AudioPlayer/entry/src/main/resources/base/layout/main_play_layout.xml
index 05280bbaff..e42ca41f1f 100644
--- a/media/AudioPlayer/entry/src/main/resources/base/layout/main_play_layout.xml
+++ b/media/AudioPlayer/entry/src/main/resources/base/layout/main_play_layout.xml
@@ -20,7 +20,7 @@
 
     <Button
         ohos:id="$+id:jump_to_next_page_button"
-        ohos:text_size="20fp"
+        ohos:text_size="18fp"
         ohos:text="$string:jump"
         ohos:text_alignment="center"
         ohos:width="match_content"
@@ -79,7 +79,6 @@
         ohos:background_element="#11000055"/>
 
     <DirectionalLayout
-        ohos:id="$+id:main_play_root"
         ohos:background_element="#11550055"
         ohos:width="300vp"
         ohos:height="200vp"
@@ -112,7 +111,7 @@
 
             <Text
                 ohos:id="$+id:text_delimiter"
-                ohos:text="/"
+                ohos:text="$string:slash"
                 ohos:text_size="20fp"
                 ohos:text_color="#FF000000"
                 ohos:text_alignment="center"
diff --git a/media/AudioPlayer/entry/src/main/resources/base/layout/online_play_layout.xml b/media/AudioPlayer/entry/src/main/resources/base/layout/online_play_layout.xml
index 4236ba1cb3..6bb7b930b9 100644
--- a/media/AudioPlayer/entry/src/main/resources/base/layout/online_play_layout.xml
+++ b/media/AudioPlayer/entry/src/main/resources/base/layout/online_play_layout.xml
@@ -20,7 +20,7 @@
 
     <Text
         ohos:id="$+id:input_uri"
-        ohos:text="https://"
+        ohos:text="$string:http"
         ohos:text_size="20fp"
         ohos:margin="30vp"
         ohos:text_color="#FF000000"
diff --git a/media/Camera/entry/src/main/java/ohos/samples/camera/MainAbility.java b/media/Camera/entry/src/main/java/ohos/samples/camera/MainAbility.java
index df5006db77..0d37da545f 100644
--- a/media/Camera/entry/src/main/java/ohos/samples/camera/MainAbility.java
+++ b/media/Camera/entry/src/main/java/ohos/samples/camera/MainAbility.java
@@ -23,8 +23,6 @@ import ohos.bundle.IBundleManager;
 import ohos.security.SystemPermission;
 
 import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * MainAbility
@@ -39,13 +37,11 @@ public class MainAbility extends Ability {
 
     private void requestPermissions() {
         String[] permissions = {
-            SystemPermission.WRITE_USER_STORAGE, SystemPermission.READ_USER_STORAGE, SystemPermission.CAMERA,
-            SystemPermission.MICROPHONE, SystemPermission.LOCATION
+                SystemPermission.WRITE_USER_STORAGE, SystemPermission.READ_USER_STORAGE, SystemPermission.CAMERA,
+                SystemPermission.MICROPHONE, SystemPermission.LOCATION
         };
-        List<String> permissionFiltered = Arrays.stream(permissions)
-            .filter(permission -> verifySelfPermission(permission) != IBundleManager.PERMISSION_GRANTED)
-            .collect(Collectors.toList());
-        requestPermissionsFromUser(permissionFiltered.toArray(new String[permissionFiltered.size()]), 0);
+        requestPermissionsFromUser(Arrays.stream(permissions)
+                .filter(permission -> verifySelfPermission(permission) != IBundleManager.PERMISSION_GRANTED).toArray(String[]::new), 0);
     }
 
     @Override
diff --git a/media/Camera/entry/src/main/java/ohos/samples/camera/TakePhotoAbility.java b/media/Camera/entry/src/main/java/ohos/samples/camera/TakePhotoAbility.java
index 1242b7d832..7020281a07 100644
--- a/media/Camera/entry/src/main/java/ohos/samples/camera/TakePhotoAbility.java
+++ b/media/Camera/entry/src/main/java/ohos/samples/camera/TakePhotoAbility.java
@@ -76,7 +76,8 @@ public class TakePhotoAbility extends Ability {
 
     private ComponentContainer surfaceContainer;
 
-    private EventHandler eventHandler = new EventHandler(EventRunner.current()) { };
+    private final EventHandler eventHandler = new EventHandler(EventRunner.current()) {
+    };
 
     @Override
     public void onStart(Intent intent) {
@@ -90,11 +91,13 @@ public class TakePhotoAbility extends Ability {
     private void initSurface() {
         getWindow().setTransparent(true);
         DirectionalLayout.LayoutConfig params = new DirectionalLayout.LayoutConfig(
-            ComponentContainer.LayoutConfig.MATCH_PARENT, ComponentContainer.LayoutConfig.MATCH_PARENT);
+                ComponentContainer.LayoutConfig.MATCH_PARENT, ComponentContainer.LayoutConfig.MATCH_PARENT);
         surfaceProvider = new SurfaceProvider(this);
         surfaceProvider.setLayoutConfig(params);
         surfaceProvider.pinToZTop(false);
-        surfaceProvider.getSurfaceOps().get().addCallback(new SurfaceCallBack());
+        if (surfaceProvider.getSurfaceOps().isPresent()) {
+            surfaceProvider.getSurfaceOps().get().addCallback(new SurfaceCallBack());
+        }
         surfaceContainer.addComponent(surfaceProvider);
     }
 
@@ -118,7 +121,7 @@ public class TakePhotoAbility extends Ability {
         String cameraId = "";
         for (String logicalCameraId : cameraList) {
             int faceType = cameraKit.getCameraInfo(logicalCameraId).getFacingType();
-            switch (faceType){
+            switch (faceType) {
                 case CameraInfo.FacingType.CAMERA_FACING_FRONT:
                     if (isFrontCamera) {
                         cameraId = logicalCameraId;
@@ -149,7 +152,8 @@ public class TakePhotoAbility extends Ability {
         try (FileOutputStream output = new FileOutputStream(saveFile)) {
             output.write(bytes);
             output.flush();
-            showTips(this, "Take photo succeed");
+            String msg = "Take photo succeed";
+            showTips(this, msg);
         } catch (IOException e) {
             HiLog.error(LABEL_LOG, "%{public}s", "saveImage IOException");
         }
@@ -191,7 +195,9 @@ public class TakePhotoAbility extends Ability {
 
         @Override
         public void onCreated(Camera camera) {
-            previewSurface = surfaceProvider.getSurfaceOps().get().getSurface();
+            if (surfaceProvider.getSurfaceOps().isPresent()) {
+                previewSurface = surfaceProvider.getSurfaceOps().get().getSurface();
+            }
             if (previewSurface == null) {
                 HiLog.error(LABEL_LOG, "%{public}s", "Create camera filed, preview surface is null");
                 return;
@@ -220,14 +226,9 @@ public class TakePhotoAbility extends Ability {
         @Override
         public void surfaceCreated(SurfaceOps callbackSurfaceOps) {
             if (callbackSurfaceOps != null) {
-                callbackSurfaceOps.setFixedSize(SCREEN_HEIGHT,SCREEN_WIDTH);
+                callbackSurfaceOps.setFixedSize(SCREEN_HEIGHT, SCREEN_WIDTH);
             }
-            eventHandler.postTask(new Runnable() {
-                @Override
-                public void run() {
-                    openCamera();
-                }
-            },200);
+            eventHandler.postTask(TakePhotoAbility.this::openCamera, 200);
         }
 
         @Override
diff --git a/media/Camera/entry/src/main/java/ohos/samples/camera/VideoRecordAbility.java b/media/Camera/entry/src/main/java/ohos/samples/camera/VideoRecordAbility.java
index ba7de740b1..1b4159c1d3 100644
--- a/media/Camera/entry/src/main/java/ohos/samples/camera/VideoRecordAbility.java
+++ b/media/Camera/entry/src/main/java/ohos/samples/camera/VideoRecordAbility.java
@@ -80,7 +80,8 @@ public class VideoRecordAbility extends Ability {
 
     private final Object lock = new Object();
 
-    private EventHandler eventHandler = new EventHandler(EventRunner.current()) { };
+    private final EventHandler eventHandler = new EventHandler(EventRunner.current()) {
+    };
 
     @Override
     public void onStart(Intent intent) {
@@ -94,11 +95,13 @@ public class VideoRecordAbility extends Ability {
     private void initSurface() {
         getWindow().setTransparent(true);
         DirectionalLayout.LayoutConfig params = new DirectionalLayout.LayoutConfig(
-            ComponentContainer.LayoutConfig.MATCH_PARENT, ComponentContainer.LayoutConfig.MATCH_PARENT);
+                ComponentContainer.LayoutConfig.MATCH_PARENT, ComponentContainer.LayoutConfig.MATCH_PARENT);
         surfaceProvider = new SurfaceProvider(this);
         surfaceProvider.setLayoutConfig(params);
         surfaceProvider.pinToZTop(false);
-        surfaceProvider.getSurfaceOps().get().addCallback(new SurfaceCallBack());
+        if (surfaceProvider.getSurfaceOps().isPresent()) {
+            surfaceProvider.getSurfaceOps().get().addCallback(new SurfaceCallBack());
+        }
         surfaceContainer.addComponent(surfaceProvider);
     }
 
@@ -161,7 +164,7 @@ public class VideoRecordAbility extends Ability {
         String cameraId = "";
         for (String logicalCameraId : cameraList) {
             int faceType = cameraKit.getCameraInfo(logicalCameraId).getFacingType();
-            switch (faceType){
+            switch (faceType) {
                 case CameraInfo.FacingType.CAMERA_FACING_FRONT:
                     if (isFrontCamera) {
                         cameraId = logicalCameraId;
@@ -198,7 +201,9 @@ public class VideoRecordAbility extends Ability {
 
         @Override
         public void onCreated(Camera camera) {
-            previewSurface = surfaceProvider.getSurfaceOps().get().getSurface();
+            if (surfaceProvider.getSurfaceOps().isPresent()) {
+                previewSurface = surfaceProvider.getSurfaceOps().get().getSurface();
+            }
             if (previewSurface == null) {
                 HiLog.error(LABEL_LOG, "%{public}s", "Create camera filed, preview surface is null");
                 return;
@@ -273,15 +278,9 @@ public class VideoRecordAbility extends Ability {
         @Override
         public void surfaceCreated(SurfaceOps callbackSurfaceOps) {
             if (callbackSurfaceOps != null) {
-                callbackSurfaceOps.setFixedSize(SCREEN_HEIGHT,SCREEN_WIDTH);
+                callbackSurfaceOps.setFixedSize(SCREEN_HEIGHT, SCREEN_WIDTH);
             }
-            eventHandler.postTask(new Runnable() {
-                @Override
-                public void run() {
-                    openCamera();
-                }
-            },200);
-
+            eventHandler.postTask(VideoRecordAbility.this::openCamera, 200);
         }
 
         @Override
diff --git a/media/Camera/entry/src/main/java/ohos/samples/camera/slice/MainAbilitySlice.java b/media/Camera/entry/src/main/java/ohos/samples/camera/slice/MainAbilitySlice.java
index 8d881bfc71..857c6698b9 100644
--- a/media/Camera/entry/src/main/java/ohos/samples/camera/slice/MainAbilitySlice.java
+++ b/media/Camera/entry/src/main/java/ohos/samples/camera/slice/MainAbilitySlice.java
@@ -23,8 +23,6 @@ import ohos.aafwk.ability.AbilitySlice;
 import ohos.aafwk.content.Intent;
 import ohos.aafwk.content.Operation;
 import ohos.agp.components.Component;
-import ohos.agp.components.Image;
-import ohos.agp.components.Text;
 
 /**
  * MainAbilitySlice
@@ -46,10 +44,10 @@ public class MainAbilitySlice extends AbilitySlice {
 
     private void startAbility(String abilityName) {
         Operation operation = new Intent.OperationBuilder()
-            .withDeviceId("")
-            .withBundleName(getBundleName())
-            .withAbilityName(abilityName)
-            .build();
+                .withDeviceId("")
+                .withBundleName(getBundleName())
+                .withAbilityName(abilityName)
+                .build();
         Intent intent = new Intent();
         intent.setOperation(operation);
         startAbility(intent);
diff --git a/media/Camera/entry/src/main/resources/base/element/string.json b/media/Camera/entry/src/main/resources/base/element/string.json
index 1b00860953..738ca5d906 100644
--- a/media/Camera/entry/src/main/resources/base/element/string.json
+++ b/media/Camera/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,14 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "take_photo",
+      "value": "Take Photo"
+    },
+    {
+      "name": "video_record",
+      "value": "Video Record"
     }
   ]
 }
\ No newline at end of file
diff --git a/media/Camera/entry/src/main/resources/base/layout/main_ability_slice.xml b/media/Camera/entry/src/main/resources/base/layout/main_ability_slice.xml
index d0369e0a93..d3ada4fd4f 100644
--- a/media/Camera/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/media/Camera/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -32,7 +32,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="Take Photo"
+            ohos:text="$string:take_photo"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#ff000000"
             ohos:text_size="16fp"/>
@@ -56,7 +56,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="Video Record"
+            ohos:text="$string:video_record"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#ff000000"
             ohos:text_size="16fp"/>
diff --git a/media/PixelMap/entry/src/main/java/ohos/samples/pixelmap/slice/MainAbilitySlice.java b/media/PixelMap/entry/src/main/java/ohos/samples/pixelmap/slice/MainAbilitySlice.java
index dc8182f282..ddb58bf1e2 100644
--- a/media/PixelMap/entry/src/main/java/ohos/samples/pixelmap/slice/MainAbilitySlice.java
+++ b/media/PixelMap/entry/src/main/java/ohos/samples/pixelmap/slice/MainAbilitySlice.java
@@ -173,8 +173,6 @@ public class MainAbilitySlice extends AbilitySlice {
         ImageSource.SourceOptions srcOpts = new ImageSource.SourceOptions();
         srcOpts.formatHint = "image/jpeg";
         ImageSource imageSource = ImageSource.create(jpgCachePath, srcOpts);
-        int format = imageSource.getThumbnailFormat();
-        byte[] thumbnailBytes = imageSource.getImageThumbnailBytes();
         ImageSource.DecodingOptions decodingOpts = new ImageSource.DecodingOptions();
         PixelMap thumbnailPixelMap = imageSource.createThumbnailPixelmap(decodingOpts, false);
         String location = imageSource.getImagePropertyString(PropertyKey.Exif.SUBJECT_LOCATION);
@@ -220,7 +218,7 @@ public class MainAbilitySlice extends AbilitySlice {
         showResultText.setText(
             "This pixelMap detail info :" + System.lineSeparator() + "capacity = " + capacity + System.lineSeparator()
                 + "bytesNumber = " + bytesNumber + System.lineSeparator() + "rowBytes = " + rowBytes
-                + System.lineSeparator() + "ninePatchData = " + ninePatchData + System.lineSeparator());
+                + System.lineSeparator() + "ninePatchData = " + Arrays.toString(ninePatchData) + System.lineSeparator());
         pixelMap.release();
         pixelMap2.release();
     }
diff --git a/media/PixelMap/entry/src/main/resources/base/element/string.json b/media/PixelMap/entry/src/main/resources/base/element/string.json
index ee4a562d8d..1efe9dd16e 100644
--- a/media/PixelMap/entry/src/main/resources/base/element/string.json
+++ b/media/PixelMap/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,26 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "common_decode",
+      "value": "Common Decode"
+    },
+    {
+      "name": "region_decode",
+      "value": "Region Decode"
+    },
+    {
+      "name": "encode",
+      "value": "Encode"
+    },
+    {
+      "name": "pm_edit",
+      "value": "PixelMap Edit"
+    },
+    {
+      "name": "attribute",
+      "value": "PixelMap Attribute"
     }
   ]
 }
\ No newline at end of file
diff --git a/media/PixelMap/entry/src/main/resources/base/layout/main_ability_slice.xml b/media/PixelMap/entry/src/main/resources/base/layout/main_ability_slice.xml
index dcfa556c60..73f5f7504d 100644
--- a/media/PixelMap/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/media/PixelMap/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -27,7 +27,7 @@
         ohos:width="300vp"
         ohos:background_element="$graphic:button_bg"
         ohos:padding="5vp"
-        ohos:text="Common Decode"
+        ohos:text="$string:common_decode"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
         ohos:top_margin="50vp"/>
@@ -38,7 +38,7 @@
         ohos:width="300vp"
         ohos:background_element="$graphic:button_bg"
         ohos:padding="5vp"
-        ohos:text="Region Decode"
+        ohos:text="$string:region_decode"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
         ohos:top_margin="10vp"/>
@@ -49,7 +49,7 @@
         ohos:width="300vp"
         ohos:background_element="$graphic:button_bg"
         ohos:padding="5vp"
-        ohos:text="Encode"
+        ohos:text="$string:encode"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
         ohos:top_margin="10vp"/>
@@ -60,7 +60,7 @@
         ohos:width="300vp"
         ohos:background_element="$graphic:button_bg"
         ohos:padding="5vp"
-        ohos:text="PixelMap Edit"
+        ohos:text="$string:pm_edit"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
         ohos:top_margin="10vp"/>
@@ -71,7 +71,7 @@
         ohos:width="300vp"
         ohos:background_element="$graphic:button_bg"
         ohos:padding="5vp"
-        ohos:text="PixelMap Attribute"
+        ohos:text="$string:attribute"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
         ohos:top_margin="10vp"/>
diff --git a/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/slice/MainAbilitySlice.java b/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/slice/MainAbilitySlice.java
index 8b1575ac8e..7525243cb3 100644
--- a/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/slice/MainAbilitySlice.java
+++ b/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/slice/MainAbilitySlice.java
@@ -15,6 +15,7 @@
 
 package ohos.samples.videoplayer.slice;
 
+import ohos.agp.components.*;
 import ohos.samples.videoplayer.ResourceTable;
 import ohos.samples.videoplayer.utils.LogUtil;
 import ohos.samples.videoplayer.utils.VideoElementManager;
@@ -22,13 +23,6 @@ import ohos.samples.videoplayer.utils.VideoPlayerPlugin;
 
 import ohos.aafwk.ability.AbilitySlice;
 import ohos.aafwk.content.Intent;
-import ohos.agp.components.Component;
-import ohos.agp.components.ComponentContainer;
-import ohos.agp.components.DirectionalLayout;
-import ohos.agp.components.LayoutScatter;
-import ohos.agp.components.ListContainer;
-import ohos.agp.components.RecycleItemProvider;
-import ohos.agp.components.Text;
 import ohos.agp.components.surfaceprovider.SurfaceProvider;
 import ohos.agp.graphics.Surface;
 import ohos.agp.graphics.SurfaceOps;
@@ -49,20 +43,10 @@ public class MainAbilitySlice extends AbilitySlice {
 
     private VideoPlayerPlugin videoPlayerPlugin;
 
-    private Component refreshButton;
-
-    private Component playButton;
-
-    private Component pauseButton;
-
-    private Component seekButton;
-
     private ListContainer listContainer;
 
     private List<AVElement> avElements = new ArrayList<>();
 
-    private VideoElementManager videoElementManager;
-
     private Surface surface;
 
     private VideoElementsListItemProvider videoElementsListItemProvider;
@@ -79,8 +63,10 @@ public class MainAbilitySlice extends AbilitySlice {
     private void addSurfaceProvider() {
         surfaceProvider = new SurfaceProvider(this);
 
-        surfaceProvider.getSurfaceOps().get().addCallback(new SurfaceCallBack());
-        surfaceProvider.pinToZTop(true);
+        if (surfaceProvider.getSurfaceOps().isPresent()) {
+            surfaceProvider.getSurfaceOps().get().addCallback(new SurfaceCallBack());
+            surfaceProvider.pinToZTop(true);
+        }
 
         DirectionalLayout directionalLayout = (DirectionalLayout) findComponentById(ResourceTable.Id_directionalLayout);
         directionalLayout.addComponent(surfaceProvider);
@@ -92,10 +78,10 @@ public class MainAbilitySlice extends AbilitySlice {
 
     private void initComponents() {
         titleText = (Text) findComponentById(ResourceTable.Id_videoTitle_text);
-        refreshButton = findComponentById(ResourceTable.Id_refresh_list_button);
-        playButton = findComponentById(ResourceTable.Id_play_button);
-        pauseButton = findComponentById(ResourceTable.Id_pause_button);
-        seekButton = findComponentById(ResourceTable.Id_seek_button);
+        Component refreshButton = findComponentById(ResourceTable.Id_refresh_list_button);
+        Component playButton = findComponentById(ResourceTable.Id_play_button);
+        Component pauseButton = findComponentById(ResourceTable.Id_pause_button);
+        Component seekButton = findComponentById(ResourceTable.Id_seek_button);
         listContainer = (ListContainer) findComponentById(ResourceTable.Id_listContainer);
 
         playButton.setClickedListener((Component component) -> videoPlayerPlugin.startPlay());
@@ -114,7 +100,7 @@ public class MainAbilitySlice extends AbilitySlice {
     }
 
     private void refreshList() {
-        videoElementManager = new VideoElementManager(getApplicationContext());
+        VideoElementManager videoElementManager = new VideoElementManager(getApplicationContext());
         avElements = videoElementManager.getAvElements();
         listContainer.setItemProvider(videoElementsListItemProvider);
     }
@@ -148,7 +134,7 @@ public class MainAbilitySlice extends AbilitySlice {
         }
     }
 
-    class VideoElementsListItemProvider extends RecycleItemProvider {
+    class VideoElementsListItemProvider extends BaseItemProvider {
         @Override
         public int getCount() {
             return avElements.size();
@@ -170,7 +156,7 @@ public class MainAbilitySlice extends AbilitySlice {
             if (component == null) {
                 String itemText = item.getAVDescription().getTitle().toString();
                 Text text = (Text) LayoutScatter.getInstance(MainAbilitySlice.this)
-                    .parse(ResourceTable.Layout_list_item, null, false);
+                        .parse(ResourceTable.Layout_list_item, null, false);
                 text.setText(itemText);
                 return text;
             } else {
diff --git a/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/utils/LogUtil.java b/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/utils/LogUtil.java
index 3075d2496e..7e3ab702e6 100644
--- a/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/utils/LogUtil.java
+++ b/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/utils/LogUtil.java
@@ -34,16 +34,6 @@ public class LogUtil {
         /* Do nothing */
     }
 
-    /**
-     * Print debug log
-     *
-     * @param tag log tag
-     * @param msg log message
-     */
-    public static void debug(String tag, String msg) {
-        HiLog.debug(LABEL_LOG, LOG_FORMAT, tag, msg);
-    }
-
     /**
      * Print info log
      *
@@ -54,16 +44,6 @@ public class LogUtil {
         HiLog.info(LABEL_LOG, LOG_FORMAT, tag, msg);
     }
 
-    /**
-     * Print warn log
-     *
-     * @param tag log tag
-     * @param msg log message
-     */
-    public static void warn(String tag, String msg) {
-        HiLog.warn(LABEL_LOG, LOG_FORMAT, tag, msg);
-    }
-
     /**
      * Print error log
      *
diff --git a/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/utils/ThreadPoolManager.java b/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/utils/ThreadPoolManager.java
index 4539c902f8..b2fee48cb7 100644
--- a/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/utils/ThreadPoolManager.java
+++ b/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/utils/ThreadPoolManager.java
@@ -39,8 +39,8 @@ public class ThreadPoolManager {
     private ThreadPoolManager() {
         if (executor == null) {
             executor = new ThreadPoolExecutor(CORE_POOL_SIZE, MAXIMUM_POOL_SIZE, KEEP_ALIVE, TimeUnit.SECONDS,
-                new ArrayBlockingQueue<Runnable>(20), Executors.defaultThreadFactory(),
-                new ThreadPoolExecutor.AbortPolicy());
+                    new ArrayBlockingQueue<>(20), Executors.defaultThreadFactory(),
+                    new ThreadPoolExecutor.AbortPolicy());
         }
     }
 
diff --git a/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/utils/VideoElementManager.java b/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/utils/VideoElementManager.java
index 4c44ff953b..a75a460412 100644
--- a/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/utils/VideoElementManager.java
+++ b/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/utils/VideoElementManager.java
@@ -34,7 +34,7 @@ public class VideoElementManager {
     private static final String TAG = VideoElementManager.class.getSimpleName();
     private static final String WEB_VIDEO_PATH = "https://ss0.bdstatic.com/-0U0bnSm1A5BphGlnYG/"
             + "cae-legoup-video-target/93be3d88-9fc2-4fbd-bd14-833bca731ca7.mp4";
-    private List<AVElement> avElements = new ArrayList<>();
+    private final List<AVElement> avElements = new ArrayList<>();
 
     /**
      * The construction method of this class
diff --git a/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/utils/VideoPlayerPlugin.java b/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/utils/VideoPlayerPlugin.java
index 88fa821883..1f74af942a 100644
--- a/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/utils/VideoPlayerPlugin.java
+++ b/media/VideoPlayer/entry/src/main/java/ohos/samples/videoplayer/utils/VideoPlayerPlugin.java
@@ -29,9 +29,9 @@ public class VideoPlayerPlugin {
 
     private static final int REWIND_TIME = 2000;
 
-    private Player videoPlayer;
+    private final Context context;
 
-    private Context context;
+    private Player videoPlayer;
 
     private Runnable videoRunnable;
 
@@ -59,7 +59,7 @@ public class VideoPlayerPlugin {
      * Set source,prepare,start
      *
      * @param avElement AVElement
-     * @param surface Surface
+     * @param surface   Surface
      */
     public synchronized void startPlay(AVElement avElement, Surface surface) {
         if (videoPlayer != null) {
diff --git a/media/VideoPlayer/entry/src/main/resources/base/element/string.json b/media/VideoPlayer/entry/src/main/resources/base/element/string.json
index 9efac3a5e9..31554005fe 100644
--- a/media/VideoPlayer/entry/src/main/resources/base/element/string.json
+++ b/media/VideoPlayer/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,26 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "video",
+      "value": "Video"
+    },
+    {
+      "name": "play",
+      "value": "play"
+    },
+    {
+      "name": "pause",
+      "value": "pause"
+    },
+    {
+      "name": "seek",
+      "value": "seek"
+    },
+    {
+      "name": "refresh_list",
+      "value": "Refresh List"
     }
   ]
 }
\ No newline at end of file
diff --git a/media/VideoPlayer/entry/src/main/resources/base/layout/main_ability_slice.xml b/media/VideoPlayer/entry/src/main/resources/base/layout/main_ability_slice.xml
index aad5aafeab..4b83e5a4d4 100644
--- a/media/VideoPlayer/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/media/VideoPlayer/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -23,7 +23,7 @@
         ohos:id="$+id:videoTitle_text"
         ohos:text_size="15fp"
         ohos:width="match_content"
-        ohos:text="Video"
+        ohos:text="$string:video"
         ohos:layout_alignment="horizontal_center"
         ohos:left_margin="5vp"
         ohos:top_margin="20vp"
@@ -47,7 +47,7 @@
 
         <Button
             ohos:id="$+id:play_button"
-            ohos:text="play"
+            ohos:text="$string:play"
             ohos:width="0vp"
             ohos:weight="1"
             ohos:height="match_content"
@@ -58,7 +58,7 @@
 
         <Button
             ohos:id="$+id:pause_button"
-            ohos:text="pause"
+            ohos:text="$string:pause"
             ohos:width="0vp"
             ohos:weight="1"
             ohos:height="match_content"
@@ -80,7 +80,7 @@
 
         <Button
             ohos:id="$+id:seek_button"
-            ohos:text="seek"
+            ohos:text="$string:seek"
             ohos:width="0vp"
             ohos:weight="1"
             ohos:padding="8vp"
@@ -91,7 +91,7 @@
 
         <Button
             ohos:id="$+id:refresh_list_button"
-            ohos:text="Refresh List"
+            ohos:text="$string:refresh_list"
             ohos:width="0vp"
             ohos:weight="1"
             ohos:height="match_content"
diff --git a/network/Bluetooth/entry/src/main/java/ohos/samples/bluetooth/BluetoothPlugin.java b/network/Bluetooth/entry/src/main/java/ohos/samples/bluetooth/BluetoothPlugin.java
index 70e4b1ffa7..cf9cba0e72 100644
--- a/network/Bluetooth/entry/src/main/java/ohos/samples/bluetooth/BluetoothPlugin.java
+++ b/network/Bluetooth/entry/src/main/java/ohos/samples/bluetooth/BluetoothPlugin.java
@@ -58,7 +58,7 @@ public class BluetoothPlugin {
 
     private CommonEventSubscriber commonEventSubscriber = null;
 
-    private Set<BluetoothRemoteDevice> availableDevices = new LinkedHashSet<>();
+    private final Set<BluetoothRemoteDevice> availableDevices = new LinkedHashSet<>();
 
     private AbilityContext mainSliceContext;
 
@@ -222,8 +222,7 @@ public class BluetoothPlugin {
     }
 
     private void handleDevicePairState(Intent intent) {
-        BluetoothRemoteDevice btRemoteDevice = intent.getParcelableParam(
-            BluetoothRemoteDevice.REMOTE_DEVICE_PARAM_DEVICE);
+        BluetoothRemoteDevice btRemoteDevice = intent.getSequenceableParam(BluetoothRemoteDevice.REMOTE_DEVICE_PARAM_DEVICE);
         if (btRemoteDevice.getPairState() == BluetoothRemoteDevice.PAIR_STATE_PAIRED) {
             updateAvailableDeviceList(btRemoteDevice);
             updatePairedDeviceList();
@@ -240,7 +239,7 @@ public class BluetoothPlugin {
     }
 
     private void handleBluetoothDeviceDiscovered(Intent intent) {
-        BluetoothRemoteDevice btRemoteDevice = intent.getParcelableParam(
+        BluetoothRemoteDevice btRemoteDevice = intent.getSequenceableParam(
             BluetoothRemoteDevice.REMOTE_DEVICE_PARAM_DEVICE);
         if (btRemoteDevice.getPairState() != BluetoothRemoteDevice.PAIR_STATE_PAIRED) {
             availableDevices.add(btRemoteDevice);
diff --git a/network/Bluetooth/entry/src/main/java/ohos/samples/bluetooth/adapter/BluetoothItemProvider.java b/network/Bluetooth/entry/src/main/java/ohos/samples/bluetooth/adapter/BluetoothItemProvider.java
index 1e4b5cd8ec..058eb0badb 100644
--- a/network/Bluetooth/entry/src/main/java/ohos/samples/bluetooth/adapter/BluetoothItemProvider.java
+++ b/network/Bluetooth/entry/src/main/java/ohos/samples/bluetooth/adapter/BluetoothItemProvider.java
@@ -33,7 +33,7 @@ import java.util.List;
  * BluetoothItemProvider extends BaseItemProvider
  */
 public class BluetoothItemProvider extends BaseItemProvider {
-    private AbilityContext context;
+    private final AbilityContext context;
 
     private List<BluetoothDevice> bluetoothDeviceList;
 
diff --git a/network/Bluetooth/entry/src/main/java/ohos/samples/bluetooth/utils/LogUtil.java b/network/Bluetooth/entry/src/main/java/ohos/samples/bluetooth/utils/LogUtil.java
index f924dcf50c..8963fd608d 100644
--- a/network/Bluetooth/entry/src/main/java/ohos/samples/bluetooth/utils/LogUtil.java
+++ b/network/Bluetooth/entry/src/main/java/ohos/samples/bluetooth/utils/LogUtil.java
@@ -36,16 +36,6 @@ public class LogUtil {
         /* Do nothing */
     }
 
-    /**
-     * Print debug log
-     *
-     * @param tag log tag
-     * @param msg log message
-     */
-    public static void debug(String tag, String msg) {
-        HiLog.debug(LABEL_LOG, String.format(Locale.ROOT, LOG_FORMAT, tag, msg));
-    }
-
     /**
      * Print info log
      *
@@ -56,16 +46,6 @@ public class LogUtil {
         HiLog.info(LABEL_LOG, String.format(Locale.ROOT, LOG_FORMAT, tag, msg));
     }
 
-    /**
-     * Print warn log
-     *
-     * @param tag log tag
-     * @param msg log message
-     */
-    public static void warn(String tag, String msg) {
-        HiLog.warn(LABEL_LOG, String.format(Locale.ROOT, LOG_FORMAT, tag, msg));
-    }
-
     /**
      * Print error log
      *
diff --git a/network/Bluetooth/entry/src/main/resources/base/layout/slice_main.xml b/network/Bluetooth/entry/src/main/resources/base/layout/slice_main.xml
index ea675a99ce..f4584dcf7d 100644
--- a/network/Bluetooth/entry/src/main/resources/base/layout/slice_main.xml
+++ b/network/Bluetooth/entry/src/main/resources/base/layout/slice_main.xml
@@ -81,7 +81,7 @@
                 ohos:id="$+id:container_lists"
                 ohos:height="match_content"
                 ohos:width="match_parent"
-                ohos:visibility="gone">
+                ohos:visibility="hide">
 
                 <DirectionalLayout
                     ohos:height="match_content"
@@ -126,7 +126,7 @@
                             ohos:id="$+id:progressbar"
                             ohos:height="24vp"
                             ohos:width="24vp"
-                            ohos:visibility="gone"
+                            ohos:visibility="hide"
                             ohos:layout_alignment="right|vertical_center"
                             ohos:right_margin="20vp"
                             ohos:progress_color="#2B3FD2"
diff --git a/network/DistributedAbility/client/src/main/java/ohos/samples/distributedclient/DevicePlugin.java b/network/DistributedAbility/client/src/main/java/ohos/samples/distributedclient/DevicePlugin.java
index 441976ac36..f55315d6d5 100644
--- a/network/DistributedAbility/client/src/main/java/ohos/samples/distributedclient/DevicePlugin.java
+++ b/network/DistributedAbility/client/src/main/java/ohos/samples/distributedclient/DevicePlugin.java
@@ -18,7 +18,6 @@ package ohos.samples.distributedclient;
 import ohos.samples.distributedclient.interfaces.DeviceListener;
 import ohos.samples.distributedclient.utils.LogUtil;
 import ohos.samples.distributedserver.RemoteAgentProxy;
-import ohos.samples.distributedserver.RemoteAgentStub;
 
 import ohos.aafwk.ability.IAbilityConnection;
 import ohos.aafwk.content.Intent;
@@ -45,15 +44,11 @@ public class DevicePlugin {
 
     private static volatile DevicePlugin instance = null;
 
-    private List<DeviceInfo> deviceInfoList;
-
     private Context context;
 
-    private String remoteDeviceId;
-
     private DeviceListener listener;
 
-    private IAbilityConnection connection = new IAbilityConnection() {
+    private final IAbilityConnection connection = new IAbilityConnection() {
         @Override
         public void onAbilityConnectDone(ElementName elementName, IRemoteObject iRemoteObject, int resultCode) {
             LogUtil.info(TAG, "onAbilityConnectDone resultCode:" + resultCode);
@@ -73,7 +68,7 @@ public class DevicePlugin {
         }
     };
 
-    private IDeviceStateCallback iDeviceStateCallback = new IDeviceStateCallback() {
+    private final IDeviceStateCallback iDeviceStateCallback = new IDeviceStateCallback() {
         @Override
         public void onDeviceOffline(String deviceId, int deviceType) {
             LogUtil.info(TAG, "onDeviceOffline , deviceId: " + deviceId);
@@ -95,8 +90,7 @@ public class DevicePlugin {
      * @return current distribute net device list
      */
     public List<DeviceInfo> scanRemoteAbility() {
-        deviceInfoList = DeviceManager.getDeviceList(DeviceInfo.FLAG_GET_ALL_DEVICE);
-        return deviceInfoList;
+        return DeviceManager.getDeviceList(DeviceInfo.FLAG_GET_ALL_DEVICE);
     }
 
     /**
@@ -106,9 +100,8 @@ public class DevicePlugin {
      * @param context context.
      */
     public void connectAbility(Context context, DeviceInfo deviceInfo) {
-        remoteDeviceId = deviceInfo.getDeviceId();
         Intent intent = new Intent();
-        Operation operation = new Intent.OperationBuilder().withDeviceId(remoteDeviceId)
+        Operation operation = new Intent.OperationBuilder().withDeviceId(deviceInfo.getDeviceId())
             .withBundleName(REMOTE_BUNDLE_NAME)
             .withAbilityName(REMOTE_ABILITY_NAME)
             .withFlags(Intent.FLAG_ABILITYSLICE_MULTI_DEVICE)
@@ -120,15 +113,10 @@ public class DevicePlugin {
 
     /**
      * disconnect remote ability
-     *
-     * @return connect result
      */
-    public boolean stopRemoteConnectedAbility() {
-        if (connection != null) {
-            context.disconnectAbility(connection);
-            LogUtil.info(TAG, "stopRemoteConnectAbility");
-        }
-        return true;
+    public void stopRemoteConnectedAbility() {
+        context.disconnectAbility(connection);
+        LogUtil.info(TAG, "stopRemoteConnectAbility");
     }
 
     /**
diff --git a/network/DistributedAbility/client/src/main/java/ohos/samples/distributedclient/provider/DeviceProvider.java b/network/DistributedAbility/client/src/main/java/ohos/samples/distributedclient/provider/DeviceProvider.java
index e84cbcc2d4..b38836cac2 100644
--- a/network/DistributedAbility/client/src/main/java/ohos/samples/distributedclient/provider/DeviceProvider.java
+++ b/network/DistributedAbility/client/src/main/java/ohos/samples/distributedclient/provider/DeviceProvider.java
@@ -15,15 +15,11 @@
 
 package ohos.samples.distributedclient.provider;
 
+import ohos.agp.components.*;
 import ohos.samples.distributedclient.DevicePlugin;
 import ohos.samples.distributedclient.ResourceTable;
 import ohos.samples.distributedclient.slice.MainAbilitySlice;
 
-import ohos.agp.components.Component;
-import ohos.agp.components.ComponentContainer;
-import ohos.agp.components.LayoutScatter;
-import ohos.agp.components.RecycleItemProvider;
-import ohos.agp.components.Text;
 import ohos.app.Context;
 import ohos.distributedschedule.interwork.DeviceInfo;
 
@@ -32,12 +28,12 @@ import java.util.List;
 /**
  * DeviceProvider
  */
-public class DeviceProvider extends RecycleItemProvider {
-    private Context context;
+public class DeviceProvider extends BaseItemProvider {
+    private final Context context;
 
     private List<DeviceInfo> deviceInfoList;
 
-    private DevicePlugin devicePlugin;
+    private final DevicePlugin devicePlugin;
 
     public DeviceProvider(MainAbilitySlice mainAbilitySlice, List<DeviceInfo> deviceInfoList,
         DevicePlugin devicePlugin) {
diff --git a/network/DistributedAbility/client/src/main/java/ohos/samples/distributedclient/slice/MainAbilitySlice.java b/network/DistributedAbility/client/src/main/java/ohos/samples/distributedclient/slice/MainAbilitySlice.java
index 9326d38bac..14035b3b8e 100644
--- a/network/DistributedAbility/client/src/main/java/ohos/samples/distributedclient/slice/MainAbilitySlice.java
+++ b/network/DistributedAbility/client/src/main/java/ohos/samples/distributedclient/slice/MainAbilitySlice.java
@@ -57,7 +57,7 @@ public class MainAbilitySlice extends AbilitySlice implements DeviceListener {
 
     private String dialogMessage;
 
-    private EventHandler handler = new EventHandler(EventRunner.current()) {
+    private final EventHandler handler = new EventHandler(EventRunner.current()) {
         @Override
         protected void processEvent(InnerEvent event) {
             showDialog(dialogMessage);
@@ -84,10 +84,10 @@ public class MainAbilitySlice extends AbilitySlice implements DeviceListener {
         Component scanBtn = findComponentById(ResourceTable.Id_scan_btn);
         Component registerBtn = findComponentById(ResourceTable.Id_register_change_btn);
         Component unRegisterBtn = findComponentById(ResourceTable.Id_unregister_btn);
-        Component unDisconnectBtn = findComponentById(ResourceTable.Id_disconnect_btn);
+        Component disconnectBtn = findComponentById(ResourceTable.Id_disconnect_btn);
         registerBtn.setClickedListener(component -> devicePlugin.registerDeviceStateListener());
         unRegisterBtn.setClickedListener(component -> devicePlugin.unRegisterDeviceStateListener());
-        unDisconnectBtn.setClickedListener(component -> devicePlugin.stopRemoteConnectedAbility());
+        disconnectBtn.setClickedListener(component -> devicePlugin.stopRemoteConnectedAbility());
         scanBtn.setClickedListener(component -> scanRemoteAbility(true));
         deviceProvider = new DeviceProvider(this, deviceInfoList, devicePlugin);
         ListContainer listContainer = (ListContainer) findComponentById(ResourceTable.Id_container_list);
diff --git a/network/DistributedAbility/server/src/main/java/ohos/samples/distributedserver/RemoteAbility.java b/network/DistributedAbility/server/src/main/java/ohos/samples/distributedserver/RemoteAbility.java
index 6bd69c697b..bd1b429ee5 100644
--- a/network/DistributedAbility/server/src/main/java/ohos/samples/distributedserver/RemoteAbility.java
+++ b/network/DistributedAbility/server/src/main/java/ohos/samples/distributedserver/RemoteAbility.java
@@ -44,7 +44,7 @@ public final class RemoteAbility extends Ability {
 
     private static final int DIALOG_CORNER_RADIUS = 30;
 
-    private RemoteAgentStub remoteAgent = new RemoteAgentStub(ABILITY_DESCRIPTION) {
+    private final RemoteAgentStub remoteAgent = new RemoteAgentStub(ABILITY_DESCRIPTION) {
         @Override
         public void setRemoteObject() {
             LogUtil.info(TAG, " RemoteAgentStub setRemoteObject");
@@ -57,14 +57,14 @@ public final class RemoteAbility extends Ability {
         LogUtil.info(TAG, "onConnect Success , ConnectedDeviceName : " + connectedDeviceName);
         super.onConnect(intent);
         showDialog("Connect Success");
-        showNotification(this, NOTIFICATION_ID, "DistributedServer message", "Connect Success");
+        showNotification(this, "Connect Success");
         return remoteAgent;
     }
 
     @Override
     public void onDisconnect(Intent intent) {
         super.onDisconnect(intent);
-        showNotification(this, NOTIFICATION_ID, "DistributedServer message", "Disconnected");
+        showNotification(this, "Disconnected");
         showDialog("Disconnected");
         cancelBackgroundRunning();
     }
@@ -76,14 +76,14 @@ public final class RemoteAbility extends Ability {
         cancelBackgroundRunning();
     }
 
-    private void showNotification(Ability ability, int notificationId, String title, String text) {
+    private void showNotification(Ability ability, String text) {
         NotificationRequest.NotificationNormalContent content = new NotificationRequest.NotificationNormalContent();
-        content.setTitle(title).setText(text);
+        content.setTitle("DistributedServer message").setText(text);
         NotificationRequest.NotificationContent notificationContent = new NotificationRequest.NotificationContent(
             content);
-        NotificationRequest request = new NotificationRequest(notificationId);
+        NotificationRequest request = new NotificationRequest(NOTIFICATION_ID);
         request.setContent(notificationContent);
-        ability.keepBackgroundRunning(notificationId, request);
+        ability.keepBackgroundRunning(NOTIFICATION_ID, request);
         try {
             NotificationHelper.publishNotification(request);
         } catch (RemoteException e) {
diff --git a/network/DistributedAbility/server/src/main/resources/base/element/string.json b/network/DistributedAbility/server/src/main/resources/base/element/string.json
index 31cfed78f4..fd3d8ea918 100644
--- a/network/DistributedAbility/server/src/main/resources/base/element/string.json
+++ b/network/DistributedAbility/server/src/main/resources/base/element/string.json
@@ -11,6 +11,14 @@
     {
       "name": "serviceability_description",
       "value": "hap sample empty service"
+    },
+    {
+      "name": "distribute_server",
+      "value": "Distribute Server"
+    },
+    {
+      "name": "text_ok",
+      "value": "O K"
     }
   ]
 }
\ No newline at end of file
diff --git a/network/DistributedAbility/server/src/main/resources/base/layout/dialog_layout.xml b/network/DistributedAbility/server/src/main/resources/base/layout/dialog_layout.xml
index 23a6429627..6d5ff9ccdd 100644
--- a/network/DistributedAbility/server/src/main/resources/base/layout/dialog_layout.xml
+++ b/network/DistributedAbility/server/src/main/resources/base/layout/dialog_layout.xml
@@ -43,7 +43,7 @@
         ohos:text_alignment="center"
         ohos:margin="10vp"
         ohos:height="match_content"
-        ohos:text="O K"
+        ohos:text="$string:text_ok"
         ohos:text_size="18fp"
         ohos:text_color="#0000ff"/>
 </DirectionalLayout>
\ No newline at end of file
diff --git a/network/DistributedAbility/server/src/main/resources/base/layout/main_layout.xml b/network/DistributedAbility/server/src/main/resources/base/layout/main_layout.xml
index ef166bb3fa..776325553d 100644
--- a/network/DistributedAbility/server/src/main/resources/base/layout/main_layout.xml
+++ b/network/DistributedAbility/server/src/main/resources/base/layout/main_layout.xml
@@ -22,7 +22,7 @@
 
     <Text
         ohos:width="match_content"
-        ohos:text="Distribute Server"
+        ohos:text="$string:distribute_server"
         ohos:height="match_content"
         ohos:text_size="18fp"
         ohos:text_color="#0000ff"/>
diff --git a/network/DistributedDevices/entry/src/main/java/ohos/samples/devices/provider/DeviceProvider.java b/network/DistributedDevices/entry/src/main/java/ohos/samples/devices/provider/DeviceProvider.java
index a2da38e768..f8dd1b1dbf 100644
--- a/network/DistributedDevices/entry/src/main/java/ohos/samples/devices/provider/DeviceProvider.java
+++ b/network/DistributedDevices/entry/src/main/java/ohos/samples/devices/provider/DeviceProvider.java
@@ -15,14 +15,10 @@
 
 package ohos.samples.devices.provider;
 
+import ohos.agp.components.*;
 import ohos.samples.devices.ResourceTable;
 import ohos.samples.devices.slice.MainAbilitySlice;
 
-import ohos.agp.components.Component;
-import ohos.agp.components.ComponentContainer;
-import ohos.agp.components.LayoutScatter;
-import ohos.agp.components.RecycleItemProvider;
-import ohos.agp.components.Text;
 import ohos.agp.utils.Color;
 import ohos.app.Context;
 import ohos.distributedschedule.interwork.DeviceInfo;
@@ -32,14 +28,14 @@ import java.util.List;
 /**
  * DeviceProvider
  */
-public class DeviceProvider extends RecycleItemProvider {
+public class DeviceProvider extends BaseItemProvider {
     private static final String STATUS_ONLINE = "online";
 
     private static final String STATUS_OFFLINE = "offline";
 
     private static final int SUBSTRING_INDEX = 6;
 
-    private Context context;
+    private final Context context;
 
     private List<DeviceInfo> deviceInfoList;
 
diff --git a/network/DistributedDevices/entry/src/main/java/ohos/samples/devices/slice/MainAbilitySlice.java b/network/DistributedDevices/entry/src/main/java/ohos/samples/devices/slice/MainAbilitySlice.java
index 3f7fd9fce3..ef25016b76 100644
--- a/network/DistributedDevices/entry/src/main/java/ohos/samples/devices/slice/MainAbilitySlice.java
+++ b/network/DistributedDevices/entry/src/main/java/ohos/samples/devices/slice/MainAbilitySlice.java
@@ -43,7 +43,7 @@ public class MainAbilitySlice extends AbilitySlice {
 
     private DeviceProvider deviceProvider;
 
-    private EventHandler handler = new EventHandler(EventRunner.current()) {
+    private final EventHandler handler = new EventHandler(EventRunner.current()) {
         @Override
         protected void processEvent(InnerEvent event) {
             deviceProvider.updateData(getDeviceList());
@@ -74,7 +74,7 @@ public class MainAbilitySlice extends AbilitySlice {
         DeviceManager.registerDeviceStateCallback(iDeviceStateCallback);
     }
 
-    private IDeviceStateCallback iDeviceStateCallback = new IDeviceStateCallback() {
+    private final IDeviceStateCallback iDeviceStateCallback = new IDeviceStateCallback() {
         @Override
         public void onDeviceOffline(String deviceId, int deviceType) {
             LogUtil.info(TAG, "DeviceOffline : " + deviceId);
diff --git a/network/DistributedDevices/entry/src/main/java/ohos/samples/devices/utils/LogUtil.java b/network/DistributedDevices/entry/src/main/java/ohos/samples/devices/utils/LogUtil.java
index 50356ddd74..ee0d08b626 100644
--- a/network/DistributedDevices/entry/src/main/java/ohos/samples/devices/utils/LogUtil.java
+++ b/network/DistributedDevices/entry/src/main/java/ohos/samples/devices/utils/LogUtil.java
@@ -45,14 +45,4 @@ public class LogUtil {
     public static void info(String tag, String msg) {
         HiLog.info(LABEL_LOG, String.format(Locale.ROOT, LOG_FORMAT, TAG_LOG + tag, msg));
     }
-
-    /**
-     * Print error log
-     *
-     * @param tag log tag
-     * @param msg log message
-     */
-    public static void error(String tag, String msg) {
-        HiLog.error(LABEL_LOG, String.format(Locale.ROOT, LOG_FORMAT, TAG_LOG + tag, msg));
-    }
 }
diff --git a/network/DistributedDevices/entry/src/main/resources/base/element/string.json b/network/DistributedDevices/entry/src/main/resources/base/element/string.json
index f06570d389..f94bacb441 100644
--- a/network/DistributedDevices/entry/src/main/resources/base/element/string.json
+++ b/network/DistributedDevices/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,22 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "name",
+      "value": "Name"
+    },
+    {
+      "name": "status",
+      "value": "Status"
+    },
+    {
+      "name": "type",
+      "value": "Type"
+    },
+    {
+      "name": "no_remote_device_found",
+      "value": "No remote device found"
     }
   ]
 }
\ No newline at end of file
diff --git a/network/DistributedDevices/entry/src/main/resources/base/layout/list_item.xml b/network/DistributedDevices/entry/src/main/resources/base/layout/list_item.xml
index 98d89e476f..4a98340c2a 100644
--- a/network/DistributedDevices/entry/src/main/resources/base/layout/list_item.xml
+++ b/network/DistributedDevices/entry/src/main/resources/base/layout/list_item.xml
@@ -35,7 +35,7 @@
 
         <Text
             ohos:id="$+id:name_text"
-            ohos:text="Name"
+            ohos:text="$string:name"
             ohos:width="0vp"
             ohos:text_size="20fp"
             ohos:text_color="#ffffff"
@@ -45,7 +45,7 @@
 
         <Text
             ohos:id="$+id:state_text"
-            ohos:text="Status"
+            ohos:text="$string:status"
             ohos:width="0vp"
             ohos:text_size="20fp"
             ohos:weight="1"
diff --git a/network/DistributedDevices/entry/src/main/resources/base/layout/main_layout.xml b/network/DistributedDevices/entry/src/main/resources/base/layout/main_layout.xml
index 605882be7d..4bd2705c93 100644
--- a/network/DistributedDevices/entry/src/main/resources/base/layout/main_layout.xml
+++ b/network/DistributedDevices/entry/src/main/resources/base/layout/main_layout.xml
@@ -25,7 +25,7 @@
         ohos:height="60vp">
 
         <Text
-            ohos:text="Type"
+            ohos:text="$string:type"
             ohos:width="0vp"
             ohos:text_size="20fp"
             ohos:text_color="#ffffff"
@@ -34,7 +34,7 @@
             ohos:height="match_parent"/>
 
         <Text
-            ohos:text="Name"
+            ohos:text="$string:name"
             ohos:width="0vp"
             ohos:text_size="20fp"
             ohos:text_color="#ffffff"
@@ -43,7 +43,7 @@
             ohos:height="match_parent"/>
 
         <Text
-            ohos:text="Status"
+            ohos:text="$string:status"
             ohos:width="0vp"
             ohos:text_size="20fp"
             ohos:weight="1"
@@ -61,11 +61,11 @@
         <Text
             ohos:id="$+id:empty_text"
             ohos:width="match_parent"
-            ohos:padding="5dp"
+            ohos:padding="5vp"
             ohos:height="40vp"
             ohos:text_size="18fp"
             ohos:top_margin="2vp"
-            ohos:text="No remote device found"
+            ohos:text="$string:no_remote_device_found"
             ohos:background_element="#aaaaaa"
             ohos:text_alignment="center"/>
 
diff --git a/network/NFC/entry/src/main/java/ohos/samples/nfcsample/utils/LogUtil.java b/network/NFC/entry/src/main/java/ohos/samples/nfcsample/utils/LogUtil.java
index 26aad8698b..b675935d29 100644
--- a/network/NFC/entry/src/main/java/ohos/samples/nfcsample/utils/LogUtil.java
+++ b/network/NFC/entry/src/main/java/ohos/samples/nfcsample/utils/LogUtil.java
@@ -36,36 +36,6 @@ public class LogUtil {
         /* Do nothing */
     }
 
-    /**
-     * Print debug log
-     *
-     * @param tag log tag
-     * @param msg log message
-     */
-    public static void debug(String tag, String msg) {
-        HiLog.debug(LABEL_LOG, String.format(Locale.ROOT, LOG_FORMAT, tag, msg));
-    }
-
-    /**
-     * Print info log
-     *
-     * @param tag log tag
-     * @param msg log message
-     */
-    public static void info(String tag, String msg) {
-        HiLog.info(LABEL_LOG, String.format(Locale.ROOT, LOG_FORMAT, tag, msg));
-    }
-
-    /**
-     * Print warn log
-     *
-     * @param tag log tag
-     * @param msg log message
-     */
-    public static void warn(String tag, String msg) {
-        HiLog.warn(LABEL_LOG, String.format(Locale.ROOT, LOG_FORMAT, tag, msg));
-    }
-
     /**
      * Print error log
      *
diff --git a/network/NFC/entry/src/main/resources/base/element/string.json b/network/NFC/entry/src/main/resources/base/element/string.json
index dcd70ec80b..d63c8c5367 100644
--- a/network/NFC/entry/src/main/resources/base/element/string.json
+++ b/network/NFC/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,10 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "nfc_state",
+      "value": "NFC State:"
     }
   ]
 }
\ No newline at end of file
diff --git a/network/NFC/entry/src/main/resources/base/layout/main_ability_slice.xml b/network/NFC/entry/src/main/resources/base/layout/main_ability_slice.xml
index 9cf258a40d..24e746d9c6 100644
--- a/network/NFC/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/network/NFC/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -25,7 +25,7 @@
             ohos:top_margin="20vp">
 
         <Text
-                ohos:text="NFC State:"
+                ohos:text="$string:nfc_state"
                 ohos:height="match_content"
                 ohos:width="match_content"
                 ohos:text_size="20fp"/>
diff --git a/network/NetworkManagement/entry/src/main/java/ohos/samples/networkmanagement/slice/HttpCacheSlice.java b/network/NetworkManagement/entry/src/main/java/ohos/samples/networkmanagement/slice/HttpCacheSlice.java
index 4232524b36..557e3f1c2d 100644
--- a/network/NetworkManagement/entry/src/main/java/ohos/samples/networkmanagement/slice/HttpCacheSlice.java
+++ b/network/NetworkManagement/entry/src/main/java/ohos/samples/networkmanagement/slice/HttpCacheSlice.java
@@ -31,7 +31,6 @@ import ohos.net.HttpResponseCache;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
diff --git a/network/NetworkManagement/entry/src/main/java/ohos/samples/networkmanagement/slice/NetRequestSlice.java b/network/NetworkManagement/entry/src/main/java/ohos/samples/networkmanagement/slice/NetRequestSlice.java
index 6c2cf0c220..e5ff83a089 100644
--- a/network/NetworkManagement/entry/src/main/java/ohos/samples/networkmanagement/slice/NetRequestSlice.java
+++ b/network/NetworkManagement/entry/src/main/java/ohos/samples/networkmanagement/slice/NetRequestSlice.java
@@ -113,7 +113,7 @@ public class NetRequestSlice extends AbilitySlice {
         });
     }
 
-    private NetStatusCallback callback = new NetStatusCallback() {
+    private final NetStatusCallback callback = new NetStatusCallback() {
         @Override
         public void onAvailable(NetHandle handle) {
             HiLog.info(LABEL_LOG, "%{public}s", "NetStatusCallback onAvailable");
diff --git a/network/NetworkManagement/entry/src/main/java/ohos/samples/networkmanagement/slice/SocketClientSlice.java b/network/NetworkManagement/entry/src/main/java/ohos/samples/networkmanagement/slice/SocketClientSlice.java
index 916285a4fc..3f51f488e3 100644
--- a/network/NetworkManagement/entry/src/main/java/ohos/samples/networkmanagement/slice/SocketClientSlice.java
+++ b/network/NetworkManagement/entry/src/main/java/ohos/samples/networkmanagement/slice/SocketClientSlice.java
@@ -40,7 +40,7 @@ public class SocketClientSlice extends AbilitySlice {
 
     private static final HiLogLabel LABEL_LOG = new HiLogLabel(3, 0xD000F00, TAG);
 
-    private static int PORT = 8888;
+    private static final int PORT = 8888;
 
     private Text inputText;
 
diff --git a/network/NetworkManagement/entry/src/main/java/ohos/samples/networkmanagement/slice/SocketServerSlice.java b/network/NetworkManagement/entry/src/main/java/ohos/samples/networkmanagement/slice/SocketServerSlice.java
index 96b574fa6d..1a6453e966 100644
--- a/network/NetworkManagement/entry/src/main/java/ohos/samples/networkmanagement/slice/SocketServerSlice.java
+++ b/network/NetworkManagement/entry/src/main/java/ohos/samples/networkmanagement/slice/SocketServerSlice.java
@@ -40,7 +40,7 @@ public class SocketServerSlice extends AbilitySlice {
 
     private static final HiLogLabel LABEL_LOG = new HiLogLabel(3, 0xD000F00, TAG);
 
-    private static int PORT = 8888;
+    private static final int PORT = 8888;
 
     private Text outText;
 
@@ -64,14 +64,13 @@ public class SocketServerSlice extends AbilitySlice {
         ThreadPoolUtil.submit(() -> {
             try (DatagramSocket socket = new DatagramSocket(PORT)) {
                 DatagramPacket packet = new DatagramPacket(new byte[255], 255);
+                //noinspection InfiniteLoopStatement
                 while (true) {
                     socket.receive(packet);
-                    getUITaskDispatcher().syncDispatch(() -> {
-                        outText.setText(
-                            "Receive a message from :" + packet.getAddress().getHostAddress() + System.lineSeparator()
-                                + " on port " + packet.getPort() + System.lineSeparator() + "message :" + new String(
-                                packet.getData()).substring(0, packet.getLength()));
-                    });
+                    getUITaskDispatcher().syncDispatch(() -> outText.setText(
+                        "Receive a message from :" + packet.getAddress().getHostAddress() + System.lineSeparator()
+                            + " on port " + packet.getPort() + System.lineSeparator() + "message :" + new String(
+                            packet.getData()).substring(0, packet.getLength())));
                     packet.setLength(255);
                     Thread.sleep(1000);
                 }
diff --git a/network/NetworkManagement/entry/src/main/resources/base/element/string.json b/network/NetworkManagement/entry/src/main/resources/base/element/string.json
index 5f0cc16dbb..363a1fdeda 100644
--- a/network/NetworkManagement/entry/src/main/resources/base/element/string.json
+++ b/network/NetworkManagement/entry/src/main/resources/base/element/string.json
@@ -15,6 +15,42 @@
     {
       "name": "image_net_url",
       "value": "https://img-blog.csdn.net/20160121201510406?watermark/2/text/aHR0cDovL2Jsb2cuY3Nkbi5uZXQv/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70/gravity/Center"
+    },
+    {
+      "name": "start_request",
+      "value": "Start Request"
+    },
+    {
+      "name": "network_equest",
+      "value": "Network Request"
+    },
+    {
+      "name": "socket_client",
+      "value": "Socket Client"
+    },
+    {
+      "name": "socket_server",
+      "value": "Socket Server"
+    },
+    {
+      "name": "http_cache",
+      "value": "HTTP Cache"
+    },
+    {
+      "name": "input_text",
+      "value": "https://restapi.amap.com/v3/weather/weatherInfo?city=110101&amp;key=bf2ef503691a67e10d5bc4c5a6d8ff81"
+    },
+    {
+      "name": "input_service_ip",
+      "value": "Please input the server IP address"
+    },
+    {
+      "name": "send_message",
+      "value": "Send Message"
+    },
+    {
+      "name": "start_server",
+      "value": "Start Server"
     }
   ]
 }
\ No newline at end of file
diff --git a/network/NetworkManagement/entry/src/main/resources/base/layout/http_cache_slice.xml b/network/NetworkManagement/entry/src/main/resources/base/layout/http_cache_slice.xml
index c1d879e238..971fa02823 100644
--- a/network/NetworkManagement/entry/src/main/resources/base/layout/http_cache_slice.xml
+++ b/network/NetworkManagement/entry/src/main/resources/base/layout/http_cache_slice.xml
@@ -38,7 +38,7 @@
         ohos:width="240vp"
         ohos:background_element="$graphic:button_bg"
         ohos:margin="20vp"
-        ohos:text="Start Request"
+        ohos:text="$string:start_request"
         ohos:text_size="16fp"/>
 
     <Image
diff --git a/network/NetworkManagement/entry/src/main/resources/base/layout/main_ability_slice.xml b/network/NetworkManagement/entry/src/main/resources/base/layout/main_ability_slice.xml
index c1e54237a7..0185e25cbe 100644
--- a/network/NetworkManagement/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/network/NetworkManagement/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -32,7 +32,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="Network Request"
+            ohos:text="$string:network_equest"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#ff000000"
             ohos:text_size="16fp"/>
@@ -56,7 +56,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="Socket Client"
+            ohos:text="$string:socket_client"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#ff000000"
             ohos:text_size="16fp"/>
@@ -80,7 +80,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="Socket Server"
+            ohos:text="$string:socket_server"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#ff000000"
             ohos:text_size="16fp"/>
@@ -104,7 +104,7 @@
         <Text
             ohos:height="match_parent"
             ohos:width="match_content"
-            ohos:text="HTTP Cache"
+            ohos:text="$string:http_cache"
             ohos:text_alignment="vertical_center"
             ohos:text_color="#ff000000"
             ohos:text_size="16fp"/>
diff --git a/network/NetworkManagement/entry/src/main/resources/base/layout/net_request_slice.xml b/network/NetworkManagement/entry/src/main/resources/base/layout/net_request_slice.xml
index 659110f381..80024b4b37 100644
--- a/network/NetworkManagement/entry/src/main/resources/base/layout/net_request_slice.xml
+++ b/network/NetworkManagement/entry/src/main/resources/base/layout/net_request_slice.xml
@@ -30,7 +30,7 @@
         ohos:left_margin="10vp"
         ohos:padding="10vp"
         ohos:right_margin="10vp"
-        ohos:text="https://restapi.amap.com/v3/weather/weatherInfo?city=110101&amp;key=bf2ef503691a67e10d5bc4c5a6d8ff81"
+        ohos:text="$string:input_text"
         ohos:text_alignment="center"
         ohos:text_size="16fp"/>
 
@@ -40,7 +40,7 @@
         ohos:width="240vp"
         ohos:background_element="$graphic:button_bg"
         ohos:margin="20vp"
-        ohos:text="Start Request"
+        ohos:text="$string:start_request"
         ohos:text_size="16fp"/>
 
     <Text
diff --git a/network/NetworkManagement/entry/src/main/resources/base/layout/socket_client_slice.xml b/network/NetworkManagement/entry/src/main/resources/base/layout/socket_client_slice.xml
index 635c4e286b..8e37c8fa8d 100644
--- a/network/NetworkManagement/entry/src/main/resources/base/layout/socket_client_slice.xml
+++ b/network/NetworkManagement/entry/src/main/resources/base/layout/socket_client_slice.xml
@@ -36,7 +36,7 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:background_element="$graphic:textfield_bg"
-        ohos:hint="Please input the server IP address"
+        ohos:hint="$string:input_service_ip"
         ohos:left_margin="10vp"
         ohos:padding="10vp"
         ohos:right_margin="10vp"
@@ -49,7 +49,7 @@
         ohos:width="240vp"
         ohos:background_element="$graphic:button_bg"
         ohos:margin="20vp"
-        ohos:text="Send Message"
+        ohos:text="$string:send_message"
         ohos:text_size="16fp"/>
 
     <Text
diff --git a/network/NetworkManagement/entry/src/main/resources/base/layout/socket_server_slice.xml b/network/NetworkManagement/entry/src/main/resources/base/layout/socket_server_slice.xml
index c997c35311..9ed658496b 100644
--- a/network/NetworkManagement/entry/src/main/resources/base/layout/socket_server_slice.xml
+++ b/network/NetworkManagement/entry/src/main/resources/base/layout/socket_server_slice.xml
@@ -38,7 +38,7 @@
         ohos:width="240vp"
         ohos:background_element="$graphic:button_bg"
         ohos:margin="20vp"
-        ohos:text="Start Server"
+        ohos:text="$string:start_server"
         ohos:text_size="16fp"/>
 
     <Text
diff --git a/network/WLAN/entry/src/main/java/ohos/samples/wlan/ItemProvider.java b/network/WLAN/entry/src/main/java/ohos/samples/wlan/ItemProvider.java
index 1ecf549431..bc9fd0d3c7 100644
--- a/network/WLAN/entry/src/main/java/ohos/samples/wlan/ItemProvider.java
+++ b/network/WLAN/entry/src/main/java/ohos/samples/wlan/ItemProvider.java
@@ -29,9 +29,9 @@ import java.util.List;
  * ItemProvider
  */
 public class ItemProvider extends BaseItemProvider {
-    private Context context;
+    private final Context context;
 
-    private List<WifiP2pDevice> wifiP2pDevices;
+    private final List<WifiP2pDevice> wifiP2pDevices;
 
     public ItemProvider(Context abilitySliceContext, List<WifiP2pDevice> devices) {
         context = abilitySliceContext;
diff --git a/network/WLAN/entry/src/main/java/ohos/samples/wlan/slice/P2pSlice.java b/network/WLAN/entry/src/main/java/ohos/samples/wlan/slice/P2pSlice.java
index 7fc1777b69..d4a2b087a4 100644
--- a/network/WLAN/entry/src/main/java/ohos/samples/wlan/slice/P2pSlice.java
+++ b/network/WLAN/entry/src/main/java/ohos/samples/wlan/slice/P2pSlice.java
@@ -16,7 +16,6 @@
 package ohos.samples.wlan.slice;
 
 import static ohos.event.commonevent.CommonEventSupport.COMMON_EVENT_WIFI_P2P_PEERS_STATE_CHANGED;
-import static ohos.wifi.WifiEvents.PARAM_P2P_DISCOVERY;
 import static ohos.wifi.p2p.WifiP2pConfig.GO_BAND_AUTO;
 
 import ohos.samples.wlan.ItemProvider;
@@ -73,7 +72,7 @@ public class P2pSlice extends AbilitySlice {
 
     private WeakReference<WifiP2pCallback> wifiP2pCallbackWeakReference;
 
-    private EventHandler handler = new EventHandler(EventRunner.current()) {
+    private final EventHandler handler = new EventHandler(EventRunner.current()) {
         @Override
         protected void processEvent(InnerEvent event) {
             switch (event.eventId) {
diff --git a/network/WLAN/entry/src/main/resources/base/element/string.json b/network/WLAN/entry/src/main/resources/base/element/string.json
index 0e31ffec9a..8959e3a0c2 100644
--- a/network/WLAN/entry/src/main/resources/base/element/string.json
+++ b/network/WLAN/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,74 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "scan",
+      "value": "Scan"
+    },
+    {
+      "name": "get_connected_info",
+      "value": "Get Connected Info"
+    },
+    {
+      "name": "get_country_code",
+      "value": "Get Country Code"
+    },
+    {
+      "name": "get_support_feature",
+      "value": "Get Support Feature"
+    },
+    {
+      "name": "basic_features",
+      "value": "Basic Features"
+    },
+    {
+      "name": "untrusted_config",
+      "value": "Untrusted Config"
+    },
+    {
+      "name": "p2p",
+      "value": "P2P"
+    },
+    {
+      "name": "wlan_notification",
+      "value": "Wlan Notification"
+    },
+    {
+      "name": "discover",
+      "value": "Discover"
+    },
+    {
+      "name": "stop_discover",
+      "value": "Stop Discover"
+    },
+    {
+      "name": "create_group",
+      "value": "Create Group"
+    },
+    {
+      "name": "remove_group",
+      "value": "Remove Group"
+    },
+    {
+      "name": "disconnect",
+      "value": "Disconnect"
+    },
+    {
+      "name": "add_untrusted_wifi",
+      "value": "Add Untrusted Wifi"
+    },
+    {
+      "name": "remove_untrusted_wifi",
+      "value": "Remove Untrusted Wifi"
+    },
+    {
+      "name": "register",
+      "value": "Register"
+    },
+    {
+      "name": "unregister",
+      "value": "Unregister"
     }
   ]
 }
\ No newline at end of file
diff --git a/network/WLAN/entry/src/main/resources/base/layout/feature_slice_layout.xml b/network/WLAN/entry/src/main/resources/base/layout/feature_slice_layout.xml
index a8d76735a9..2923bf320d 100644
--- a/network/WLAN/entry/src/main/resources/base/layout/feature_slice_layout.xml
+++ b/network/WLAN/entry/src/main/resources/base/layout/feature_slice_layout.xml
@@ -27,7 +27,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Scan"
+        ohos:text="$string:scan"
         ohos:text_alignment="center"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
@@ -40,7 +40,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Get Connected Info"
+        ohos:text="$string:get_connected_info"
         ohos:text_alignment="center"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
@@ -53,7 +53,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Get Country Code"
+        ohos:text="$string:get_connected_info"
         ohos:text_alignment="center"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
@@ -66,7 +66,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Get Support Feature"
+        ohos:text="$string:get_support_feature"
         ohos:text_alignment="center"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
diff --git a/network/WLAN/entry/src/main/resources/base/layout/main_ability_slice.xml b/network/WLAN/entry/src/main/resources/base/layout/main_ability_slice.xml
index 0aaa820b9d..02fe4d3a08 100644
--- a/network/WLAN/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/network/WLAN/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -26,7 +26,7 @@
         ohos:element_right="$media:ic_arrow_right"
         ohos:left_padding="14vp"
         ohos:padding="10vp"
-        ohos:text="Basic Features"
+        ohos:text="$string:basic_features"
         ohos:text_alignment="left"
         ohos:text_size="16vp"
         ohos:top_margin="10vp"/>
@@ -38,7 +38,7 @@
         ohos:element_right="$media:ic_arrow_right"
         ohos:left_padding="14vp"
         ohos:padding="10vp"
-        ohos:text="Untrusted Config"
+        ohos:text="$string:untrusted_config"
         ohos:text_alignment="left"
         ohos:text_size="16vp"
         ohos:top_margin="10vp"/>
@@ -50,7 +50,7 @@
         ohos:element_right="$media:ic_arrow_right"
         ohos:left_padding="14vp"
         ohos:padding="10vp"
-        ohos:text="P2P"
+        ohos:text="$string:p2p"
         ohos:text_alignment="left"
         ohos:text_size="16vp"
         ohos:top_margin="10vp"/>
@@ -62,7 +62,7 @@
         ohos:element_right="$media:ic_arrow_right"
         ohos:left_padding="14vp"
         ohos:padding="10vp"
-        ohos:text="Wlan Notification"
+        ohos:text="$string:wlan_notification"
         ohos:text_alignment="left"
         ohos:text_size="16vp"
         ohos:top_margin="10vp"/>
diff --git a/network/WLAN/entry/src/main/resources/base/layout/p2p_slice_layout.xml b/network/WLAN/entry/src/main/resources/base/layout/p2p_slice_layout.xml
index 2c0d1f35a2..a198513160 100644
--- a/network/WLAN/entry/src/main/resources/base/layout/p2p_slice_layout.xml
+++ b/network/WLAN/entry/src/main/resources/base/layout/p2p_slice_layout.xml
@@ -34,7 +34,7 @@
             ohos:weight="1"
             ohos:background_element="$graphic:button_background"
             ohos:padding="10vp"
-            ohos:text="Discover"
+            ohos:text="$string:discover"
             ohos:right_margin="10vp"
             ohos:text_size="16fp"/>
 
@@ -45,7 +45,7 @@
             ohos:weight="1"
             ohos:background_element="$graphic:button_background"
             ohos:padding="10vp"
-            ohos:text="Stop Discover"
+            ohos:text="$string:stop_discover"
             ohos:text_size="16fp"/>
     </DirectionalLayout>
 
@@ -65,7 +65,7 @@
             ohos:background_element="$graphic:button_background"
             ohos:right_margin="10vp"
             ohos:padding="10vp"
-            ohos:text="Create Group"
+            ohos:text="$string:create_group"
             ohos:text_size="16fp"/>
 
         <Button
@@ -75,14 +75,14 @@
             ohos:weight="1"
             ohos:background_element="$graphic:button_background"
             ohos:padding="10vp"
-            ohos:text="Remove Group"
+            ohos:text="$string:remove_group"
             ohos:text_size="16fp"/>
     </DirectionalLayout>
 
     <Button
         ohos:id="$+id:disconnect_button"
         ohos:text_size="16vp"
-        ohos:text="Disconnect"
+        ohos:text="$string:disconnect"
         ohos:padding="10vp"
         ohos:background_element="$graphic:button_background"
         ohos:left_margin="24vp"
diff --git a/network/WLAN/entry/src/main/resources/base/layout/untrusted_config_slice_layout.xml b/network/WLAN/entry/src/main/resources/base/layout/untrusted_config_slice_layout.xml
index 1cc1757bc6..f8eac286d0 100644
--- a/network/WLAN/entry/src/main/resources/base/layout/untrusted_config_slice_layout.xml
+++ b/network/WLAN/entry/src/main/resources/base/layout/untrusted_config_slice_layout.xml
@@ -27,7 +27,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Add Untrusted Wifi"
+        ohos:text="$string:add_untrusted_wifi"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
 
@@ -39,7 +39,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Remove Untrusted Wifi"
+        ohos:text="$string:remove_untrusted_wifi"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
 </DirectionalLayout>
\ No newline at end of file
diff --git a/network/WLAN/entry/src/main/resources/base/layout/wlan_notification_slice_layout.xml b/network/WLAN/entry/src/main/resources/base/layout/wlan_notification_slice_layout.xml
index 0a65027504..28f2f5cfdb 100644
--- a/network/WLAN/entry/src/main/resources/base/layout/wlan_notification_slice_layout.xml
+++ b/network/WLAN/entry/src/main/resources/base/layout/wlan_notification_slice_layout.xml
@@ -27,7 +27,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Register"
+        ohos:text="$string:register"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
 
@@ -39,7 +39,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Unregister"
+        ohos:text="$string:unregister"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
 
diff --git a/security/DataSecurity/entry/src/main/java/ohos/samples/datasecurity/slice/MainAbilitySlice.java b/security/DataSecurity/entry/src/main/java/ohos/samples/datasecurity/slice/MainAbilitySlice.java
index 10d7084db1..8c160fbf1f 100644
--- a/security/DataSecurity/entry/src/main/java/ohos/samples/datasecurity/slice/MainAbilitySlice.java
+++ b/security/DataSecurity/entry/src/main/java/ohos/samples/datasecurity/slice/MainAbilitySlice.java
@@ -116,12 +116,14 @@ public class MainAbilitySlice extends AbilitySlice {
     private void encrypt() {
         try {
             Optional<KeyPair> keyPairOptional = getSecKey();
-            KeyPair keyPair = keyPairOptional.get();
-            Cipher cipher = Cipher.getInstance(ENCRYPT_ALGORITHM, PROVIDER);
-            cipher.init(Cipher.ENCRYPT_MODE, keyPair.getPublic());
-            byte[] bytes = cipher.doFinal(PLAIN_TEXT.getBytes(StandardCharsets.UTF_8));
-            result = Base64.getEncoder().encodeToString(bytes);
-            resultText.setText(result);
+            if(keyPairOptional.isPresent()) {
+                KeyPair keyPair = keyPairOptional.get();
+                Cipher cipher = Cipher.getInstance(ENCRYPT_ALGORITHM, PROVIDER);
+                cipher.init(Cipher.ENCRYPT_MODE, keyPair.getPublic());
+                byte[] bytes = cipher.doFinal(PLAIN_TEXT.getBytes(StandardCharsets.UTF_8));
+                result = Base64.getEncoder().encodeToString(bytes);
+                resultText.setText(result);
+            }
         } catch (NoSuchAlgorithmException | NoSuchPaddingException | NoSuchProviderException
             | InvalidKeyException | BadPaddingException | IllegalBlockSizeException e) {
             HiLog.error(LABEL_LOG, "%{public}s", "encrypt exception.");
@@ -131,13 +133,12 @@ public class MainAbilitySlice extends AbilitySlice {
     private void decrypt() {
         if (Objects.isNull(result) || PLAIN_TEXT.equals(result)) {
             HiLog.error(LABEL_LOG, "%{public}s", "result is null or " + PLAIN_TEXT.equals(result));
-            return;
         } else {
             try {
                 KeyStore keyStore = KeyStore.getInstance(KEY_STORE);
                 keyStore.load(null);
                 Key key = keyStore.getKey(KEY_PAIR_ALIAS, null);
-                PrivateKey privateKey = null;
+                PrivateKey privateKey;
                 if (key instanceof PrivateKey) {
                     privateKey = (PrivateKey) key;
                 } else {
diff --git a/security/DataSecurity/entry/src/main/resources/base/element/string.json b/security/DataSecurity/entry/src/main/resources/base/element/string.json
index af0198f6c2..0f1f8d92f7 100644
--- a/security/DataSecurity/entry/src/main/resources/base/element/string.json
+++ b/security/DataSecurity/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,26 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "encrypt",
+      "value": "Encrypt"
+    },
+    {
+      "name": "decrypt",
+      "value": "Decrypt"
+    },
+    {
+      "name": "plain_text",
+      "value": "PlainText : "
+    },
+    {
+      "name": "hello_world",
+      "value": "Hello World : "
+    },
+    {
+      "name": "result",
+      "value": "Result : "
     }
   ]
 }
\ No newline at end of file
diff --git a/security/DataSecurity/entry/src/main/resources/base/layout/main_ability_slice.xml b/security/DataSecurity/entry/src/main/resources/base/layout/main_ability_slice.xml
index 73157ddcd4..828127270f 100644
--- a/security/DataSecurity/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/security/DataSecurity/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -33,7 +33,7 @@
             ohos:width="160vp"
             ohos:background_element="$graphic:button_background"
             ohos:padding="10vp"
-            ohos:text="Encrypt"
+            ohos:text="$string:encrypt"
             ohos:text_alignment="center"
             ohos:text_size="16fp"/>
 
@@ -44,7 +44,7 @@
             ohos:background_element="$graphic:button_background"
             ohos:left_margin="15vp"
             ohos:padding="10vp"
-            ohos:text="Decrypt"
+            ohos:text="$string:decrypt"
             ohos:text_alignment="center"
             ohos:text_size="16fp"/>
     </DirectionalLayout>
@@ -59,14 +59,14 @@
             ohos:height="match_content"
             ohos:width="match_content"
             ohos:left_padding="15vp"
-            ohos:text="PlainText : "
+            ohos:text="$string:plain_text"
             ohos:text_size="16fp"/>
 
         <Text
             ohos:id="$+id:plaintext_text"
             ohos:height="match_content"
             ohos:width="match_content"
-            ohos:text="Hello World!"
+            ohos:text="$string:hello_world"
             ohos:text_color="#708095"
             ohos:text_size="16fp"/>
     </DirectionalLayout>
@@ -80,7 +80,7 @@
             ohos:height="match_content"
             ohos:width="match_content"
             ohos:left_padding="15vp"
-            ohos:text="Result : "
+            ohos:text="$string:result"
             ohos:text_size="16fp"/>
 
         <Text
diff --git a/security/FaceRecognition/entry/src/main/java/ohos/samples/facerecognition/slice/MainAbilitySlice.java b/security/FaceRecognition/entry/src/main/java/ohos/samples/facerecognition/slice/MainAbilitySlice.java
index 7ee321e055..ca4c7944c0 100644
--- a/security/FaceRecognition/entry/src/main/java/ohos/samples/facerecognition/slice/MainAbilitySlice.java
+++ b/security/FaceRecognition/entry/src/main/java/ohos/samples/facerecognition/slice/MainAbilitySlice.java
@@ -43,7 +43,7 @@ public class MainAbilitySlice extends AbilitySlice {
 
     private String result;
 
-    private EventHandler handler = new EventHandler(EventRunner.current()) {
+    private final EventHandler handler = new EventHandler(EventRunner.current()) {
         @Override
         protected void processEvent(InnerEvent event) {
             switch (event.eventId) {
@@ -99,7 +99,7 @@ public class MainAbilitySlice extends AbilitySlice {
         ThreadPoolUtil.submit(() -> {
             int authenticationAction = biometricAuthentication.execAuthenticationAction(
                 BiometricAuthentication.AuthType.AUTH_TYPE_BIOMETRIC_FACE_ONLY,
-                BiometricAuthentication.SecureLevel.SECURE_LEVEL_S4, true, false, null);
+                BiometricAuthentication.SecureLevel.SECURE_LEVEL_S2, true, false, null);
             if (authenticationAction == 0) {
                 result = "Unlocked successfully";
                 handler.sendEvent(EVENT_MESSAGE_SUCCESS);
@@ -112,7 +112,12 @@ public class MainAbilitySlice extends AbilitySlice {
 
     private void cancelRecognition(Component component) {
         if (biometricAuthentication != null) {
-            biometricAuthentication.cancelAuthenticationAction();
+            int resultCode = biometricAuthentication.cancelAuthenticationAction();
+            if (resultCode == 0) {
+                resultText.setText("Cancel succeed.");
+            } else {
+                resultText.setText("Cancel failed,code = " + resultCode);
+            }
         }
     }
 
diff --git a/security/FaceRecognition/entry/src/main/java/ohos/samples/facerecognition/utils/ThreadPoolUtil.java b/security/FaceRecognition/entry/src/main/java/ohos/samples/facerecognition/utils/ThreadPoolUtil.java
index 55b2df2140..18416b3eb6 100644
--- a/security/FaceRecognition/entry/src/main/java/ohos/samples/facerecognition/utils/ThreadPoolUtil.java
+++ b/security/FaceRecognition/entry/src/main/java/ohos/samples/facerecognition/utils/ThreadPoolUtil.java
@@ -35,7 +35,7 @@ public class ThreadPoolUtil {
 
     private static final AtomicInteger THREAD_ID = new AtomicInteger(1);
 
-    private static ThreadPoolExecutor executor = new ThreadPoolExecutor(CORE_COUNT, THREAD_COUNT, KEEP_ALIVE,
+    private static final ThreadPoolExecutor executor = new ThreadPoolExecutor(CORE_COUNT, THREAD_COUNT, KEEP_ALIVE,
         TimeUnit.SECONDS, new ArrayBlockingQueue<>(WORK_QUEUE_SIZE), new CommonThreadFactory());
 
     private ThreadPoolUtil() {
@@ -57,7 +57,7 @@ public class ThreadPoolUtil {
     static class CommonThreadFactory implements ThreadFactory {
         @Override
         public Thread newThread(Runnable runnable) {
-            String threadName = null;
+            String threadName;
             if (THREAD_ID.get() == Integer.MAX_VALUE) {
                 threadName = "threadpool-common-" + THREAD_ID.getAndSet(1);
             } else {
diff --git a/security/FaceRecognition/entry/src/main/resources/base/element/string.json b/security/FaceRecognition/entry/src/main/resources/base/element/string.json
index 5616ce7d89..f56b19192f 100644
--- a/security/FaceRecognition/entry/src/main/resources/base/element/string.json
+++ b/security/FaceRecognition/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,22 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "camera_tips",
+      "value": "Align the face with the front camera and press start button to unlock the face."
+    },
+    {
+      "name": "face_unlock",
+      "value": "Start Face Unlock"
+    },
+    {
+      "name": "cancel_auth",
+      "value": "Cancel Authentication"
+    },
+    {
+      "name": "text_ok",
+      "value": "O K"
     }
   ]
 }
\ No newline at end of file
diff --git a/security/FaceRecognition/entry/src/main/resources/base/layout/dialog_layout.xml b/security/FaceRecognition/entry/src/main/resources/base/layout/dialog_layout.xml
index 92119f692a..36f99a3bb7 100644
--- a/security/FaceRecognition/entry/src/main/resources/base/layout/dialog_layout.xml
+++ b/security/FaceRecognition/entry/src/main/resources/base/layout/dialog_layout.xml
@@ -44,7 +44,7 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:margin="10vp"
-        ohos:text="O K"
+        ohos:text="$string:text_ok"
         ohos:text_alignment="center"
         ohos:text_size="20fp"/>
 </DirectionalLayout>
\ No newline at end of file
diff --git a/security/FaceRecognition/entry/src/main/resources/base/layout/main_ability_slice.xml b/security/FaceRecognition/entry/src/main/resources/base/layout/main_ability_slice.xml
index e7b02ad003..4de4146d02 100644
--- a/security/FaceRecognition/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/security/FaceRecognition/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -26,7 +26,7 @@
         ohos:width="match_content"
         ohos:margin="20vp"
         ohos:multiple_lines="true"
-        ohos:text="Align the face with the front camera and press start button to unlock the face."
+        ohos:text="$string:camera_tips"
         ohos:text_size="16fp"/>
 
     <Button
@@ -35,7 +35,7 @@
         ohos:width="240vp"
         ohos:background_element="$graphic:button_bg"
         ohos:margin="10vp"
-        ohos:text="Start Face Unlock"
+        ohos:text="$string:face_unlock"
         ohos:text_size="16fp"/>
 
     <Button
@@ -44,7 +44,7 @@
         ohos:width="240vp"
         ohos:background_element="$graphic:button_bg"
         ohos:margin="10vp"
-        ohos:text="Cancel Authentication"
+        ohos:text="$string:cancel_auth"
         ohos:text_size="16fp"/>
 
     <Text
diff --git a/security/Permission/entry/src/main/java/ohos/samples/permissionapp/slice/MainAbilitySlice.java b/security/Permission/entry/src/main/java/ohos/samples/permissionapp/slice/MainAbilitySlice.java
index f6aea28487..d4dc7075a2 100644
--- a/security/Permission/entry/src/main/java/ohos/samples/permissionapp/slice/MainAbilitySlice.java
+++ b/security/Permission/entry/src/main/java/ohos/samples/permissionapp/slice/MainAbilitySlice.java
@@ -107,9 +107,7 @@ public class MainAbilitySlice extends AbilitySlice implements Component.ClickedL
                 @Override
                 public void run() {
                     capturer.stop();
-                    context.getUITaskDispatcher().asyncDispatch(() -> {
-                        showTips(context, "Stopped recording.");
-                    });
+                    context.getUITaskDispatcher().asyncDispatch(() -> showTips(context, "Stopped recording."));
                 }
             }, AUDIO_RECORDING_TIME);
         } catch (IllegalArgumentException | SecurityException e) {
diff --git a/security/Permission/entry/src/main/java/ohos/samples/permissionapp/utils/Constants.java b/security/Permission/entry/src/main/java/ohos/samples/permissionapp/utils/Constants.java
index 7a57858246..3125e0bee9 100644
--- a/security/Permission/entry/src/main/java/ohos/samples/permissionapp/utils/Constants.java
+++ b/security/Permission/entry/src/main/java/ohos/samples/permissionapp/utils/Constants.java
@@ -24,11 +24,6 @@ public class Constants {
      */
     public static final int PERM_LOCATION_REQ_CODE = 1000;
 
-    /**
-     * Contacts Read permission request code
-     */
-    public static final int PERM_READ_CONTACTS_REQ_CODE = 1001;
-
     /**
      * Microphone permission request code
      */
diff --git a/security/Permission/entry/src/main/resources/base/element/string.json b/security/Permission/entry/src/main/resources/base/element/string.json
index 29687de4bb..40b49b40e8 100644
--- a/security/Permission/entry/src/main/resources/base/element/string.json
+++ b/security/Permission/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,26 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "btn_obtain_permission",
+      "value": "Click on button to obtain permission"
+    },
+    {
+      "name": "req_location_permission",
+      "value": "Request Location permission"
+    },
+    {
+      "name": "req_microphone_permission",
+      "value": "Request Location permission"
+    },
+    {
+      "name": "req_calendar_permission",
+      "value": "Request Calendar permission"
+    },
+    {
+      "name": "req_storage_permission",
+      "value": "Request Storage permission"
     }
   ]
 }
\ No newline at end of file
diff --git a/security/Permission/entry/src/main/resources/base/layout/main_ability_slice.xml b/security/Permission/entry/src/main/resources/base/layout/main_ability_slice.xml
index fcfc8b092a..3ad62e385d 100644
--- a/security/Permission/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/security/Permission/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -21,7 +21,7 @@
     <Text
         ohos:width="match_parent"
         ohos:height="match_content"
-        ohos:text="Click on button to obtain permission"
+        ohos:text="$string:btn_obtain_permission"
         ohos:top_margin="50vp"
         ohos:left_margin="10vp"
         ohos:right_margin="10vp"
@@ -36,7 +36,7 @@
         ohos:height="40vp"
         ohos:top_margin="40vp"
         ohos:layout_alignment="horizontal_center"
-        ohos:text="Request Location permission"
+        ohos:text="$string:req_location_permission"
         ohos:text_size="20vp"
         ohos:text_color="#ffffffff"
         ohos:background_element="$graphic:bg"/>
@@ -47,7 +47,7 @@
         ohos:height="40vp"
         ohos:top_margin="40vp"
         ohos:layout_alignment="horizontal_center"
-        ohos:text="Request Microphone permission"
+        ohos:text="$string:req_microphone_permission"
         ohos:text_size="20vp"
         ohos:text_color="#ffffffff"
         ohos:background_element="$graphic:bg"/>
@@ -58,7 +58,7 @@
         ohos:height="40vp"
         ohos:top_margin="40vp"
         ohos:layout_alignment="horizontal_center"
-        ohos:text="Request Calendar permission"
+        ohos:text="$string:req_calendar_permission"
         ohos:text_size="20vp"
         ohos:text_color="#ffffffff"
         ohos:background_element="$graphic:bg"/>
@@ -69,7 +69,7 @@
         ohos:height="40vp"
         ohos:top_margin="40vp"
         ohos:layout_alignment="horizontal_center"
-        ohos:text="Request Storage permission"
+        ohos:text="$string:req_storage_permission"
         ohos:text_size="20vp"
         ohos:text_color="#ffffffff"
         ohos:background_element="$graphic:bg"/>
diff --git a/thread/EventHandler/entry/src/main/java/ohos/samples/eventhandler/slice/MainAbilitySlice.java b/thread/EventHandler/entry/src/main/java/ohos/samples/eventhandler/slice/MainAbilitySlice.java
index 9c8b872851..48687db6e8 100644
--- a/thread/EventHandler/entry/src/main/java/ohos/samples/eventhandler/slice/MainAbilitySlice.java
+++ b/thread/EventHandler/entry/src/main/java/ohos/samples/eventhandler/slice/MainAbilitySlice.java
@@ -72,9 +72,8 @@ public class MainAbilitySlice extends AbilitySlice {
     private void sendInnerEvent(Component component) {
         stringBuffer = new StringBuffer();
         long param = 0L;
-        Object object = null;
-        InnerEvent normalInnerEvent = InnerEvent.get(EVENT_MESSAGE_NORMAL, param, object);
-        InnerEvent delayInnerEvent = InnerEvent.get(EVENT_MESSAGE_DELAY, param, object);
+        InnerEvent normalInnerEvent = InnerEvent.get(EVENT_MESSAGE_NORMAL, param, null);
+        InnerEvent delayInnerEvent = InnerEvent.get(EVENT_MESSAGE_DELAY, param, null);
         handler.sendEvent(normalInnerEvent, EventHandler.Priority.IMMEDIATE);
         handler.sendEvent(delayInnerEvent, DELAY_TIME, EventHandler.Priority.IMMEDIATE);
     }
@@ -82,11 +81,11 @@ public class MainAbilitySlice extends AbilitySlice {
     private void postRunnableTask(Component component) {
         stringBuffer = new StringBuffer();
         Runnable task1 = () -> {
-            stringBuffer.append("Post runnableTask1 done" + System.lineSeparator());
+            stringBuffer.append("Post runnableTask1 done").append(System.lineSeparator());
             getUITaskDispatcher().asyncDispatch(() -> resultText.setText(stringBuffer.toString()));
         };
         Runnable task2 = () -> {
-            stringBuffer.append("Post runnableTask2 done" + System.lineSeparator());
+            stringBuffer.append("Post runnableTask2 done").append(System.lineSeparator());
             getUITaskDispatcher().asyncDispatch(() -> resultText.setText(stringBuffer.toString()));
         };
         handler.postTask(task1, EventHandler.Priority.IMMEDIATE);
@@ -109,11 +108,11 @@ public class MainAbilitySlice extends AbilitySlice {
         public void processEvent(InnerEvent event) {
             switch (event.eventId) {
                 case EVENT_MESSAGE_NORMAL:
-                    stringBuffer.append("Received an innerEvent message" + System.lineSeparator());
+                    stringBuffer.append("Received an innerEvent message").append(System.lineSeparator());
                     getUITaskDispatcher().asyncDispatch(() -> resultText.setText(stringBuffer.toString()));
                     break;
                 case EVENT_MESSAGE_DELAY:
-                    stringBuffer.append("Received an innerEvent delay message" + System.lineSeparator());
+                    stringBuffer.append("Received an innerEvent delay message").append(System.lineSeparator());
                     getUITaskDispatcher().asyncDispatch(() -> resultText.setText(stringBuffer.toString()));
                     break;
                 case EVENT_MESSAGE_CROSS_THREAD:
@@ -129,8 +128,7 @@ public class MainAbilitySlice extends AbilitySlice {
                         };
                         int testEventId = 1;
                         long testParam = 0;
-                        Object testObject = null;
-                        InnerEvent innerEvent = InnerEvent.get(testEventId, testParam, testObject);
+                        InnerEvent innerEvent = InnerEvent.get(testEventId, testParam, null);
                         eventHandler.sendEvent(innerEvent);
                     }
                     break;
diff --git a/thread/EventHandler/entry/src/main/resources/base/element/string.json b/thread/EventHandler/entry/src/main/resources/base/element/string.json
index 9945c5050e..4df2b095f5 100644
--- a/thread/EventHandler/entry/src/main/resources/base/element/string.json
+++ b/thread/EventHandler/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,18 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "send_inner_event",
+      "value": "Send InnerEvent"
+    },
+    {
+      "name": "post_runnable_task",
+      "value": "Post Runnable Task"
+    },
+    {
+      "name": "send_event",
+      "value": " Send Event To OriginalThread"
     }
   ]
 }
\ No newline at end of file
diff --git a/thread/EventHandler/entry/src/main/resources/base/layout/main_ability_slice.xml b/thread/EventHandler/entry/src/main/resources/base/layout/main_ability_slice.xml
index 0523089dde..c0ec786f7c 100644
--- a/thread/EventHandler/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/thread/EventHandler/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -27,7 +27,7 @@
         ohos:width="300vp"
         ohos:background_element="$graphic:button_bg"
         ohos:padding="5vp"
-        ohos:text="Send InnerEvent"
+        ohos:text="$string:send_inner_event"
         ohos:text_alignment="center"
         ohos:text_size="16fp"
         ohos:top_margin="50vp"/>
@@ -38,7 +38,7 @@
         ohos:width="300vp"
         ohos:background_element="$graphic:button_bg"
         ohos:padding="5vp"
-        ohos:text="Post Runnable Task"
+        ohos:text="$string:post_runnable_task"
         ohos:text_alignment="center"
         ohos:text_size="16fp"
         ohos:top_margin="10vp"/>
@@ -49,7 +49,7 @@
         ohos:width="300vp"
         ohos:background_element="$graphic:button_bg"
         ohos:padding="5vp"
-        ohos:text="Send Event To OriginalThread"
+        ohos:text="$string:send_event"
         ohos:text_alignment="center"
         ohos:text_size="16fp"
         ohos:top_margin="10vp"/>
diff --git a/thread/TaskDispatcher/entry/src/main/java/ohos/samples/taskmanager/slice/MainAbilitySlice.java b/thread/TaskDispatcher/entry/src/main/java/ohos/samples/taskmanager/slice/MainAbilitySlice.java
index ecacd5fc86..a915db02f0 100644
--- a/thread/TaskDispatcher/entry/src/main/java/ohos/samples/taskmanager/slice/MainAbilitySlice.java
+++ b/thread/TaskDispatcher/entry/src/main/java/ohos/samples/taskmanager/slice/MainAbilitySlice.java
@@ -27,7 +27,6 @@ import ohos.app.dispatcher.task.Revocable;
 import ohos.app.dispatcher.task.TaskPriority;
 import ohos.eventhandler.EventHandler;
 import ohos.eventhandler.EventRunner;
-import ohos.eventhandler.InnerEvent;
 import ohos.hiviewdfx.HiLog;
 import ohos.hiviewdfx.HiLogLabel;
 
@@ -48,7 +47,7 @@ public class MainAbilitySlice extends AbilitySlice {
 
     private Text resultText;
 
-    private EventHandler handler = new EventHandler(EventRunner.current());
+    private final EventHandler handler = new EventHandler(EventRunner.current());
 
     @Override
     public void onStart(Intent intent) {
@@ -81,10 +80,10 @@ public class MainAbilitySlice extends AbilitySlice {
     private void syncTask(Component component) {
         StringBuffer stringBuffer = new StringBuffer();
         TaskDispatcher globalTaskDispatcher = getGlobalTaskDispatcher(TaskPriority.DEFAULT);
-        globalTaskDispatcher.syncDispatch(() -> stringBuffer.append("Sync task1 run" + System.lineSeparator()));
-        stringBuffer.append("After sync task1" + System.lineSeparator());
-        globalTaskDispatcher.syncDispatch(() -> stringBuffer.append("Sync task2 run" + System.lineSeparator()));
-        stringBuffer.append("After sync task2" + System.lineSeparator());
+        globalTaskDispatcher.syncDispatch(() -> stringBuffer.append("Sync task1 run").append(System.lineSeparator()));
+        stringBuffer.append("After sync task1").append(System.lineSeparator());
+        globalTaskDispatcher.syncDispatch(() -> stringBuffer.append("Sync task2 run").append(System.lineSeparator()));
+        stringBuffer.append("After sync task2").append(System.lineSeparator());
         resultText.setText(stringBuffer.toString());
     }
 
@@ -97,20 +96,20 @@ public class MainAbilitySlice extends AbilitySlice {
             } catch (InterruptedException e) {
                 HiLog.error(LABEL_LOG, "%{public}s", "AsyncDispatch InterruptedException");
             }
-            stringBuffer.append("Async task1 run" + System.lineSeparator());
+            stringBuffer.append("Async task1 run").append(System.lineSeparator());
             handler.postSyncTask(() -> resultText.setText(stringBuffer.toString()));
         });
-        stringBuffer.append("After async task1" + System.lineSeparator());
+        stringBuffer.append("After async task1").append(System.lineSeparator());
         globalTaskDispatcher.asyncDispatch(() -> {
             try {
                 Thread.sleep(200);
             } catch (InterruptedException e) {
                 HiLog.error(LABEL_LOG, "%{public}s", "AsyncDispatch InterruptedException");
             }
-            stringBuffer.append("Async task2 run" + System.lineSeparator());
+            stringBuffer.append("Async task2 run").append(System.lineSeparator());
             handler.postSyncTask(() -> resultText.setText(stringBuffer.toString()));
         });
-        stringBuffer.append("After async task2" + System.lineSeparator());
+        stringBuffer.append("After async task2").append(System.lineSeparator());
         resultText.setText(stringBuffer.toString());
     }
 
@@ -119,12 +118,12 @@ public class MainAbilitySlice extends AbilitySlice {
         TaskDispatcher globalTaskDispatcher = getGlobalTaskDispatcher(TaskPriority.DEFAULT);
         final long callTime = System.currentTimeMillis();
         globalTaskDispatcher.delayDispatch(() -> {
-            stringBuffer.append("DelayDispatch task1 run" + System.lineSeparator());
+            stringBuffer.append("DelayDispatch task1 run").append(System.lineSeparator());
             final long actualDelayMs = System.currentTimeMillis() - callTime;
-            stringBuffer.append("ActualDelayTime >= delayTime : " + (actualDelayMs >= DELAY_TIME));
+            stringBuffer.append("ActualDelayTime >= delayTime : ").append((actualDelayMs >= DELAY_TIME));
             handler.postSyncTask(() -> resultText.setText(stringBuffer.toString()));
         }, DELAY_TIME);
-        stringBuffer.append("After delayDispatch task1" + System.lineSeparator());
+        stringBuffer.append("After delayDispatch task1").append(System.lineSeparator());
         resultText.setText(stringBuffer.toString());
     }
 
@@ -133,15 +132,15 @@ public class MainAbilitySlice extends AbilitySlice {
         TaskDispatcher dispatcher = createParallelTaskDispatcher("", TaskPriority.DEFAULT);
         Group group = dispatcher.createDispatchGroup();
         dispatcher.asyncGroupDispatch(group, () -> {
-            stringBuffer.append("GroupTask1 is running" + System.lineSeparator());
+            stringBuffer.append("GroupTask1 is running").append(System.lineSeparator());
             handler.postSyncTask(() -> resultText.setText(stringBuffer.toString()));
         });
         dispatcher.asyncGroupDispatch(group, () -> {
-            stringBuffer.append("GroupTask2 is running" + System.lineSeparator());
+            stringBuffer.append("GroupTask2 is running").append(System.lineSeparator());
             handler.postSyncTask(() -> resultText.setText(stringBuffer.toString()));
         });
         dispatcher.groupDispatchNotify(group, () -> stringBuffer.append(
-            "This task running after all tasks in the group are completed" + System.lineSeparator()));
+            "This task running after all tasks in the group are completed").append(System.lineSeparator()));
         resultText.setText(stringBuffer.toString());
     }
 
@@ -149,11 +148,11 @@ public class MainAbilitySlice extends AbilitySlice {
         StringBuffer stringBuffer = new StringBuffer();
         TaskDispatcher dispatcher = getUITaskDispatcher();
         Revocable revocable = dispatcher.delayDispatch(() -> {
-            stringBuffer.append("Delay dispatch" + System.lineSeparator());
+            stringBuffer.append("Delay dispatch").append(System.lineSeparator());
             handler.postSyncTask(() -> resultText.setText(stringBuffer.toString()));
         }, 50);
         boolean revoked = revocable.revoke();
-        stringBuffer.append("Revoke result :" + revoked);
+        stringBuffer.append("Revoke result :").append(revoked);
         resultText.setText(stringBuffer.toString());
     }
 
@@ -161,16 +160,10 @@ public class MainAbilitySlice extends AbilitySlice {
         StringBuffer stringBuffer = new StringBuffer();
         TaskDispatcher dispatcher = createParallelTaskDispatcher("SyncBarrierDispatcher", TaskPriority.DEFAULT);
         Group group = dispatcher.createDispatchGroup();
-        dispatcher.asyncGroupDispatch(group, () -> {
-            stringBuffer.append("Task1 is running" + System.lineSeparator());
-        });
-        dispatcher.asyncGroupDispatch(group, () -> {
-            stringBuffer.append("Task2 is running" + System.lineSeparator());
-        });
-        dispatcher.syncDispatchBarrier(() -> {
-            stringBuffer.append("Barrier" + System.lineSeparator());
-        });
-        stringBuffer.append("After syncDispatchBarrier" + System.lineSeparator());
+        dispatcher.asyncGroupDispatch(group, () -> stringBuffer.append("Task1 is running").append(System.lineSeparator()));
+        dispatcher.asyncGroupDispatch(group, () -> stringBuffer.append("Task2 is running").append(System.lineSeparator()));
+        dispatcher.syncDispatchBarrier(() -> stringBuffer.append("Barrier").append(System.lineSeparator()));
+        stringBuffer.append("After syncDispatchBarrier").append(System.lineSeparator());
         resultText.setText(stringBuffer.toString());
     }
 
@@ -179,23 +172,23 @@ public class MainAbilitySlice extends AbilitySlice {
         TaskDispatcher dispatcher = createParallelTaskDispatcher("AsyncBarrierDispatcher", TaskPriority.DEFAULT);
         Group group = dispatcher.createDispatchGroup();
         dispatcher.asyncGroupDispatch(group, () -> {
-            stringBuffer.append("Task1 is running" + System.lineSeparator());
+            stringBuffer.append("Task1 is running").append(System.lineSeparator());
             handler.postSyncTask(() -> resultText.setText(stringBuffer.toString()));
         });
         dispatcher.asyncGroupDispatch(group, () -> {
-            stringBuffer.append("Task2 is running" + System.lineSeparator());
+            stringBuffer.append("Task2 is running").append(System.lineSeparator());
             handler.postSyncTask(() -> resultText.setText(stringBuffer.toString()));
         });
         dispatcher.asyncDispatchBarrier(() -> {
-            stringBuffer.append("Barrier" + System.lineSeparator());
+            stringBuffer.append("Barrier").append(System.lineSeparator());
             handler.postSyncTask(() -> resultText.setText(stringBuffer.toString()));
         });
-        stringBuffer.append("After asyncDispatchBarrier" + System.lineSeparator());
+        stringBuffer.append("After asyncDispatchBarrier").append(System.lineSeparator());
         resultText.setText(stringBuffer.toString());
     }
 
     private void applyDispatchTask(Component component) {
-        StringBuffer stringBuffer = new StringBuffer();
+        StringBuilder stringBuilder = new StringBuilder();
         final CountDownLatch latch = new CountDownLatch(TASK_TOTAL);
         final ArrayList<Long> indexList = new ArrayList<>(TASK_TOTAL);
         TaskDispatcher globalTaskDispatcher = getGlobalTaskDispatcher(TaskPriority.DEFAULT);
@@ -208,7 +201,7 @@ public class MainAbilitySlice extends AbilitySlice {
         } catch (InterruptedException exception) {
             HiLog.error(LABEL_LOG, "%{public}s", "applyDispatchTask InterruptedException");
         }
-        stringBuffer.append("List size matches :" + (indexList.size() == TASK_TOTAL));
-        resultText.setText(stringBuffer.toString());
+        stringBuilder.append("List size matches :").append((indexList.size() == TASK_TOTAL));
+        resultText.setText(stringBuilder.toString());
     }
 }
diff --git a/thread/TaskDispatcher/entry/src/main/resources/base/element/string.json b/thread/TaskDispatcher/entry/src/main/resources/base/element/string.json
index b70430f0f9..d644a492e1 100644
--- a/thread/TaskDispatcher/entry/src/main/resources/base/element/string.json
+++ b/thread/TaskDispatcher/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,38 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "sync_dispatch",
+      "value": "Sync Dispatch"
+    },
+    {
+      "name": "async_dispatch",
+      "value": "Async Dispatch"
+    },
+    {
+      "name": "delay_dispatch",
+      "value": "Delay Dispatch"
+    },
+    {
+      "name": "dispatch_group",
+      "value": "Dispatch Group"
+    },
+    {
+      "name": "revoke_task",
+      "value": "Revoke Task"
+    },
+    {
+      "name": "sync_dispatch_barrier",
+      "value": "Sync Dispatch Barrier"
+    },
+    {
+      "name": "async_dispatch_barrier",
+      "value": "Async Dispatch Barrier"
+    },
+    {
+      "name": "apply_Dispatch",
+      "value": "Apply Dispatch"
     }
   ]
 }
\ No newline at end of file
diff --git a/thread/TaskDispatcher/entry/src/main/resources/base/layout/main_ability_slice.xml b/thread/TaskDispatcher/entry/src/main/resources/base/layout/main_ability_slice.xml
index 7ad1ba9af5..78a60c1a8f 100644
--- a/thread/TaskDispatcher/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/thread/TaskDispatcher/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -27,7 +27,7 @@
         ohos:width="300vp"
         ohos:background_element="$graphic:button_bg"
         ohos:padding="5vp"
-        ohos:text="Sync Dispatch"
+        ohos:text="$string:sync_dispatch"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
         ohos:top_margin="50vp"/>
@@ -38,7 +38,7 @@
         ohos:width="300vp"
         ohos:background_element="$graphic:button_bg"
         ohos:padding="5vp"
-        ohos:text="Async Dispatch"
+        ohos:text="$string:async_dispatch"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
         ohos:top_margin="10vp"/>
@@ -49,7 +49,7 @@
         ohos:width="300vp"
         ohos:background_element="$graphic:button_bg"
         ohos:padding="5vp"
-        ohos:text="Delay Dispatch"
+        ohos:text="$string:delay_dispatch"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
         ohos:top_margin="10vp"/>
@@ -60,7 +60,7 @@
         ohos:width="300vp"
         ohos:background_element="$graphic:button_bg"
         ohos:padding="5vp"
-        ohos:text="Dispatch Group"
+        ohos:text="$string:dispatch_group"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
         ohos:top_margin="10vp"/>
@@ -71,7 +71,7 @@
         ohos:width="300vp"
         ohos:background_element="$graphic:button_bg"
         ohos:padding="5vp"
-        ohos:text="Revoke Task"
+        ohos:text="$string:revoke_task"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
         ohos:top_margin="10vp"/>
@@ -82,7 +82,7 @@
         ohos:width="300vp"
         ohos:background_element="$graphic:button_bg"
         ohos:padding="5vp"
-        ohos:text="Sync Dispatch Barrier"
+        ohos:text="$string:sync_dispatch_barrier"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
         ohos:top_margin="10vp"/>
@@ -93,7 +93,7 @@
         ohos:width="300vp"
         ohos:background_element="$graphic:button_bg"
         ohos:padding="5vp"
-        ohos:text="Async Dispatch Barrier"
+        ohos:text="$string:async_dispatch_barrier"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
         ohos:top_margin="10vp"/>
@@ -104,7 +104,7 @@
         ohos:width="300vp"
         ohos:background_element="$graphic:button_bg"
         ohos:padding="5vp"
-        ohos:text="Apply Dispatch"
+        ohos:text="$string:apply_Dispatch"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
         ohos:top_margin="10vp"/>
-- 
Gitee


From fc78ec316bafdbe3c70baeb30fa78d34095e53d2 Mon Sep 17 00:00:00 2001
From: guojin26 <guojin26@huawei.com>
Date: Fri, 6 Aug 2021 15:51:11 +0800
Subject: [PATCH 2/2] update

Signed-off-by: guojin26 <guojin26@huawei.com>
---
 .../java/ohos/samples/aifunctionset/bean/AsrBean.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/bean/AsrBean.java b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/bean/AsrBean.java
index 26725d3f89..b8fd7ea689 100644
--- a/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/bean/AsrBean.java
+++ b/AI/AIFunctionSet/entry/src/main/java/ohos/samples/aifunctionset/bean/AsrBean.java
@@ -24,6 +24,8 @@ import java.util.List;
 public class AsrBean {
     private List<Result> result;
 
+    private String resultType;
+
     public void setResult(List<Result> result) {
         this.result = result;
     }
@@ -32,6 +34,14 @@ public class AsrBean {
         return result;
     }
 
+    public void setResultType(String resultType) {
+        this.resultType = resultType;
+    }
+
+    public String getResultType() {
+        return resultType;
+    }
+
     /**
      * Speech recognition result
      */
-- 
Gitee