From 2a8711e83351e744253c6f53b6ebcc1055d0676b Mon Sep 17 00:00:00 2001
From: gaohui <gaohui34@huawei.com>
Date: Fri, 6 Aug 2021 17:37:09 +0800
Subject: [PATCH] fix warning

Signed-off-by:gaohui<gaohui34@huawei.com>
---
 .../entry/src/main/config.json                |  2 +-
 .../main/resources/base/element/string.json   | 30 +++++++++++++-
 .../base/layout/another_ability_slice.xml     |  8 ++--
 .../base/layout/main_ability_slice.xml        | 12 +++---
 .../main/resources/base/element/string.json   |  4 ++
 .../resources/base/layout/form_layout.xml     |  2 +-
 .../abilityform/slice/FormAbilitySlice.java   | 32 +++++++--------
 .../main/resources/base/element/string.json   |  8 ++++
 .../base/layout/ability_form_layout.xml       |  4 +-
 .../slice/SecondAbilitySlice.java             |  2 +-
 .../main/resources/base/element/string.json   | 12 ++++++
 .../base/layout/first_ability_slice.xml       |  4 +-
 .../base/layout/second_ability_slice.xml      |  4 +-
 .../base/layout/third_ability_slice.xml       |  2 +-
 .../slice/FirstAbilitySlice.java              |  1 -
 .../main/resources/base/element/string.json   | 32 +++++++++++++++
 .../base/layout/first_ability_slice.xml       | 11 +++--
 .../base/layout/second_ability_slice.xml      |  6 +--
 .../commonevent/CommonEventPlugin.java        |  4 +-
 .../main/resources/base/element/string.json   | 12 ++++++
 .../base/layout/main_ability_slice.xml        |  6 +--
 .../MainAbility.java                          |  2 +-
 .../NotificationAbility.java                  | 19 ++++-----
 .../utils/LogUtil.java                        | 12 +-----
 .../samples/dataability/UserDataAbility.java  |  7 ++--
 .../dataability/slice/MainAbilitySlice.java   | 40 ++++++++-----------
 .../main/resources/base/element/string.json   | 28 +++++++++++++
 .../base/layout/main_ability_slice.xml        | 14 +++----
 .../delegator/slice/FirstAbilitySlice.java    |  4 +-
 .../delegator/slice/SecondAbilitySlice.java   | 10 ++---
 .../resources/base/layout/ability_first.xml   |  2 +-
 .../resources/base/layout/ability_second.xml  |  2 +-
 .../slice/MainAbilitySlice.java               |  5 +--
 .../distributedmusicplayer/utils/LogUtil.java | 10 -----
 .../utils/PlayerManager.java                  |  2 +-
 .../main/resources/base/element/string.json   |  8 ++++
 .../base/layout/main_ability_slice.xml        |  8 ++--
 .../ohos/samples/fraction/MainFraction.java   |  2 -
 .../ohos/samples/fraction/NextAbility.java    |  8 +++-
 .../rpcclient/slice/MainAbilitySlice.java     | 11 +++--
 .../main/resources/base/element/string.json   | 20 ++++++++++
 .../resources/base/layout/main_blility.xml    | 28 ++++++-------
 .../ohos/samples/rpcserver/MainAbility.java   |  3 --
 .../samples/rpcserver/ServiceAbility.java     |  2 +-
 .../rpcserver/slice/MainAbilitySlice.java     |  1 -
 .../main/resources/base/element/string.json   |  4 ++
 .../base/layout/main_ablility_slice.xml       |  2 +-
 .../java/ohos/samples/intent/MainAbility.java |  3 +-
 .../main/resources/base/element/string.json   |  8 ++++
 .../base/layout/main_ability_slice.xml        |  4 +-
 .../ohos/samples/secondapp/MainAbility.java   |  3 +-
 .../main/resources/base/element/string.json   |  4 ++
 .../base/layout/main_ability_slice.xml        |  2 +-
 .../intentagent/slice/MainAbilitySlice.java   |  3 +-
 .../main/resources/base/element/string.json   | 12 ++++++
 .../base/layout/intentagent_ability.xml       |  2 +-
 .../base/layout/main_ability_slice.xml        |  4 +-
 .../notification/slice/MainAbilitySlice.java  | 30 +++++++-------
 .../main/resources/base/element/string.json   | 20 ++++++++++
 .../base/layout/main_ability_slice.xml        | 10 ++---
 .../slice/ContinuationAbilitySlice.java       |  2 +-
 .../slice/FirstAbilityMainSlice.java          |  3 +-
 .../main/resources/base/element/string.json   | 40 +++++++++++++++++++
 .../base/layout/continuation_ability.xml      |  6 +--
 .../base/layout/first_ability_main_slice.xml  | 10 ++---
 .../layout/first_ability_second_slice.xml     |  4 +-
 .../base/layout/main_ability_slice.xml        |  4 +-
 .../base/layout/second_ability_main_slice.xml |  4 +-
 .../layout/second_ability_second_slice.xml    |  4 +-
 .../copy/slice/MainAbilitySlice.java          |  2 +-
 .../main/resources/base/element/string.json   | 12 ++++++
 .../base/layout/main_ability_slice.xml        |  6 +--
 .../serviceability/LocalServiceAbility.java   |  2 +-
 .../samples/serviceability/RemoteAbility.java |  3 +-
 .../slice/MainAbilitySlice.java               | 36 ++++++++---------
 .../main/resources/base/element/string.json   | 36 +++++++++++++++++
 .../main/resources/base/layout/main_slice.xml | 18 ++++-----
 77 files changed, 501 insertions(+), 248 deletions(-)

diff --git a/ability/AbilityConnection/entry/src/main/config.json b/ability/AbilityConnection/entry/src/main/config.json
index 2e5e009a23..1ac90100be 100644
--- a/ability/AbilityConnection/entry/src/main/config.json
+++ b/ability/AbilityConnection/entry/src/main/config.json
@@ -59,7 +59,7 @@
         "formsEnabled": false,
         "name": ".AnotherAbility",
         "icon": "$media:icon",
-        "description": "$string:anotherability_description",
+        "description": "$string:anotherAbility_description",
         "type": "page",
         "launchType": "standard"
       }
diff --git a/ability/AbilityConnection/entry/src/main/resources/base/element/string.json b/ability/AbilityConnection/entry/src/main/resources/base/element/string.json
index e57e24a845..d25e979cb4 100644
--- a/ability/AbilityConnection/entry/src/main/resources/base/element/string.json
+++ b/ability/AbilityConnection/entry/src/main/resources/base/element/string.json
@@ -9,8 +9,36 @@
       "value": "hap sample empty page"
     },
     {
-      "name": "anotherability_description",
+      "name": "anotherAbility_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "launch_button",
+      "value": "Launch Another Ability"
+    },
+    {
+      "name": "start_button",
+      "value": "Start Service"
+    },
+    {
+      "name": "stop_button",
+      "value": "Stop Service"
+    },
+    {
+      "name": "new_task_button",
+      "value": "Start Task"
+    },
+    {
+      "name": "cancel_task_button",
+      "value": "Cancel Task"
+    },
+    {
+      "name": "state_text",
+      "value": "--"
+    },
+    {
+      "name": "connect_service",
+      "value": "Connect Service"
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/AbilityConnection/entry/src/main/resources/base/layout/another_ability_slice.xml b/ability/AbilityConnection/entry/src/main/resources/base/layout/another_ability_slice.xml
index f2c09aef97..fdc7e82095 100644
--- a/ability/AbilityConnection/entry/src/main/resources/base/layout/another_ability_slice.xml
+++ b/ability/AbilityConnection/entry/src/main/resources/base/layout/another_ability_slice.xml
@@ -23,7 +23,7 @@
         ohos:id="$+id:start_button"
         ohos:width="match_parent"
         ohos:height="match_content"
-        ohos:text="Connect Service"
+        ohos:text="$string:connect_service"
         ohos:text_size="15fp"
         ohos:padding="8vp"
         ohos:background_element="$graphic:button_background"
@@ -36,7 +36,7 @@
         ohos:id="$+id:stop_button"
         ohos:width="match_parent"
         ohos:height="match_content"
-        ohos:text="Stop Service"
+        ohos:text="$string:stop_button"
         ohos:text_size="15fp"
         ohos:padding="8vp"
         ohos:background_element="$graphic:button_background"
@@ -50,7 +50,7 @@
         ohos:width="match_parent"
         ohos:right_margin="30vp"
         ohos:height="match_content"
-        ohos:text="Cancel Task"
+        ohos:text="$string:cancel_task_button"
         ohos:text_size="15fp"
         ohos:top_margin="30vp"
         ohos:padding="8vp"
@@ -62,7 +62,7 @@
         ohos:id="$+id:state_text"
         ohos:height="match_content"
         ohos:width="match_parent"
-        ohos:text="--"
+        ohos:text="$string:state_text"
         ohos:text_alignment="center"
         ohos:text_size="15fp"
         ohos:top_margin="50vp"/>
diff --git a/ability/AbilityConnection/entry/src/main/resources/base/layout/main_ability_slice.xml b/ability/AbilityConnection/entry/src/main/resources/base/layout/main_ability_slice.xml
index a683223fbf..9991cda10a 100644
--- a/ability/AbilityConnection/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/ability/AbilityConnection/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -24,7 +24,7 @@
         ohos:id="$+id:launch_button"
         ohos:width="match_parent"
         ohos:height="match_content"
-        ohos:text="Launch Another Ability"
+        ohos:text="$string:launch_button"
         ohos:text_size="15fp"
         ohos:padding="8vp"
         ohos:background_element="$graphic:button_background"
@@ -36,7 +36,7 @@
         ohos:id="$+id:start_button"
         ohos:width="match_parent"
         ohos:height="match_content"
-        ohos:text="Start Service"
+        ohos:text="$string:start_button"
         ohos:text_size="15fp"
         ohos:padding="8vp"
         ohos:background_element="$graphic:button_background"
@@ -49,7 +49,7 @@
         ohos:id="$+id:stop_button"
         ohos:width="match_parent"
         ohos:height="match_content"
-        ohos:text="Stop Service"
+        ohos:text="$string:stop_button"
         ohos:text_size="15fp"
         ohos:padding="8vp"
         ohos:background_element="$graphic:button_background"
@@ -62,7 +62,7 @@
         ohos:id="$+id:new_task_button"
         ohos:width="match_parent"
         ohos:height="match_content"
-        ohos:text="Start Task"
+        ohos:text="$string:new_task_button"
         ohos:left_margin="30vp"
         ohos:right_margin="30vp"
         ohos:top_margin="50vp"
@@ -76,7 +76,7 @@
         ohos:width="match_parent"
         ohos:right_margin="30vp"
         ohos:height="match_content"
-        ohos:text="Cancel Task"
+        ohos:text="$string:cancel_task_button"
         ohos:text_size="15fp"
         ohos:top_margin="30vp"
         ohos:padding="8vp"
@@ -88,7 +88,7 @@
         ohos:id="$+id:state_text"
         ohos:height="match_content"
         ohos:width="match_parent"
-        ohos:text="--"
+        ohos:text="$string:state_text"
         ohos:text_alignment="center"
         ohos:text_size="15fp"
         ohos:top_margin="50vp"/>
diff --git a/ability/AbilityForm/abilityformprovider/src/main/resources/base/element/string.json b/ability/AbilityForm/abilityformprovider/src/main/resources/base/element/string.json
index 8b458850df..541ad01cf5 100644
--- a/ability/AbilityForm/abilityformprovider/src/main/resources/base/element/string.json
+++ b/ability/AbilityForm/abilityformprovider/src/main/resources/base/element/string.json
@@ -7,6 +7,10 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "title_text",
+      "value": "Counter"
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/AbilityForm/abilityformprovider/src/main/resources/base/layout/form_layout.xml b/ability/AbilityForm/abilityformprovider/src/main/resources/base/layout/form_layout.xml
index 437e25ca8f..0db6f4ec6d 100644
--- a/ability/AbilityForm/abilityformprovider/src/main/resources/base/layout/form_layout.xml
+++ b/ability/AbilityForm/abilityformprovider/src/main/resources/base/layout/form_layout.xml
@@ -26,7 +26,7 @@
         ohos:id="$+id:title_text"
         ohos:height="match_content"
         ohos:width="match_content"
-        ohos:text="Counter"
+        ohos:text="$string:title_text"
         ohos:text_color="#ff555555"
         ohos:text_size="20fp"/>
 
diff --git a/ability/AbilityForm/entry/src/main/java/ohos/samples/abilityform/slice/FormAbilitySlice.java b/ability/AbilityForm/entry/src/main/java/ohos/samples/abilityform/slice/FormAbilitySlice.java
index 147f585ae3..658412817a 100644
--- a/ability/AbilityForm/entry/src/main/java/ohos/samples/abilityform/slice/FormAbilitySlice.java
+++ b/ability/AbilityForm/entry/src/main/java/ohos/samples/abilityform/slice/FormAbilitySlice.java
@@ -97,25 +97,23 @@ public class FormAbilitySlice extends AbilitySlice {
 
     private void showForm(Intent intent) {
         TaskDispatcher globalTaskDispatcher = getGlobalTaskDispatcher(TaskPriority.DEFAULT);
-        globalTaskDispatcher.asyncDispatch(() -> {
-            FormAbilitySlice.this.acquireAbilityFormAsync(intent, new AbilityForm.OnAcquiredCallback() {
-                @Override
-                public void onAcquired(AbilityForm form) {
-                    if (form == null) {
-                        HiLog.info(LABEL_LOG, "%{public}s", "showForm: Form is null");
-                        return;
-                    }
-                    abilityForm = form;
-                    addForm();
+        globalTaskDispatcher.asyncDispatch(() -> FormAbilitySlice.this.acquireAbilityFormAsync(intent, new AbilityForm.OnAcquiredCallback() {
+            @Override
+            public void onAcquired(AbilityForm form) {
+                if (form == null) {
+                    HiLog.info(LABEL_LOG, "%{public}s", "showForm: Form is null");
+                    return;
                 }
+                abilityForm = form;
+                addForm();
+            }
 
-                @Override
-                public void onDestroyed(AbilityForm form) {
-                    abilityForm = null;
-                    HiLog.error(LABEL_LOG, "%{public}s", "showForm: AbilityForm on destroy");
-                }
-            });
-        });
+            @Override
+            public void onDestroyed(AbilityForm form) {
+                abilityForm = null;
+                HiLog.error(LABEL_LOG, "%{public}s", "showForm: AbilityForm on destroy");
+            }
+        }));
     }
 
     private void addForm() {
diff --git a/ability/AbilityForm/entry/src/main/resources/base/element/string.json b/ability/AbilityForm/entry/src/main/resources/base/element/string.json
index 8b458850df..e81eaf550d 100644
--- a/ability/AbilityForm/entry/src/main/resources/base/element/string.json
+++ b/ability/AbilityForm/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,14 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "load_form_button",
+      "value": "Load Form"
+    },
+    {
+      "name": "remove_form_button",
+      "value": "Remove Form"
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/AbilityForm/entry/src/main/resources/base/layout/ability_form_layout.xml b/ability/AbilityForm/entry/src/main/resources/base/layout/ability_form_layout.xml
index e0c5340045..76809f8da9 100644
--- a/ability/AbilityForm/entry/src/main/resources/base/layout/ability_form_layout.xml
+++ b/ability/AbilityForm/entry/src/main/resources/base/layout/ability_form_layout.xml
@@ -37,7 +37,7 @@
         ohos:background_element="$graphic:button_background"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Load Form"
+        ohos:text="$string:load_form_button"
         ohos:text_size="16fp"/>
 
     <Button
@@ -50,7 +50,7 @@
         ohos:padding="10vp"
         ohos:background_element="$graphic:button_background"
         ohos:right_margin="24vp"
-        ohos:text="Remove Form"
+        ohos:text="$string:remove_form_button"
         ohos:text_size="16fp"
         ohos:top_margin="10vp"/>
 </DirectionalLayout>
\ No newline at end of file
diff --git a/ability/AbilityIntent/entry/src/main/java/ohos/samples/abilityinteractionex/slice/SecondAbilitySlice.java b/ability/AbilityIntent/entry/src/main/java/ohos/samples/abilityinteractionex/slice/SecondAbilitySlice.java
index e8f959f684..0eb5d8e35d 100644
--- a/ability/AbilityIntent/entry/src/main/java/ohos/samples/abilityinteractionex/slice/SecondAbilitySlice.java
+++ b/ability/AbilityIntent/entry/src/main/java/ohos/samples/abilityinteractionex/slice/SecondAbilitySlice.java
@@ -35,7 +35,7 @@ public class SecondAbilitySlice extends AbilitySlice {
         Component secondBackFirstButton = findComponentById(ResourceTable.Id_second_back_first);
         secondBackFirstButton.setClickedListener(component -> terminate());
 
-        Text showParametersText = (Text) findComponentById(ResourceTable.Id_secode_text);
+        Text showParametersText = (Text) findComponentById(ResourceTable.Id_second_text);
         showParametersText.setText(intent.getStringParam(Const.ABILITY_PARAMETER_KEY));
     }
 }
diff --git a/ability/AbilityIntent/entry/src/main/resources/base/element/string.json b/ability/AbilityIntent/entry/src/main/resources/base/element/string.json
index 7afcaa908d..56d0045f6e 100644
--- a/ability/AbilityIntent/entry/src/main/resources/base/element/string.json
+++ b/ability/AbilityIntent/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,18 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "enter_second",
+      "value": "Start Second Ability"
+    },
+    {
+      "name": "enter_third",
+      "value": "Start Third Ability"
+    },
+    {
+      "name": "second_back_first",
+      "value": "Back First Ability"
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/AbilityIntent/entry/src/main/resources/base/layout/first_ability_slice.xml b/ability/AbilityIntent/entry/src/main/resources/base/layout/first_ability_slice.xml
index 28273535e2..7a2e01a5d1 100644
--- a/ability/AbilityIntent/entry/src/main/resources/base/layout/first_ability_slice.xml
+++ b/ability/AbilityIntent/entry/src/main/resources/base/layout/first_ability_slice.xml
@@ -32,7 +32,7 @@
         ohos:id="$+id:enter_second"
         ohos:width="200vp"
         ohos:height="35vp"
-        ohos:text="Start Second Ability"
+        ohos:text="$string:enter_second"
         ohos:multiple_lines="true"
         ohos:text_size="12fp"
         ohos:center_in_parent="true"
@@ -42,7 +42,7 @@
         ohos:id="$+id:enter_third"
         ohos:width="200vp"
         ohos:height="35vp"
-        ohos:text="Start Third Ability"
+        ohos:text="$string:enter_third"
         ohos:multiple_lines="true"
         ohos:top_margin="20vp"
         ohos:text_size="12fp"
diff --git a/ability/AbilityIntent/entry/src/main/resources/base/layout/second_ability_slice.xml b/ability/AbilityIntent/entry/src/main/resources/base/layout/second_ability_slice.xml
index 7968313903..2edaa2f505 100644
--- a/ability/AbilityIntent/entry/src/main/resources/base/layout/second_ability_slice.xml
+++ b/ability/AbilityIntent/entry/src/main/resources/base/layout/second_ability_slice.xml
@@ -19,7 +19,7 @@
                  ohos:height="match_parent">
 
     <Text
-        ohos:id="$+id:secode_text"
+        ohos:id="$+id:second_text"
         ohos:width="match_content"
         ohos:height="35vp"
         ohos:multiple_lines="true"
@@ -33,7 +33,7 @@
         ohos:id="$+id:second_back_first"
         ohos:width="200vp"
         ohos:height="35vp"
-        ohos:text="Back First Ability"
+        ohos:text="$string:second_back_first"
         ohos:multiple_lines="true"
         ohos:text_size="12fp"
         ohos:bottom_margin="50vp"
diff --git a/ability/AbilityIntent/entry/src/main/resources/base/layout/third_ability_slice.xml b/ability/AbilityIntent/entry/src/main/resources/base/layout/third_ability_slice.xml
index f20cde5f8c..dd78829692 100644
--- a/ability/AbilityIntent/entry/src/main/resources/base/layout/third_ability_slice.xml
+++ b/ability/AbilityIntent/entry/src/main/resources/base/layout/third_ability_slice.xml
@@ -32,7 +32,7 @@
         ohos:id="$+id:third_back_first"
         ohos:width="200vp"
         ohos:height="35vp"
-        ohos:text="Back First Ability"
+        ohos:text="$string:second_back_first"
         ohos:multiple_lines="true"
         ohos:text_size="12fp"
         ohos:bottom_margin="50vp"
diff --git a/ability/AbilityInteraction/entry/src/main/java/ohos/samples/abilityinteraction/slice/FirstAbilitySlice.java b/ability/AbilityInteraction/entry/src/main/java/ohos/samples/abilityinteraction/slice/FirstAbilitySlice.java
index 22a971f31e..b80d035c82 100644
--- a/ability/AbilityInteraction/entry/src/main/java/ohos/samples/abilityinteraction/slice/FirstAbilitySlice.java
+++ b/ability/AbilityInteraction/entry/src/main/java/ohos/samples/abilityinteraction/slice/FirstAbilitySlice.java
@@ -15,7 +15,6 @@
 
 package ohos.samples.abilityinteraction.slice;
 
-import ohos.agp.components.Component;
 import ohos.samples.abilityinteraction.ResourceTable;
 import ohos.samples.abilityinteraction.SecondAbility;
 import ohos.samples.abilityinteraction.utils.Const;
diff --git a/ability/AbilityInteraction/entry/src/main/resources/base/element/string.json b/ability/AbilityInteraction/entry/src/main/resources/base/element/string.json
index 5565460d96..573f1c84a3 100644
--- a/ability/AbilityInteraction/entry/src/main/resources/base/element/string.json
+++ b/ability/AbilityInteraction/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,38 @@
     {
       "name": "firstability_description",
       "value": "First Ability"
+    },
+    {
+      "name": "number",
+      "value": "?"
+    },
+    {
+      "name": "first_text",
+      "value": "Calculate Squared Number"
+    },
+    {
+      "name": "enter_second",
+      "value": "Start Second Ability"
+    },
+    {
+      "name": "continue_ability",
+      "value": "Start Continue Ability"
+    },
+    {
+      "name": "lifecycle_title",
+      "value": "First Ability Lifecycle Changement:"
+    },
+    {
+      "name": "second_text",
+      "value": "Squared Result"
+    },
+    {
+      "name": "Number",
+      "value": "12"
+    },
+    {
+      "name": "second_back_first",
+      "value": "Back First Ability"
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/AbilityInteraction/entry/src/main/resources/base/layout/first_ability_slice.xml b/ability/AbilityInteraction/entry/src/main/resources/base/layout/first_ability_slice.xml
index 149c24189a..8653801f59 100644
--- a/ability/AbilityInteraction/entry/src/main/resources/base/layout/first_ability_slice.xml
+++ b/ability/AbilityInteraction/entry/src/main/resources/base/layout/first_ability_slice.xml
@@ -24,7 +24,7 @@
         ohos:width="match_parent"
         ohos:height="match_content"
         ohos:margin="20vp"
-        ohos:text="Calculate Squared Number"
+        ohos:text="$string:first_text"
         ohos:text_color="#ff000000"
         ohos:text_alignment="center"
         ohos:text_size="15fp" />
@@ -34,7 +34,7 @@
         ohos:width="match_parent"
         ohos:height="match_content"
         ohos:margin="20vp"
-        ohos:text="?"
+        ohos:text="$string:number"
         ohos:text_color="#88ff0000"
         ohos:text_alignment="center"
         ohos:text_size="25fp" />
@@ -45,7 +45,7 @@
         ohos:height="match_content"
         ohos:top_margin="10vp"
         ohos:padding="10vp"
-        ohos:text="Start Second Ability"
+        ohos:text="$string:enter_second"
         ohos:text_size="15fp"
         ohos:background_element="$graphic:button_bg" />
 
@@ -55,7 +55,7 @@
         ohos:height="match_content"
         ohos:top_margin="10vp"
         ohos:padding="10vp"
-        ohos:text="Start Continue Ability"
+        ohos:text="$string:continue_ability"
         ohos:text_size="15fp"
         ohos:background_element="$graphic:button_bg" />
 
@@ -64,10 +64,9 @@
         ohos:width="match_parent"
         ohos:height="match_content"
         ohos:top_margin="50vp"
-        ohos:text="First Ability Lifecycle Changement:"
+        ohos:text="$string:lifecycle_title"
         ohos:text_color="#ff000000"
         ohos:text_alignment="left"
-        ohos:text_style="bold"
         ohos:text_size="15fp" />
 
     <Text
diff --git a/ability/AbilityInteraction/entry/src/main/resources/base/layout/second_ability_slice.xml b/ability/AbilityInteraction/entry/src/main/resources/base/layout/second_ability_slice.xml
index ba194e8474..c541ee1a46 100644
--- a/ability/AbilityInteraction/entry/src/main/resources/base/layout/second_ability_slice.xml
+++ b/ability/AbilityInteraction/entry/src/main/resources/base/layout/second_ability_slice.xml
@@ -24,7 +24,7 @@
         ohos:width="match_parent"
         ohos:height="match_content"
         ohos:margin="20vp"
-        ohos:text="Squared Result"
+        ohos:text="$string:second_text"
         ohos:text_color="#ff000000"
         ohos:text_alignment="center"
         ohos:text_size="15fp" />
@@ -34,7 +34,7 @@
         ohos:width="match_parent"
         ohos:height="match_content"
         ohos:margin="20vp"
-        ohos:text="12"
+        ohos:text="$string:number"
         ohos:text_color="#ff000000"
         ohos:text_alignment="center"
         ohos:text_size="25fp" />
@@ -44,7 +44,7 @@
         ohos:width="match_parent"
         ohos:height="match_content"
         ohos:padding="10vp"
-        ohos:text="Back First Ability"
+        ohos:text="$string:second_back_first"
         ohos:text_size="15fp"
         ohos:background_element="$graphic:button_bg" />
 
diff --git a/ability/CommonEvent/entry/src/main/java/ohos/samples/commonevent/CommonEventPlugin.java b/ability/CommonEvent/entry/src/main/java/ohos/samples/commonevent/CommonEventPlugin.java
index e70ae7e1f9..07f962988c 100644
--- a/ability/CommonEvent/entry/src/main/java/ohos/samples/commonevent/CommonEventPlugin.java
+++ b/ability/CommonEvent/entry/src/main/java/ohos/samples/commonevent/CommonEventPlugin.java
@@ -37,7 +37,7 @@ public class CommonEventPlugin {
 
     private static final HiLogLabel LABEL_LOG = new HiLogLabel(3, 0xD000F00, TAG);
 
-    private String event = "com.utils.test";
+    private final String event = "com.utils.test";
 
     private boolean unSubscribe = true;
 
@@ -189,7 +189,7 @@ public class CommonEventPlugin {
             String receivedAction = commonEventData.getIntent().getAction();
             HiLog.info(LABEL_LOG, "%{public}s", "onReceiveEvent action:" + receivedAction);
             if (receivedAction.equals(event) && eventListener != null) {
-                eventListener.onEventReceive("Receive commonevent succeeded,commonevent is:" + event);
+                eventListener.onEventReceive("Receive CommonEvent succeeded,CommonEvent is:" + event);
             }
         }
     }
diff --git a/ability/CommonEvent/entry/src/main/resources/base/element/string.json b/ability/CommonEvent/entry/src/main/resources/base/element/string.json
index 14d9c4855c..49b4ea3e82 100644
--- a/ability/CommonEvent/entry/src/main/resources/base/element/string.json
+++ b/ability/CommonEvent/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,18 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "subscribe_button",
+      "value": "Subscribe CommonEvent"
+    },
+    {
+      "name": "publish_button",
+      "value": "Publish CommonEvent"
+    },
+    {
+      "name": "unsubscribe_button",
+      "value": "Unsubscribe CommonEvent"
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/CommonEvent/entry/src/main/resources/base/layout/main_ability_slice.xml b/ability/CommonEvent/entry/src/main/resources/base/layout/main_ability_slice.xml
index 2e7e72d7ca..e8f5fe0629 100644
--- a/ability/CommonEvent/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/ability/CommonEvent/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -28,7 +28,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Subscribe CommonEvent"
+        ohos:text="$string:subscribe_button"
         ohos:text_alignment="center"
         ohos:background_element="$graphic:button_background"
         ohos:text_size="16fp"
@@ -41,7 +41,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Publish CommonEvent"
+        ohos:text="$string:publish_button"
         ohos:text_alignment="center"
         ohos:background_element="$graphic:button_background"
         ohos:text_size="16fp"
@@ -54,7 +54,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Unsubscribe CommonEvent"
+        ohos:text="$string:unsubscribe_button"
         ohos:text_alignment="center"
         ohos:background_element="$graphic:button_background"
         ohos:text_size="16fp"
diff --git a/ability/CustomNotification/entry/src/main/java/ohos/samples/autoreplynotificationsample/MainAbility.java b/ability/CustomNotification/entry/src/main/java/ohos/samples/autoreplynotificationsample/MainAbility.java
index a30c790912..ac1fe0778d 100644
--- a/ability/CustomNotification/entry/src/main/java/ohos/samples/autoreplynotificationsample/MainAbility.java
+++ b/ability/CustomNotification/entry/src/main/java/ohos/samples/autoreplynotificationsample/MainAbility.java
@@ -31,6 +31,6 @@ public class MainAbility extends AceAbility {
     @Override
     public void onStop() {
         super.onStop();
-        NotificationAbility.deregister();
+        NotificationAbility.deRegister();
     }
 }
diff --git a/ability/CustomNotification/entry/src/main/java/ohos/samples/autoreplynotificationsample/NotificationAbility.java b/ability/CustomNotification/entry/src/main/java/ohos/samples/autoreplynotificationsample/NotificationAbility.java
index 1e219e7dbe..cb3590e831 100644
--- a/ability/CustomNotification/entry/src/main/java/ohos/samples/autoreplynotificationsample/NotificationAbility.java
+++ b/ability/CustomNotification/entry/src/main/java/ohos/samples/autoreplynotificationsample/NotificationAbility.java
@@ -15,6 +15,7 @@
 
 package ohos.samples.autoreplynotificationsample;
 
+import ohos.aafwk.content.Operation;
 import ohos.samples.autoreplynotificationsample.utils.Constants;
 import ohos.samples.autoreplynotificationsample.utils.LogUtil;
 
@@ -35,7 +36,6 @@ import ohos.event.notification.NotificationConstant;
 import ohos.event.notification.NotificationHelper;
 import ohos.event.notification.NotificationRequest;
 import ohos.event.notification.NotificationUserInput;
-import ohos.global.resource.NotExistException;
 import ohos.global.resource.RawFileEntry;
 import ohos.global.resource.Resource;
 import ohos.media.image.ImageSource;
@@ -177,7 +177,6 @@ public class NotificationAbility extends AceInternalAbility {
     }
 
     private PixelMap getPixMap() {
-        PixelMap pixelMap = null;
         try {
             RawFileEntry rawFileEntry = context.getResourceManager().getRawFileEntry(RAW_FILE_PATH + "icon.png");
             Resource resource = rawFileEntry.openRawFile();
@@ -187,11 +186,11 @@ public class NotificationAbility extends AceInternalAbility {
             decodingOptions.desiredSize = new Size(0, 0);
             decodingOptions.desiredRegion = new Rect(0, 0, 0, 0);
             decodingOptions.desiredPixelFormat = PixelFormat.ARGB_8888;
-            pixelMap = imageSource.createPixelmap(decodingOptions);
+            return imageSource.createPixelmap(decodingOptions);
         } catch (IOException e) {
             LogUtil.error(TAG, "getPixMap IOException");
         }
-        return pixelMap;
+        return null;
     }
 
     private void subscribeEvent(MessageParcel data, MessageParcel reply, MessageOption option) {
@@ -255,8 +254,10 @@ public class NotificationAbility extends AceInternalAbility {
     }
 
     private IntentAgent setIntentAgent() {
+
         Intent intent = new Intent();
-        intent.setAction(Constants.COMMON_EVENT_ACTION);
+        Operation operation = new Intent.OperationBuilder().withAction(Constants.COMMON_EVENT_ACTION).build();
+        intent.setOperation(operation);
         List<Intent> intentList = new ArrayList<>();
         intentList.add(intent);
 
@@ -282,13 +283,13 @@ public class NotificationAbility extends AceInternalAbility {
     }
 
     /**
-     * Internal ability deregistration.
+     * Internal ability deRegistration.
      */
-    public static void deregister() {
-        instance.onDeregister();
+    public static void deRegister() {
+        instance.onDeRegister();
     }
 
-    private void onDeregister() {
+    private void onDeRegister() {
         context = null;
         this.setInternalAbilityHandler(null);
     }
diff --git a/ability/CustomNotification/entry/src/main/java/ohos/samples/autoreplynotificationsample/utils/LogUtil.java b/ability/CustomNotification/entry/src/main/java/ohos/samples/autoreplynotificationsample/utils/LogUtil.java
index dcb44104b1..8639ab7791 100644
--- a/ability/CustomNotification/entry/src/main/java/ohos/samples/autoreplynotificationsample/utils/LogUtil.java
+++ b/ability/CustomNotification/entry/src/main/java/ohos/samples/autoreplynotificationsample/utils/LogUtil.java
@@ -21,7 +21,7 @@ import ohos.hiviewdfx.HiLogLabel;
 import java.util.Locale;
 
 /**
- * Hilog util class
+ * HiLog util class
  */
 public class LogUtil {
     private static final String TAG_LOG = "AutoReplyNotificationSample";
@@ -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
      *
diff --git a/ability/DataAbility/entry/src/main/java/ohos/samples/dataability/UserDataAbility.java b/ability/DataAbility/entry/src/main/java/ohos/samples/dataability/UserDataAbility.java
index d1f0b9b1e2..431be4f707 100644
--- a/ability/DataAbility/entry/src/main/java/ohos/samples/dataability/UserDataAbility.java
+++ b/ability/DataAbility/entry/src/main/java/ohos/samples/dataability/UserDataAbility.java
@@ -20,7 +20,6 @@ import ohos.samples.dataability.utils.Const;
 import ohos.aafwk.ability.Ability;
 import ohos.aafwk.ability.DataAbilityHelper;
 import ohos.aafwk.content.Intent;
-import ohos.app.Environment;
 import ohos.data.DatabaseHelper;
 import ohos.data.dataability.DataAbilityPredicates;
 import ohos.data.dataability.DataAbilityUtils;
@@ -48,11 +47,11 @@ public class UserDataAbility extends Ability {
 
     private static final HiLogLabel LABEL_LOG = new HiLogLabel(3, 0xD000F00, TAG);
 
-    private StoreConfig config = StoreConfig.newDefaultConfig(Const.DB_NAME);
+    private final StoreConfig config = StoreConfig.newDefaultConfig(Const.DB_NAME);
 
     private RdbStore rdbStore;
 
-    private RdbOpenCallback rdbOpenCallback = new RdbOpenCallback() {
+    private final RdbOpenCallback rdbOpenCallback = new RdbOpenCallback() {
         @Override
         public void onCreate(RdbStore store) {
             store.executeSql(
@@ -117,7 +116,7 @@ public class UserDataAbility extends Ability {
     @Override
     public FileDescriptor openFile(Uri uri, String mode) {
         File file = new File(getFilesDir(), uri.getDecodedQuery());
-        if (mode == null || !"rw".equals(mode)) {
+        if (!"rw".equals(mode)) {
             boolean result = file.setReadOnly();
             HiLog.info(LABEL_LOG, "%{public}s", "setReadOnly result: " + result);
         }
diff --git a/ability/DataAbility/entry/src/main/java/ohos/samples/dataability/slice/MainAbilitySlice.java b/ability/DataAbility/entry/src/main/java/ohos/samples/dataability/slice/MainAbilitySlice.java
index a341463f73..e9cdd6ada1 100644
--- a/ability/DataAbility/entry/src/main/java/ohos/samples/dataability/slice/MainAbilitySlice.java
+++ b/ability/DataAbility/entry/src/main/java/ohos/samples/dataability/slice/MainAbilitySlice.java
@@ -143,22 +143,19 @@ public class MainAbilitySlice extends AbilitySlice {
     }
 
     private void query(boolean queryAll) {
-        getGlobalTaskDispatcher(TaskPriority.DEFAULT).asyncDispatch(new Runnable() {
-            @Override
-            public void run() {
-                String[] columns = new String[]{Const.DB_COLUMN_NAME, Const.DB_COLUMN_AGE, Const.DB_COLUMN_USER_ID};
-                DataAbilityPredicates predicates = new DataAbilityPredicates();
-                if (!queryAll) {
-                    // test data
-                    predicates.between(Const.DB_COLUMN_USER_ID, 2, 4);
-                }
-                try {
-                    ResultSet resultSet = databaseHelper.query(Uri.parse(Const.BASE_URI + Const.DATA_PATH), columns,
-                            predicates);
-                    appendText(resultSet);
-                } catch (DataAbilityRemoteException | IllegalStateException exception) {
-                    HiLog.error(LABEL_LOG, "%{public}s", "query: dataRemote exception|illegalStateException");
-                }
+        getGlobalTaskDispatcher(TaskPriority.DEFAULT).asyncDispatch(() -> {
+            String[] columns = new String[]{Const.DB_COLUMN_NAME, Const.DB_COLUMN_AGE, Const.DB_COLUMN_USER_ID};
+            DataAbilityPredicates predicates = new DataAbilityPredicates();
+            if (!queryAll) {
+                // test data
+                predicates.between(Const.DB_COLUMN_USER_ID, 2, 4);
+            }
+            try {
+                ResultSet resultSet = databaseHelper.query(Uri.parse(Const.BASE_URI + Const.DATA_PATH), columns,
+                        predicates);
+                appendText(resultSet);
+            } catch (DataAbilityRemoteException | IllegalStateException exception) {
+                HiLog.error(LABEL_LOG, "%{public}s", "query: dataRemote exception|illegalStateException");
             }
         });
     }
@@ -179,16 +176,13 @@ public class MainAbilitySlice extends AbilitySlice {
             String name = resultSet.getString(nameIndex);
             int age = resultSet.getInt(ageIndex);
             int userId = resultSet.getInt(userIndex);
-            appendStr.append(userId + "   " + name + "   " + age + System.lineSeparator());
+            appendStr.append(userId).append("   ").append(name).append("   ").append(age).append(System.lineSeparator());
         } while (resultSet.goToNextRow() && queryCount < allowQueryMaxCount);
         HiLog.info(LABEL_LOG, " queryCount : " + queryCount);
         HiLog.info(LABEL_LOG, " appendStr : " + appendStr.toString());
-        getUITaskDispatcher().asyncDispatch(new Runnable() {
-            @Override
-            public void run() {
-                logText.setText("");
-                logText.setText(appendStr.toString());
-            }
+        getUITaskDispatcher().asyncDispatch(() -> {
+            logText.setText("");
+            logText.setText(appendStr.toString());
         });
     }
 
diff --git a/ability/DataAbility/entry/src/main/resources/base/element/string.json b/ability/DataAbility/entry/src/main/resources/base/element/string.json
index 3638f70ec1..62441eee78 100644
--- a/ability/DataAbility/entry/src/main/resources/base/element/string.json
+++ b/ability/DataAbility/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,34 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "insert_button",
+      "value": "Insert"
+    },
+    {
+      "name": "delete_button",
+      "value": "Delete"
+    },
+    {
+      "name": "update_button",
+      "value": "Update"
+    },
+    {
+      "name": "query_button",
+      "value": "Query"
+    },
+    {
+      "name": "batch_insert_button",
+      "value": "Batch Insert"
+    },
+    {
+      "name": "batch_execute_button",
+      "value": "Batch Execute"
+    },
+    {
+      "name": "read_file_button",
+      "value": "Read Text File"
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/DataAbility/entry/src/main/resources/base/layout/main_ability_slice.xml b/ability/DataAbility/entry/src/main/resources/base/layout/main_ability_slice.xml
index cf8403d3bd..ca56cd41a3 100644
--- a/ability/DataAbility/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/ability/DataAbility/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -47,7 +47,7 @@
             ohos:width="0vp"
             ohos:background_element="$graphic:button_background"
             ohos:padding="10vp"
-            ohos:text="Insert"
+            ohos:text="$string:insert_button"
             ohos:text_size="16fp"
             ohos:weight="1"/>
 
@@ -58,7 +58,7 @@
             ohos:background_element="$graphic:button_background"
             ohos:left_margin="10vp"
             ohos:padding="10vp"
-            ohos:text="Delete"
+            ohos:text="$string:delete_button"
             ohos:text_size="16fp"
             ohos:weight="1"/>
     </DirectionalLayout>
@@ -77,7 +77,7 @@
             ohos:width="0vp"
             ohos:background_element="$graphic:button_background"
             ohos:padding="10vp"
-            ohos:text="Update"
+            ohos:text="$string:update_button"
             ohos:text_size="16fp"
             ohos:weight="1"/>
 
@@ -88,7 +88,7 @@
             ohos:background_element="$graphic:button_background"
             ohos:left_margin="10vp"
             ohos:padding="10vp"
-            ohos:text="Query"
+            ohos:text="$string:query_button"
             ohos:text_size="16fp"
             ohos:weight="1"/>
     </DirectionalLayout>
@@ -101,7 +101,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Batch Insert"
+        ohos:text="$string:batch_insert_button"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
 
@@ -113,7 +113,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Batch Execute"
+        ohos:text="$string:batch_execute_button"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
 
@@ -133,7 +133,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Read Text File"
+        ohos:text="$string:read_file_button"
         ohos:text_size="16fp"
         ohos:top_margin="10vp"/>
 </DirectionalLayout>
\ No newline at end of file
diff --git a/ability/Delegator/entry/src/main/java/ohos/samples/delegator/slice/FirstAbilitySlice.java b/ability/Delegator/entry/src/main/java/ohos/samples/delegator/slice/FirstAbilitySlice.java
index 42c1362f27..58f373f9c5 100644
--- a/ability/Delegator/entry/src/main/java/ohos/samples/delegator/slice/FirstAbilitySlice.java
+++ b/ability/Delegator/entry/src/main/java/ohos/samples/delegator/slice/FirstAbilitySlice.java
@@ -40,8 +40,6 @@ public class FirstAbilitySlice extends AbilitySlice {
                 receivedText.setText(content);
             }
         }
-        setResult.setClickedListener(component -> {
-            terminateAbility();
-        });
+        setResult.setClickedListener(component -> terminateAbility());
     }
 }
diff --git a/ability/Delegator/entry/src/main/java/ohos/samples/delegator/slice/SecondAbilitySlice.java b/ability/Delegator/entry/src/main/java/ohos/samples/delegator/slice/SecondAbilitySlice.java
index a51ad89774..18950391ac 100644
--- a/ability/Delegator/entry/src/main/java/ohos/samples/delegator/slice/SecondAbilitySlice.java
+++ b/ability/Delegator/entry/src/main/java/ohos/samples/delegator/slice/SecondAbilitySlice.java
@@ -30,7 +30,7 @@ import static ohos.samples.delegator.utils.Const.RESULT_OK;
  * @since 2021-05-19
  */
 public class SecondAbilitySlice extends AbilitySlice {
-    private TextField resposeText;
+    private TextField reSpouseText;
 
     @Override
     public void onStart(Intent intent) {
@@ -45,13 +45,13 @@ public class SecondAbilitySlice extends AbilitySlice {
                 receivedText.setText(content);
             }
         }
-        Component resposeTextComment = findComponentById(ResourceTable.Id_text_editSecond);
-        if (resposeTextComment instanceof TextField) {
-            resposeText = (TextField) resposeTextComment;
+        Component reSpouseTextComment = findComponentById(ResourceTable.Id_text_editSecond);
+        if (reSpouseTextComment instanceof TextField) {
+            reSpouseText = (TextField) reSpouseTextComment;
         }
         setResult.setClickedListener(component -> {
             Intent response = new Intent();
-            String res = resposeText.getText();
+            String res = reSpouseText.getText();
             response.setParam("Main", res);
             getAbility().setResult(RESULT_OK, response);
             terminateAbility();
diff --git a/ability/Delegator/entry/src/main/resources/base/layout/ability_first.xml b/ability/Delegator/entry/src/main/resources/base/layout/ability_first.xml
index d449fbb307..85236ca397 100644
--- a/ability/Delegator/entry/src/main/resources/base/layout/ability_first.xml
+++ b/ability/Delegator/entry/src/main/resources/base/layout/ability_first.xml
@@ -22,7 +22,7 @@
     <Text
         ohos:background_element="$graphic:background_ability_first"
         ohos:height="match_content"
-        ohos:id="$+id:text_first_helloworld"
+        ohos:id="$+id:text_first_helloWorld"
         ohos:layout_alignment="horizontal_center"
         ohos:text="$string:first_text"
         ohos:top_margin="$float:top_margin"
diff --git a/ability/Delegator/entry/src/main/resources/base/layout/ability_second.xml b/ability/Delegator/entry/src/main/resources/base/layout/ability_second.xml
index 59cfe6de56..5ae33af141 100644
--- a/ability/Delegator/entry/src/main/resources/base/layout/ability_second.xml
+++ b/ability/Delegator/entry/src/main/resources/base/layout/ability_second.xml
@@ -22,7 +22,7 @@
     <Text
         ohos:background_element="$graphic:background_ability_second"
         ohos:height="match_content"
-        ohos:id="$+id:text_second_helloworld"
+        ohos:id="$+id:text_second_helloWorld"
         ohos:layout_alignment="horizontal_center"
         ohos:text="$string:second_text"
         ohos:top_margin="$float:top_margin"
diff --git a/ability/DistributedMusicPlayer/entry/src/main/java/ohos/samples/distributedmusicplayer/slice/MainAbilitySlice.java b/ability/DistributedMusicPlayer/entry/src/main/java/ohos/samples/distributedmusicplayer/slice/MainAbilitySlice.java
index 8de6278f80..26f7d8ac33 100644
--- a/ability/DistributedMusicPlayer/entry/src/main/java/ohos/samples/distributedmusicplayer/slice/MainAbilitySlice.java
+++ b/ability/DistributedMusicPlayer/entry/src/main/java/ohos/samples/distributedmusicplayer/slice/MainAbilitySlice.java
@@ -15,7 +15,6 @@
 
 package ohos.samples.distributedmusicplayer.slice;
 
-import ohos.hiviewdfx.HiLog;
 import ohos.samples.distributedmusicplayer.ResourceTable;
 import ohos.samples.distributedmusicplayer.utils.LogUtil;
 import ohos.samples.distributedmusicplayer.utils.PlayerManager;
@@ -51,9 +50,9 @@ public class MainAbilitySlice extends AbilitySlice implements PlayerStateListene
 
     private static final String URI2 = "resources/rawfile/Homey.wav";
 
-    private String[] musics = {URI1, URI2};
+    private final String[] musics = {URI1, URI2};
 
-    private int[] posters = {ResourceTable.Media_album, ResourceTable.Media_album2};
+    private final int[] posters = {ResourceTable.Media_album, ResourceTable.Media_album2};
 
     private PlayerManager playerManager;
 
diff --git a/ability/DistributedMusicPlayer/entry/src/main/java/ohos/samples/distributedmusicplayer/utils/LogUtil.java b/ability/DistributedMusicPlayer/entry/src/main/java/ohos/samples/distributedmusicplayer/utils/LogUtil.java
index d72d5b47c3..7dfbb79809 100644
--- a/ability/DistributedMusicPlayer/entry/src/main/java/ohos/samples/distributedmusicplayer/utils/LogUtil.java
+++ b/ability/DistributedMusicPlayer/entry/src/main/java/ohos/samples/distributedmusicplayer/utils/LogUtil.java
@@ -53,16 +53,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/ability/DistributedMusicPlayer/entry/src/main/java/ohos/samples/distributedmusicplayer/utils/PlayerManager.java b/ability/DistributedMusicPlayer/entry/src/main/java/ohos/samples/distributedmusicplayer/utils/PlayerManager.java
index 17253ffaea..5f444baca8 100644
--- a/ability/DistributedMusicPlayer/entry/src/main/java/ohos/samples/distributedmusicplayer/utils/PlayerManager.java
+++ b/ability/DistributedMusicPlayer/entry/src/main/java/ohos/samples/distributedmusicplayer/utils/PlayerManager.java
@@ -124,7 +124,7 @@ public class PlayerManager {
         handler.sendEvent(PLAY_STATE_PAUSE);
     }
 
-    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/ability/DistributedMusicPlayer/entry/src/main/resources/base/element/string.json b/ability/DistributedMusicPlayer/entry/src/main/resources/base/element/string.json
index 08d0daf950..b692ec0145 100644
--- a/ability/DistributedMusicPlayer/entry/src/main/resources/base/element/string.json
+++ b/ability/DistributedMusicPlayer/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,14 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "play_time",
+      "value": "00:00"
+    },
+    {
+      "name": "music_name",
+      "value": "Technology"
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/DistributedMusicPlayer/entry/src/main/resources/base/layout/main_ability_slice.xml b/ability/DistributedMusicPlayer/entry/src/main/resources/base/layout/main_ability_slice.xml
index a128b34bd0..232d4d5c3d 100644
--- a/ability/DistributedMusicPlayer/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/ability/DistributedMusicPlayer/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -33,7 +33,7 @@
             ohos:height="match_content"
             ohos:width="match_content"
             ohos:bottom_margin="10vp"
-            ohos:text="Technology"
+            ohos:text="$string:music_name"
             ohos:text_alignment="center"
             ohos:text_color="#FFFFFF"
             ohos:text_size="34fp"/>
@@ -72,7 +72,7 @@
                 ohos:width="match_content"
                 ohos:layout_alignment="vertical_center"
                 ohos:right_margin="10vp"
-                ohos:text="00:00"
+                ohos:text="$string:play_time"
                 ohos:text_alignment="center"
                 ohos:text_color="#FFCCE7FF"
                 ohos:text_size="13vp"/>
@@ -88,7 +88,7 @@
                 ohos:width="match_content"
                 ohos:layout_alignment="vertical_center"
                 ohos:right_margin="10vp"
-                ohos:text="00:00"
+                ohos:text="$string:play_time"
                 ohos:text_alignment="center"
                 ohos:text_color="#FFCCE7FF"
                 ohos:text_size="13vp"/>
@@ -116,7 +116,7 @@
         ohos:top_margin="40vp">
 
         <DirectionalLayout
-            ohos:id="$+id:control_box2"
+            ohos:id="$+id:control_box"
             ohos:height="match_content"
             ohos:width="match_content"
             ohos:layout_alignment="center"
diff --git a/ability/Fraction/entry/src/main/java/ohos/samples/fraction/MainFraction.java b/ability/Fraction/entry/src/main/java/ohos/samples/fraction/MainFraction.java
index 49fd7814fb..8837735996 100644
--- a/ability/Fraction/entry/src/main/java/ohos/samples/fraction/MainFraction.java
+++ b/ability/Fraction/entry/src/main/java/ohos/samples/fraction/MainFraction.java
@@ -26,8 +26,6 @@ import ohos.agp.components.Text;
 import ohos.agp.components.element.ShapeElement;
 import ohos.agp.utils.Color;
 import ohos.agp.utils.LayoutAlignment;
-import ohos.hiviewdfx.HiLog;
-import ohos.hiviewdfx.HiLogLabel;
 
 /**
  * FractionDemo1
diff --git a/ability/Fraction/entry/src/main/java/ohos/samples/fraction/NextAbility.java b/ability/Fraction/entry/src/main/java/ohos/samples/fraction/NextAbility.java
index 12f45121c7..32beb7a426 100644
--- a/ability/Fraction/entry/src/main/java/ohos/samples/fraction/NextAbility.java
+++ b/ability/Fraction/entry/src/main/java/ohos/samples/fraction/NextAbility.java
@@ -23,6 +23,8 @@ import ohos.agp.components.Component;
 import ohos.hiviewdfx.HiLog;
 import ohos.hiviewdfx.HiLogLabel;
 
+import java.util.Optional;
+
 /**
  * NextAbility
  *
@@ -67,7 +69,11 @@ public class NextAbility extends FractionAbility {
     }
 
     private void hide(Component component) {
-        Fraction fraction = getFractionManager().getFractionByTag("nextFraction").get();
+        Fraction fraction = new Fraction();
+        Optional<Fraction> optional = getFractionManager().getFractionByTag("nextFraction");
+        if (optional.isPresent()) {
+            fraction = optional.get();
+        }
         if ((getApplicationContext().getString(ResourceTable.String_hide_fraction)).equals(hideButton.getText())) {
             hideButton.setText(getApplicationContext().getString(ResourceTable.String_show_fraction));
             getFractionManager().startFractionScheduler().hide(fraction).submit();
diff --git a/ability/Idl/rpcclient/src/main/java/ohos/samples/rpcclient/slice/MainAbilitySlice.java b/ability/Idl/rpcclient/src/main/java/ohos/samples/rpcclient/slice/MainAbilitySlice.java
index e1ee664bea..0beebe1dbc 100644
--- a/ability/Idl/rpcclient/src/main/java/ohos/samples/rpcclient/slice/MainAbilitySlice.java
+++ b/ability/Idl/rpcclient/src/main/java/ohos/samples/rpcclient/slice/MainAbilitySlice.java
@@ -55,7 +55,9 @@ public class MainAbilitySlice extends AbilitySlice {
 
     private ToastDialog toastDialog;
 
-    private IAbilityConnection connection = new IAbilityConnection() {
+    private String message;
+
+    private final IAbilityConnection connection = new IAbilityConnection() {
         @Override
         public void onAbilityConnectDone(ElementName elementName, IRemoteObject remoteObject, int resultCode) {
             interfaceProxy = new CalculatorInterfaceProxy(remoteObject);
@@ -87,9 +89,9 @@ public class MainAbilitySlice extends AbilitySlice {
     private void initComponents() {
         Component addButton = findComponentById(ResourceTable.Id_add_button);
         addButton.setClickedListener(component -> startAddCalculator());
-        firstTextField = (TextField) findComponentById(ResourceTable.Id_first_textfield);
+        firstTextField = (TextField) findComponentById(ResourceTable.Id_first_textField);
         firstTextField.setTextInputType(InputAttribute.ENTER_KEY_TYPE_GO);
-        secondTextField = (TextField) findComponentById(ResourceTable.Id_second_textfield);
+        secondTextField = (TextField) findComponentById(ResourceTable.Id_second_textField);
         secondTextField.setTextInputType(InputAttribute.ENTER_KEY_TYPE_GO);
         resultText = (Text) findComponentById(ResourceTable.Id_result_text);
     }
@@ -129,8 +131,9 @@ public class MainAbilitySlice extends AbilitySlice {
     }
 
     private void showTip(String msg) {
+        message = msg;
         toastDialog = new ToastDialog(getApplicationContext());
-        toastDialog.setText(msg);
+        toastDialog.setText(message);
         toastDialog.setAutoClosable(false);
         toastDialog.setDuration(TOAST_DURATION);
         toastDialog.show();
diff --git a/ability/Idl/rpcclient/src/main/resources/base/element/string.json b/ability/Idl/rpcclient/src/main/resources/base/element/string.json
index dc3372f384..f05bdde9d8 100644
--- a/ability/Idl/rpcclient/src/main/resources/base/element/string.json
+++ b/ability/Idl/rpcclient/src/main/resources/base/element/string.json
@@ -7,6 +7,26 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "btn",
+      "value": "IDL Calculator"
+    },
+    {
+      "name": "first_textField",
+      "value": "Enter First Number"
+    },
+    {
+      "name": "second_textField",
+      "value": "Enter second Number"
+    },
+    {
+      "name": "add_button",
+      "value": "ADD"
+    },
+    {
+      "name": "result_text",
+      "value": "Result"
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/Idl/rpcclient/src/main/resources/base/layout/main_blility.xml b/ability/Idl/rpcclient/src/main/resources/base/layout/main_blility.xml
index 0f21bb7446..afcf96cef0 100644
--- a/ability/Idl/rpcclient/src/main/resources/base/layout/main_blility.xml
+++ b/ability/Idl/rpcclient/src/main/resources/base/layout/main_blility.xml
@@ -25,32 +25,32 @@
         ohos:height="70vp"
         ohos:top_margin="20vp"
         ohos:bottom_margin="12vp"
-        ohos:text="IDL Calculator"
+        ohos:text="$string:btn"
         ohos:text_size="20fp"
         ohos:text_color="#ff0000"/>
 
     <TextField
-        ohos:id="$+id:first_textfield"
+        ohos:id="$+id:first_textField"
         ohos:width="match_parent"
         ohos:height="match_content"
-        ohos:hint="Enter First Number"
-        ohos:text_type="number"
+        ohos:hint="$string:first_textField"
+        ohos:text_input_type="pattern_number"
         ohos:text_size="18fp"
         ohos:text_color="#99000000"
         ohos:margin="20vp"
         ohos:multiple_lines="false"/>
 
     <TextField
-        ohos:id="$+id:second_textfield"
+        ohos:id="$+id:second_textField"
         ohos:width="match_parent"
         ohos:height="match_content"
-        ohos:hint="Enter second Number"
-        ohos:text_type="number"
-        ohos:layout_alignment="80"
+        ohos:hint="$string:second_textField"
+        ohos:text_input_type="pattern_number"
+        ohos:layout_alignment="bottom"
         ohos:text_size="18fp"
         ohos:margin="20vp"
         ohos:text_color="#99000000"
-        ohos:text_alignment="64"
+        ohos:text_alignment="vertical_center"
         ohos:multiple_lines="false"/>
 
     <Button
@@ -59,7 +59,7 @@
         ohos:height="70vp"
         ohos:top_margin="20vp"
         ohos:bottom_margin="12vp"
-        ohos:text="ADD"
+        ohos:text="$string:add_button"
         ohos:text_size="20fp"
         ohos:text_color="#ff007dff"/>
 
@@ -67,13 +67,13 @@
         ohos:id="$+id:result_text"
         ohos:width="match_parent"
         ohos:height="50vp"
-        ohos:text="Result"
-        ohos:layout_alignment="80"
+        ohos:text="$string:result_text"
+        ohos:layout_alignment="bottom"
         ohos:text_size="18fp"
         ohos:margin="20vp"
         ohos:text_color="#99000000"
-        ohos:text_alignment="64"
-        ohos:visibility="true"
+        ohos:text_alignment="vertical_center"
+        ohos:visibility="visible"
         ohos:left_margin="20vp"
         ohos:multiple_lines="false"/>
 </DirectionalLayout>
\ No newline at end of file
diff --git a/ability/Idl/rpcserver/src/main/java/ohos/samples/rpcserver/MainAbility.java b/ability/Idl/rpcserver/src/main/java/ohos/samples/rpcserver/MainAbility.java
index 1a3f6814d1..c2bdcf5382 100644
--- a/ability/Idl/rpcserver/src/main/java/ohos/samples/rpcserver/MainAbility.java
+++ b/ability/Idl/rpcserver/src/main/java/ohos/samples/rpcserver/MainAbility.java
@@ -18,10 +18,7 @@ package ohos.samples.rpcserver;
 import ohos.samples.rpcserver.slice.MainAbilitySlice;
 
 import ohos.aafwk.ability.Ability;
-import ohos.aafwk.ability.IAbilityConnection;
 import ohos.aafwk.content.Intent;
-import ohos.bundle.ElementName;
-import ohos.rpc.IRemoteObject;
 
 /**
  * MainAbility
diff --git a/ability/Idl/rpcserver/src/main/java/ohos/samples/rpcserver/ServiceAbility.java b/ability/Idl/rpcserver/src/main/java/ohos/samples/rpcserver/ServiceAbility.java
index 83c27089ae..4565010178 100644
--- a/ability/Idl/rpcserver/src/main/java/ohos/samples/rpcserver/ServiceAbility.java
+++ b/ability/Idl/rpcserver/src/main/java/ohos/samples/rpcserver/ServiceAbility.java
@@ -31,7 +31,7 @@ public class ServiceAbility extends Ability {
     /**
      * CalculatorInterfaceStubImpl
      */
-    private class CalculatorInterfaceStubImpl extends CalculatorInterfaceStub {
+    private static class CalculatorInterfaceStubImpl extends CalculatorInterfaceStub {
         public CalculatorInterfaceStubImpl(String descriptor) {
             super(descriptor);
         }
diff --git a/ability/Idl/rpcserver/src/main/java/ohos/samples/rpcserver/slice/MainAbilitySlice.java b/ability/Idl/rpcserver/src/main/java/ohos/samples/rpcserver/slice/MainAbilitySlice.java
index a2bf99ecb1..bf67d9d8e0 100644
--- a/ability/Idl/rpcserver/src/main/java/ohos/samples/rpcserver/slice/MainAbilitySlice.java
+++ b/ability/Idl/rpcserver/src/main/java/ohos/samples/rpcserver/slice/MainAbilitySlice.java
@@ -19,7 +19,6 @@ import ohos.samples.rpcserver.ResourceTable;
 
 import ohos.aafwk.ability.AbilitySlice;
 import ohos.aafwk.content.Intent;
-import ohos.agp.components.PositionLayout;
 
 /**
  * MainAbilitySlice
diff --git a/ability/Idl/rpcserver/src/main/resources/base/element/string.json b/ability/Idl/rpcserver/src/main/resources/base/element/string.json
index 01e25b7dc7..bbf112b590 100644
--- a/ability/Idl/rpcserver/src/main/resources/base/element/string.json
+++ b/ability/Idl/rpcserver/src/main/resources/base/element/string.json
@@ -7,6 +7,10 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "btn",
+      "value": "IDL Server"
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/Idl/rpcserver/src/main/resources/base/layout/main_ablility_slice.xml b/ability/Idl/rpcserver/src/main/resources/base/layout/main_ablility_slice.xml
index 26917fbc53..b7afb7ae1d 100644
--- a/ability/Idl/rpcserver/src/main/resources/base/layout/main_ablility_slice.xml
+++ b/ability/Idl/rpcserver/src/main/resources/base/layout/main_ablility_slice.xml
@@ -25,7 +25,7 @@
         ohos:height="70px"
         ohos:top_margin="30vp"
         ohos:bottom_margin="12vp"
-        ohos:text="IDL Server"
+        ohos:text="$string:btn"
         ohos:text_size="20fp"
         ohos:text_color="#ff0000"/>
 </DirectionalLayout>
\ No newline at end of file
diff --git a/ability/Intent/intent/src/main/java/ohos/samples/intent/MainAbility.java b/ability/Intent/intent/src/main/java/ohos/samples/intent/MainAbility.java
index c21a7a64dc..e347ec97b6 100644
--- a/ability/Intent/intent/src/main/java/ohos/samples/intent/MainAbility.java
+++ b/ability/Intent/intent/src/main/java/ohos/samples/intent/MainAbility.java
@@ -31,8 +31,6 @@ public class MainAbility extends Ability {
 
     private static final int REQ_CODE_START = 0;
 
-    private String ACTION_START = "ability.intent.START";
-
     private Text resultText;
 
     @Override
@@ -63,6 +61,7 @@ public class MainAbility extends Ability {
 
     private void query() {
         Intent intent = new Intent();
+        String ACTION_START = "ability.intent.START";
         Operation operation = new Intent.OperationBuilder().withAction(ACTION_START).build();
         intent.setOperation(operation);
         startAbilityForResult(intent, REQ_CODE_START);
diff --git a/ability/Intent/intent/src/main/resources/base/element/string.json b/ability/Intent/intent/src/main/resources/base/element/string.json
index c83bd670ee..9353f8014c 100644
--- a/ability/Intent/intent/src/main/resources/base/element/string.json
+++ b/ability/Intent/intent/src/main/resources/base/element/string.json
@@ -7,6 +7,14 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "start_by_name_button",
+      "value": "Start By Name"
+    },
+    {
+      "name": "start_by_attribute_button",
+      "value": "Start By Attribute"
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/Intent/intent/src/main/resources/base/layout/main_ability_slice.xml b/ability/Intent/intent/src/main/resources/base/layout/main_ability_slice.xml
index 37e951aba3..556420c988 100644
--- a/ability/Intent/intent/src/main/resources/base/layout/main_ability_slice.xml
+++ b/ability/Intent/intent/src/main/resources/base/layout/main_ability_slice.xml
@@ -27,7 +27,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Start By Name"
+        ohos:text="$string:start_by_name_button"
         ohos:text_alignment="center"
         ohos:background_element="$graphic:button_background"
         ohos:text_size="16fp"
@@ -40,7 +40,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Start By Attribute"
+        ohos:text="$string:start_by_attribute_button"
         ohos:text_alignment="center"
         ohos:background_element="$graphic:button_background"
         ohos:text_size="16fp"
diff --git a/ability/Intent/secondapp/src/main/java/ohos/samples/secondapp/MainAbility.java b/ability/Intent/secondapp/src/main/java/ohos/samples/secondapp/MainAbility.java
index 189c96643c..bc4cb8a467 100644
--- a/ability/Intent/secondapp/src/main/java/ohos/samples/secondapp/MainAbility.java
+++ b/ability/Intent/secondapp/src/main/java/ohos/samples/secondapp/MainAbility.java
@@ -26,10 +26,9 @@ import ohos.aafwk.content.Intent;
 public class MainAbility extends Ability {
     private static final String RESULT_KEY = "ohos.samples.intent.RESULT_KEY";
 
-    private String ACTION_START = "ability.intent.START";
-
     @Override
     public void onStart(Intent intent) {
+        String ACTION_START = "ability.intent.START";
         super.onStart(intent);
         super.setMainRoute(MainAbilitySlice.class.getName());
         addActionRoute(ACTION_START, MainAbilitySlice.class.getName());
diff --git a/ability/Intent/secondapp/src/main/resources/base/element/string.json b/ability/Intent/secondapp/src/main/resources/base/element/string.json
index 9e77fee015..c2ed9574bb 100644
--- a/ability/Intent/secondapp/src/main/resources/base/element/string.json
+++ b/ability/Intent/secondapp/src/main/resources/base/element/string.json
@@ -7,6 +7,10 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "text",
+      "value": "I'm second app."
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/Intent/secondapp/src/main/resources/base/layout/main_ability_slice.xml b/ability/Intent/secondapp/src/main/resources/base/layout/main_ability_slice.xml
index fbc3070f62..d73fa7c373 100644
--- a/ability/Intent/secondapp/src/main/resources/base/layout/main_ability_slice.xml
+++ b/ability/Intent/secondapp/src/main/resources/base/layout/main_ability_slice.xml
@@ -25,7 +25,7 @@
         ohos:height="match_parent"
         ohos:width="match_content"
         ohos:layout_alignment="horizontal_center"
-        ohos:text="I'm second app."
+        ohos:text="$string:text"
         ohos:text_size="16fp"/>
 
 </DirectionalLayout>
\ No newline at end of file
diff --git a/ability/IntentAgent/entry/src/main/java/ohos/samples/intentagent/slice/MainAbilitySlice.java b/ability/IntentAgent/entry/src/main/java/ohos/samples/intentagent/slice/MainAbilitySlice.java
index 31494ea360..15e000ebac 100644
--- a/ability/IntentAgent/entry/src/main/java/ohos/samples/intentagent/slice/MainAbilitySlice.java
+++ b/ability/IntentAgent/entry/src/main/java/ohos/samples/intentagent/slice/MainAbilitySlice.java
@@ -99,7 +99,6 @@ public class MainAbilitySlice extends AbilitySlice {
         intents.add(intent);
         IntentAgentInfo agentInfo = new IntentAgentInfo(REQUEST_CODE, IntentAgentConstant.OperationType.START_ABILITY,
             IntentAgentConstant.Flags.UPDATE_PRESENT_FLAG, intents, new IntentParams());
-        IntentAgent agent = IntentAgentHelper.getIntentAgent(this, agentInfo);
-        return agent;
+        return IntentAgentHelper.getIntentAgent(this, agentInfo);
     }
 }
\ No newline at end of file
diff --git a/ability/IntentAgent/entry/src/main/resources/base/element/string.json b/ability/IntentAgent/entry/src/main/resources/base/element/string.json
index bded1b5bc3..426d54c205 100644
--- a/ability/IntentAgent/entry/src/main/resources/base/element/string.json
+++ b/ability/IntentAgent/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,18 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "server_text",
+      "value": "I'm the intentAgent target ability"
+    },
+    {
+      "name": "publish_button",
+      "value": "Publish IntentAgent Notification"
+    },
+    {
+      "name": "proactive_button",
+      "value": "Proactive Activate IntentAgent"
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/IntentAgent/entry/src/main/resources/base/layout/intentagent_ability.xml b/ability/IntentAgent/entry/src/main/resources/base/layout/intentagent_ability.xml
index 90b7042272..36a36da02c 100644
--- a/ability/IntentAgent/entry/src/main/resources/base/layout/intentagent_ability.xml
+++ b/ability/IntentAgent/entry/src/main/resources/base/layout/intentagent_ability.xml
@@ -24,7 +24,7 @@
     <Text
         ohos:id="$+id:server_text"
         ohos:width="match_content"
-        ohos:text="I'm the intentAgent target ability"
+        ohos:text="$string:server_text"
         ohos:height="match_content"
         ohos:text_size="18fp"
         ohos:text_color="#0000ff"/>
diff --git a/ability/IntentAgent/entry/src/main/resources/base/layout/main_ability_slice.xml b/ability/IntentAgent/entry/src/main/resources/base/layout/main_ability_slice.xml
index 90476ea42e..5c2c306798 100644
--- a/ability/IntentAgent/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/ability/IntentAgent/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -26,7 +26,7 @@
         ohos:height="match_content"
         ohos:width="300vp"
         ohos:padding="5vp"
-        ohos:text="Publish IntentAgent Notification"
+        ohos:text="$string:publish_button"
         ohos:background_element="$graphic:common_bg"
         ohos:top_margin="50vp"
         ohos:text_alignment="center"
@@ -37,7 +37,7 @@
         ohos:height="match_content"
         ohos:width="300vp"
         ohos:padding="5vp"
-        ohos:text="Proactive Activate IntentAgent"
+        ohos:text="$string:proactive_button"
         ohos:background_element="$graphic:common_bg"
         ohos:top_margin="20vp"
         ohos:text_alignment="center"
diff --git a/ability/Notification/entry/src/main/java/ohos/samples/notification/slice/MainAbilitySlice.java b/ability/Notification/entry/src/main/java/ohos/samples/notification/slice/MainAbilitySlice.java
index 35f7162562..04b5b4c6fc 100644
--- a/ability/Notification/entry/src/main/java/ohos/samples/notification/slice/MainAbilitySlice.java
+++ b/ability/Notification/entry/src/main/java/ohos/samples/notification/slice/MainAbilitySlice.java
@@ -15,6 +15,7 @@
 
 package ohos.samples.notification.slice;
 
+import ohos.aafwk.content.Operation;
 import ohos.agp.components.Text;
 import ohos.event.commonevent.CommonEventData;
 import ohos.event.commonevent.CommonEventSubscriber;
@@ -66,7 +67,7 @@ public class MainAbilitySlice extends AbilitySlice {
         super.onStart(intent);
         super.setUIContent(ResourceTable.Layout_main_ability_slice);
         subscribeCommonEvent();
-        defineNotificationSlot(Const.SLOT_ID, Const.SLOT_NAME, NotificationSlot.LEVEL_HIGH);
+        defineNotificationSlot();
         initComponents();
     }
 
@@ -74,17 +75,17 @@ public class MainAbilitySlice extends AbilitySlice {
         Component publishButton = findComponentById(ResourceTable.Id_publish_button);
         Component publishTextButton = findComponentById(ResourceTable.Id_publish_text_button);
         publishButton.setClickedListener(
-            component -> publishNotification(Const.NOTIFICATION_TITLE, Const.NOTIFICATION_CONTENT));
+            component -> publishNotification());
         publishTextButton.setClickedListener(
-            component -> publishNotificationWithAction(Const.NOTIFICATION_TITLE2, Const.NOTIFICATION_CONTENT2));
+            component -> publishNotificationWithAction());
         Component cancelButton = findComponentById(ResourceTable.Id_cancel_button);
         Component cancelAllButton = findComponentById(ResourceTable.Id_cancel_all_button);
         cancelButton.setClickedListener(component -> cancel());
         cancelAllButton.setClickedListener(component -> cancelAll());
     }
 
-    private void defineNotificationSlot(String id, String name, int importance) {
-        NotificationSlot notificationSlot = new NotificationSlot(id, name, importance);
+    private void defineNotificationSlot() {
+        NotificationSlot notificationSlot = new NotificationSlot(Const.SLOT_ID, Const.SLOT_NAME, NotificationSlot.LEVEL_HIGH);
         notificationSlot.setEnableVibration(true);
         notificationSlot.setLockscreenVisibleness(NotificationRequest.VISIBLENESS_TYPE_PUBLIC);
         Uri uri = Uri.parse(Const.SOUND_URI);
@@ -96,11 +97,11 @@ public class MainAbilitySlice extends AbilitySlice {
         }
     }
 
-    private void publishNotification(String title, String text) {
+    private void publishNotification() {
         notificationId = 0x1000001;
         NotificationRequest request = new NotificationRequest(notificationId).setSlotId(Const.SLOT_ID)
             .setTapDismissed(true);
-        request.setContent(createNotificationContent(title, text));
+        request.setContent(createNotificationContent(Const.NOTIFICATION_TITLE, Const.NOTIFICATION_CONTENT));
         IntentAgent intentAgent = createIntentAgent(MainAbility.class.getName(),
             IntentAgentConstant.OperationType.START_ABILITY);
         request.setIntentAgent(intentAgent);
@@ -111,11 +112,11 @@ public class MainAbilitySlice extends AbilitySlice {
         }
     }
 
-    private void publishNotificationWithAction(String title, String text) {
+    private void publishNotificationWithAction() {
         notificationId = 0x1000002;
         NotificationRequest request = new NotificationRequest(notificationId).setSlotId(Const.SLOT_ID)
             .setTapDismissed(true);
-        request.setContent(createNotificationContent(title, text));
+        request.setContent(createNotificationContent(Const.NOTIFICATION_TITLE2, Const.NOTIFICATION_CONTENT2));
         IntentAgent intentAgent = createIntentAgent(MainAbility.class.getName(),
             IntentAgentConstant.OperationType.SEND_COMMON_EVENT);
         request.setIntentAgent(intentAgent);
@@ -137,14 +138,13 @@ public class MainAbilitySlice extends AbilitySlice {
     private NotificationRequest.NotificationContent createNotificationContent(String title, String text) {
         NotificationRequest.NotificationNormalContent content
             = new NotificationRequest.NotificationNormalContent().setTitle(title).setText(text);
-        NotificationRequest.NotificationContent notificationContent = new NotificationRequest.NotificationContent(
-            content);
-        return notificationContent;
+        return new NotificationRequest.NotificationContent(content);
     }
 
     private IntentAgent createIntentAgent(String ability, IntentAgentConstant.OperationType operationType) {
         Intent intent = new Intent();
-        intent.setAction(Const.NOTIFICATION_ACTION);
+        Operation operation = new Intent.OperationBuilder().withAction(Const.NOTIFICATION_ACTION).build();
+        intent.setOperation(operation);
         if (operationType != IntentAgentConstant.OperationType.SEND_COMMON_EVENT) {
             intent.setElement(new ElementName("", Const.BUNDLE_NAME, ability));
         }
@@ -198,8 +198,8 @@ public class MainAbilitySlice extends AbilitySlice {
         }
     }
 
-    class NotificationEventSubscriber extends CommonEventSubscriber {
-        private AbilitySlice slice;
+    static class NotificationEventSubscriber extends CommonEventSubscriber {
+        private final AbilitySlice slice;
 
         /**
          * Constructor
diff --git a/ability/Notification/entry/src/main/resources/base/element/string.json b/ability/Notification/entry/src/main/resources/base/element/string.json
index 57fd74ffff..f6cb5ac70e 100644
--- a/ability/Notification/entry/src/main/resources/base/element/string.json
+++ b/ability/Notification/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,26 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "publish_button",
+      "value": "Publish Notification"
+    },
+    {
+      "name": "publish_text_button",
+      "value": "Publish Text Notification"
+    },
+    {
+      "name": "cancel_button",
+      "value": "Cancel Notification"
+    },
+    {
+      "name": "cancel_all_button",
+      "value": "Cancel All Notifications"
+    },
+    {
+      "name": "notify2_reply",
+      "value": "Notification input text would change me"
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/Notification/entry/src/main/resources/base/layout/main_ability_slice.xml b/ability/Notification/entry/src/main/resources/base/layout/main_ability_slice.xml
index 6d21c2b573..29d72cfb25 100644
--- a/ability/Notification/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/ability/Notification/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -27,7 +27,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Publish Notification"
+        ohos:text="$string:publish_button"
         ohos:text_alignment="center"
         ohos:background_element="$graphic:button_background"
         ohos:text_size="16fp"
@@ -40,7 +40,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Publish Text Notification"
+        ohos:text="$string:publish_text_button"
         ohos:text_alignment="center"
         ohos:background_element="$graphic:button_background"
         ohos:text_size="16fp"
@@ -53,7 +53,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Cancel Notification"
+        ohos:text="$string:cancel_button"
         ohos:text_alignment="center"
         ohos:background_element="$graphic:button_background"
         ohos:text_size="16fp"
@@ -66,7 +66,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Cancel All Notifications"
+        ohos:text="$string:cancel_all_button"
         ohos:text_alignment="center"
         ohos:background_element="$graphic:button_background"
         ohos:text_size="16fp"
@@ -77,7 +77,7 @@
         ohos:width="match_parent"
         ohos:height="match_content"
         ohos:margin="20vp"
-        ohos:text="Notification input text would change me"
+        ohos:text="$string:notify2_reply"
         ohos:text_size="16fp"
         ohos:text_color="#ff888888"
         ohos:text_alignment="center"
diff --git a/ability/PageAbility/entry/src/main/java/ohos/samples/pageability/slice/ContinuationAbilitySlice.java b/ability/PageAbility/entry/src/main/java/ohos/samples/pageability/slice/ContinuationAbilitySlice.java
index 9499fd8b2a..7fc02c60c7 100644
--- a/ability/PageAbility/entry/src/main/java/ohos/samples/pageability/slice/ContinuationAbilitySlice.java
+++ b/ability/PageAbility/entry/src/main/java/ohos/samples/pageability/slice/ContinuationAbilitySlice.java
@@ -52,7 +52,7 @@ public class ContinuationAbilitySlice extends AbilitySlice implements IAbilityCo
 
     private void initComponents() {
         findComponentById(ResourceTable.Id_continue_button).setClickedListener(this::migrateAbility);
-        messageTextField = (TextField) findComponentById(ResourceTable.Id_message_textfield);
+        messageTextField = (TextField) findComponentById(ResourceTable.Id_message_textField);
         if (isContinued && message != null) {
             messageTextField.setText(message);
         }
diff --git a/ability/PageAbility/entry/src/main/java/ohos/samples/pageability/slice/FirstAbilityMainSlice.java b/ability/PageAbility/entry/src/main/java/ohos/samples/pageability/slice/FirstAbilityMainSlice.java
index ac79dd99ad..1333963b1c 100644
--- a/ability/PageAbility/entry/src/main/java/ohos/samples/pageability/slice/FirstAbilityMainSlice.java
+++ b/ability/PageAbility/entry/src/main/java/ohos/samples/pageability/slice/FirstAbilityMainSlice.java
@@ -57,8 +57,7 @@ public class FirstAbilityMainSlice extends AbilitySlice {
 
     private void startAbilitySlice(Component component) {
         Intent intent = new Intent();
-        intent.setAction(ACTION);
-        Operation operation = new Intent.OperationBuilder().withDeviceId("")
+        Operation operation = new Intent.OperationBuilder().withDeviceId("").withAction(ACTION)
             .withBundleName(getBundleName())
             .withAbilityName(SecondAbility.class.getName())
             .build();
diff --git a/ability/PageAbility/entry/src/main/resources/base/element/string.json b/ability/PageAbility/entry/src/main/resources/base/element/string.json
index fc3947cf3d..3791923f90 100644
--- a/ability/PageAbility/entry/src/main/resources/base/element/string.json
+++ b/ability/PageAbility/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,46 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "message_textField",
+      "value": "Input a message"
+    },
+    {
+      "name": "continue_button",
+      "value": "Continue Ability"
+    },
+    {
+      "name": "text",
+      "value": "I'm first ability main slice"
+    },
+    {
+      "name": "present_button",
+      "value": "First Ability Second Slice"
+    },
+    {
+      "name": "present_second_ability_button",
+      "value": "Second Ability Second Slice"
+    },
+    {
+      "name": "start_second_ability_button",
+      "value": "Second Ability"
+    },
+    {
+      "name": "back_button",
+      "value": "Back"
+    },
+    {
+      "name": "navigation_button",
+      "value": "Ability Slice Navigation"
+    },
+    {
+      "name": "continuation_button",
+      "value": "Ability Continuation"
+    },
+    {
+      "name": "second_text",
+      "value": "This is second ability main slice"
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/PageAbility/entry/src/main/resources/base/layout/continuation_ability.xml b/ability/PageAbility/entry/src/main/resources/base/layout/continuation_ability.xml
index 0396aa81a0..13ea949dc9 100644
--- a/ability/PageAbility/entry/src/main/resources/base/layout/continuation_ability.xml
+++ b/ability/PageAbility/entry/src/main/resources/base/layout/continuation_ability.xml
@@ -20,10 +20,10 @@
     ohos:orientation="vertical">
 
     <TextField
-        ohos:id="$+id:message_textfield"
+        ohos:id="$+id:message_textField"
         ohos:height="match_content"
         ohos:width="match_parent"
-        ohos:hint="Input a message"
+        ohos:hint="$string:message_textField"
         ohos:top_margin="100vp"
         ohos:left_margin="24vp"
         ohos:padding="5vp"
@@ -39,7 +39,7 @@
         ohos:left_margin="24vp"
         ohos:top_margin="50vp"
         ohos:background_element="$graphic:button_background"
-        ohos:text="Continue Ability"
+        ohos:text="$string:continue_button"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
         ohos:text_size="16fp"/>
diff --git a/ability/PageAbility/entry/src/main/resources/base/layout/first_ability_main_slice.xml b/ability/PageAbility/entry/src/main/resources/base/layout/first_ability_main_slice.xml
index 54ae380b83..3ccf5739b8 100644
--- a/ability/PageAbility/entry/src/main/resources/base/layout/first_ability_main_slice.xml
+++ b/ability/PageAbility/entry/src/main/resources/base/layout/first_ability_main_slice.xml
@@ -23,7 +23,7 @@
         ohos:id="$+id:text"
         ohos:height="match_content"
         ohos:width="match_parent"
-        ohos:text="I'm first ability main slice"
+        ohos:text="$string:text"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
         ohos:top_margin="100vp"/>
@@ -37,7 +37,7 @@
         ohos:padding="10vp"
         ohos:right_margin="24vp"
         ohos:background_element="$graphic:button_background"
-        ohos:text="First Ability Second Slice"
+        ohos:text="$string:present_button"
         ohos:text_size="16vp"
         ohos:top_margin="30vp"/>
 
@@ -50,7 +50,7 @@
         ohos:padding="10vp"
         ohos:right_margin="24vp"
         ohos:background_element="$graphic:button_background"
-        ohos:text="Second Ability Second Slice"
+        ohos:text="$string:present_second_ability_button"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
 
@@ -63,7 +63,7 @@
         ohos:padding="10vp"
         ohos:right_margin="24vp"
         ohos:background_element="$graphic:button_background"
-        ohos:text="Second Ability"
+        ohos:text="$string:start_second_ability_button"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
 
@@ -75,7 +75,7 @@
         ohos:padding="10vp"
         ohos:right_margin="24vp"
         ohos:background_element="$graphic:button_background"
-        ohos:text="Back"
+        ohos:text="$string:back_button"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
 
diff --git a/ability/PageAbility/entry/src/main/resources/base/layout/first_ability_second_slice.xml b/ability/PageAbility/entry/src/main/resources/base/layout/first_ability_second_slice.xml
index 2bf50b9963..b38df49b8e 100644
--- a/ability/PageAbility/entry/src/main/resources/base/layout/first_ability_second_slice.xml
+++ b/ability/PageAbility/entry/src/main/resources/base/layout/first_ability_second_slice.xml
@@ -23,7 +23,7 @@
         ohos:id="$+id:text"
         ohos:height="match_content"
         ohos:width="match_parent"
-        ohos:text="I'm first ability second slice"
+        ohos:text="$string:text"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
         ohos:top_margin="100vp"/>
@@ -34,7 +34,7 @@
         ohos:width="match_parent"
         ohos:layout_alignment="center"
         ohos:background_element="$graphic:button_background"
-        ohos:text="Back"
+        ohos:text="$string:back_button"
         ohos:padding="10vp"
         ohos:left_margin="24vp"
         ohos:right_margin="24vp"
diff --git a/ability/PageAbility/entry/src/main/resources/base/layout/main_ability_slice.xml b/ability/PageAbility/entry/src/main/resources/base/layout/main_ability_slice.xml
index 5bbc088643..4342fb0c2e 100644
--- a/ability/PageAbility/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/ability/PageAbility/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="Ability Slice Navigation"
+        ohos:text="$string:navigation_button"
         ohos:text_alignment="left"
         ohos:text_size="16vp"/>
 
@@ -37,7 +37,7 @@
         ohos:element_right="$media:ic_arrow_right"
         ohos:left_padding="14vp"
         ohos:padding="10vp"
-        ohos:text="Ability Continuation"
+        ohos:text="$string:continuation_button"
         ohos:text_alignment="left"
         ohos:text_size="16vp"/>
 </DirectionalLayout>
\ No newline at end of file
diff --git a/ability/PageAbility/entry/src/main/resources/base/layout/second_ability_main_slice.xml b/ability/PageAbility/entry/src/main/resources/base/layout/second_ability_main_slice.xml
index f19aa8ecef..75818cd681 100644
--- a/ability/PageAbility/entry/src/main/resources/base/layout/second_ability_main_slice.xml
+++ b/ability/PageAbility/entry/src/main/resources/base/layout/second_ability_main_slice.xml
@@ -23,7 +23,7 @@
         ohos:id="$+id:text"
         ohos:height="match_content"
         ohos:width="match_parent"
-        ohos:text="This is second ability main slice"
+        ohos:text="$string:second_text"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
         ohos:top_margin="100vp"/>
@@ -37,7 +37,7 @@
         ohos:left_margin="24vp"
         ohos:padding="10vp"
         ohos:right_margin="24vp"
-        ohos:text="Back"
+        ohos:text="$string:back_button"
         ohos:text_size="16fp"
         ohos:top_margin="30vp"/>
 </DirectionalLayout>
\ No newline at end of file
diff --git a/ability/PageAbility/entry/src/main/resources/base/layout/second_ability_second_slice.xml b/ability/PageAbility/entry/src/main/resources/base/layout/second_ability_second_slice.xml
index 7f72d5232b..3cede4908f 100644
--- a/ability/PageAbility/entry/src/main/resources/base/layout/second_ability_second_slice.xml
+++ b/ability/PageAbility/entry/src/main/resources/base/layout/second_ability_second_slice.xml
@@ -25,14 +25,14 @@
         ohos:text_size="18fp"
         ohos:top_margin="100vp"
         ohos:text_alignment="center"
-        ohos:text="I'm second ability second slice"/>
+        ohos:text="$string:second_text"/>
 
     <Button
         ohos:id="$+id:back_button"
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:layout_alignment="center"
-        ohos:text="Back"
+        ohos:text="$string:back_button"
         ohos:background_element="$graphic:button_background"
         ohos:left_margin="24vp"
         ohos:right_margin="24vp"
diff --git a/ability/Pasteboard/copy/src/main/java/ohos/samples/pasteboard/copy/slice/MainAbilitySlice.java b/ability/Pasteboard/copy/src/main/java/ohos/samples/pasteboard/copy/slice/MainAbilitySlice.java
index b68aa343c0..e0beec0513 100644
--- a/ability/Pasteboard/copy/src/main/java/ohos/samples/pasteboard/copy/slice/MainAbilitySlice.java
+++ b/ability/Pasteboard/copy/src/main/java/ohos/samples/pasteboard/copy/slice/MainAbilitySlice.java
@@ -35,7 +35,7 @@ public class MainAbilitySlice extends AbilitySlice {
 
     private SystemPasteboard pasteboard;
 
-    private IPasteDataChangedListener listener = new IPasteDataChangedListener() {
+    private final IPasteDataChangedListener listener = new IPasteDataChangedListener() {
         @Override
         public void onChanged() {
             PasteData pasteData = pasteboard.getPasteData();
diff --git a/ability/Pasteboard/copy/src/main/resources/base/element/string.json b/ability/Pasteboard/copy/src/main/resources/base/element/string.json
index fcf8fa0bd4..61cc3fe547 100644
--- a/ability/Pasteboard/copy/src/main/resources/base/element/string.json
+++ b/ability/Pasteboard/copy/src/main/resources/base/element/string.json
@@ -7,6 +7,18 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "copy_text",
+      "value": "Copy text content"
+    },
+    {
+      "name": "copy_button",
+      "value": "Copy Text"
+    },
+    {
+      "name": "clear_button",
+      "value": "Clear Pasteboard"
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/Pasteboard/copy/src/main/resources/base/layout/main_ability_slice.xml b/ability/Pasteboard/copy/src/main/resources/base/layout/main_ability_slice.xml
index 66ec749fbc..caebe74e3b 100644
--- a/ability/Pasteboard/copy/src/main/resources/base/layout/main_ability_slice.xml
+++ b/ability/Pasteboard/copy/src/main/resources/base/layout/main_ability_slice.xml
@@ -26,7 +26,7 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:background_element="$graphic:textfield_bg"
-        ohos:hint="Copy text content"
+        ohos:hint="$string:copy_text"
         ohos:padding="5vp"
         ohos:text_alignment="center"
         ohos:text_size="18fp"
@@ -44,7 +44,7 @@
             ohos:width="0vp"
             ohos:background_element="$graphic:button_bg"
             ohos:padding="5vp"
-            ohos:text="Copy Text"
+            ohos:text="$string:copy_button"
             ohos:text_alignment="center"
             ohos:text_size="18fp"
             ohos:weight="1"/>
@@ -56,7 +56,7 @@
             ohos:background_element="$graphic:button_bg"
             ohos:left_margin="10vp"
             ohos:padding="5vp"
-            ohos:text="Clear Pasteboard"
+            ohos:text="$string:clear_button"
             ohos:text_alignment="center"
             ohos:text_size="18fp"
             ohos:weight="1"/>
diff --git a/ability/ServiceAbility/entry/src/main/java/ohos/samples/serviceability/LocalServiceAbility.java b/ability/ServiceAbility/entry/src/main/java/ohos/samples/serviceability/LocalServiceAbility.java
index 5f6afcf16d..8a3413f34c 100644
--- a/ability/ServiceAbility/entry/src/main/java/ohos/samples/serviceability/LocalServiceAbility.java
+++ b/ability/ServiceAbility/entry/src/main/java/ohos/samples/serviceability/LocalServiceAbility.java
@@ -67,7 +67,7 @@ public class LocalServiceAbility extends Ability {
         showTips(this, "LocalService onStop");
     }
 
-    private class CurrentRemoteObject extends RemoteObject {
+    private static class CurrentRemoteObject extends RemoteObject {
         private CurrentRemoteObject() {
             super("CurrentRemoteObject");
         }
diff --git a/ability/ServiceAbility/entry/src/main/java/ohos/samples/serviceability/RemoteAbility.java b/ability/ServiceAbility/entry/src/main/java/ohos/samples/serviceability/RemoteAbility.java
index 4cad18c91b..f6e41193c8 100644
--- a/ability/ServiceAbility/entry/src/main/java/ohos/samples/serviceability/RemoteAbility.java
+++ b/ability/ServiceAbility/entry/src/main/java/ohos/samples/serviceability/RemoteAbility.java
@@ -23,7 +23,6 @@ import ohos.app.Context;
 import ohos.hiviewdfx.HiLog;
 import ohos.hiviewdfx.HiLogLabel;
 import ohos.rpc.IRemoteObject;
-import ohos.rpc.RemoteException;
 
 /**
  * RemoteAbility
@@ -35,7 +34,7 @@ public class RemoteAbility extends Ability {
 
     RemoteAgentStub remoteAgentStub = new RemoteAgentStub(DESCRIPTOR) {
         @Override
-        public void setRemoteObject(String param) throws RemoteException {
+        public void setRemoteObject(String param) {
             showTips(RemoteAbility.this, param);
         }
     };
diff --git a/ability/ServiceAbility/entry/src/main/java/ohos/samples/serviceability/slice/MainAbilitySlice.java b/ability/ServiceAbility/entry/src/main/java/ohos/samples/serviceability/slice/MainAbilitySlice.java
index 6bddbb3694..78f8464f91 100644
--- a/ability/ServiceAbility/entry/src/main/java/ohos/samples/serviceability/slice/MainAbilitySlice.java
+++ b/ability/ServiceAbility/entry/src/main/java/ohos/samples/serviceability/slice/MainAbilitySlice.java
@@ -61,7 +61,7 @@ public class MainAbilitySlice extends AbilitySlice {
 
     private static final String FOREGROUND_SERVICE = "ForegroundServiceAbility";
 
-    private EventHandler eventHandler = new EventHandler(EventRunner.current()) {
+    private final EventHandler eventHandler = new EventHandler(EventRunner.current()) {
         @Override
         protected void processEvent(InnerEvent event) {
             switch (event.eventId) {
@@ -90,36 +90,36 @@ public class MainAbilitySlice extends AbilitySlice {
         Component stopLocalButton = findComponentById(ResourceTable.Id_stop_local_button);
         Component connectLocalButton = findComponentById(ResourceTable.Id_connect_local_button);
         Component disconnectLocalButton = findComponentById(ResourceTable.Id_disconnect_local_button);
-        startLocalButton.setClickedListener(component -> startLocalService(LOCAL_BUNDLE, NORMAL_SERVICE));
+        startLocalButton.setClickedListener(component -> startLocalService(NORMAL_SERVICE));
         stopLocalButton.setClickedListener(component -> stopService(false));
         connectLocalButton.setClickedListener(component -> connectService(false));
         disconnectLocalButton.setClickedListener(component -> disconnectAbility(connection));
         Component keepRunningButton = findComponentById(ResourceTable.Id_keep_run_button);
-        keepRunningButton.setClickedListener(component -> startLocalService(LOCAL_BUNDLE, FOREGROUND_SERVICE));
+        keepRunningButton.setClickedListener(component -> startLocalService(FOREGROUND_SERVICE));
 
         Component startRemoteButton = findComponentById(ResourceTable.Id_start_remote_button);
         Component stopRemoteButton = findComponentById(ResourceTable.Id_stop_remote_button);
         Component connectRemoteButton = findComponentById(ResourceTable.Id_connect_remote_button);
         Component disconnectRemoteButton = findComponentById(ResourceTable.Id_disconnect_remote_button);
-        startRemoteButton.setClickedListener(component -> startRemoteService(REMOTE_BUNDLE, REMOTE_SERVICE));
+        startRemoteButton.setClickedListener(component -> startRemoteService());
         connectRemoteButton.setClickedListener(component -> connectService(true));
         stopRemoteButton.setClickedListener(component -> stopService(true));
         disconnectRemoteButton.setClickedListener(component -> disconnectAbility(connection));
     }
 
-    private void startLocalService(String bundleName, String serviceName) {
-        Intent localServiceIntent = getLocalServiceIntent(bundleName, serviceName);
+    private void startLocalService(String serviceName) {
+        Intent localServiceIntent = getLocalServiceIntent(serviceName);
         startAbility(localServiceIntent);
     }
 
-    private void startRemoteService(String bundleName, String serviceName) {
-        Intent remoteServiceIntent = getRemoteServiceIntent(bundleName, serviceName);
+    private void startRemoteService() {
+        Intent remoteServiceIntent = getRemoteServiceIntent();
         startAbility(remoteServiceIntent);
     }
 
-    private Intent getLocalServiceIntent(String bundleName, String serviceName) {
+    private Intent getLocalServiceIntent(String serviceName) {
         Operation operation = new Intent.OperationBuilder().withDeviceId("")
-            .withBundleName(bundleName)
+            .withBundleName(MainAbilitySlice.LOCAL_BUNDLE)
             .withAbilityName(serviceName)
             .build();
         Intent intent = new Intent();
@@ -127,10 +127,10 @@ public class MainAbilitySlice extends AbilitySlice {
         return intent;
     }
 
-    private Intent getRemoteServiceIntent(String bundleName, String serviceName) {
+    private Intent getRemoteServiceIntent() {
         Operation operation = new Intent.OperationBuilder().withDeviceId(getRemoteDeviceId())
-            .withBundleName(bundleName)
-            .withAbilityName(serviceName)
+            .withBundleName(MainAbilitySlice.REMOTE_BUNDLE)
+            .withAbilityName(MainAbilitySlice.REMOTE_SERVICE)
             .withFlags(Intent.FLAG_ABILITYSLICE_MULTI_DEVICE)
             .build();
         Intent intent = new Intent();
@@ -140,15 +140,15 @@ public class MainAbilitySlice extends AbilitySlice {
 
     private void connectService(boolean isConnectRemote) {
         Intent intent = isConnectRemote
-            ? getRemoteServiceIntent(REMOTE_BUNDLE, REMOTE_SERVICE)
-            : getLocalServiceIntent(LOCAL_BUNDLE, NORMAL_SERVICE);
+            ? getRemoteServiceIntent()
+            : getLocalServiceIntent(NORMAL_SERVICE);
         connectAbility(intent, connection);
     }
 
     private void stopService(boolean isStopRemote) {
         Intent intent = isStopRemote
-            ? getRemoteServiceIntent(REMOTE_BUNDLE, REMOTE_SERVICE)
-            : getLocalServiceIntent(LOCAL_BUNDLE, NORMAL_SERVICE);
+            ? getRemoteServiceIntent()
+            : getLocalServiceIntent(NORMAL_SERVICE);
         stopAbility(intent);
     }
 
@@ -161,7 +161,7 @@ public class MainAbilitySlice extends AbilitySlice {
         return infoList.get(random).getDeviceId();
     }
 
-    private IAbilityConnection connection = new IAbilityConnection() {
+    private final IAbilityConnection connection = new IAbilityConnection() {
         @Override
         public void onAbilityConnectDone(ElementName elementName, IRemoteObject iRemoteObject, int resultCode) {
             HiLog.info(LABEL_LOG, "%{public}s", "onAbilityConnectDone resultCode : " + resultCode);
diff --git a/ability/ServiceAbility/entry/src/main/resources/base/element/string.json b/ability/ServiceAbility/entry/src/main/resources/base/element/string.json
index bca8d73e8f..f6938578c5 100644
--- a/ability/ServiceAbility/entry/src/main/resources/base/element/string.json
+++ b/ability/ServiceAbility/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,42 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "start_local_button",
+      "value": "Start Local Service"
+    },
+    {
+      "name": "stop_local_button",
+      "value": "Stop Local Service"
+    },
+    {
+      "name": "connect_local_button",
+      "value": "Connect Local Service"
+    },
+    {
+      "name": "disconnect_local_button",
+      "value": "Disconnect Local Service"
+    },
+    {
+      "name": "keep_run_button",
+      "value": "Keep Background Running"
+    },
+    {
+      "name": "start_remote_button",
+      "value": "Start Remote Service"
+    },
+    {
+      "name": "stop_remote_button",
+      "value": "Stop Remote Service"
+    },
+    {
+      "name": "connect_remote_button",
+      "value": "Connect Remote Service"
+    },
+    {
+      "name": "disconnect_remote_button",
+      "value": "Disconnect Remote Service"
     }
   ]
 }
\ No newline at end of file
diff --git a/ability/ServiceAbility/entry/src/main/resources/base/layout/main_slice.xml b/ability/ServiceAbility/entry/src/main/resources/base/layout/main_slice.xml
index 09fb636de4..54b1d7dce4 100644
--- a/ability/ServiceAbility/entry/src/main/resources/base/layout/main_slice.xml
+++ b/ability/ServiceAbility/entry/src/main/resources/base/layout/main_slice.xml
@@ -26,7 +26,7 @@
         ohos:height="match_content"
         ohos:width="300vp"
         ohos:padding="5vp"
-        ohos:text="Start Local Service"
+        ohos:text="$string:start_local_button"
         ohos:background_element="$graphic:button_bg"
         ohos:top_margin="50vp"
         ohos:text_alignment="center"
@@ -37,7 +37,7 @@
         ohos:height="match_content"
         ohos:width="300vp"
         ohos:padding="5vp"
-        ohos:text="Stop Local Service"
+        ohos:text="$string:stop_local_button"
         ohos:background_element="$graphic:button_bg"
         ohos:top_margin="10vp"
         ohos:text_alignment="center"
@@ -49,7 +49,7 @@
         ohos:width="300vp"
         ohos:top_margin="10vp"
         ohos:padding="5vp"
-        ohos:text="Connect Local Service"
+        ohos:text="$string:connect_local_button"
         ohos:background_element="$graphic:button_bg"
         ohos:text_alignment="center"
         ohos:text_size="18fp"/>
@@ -60,7 +60,7 @@
         ohos:width="300vp"
         ohos:top_margin="10vp"
         ohos:padding="5vp"
-        ohos:text="Disconnect Local Service"
+        ohos:text="$string:disconnect_local_button"
         ohos:background_element="$graphic:button_bg"
         ohos:text_alignment="center"
         ohos:text_size="18fp"/>
@@ -72,7 +72,7 @@
         ohos:padding="5vp"
         ohos:top_margin="10vp"
         ohos:bottom_margin="10vp"
-        ohos:text="Keep Background Running"
+        ohos:text="$string:keep_run_button"
         ohos:background_element="$graphic:button_bg"
         ohos:text_alignment="center"
         ohos:text_size="18fp"/>
@@ -89,7 +89,7 @@
         ohos:height="match_content"
         ohos:width="300vp"
         ohos:padding="5vp"
-        ohos:text="Start Remote Service"
+        ohos:text="$string:start_remote_button"
         ohos:background_element="$graphic:button_bg"
         ohos:top_margin="10vp"
         ohos:text_alignment="center"
@@ -100,7 +100,7 @@
         ohos:height="match_content"
         ohos:width="300vp"
         ohos:padding="5vp"
-        ohos:text="Stop Remote Service"
+        ohos:text="$string:stop_remote_button"
         ohos:background_element="$graphic:button_bg"
         ohos:top_margin="10vp"
         ohos:text_alignment="center"
@@ -112,7 +112,7 @@
         ohos:width="300vp"
         ohos:top_margin="10vp"
         ohos:padding="5vp"
-        ohos:text="Connect Remote Service"
+        ohos:text="$string:connect_remote_button"
         ohos:background_element="$graphic:button_bg"
         ohos:text_alignment="center"
         ohos:text_size="18fp"/>
@@ -123,7 +123,7 @@
         ohos:width="300vp"
         ohos:top_margin="10vp"
         ohos:padding="5vp"
-        ohos:text="Disconnect Remote Service"
+        ohos:text="$string:disconnect_remote_button"
         ohos:background_element="$graphic:button_bg"
         ohos:text_alignment="center"
         ohos:text_size="18fp"/>
-- 
Gitee