From 45f90bd7a08a81f9e32f5e0c0155c71ef9f7cd86 Mon Sep 17 00:00:00 2001
From: adslk <liuxin283@huawei.com>
Date: Fri, 15 Oct 2021 17:29:51 +0800
Subject: [PATCH 1/2] Clean up the alarm

Signed-off-by: adslk <liuxin283@huawei.com>
---
 .../layout/animator_frame_slice_layout.xml    |  4 +-
 .../layout/animator_group_slice_layout.xml    |  9 ++-
 .../layout/animator_property_slice_layout.xml | 16 ++--
 .../layout/animator_value_slice_layout.xml    | 24 +++---
 .../base/layout/main_ability_slice.xml        | 12 ++-
 .../layout/dependentlayout_ability_slice.xml  | 17 ++--
 .../directionalLayout_ability_slice.xml       | 42 +++++-----
 .../base/layout/main_ability_slice.xml        |  6 +-
 .../base/layout/button_example_slice.xml      | 20 ++---
 .../base/layout/button_main_ability.xml       | 31 ++++---
 .../base/layout/main_ability_slice.xml        |  6 +-
 .../base/layout/text_example_slice.xml        | 24 +++---
 .../base/layout/text_main_ability.xml         | 28 ++++---
 .../samples/customlayout/MyApplication.java   | 30 -------
 .../customlayout/component/CustomLayout.java  |  4 +-
 .../src/main/js/default/pages/index/index.hml |  2 +-
 .../src/main/js/default/pages/index/index.hml | 24 +++---
 .../src/main/js/default/pages/index/index.js  |  1 +
 .../cardtargetpage/cardtargetpage.css         |  2 +-
 .../cardtargetpage/cardtargetpage.hml         |  2 +-
 .../src/main/js/default/common/css/common.css |  6 --
 .../src/main/js/default/pages/index/index.js  |  8 +-
 .../ohos/samples/jsfacard/ClockAbility.java   |  4 +-
 .../ohos/samples/jsfacard/MainAbility.java    |  2 +-
 .../ohos/samples/jsfacard/TimerAbility.java   |  2 +-
 .../jsfacard/slice/ClockAbilitySlice.java     |  6 +-
 .../samples/jsfacard/utils/DateUtils.java     |  3 +-
 .../src/main/js/default/pages/index/index.hml |  1 -
 UI/JsList/build.gradle                        | 11 +++
 UI/JsList/settings.gradle                     |  1 +
 .../pages/homePage/microAmoy/microAmoy.hml    |  2 +-
 .../main/resources/base/layout/list_item.xml  |  3 +-
 .../samples/multimodeinput/MyApplication.java | 30 -------
 .../base/layout/first_main_ability_slice.xml  |  8 +-
 .../base/layout/key_main_ability_slice.xml    |  8 +-
 .../base/layout/main_ability_slice.xml        | 32 ++++----
 .../base/layout/mouse_ability_slice.xml       |  8 +-
 .../base/layout/second_main_ability_slice.xml |  8 +-
 .../multimodalevent/MyApplication.java        | 30 -------
 .../layout/common_event_ability_slice.xml     |  8 +-
 .../base/layout/main_ability_slice.xml        | 48 +++++------
 .../base/layout/tel_event_ability_slice.xml   | 20 ++---
 .../base/layout/touch_event_ability_slice.xml |  8 +-
 .../resources/base/layout/position_layout.xml | 43 ++++++----
 .../ohos/samples/progress/utils/LogUtil.java  | 29 -------
 .../base/layout/main_ability_slice.xml        | 34 ++++----
 .../main/resources/base/element/string.json   |  4 +-
 UI/UiComponents/entry/package.json            |  1 -
 .../samples/uicomponents/utils/LogUtil.java   | 10 ---
 UI/UserRegistration/entry/package.json        |  1 -
 .../main/js/default/pages/success/success.js  |  1 -
 .../src/main/js/default/pages/index/index.hml |  6 +-
 .../js/default/common/RemoteDeviceModel.js    |  8 +-
 .../src/main/js/default/pages/calc/calc.js    |  2 +-
 .../src/main/js/default/pages/index/index.js  |  2 +-
 .../samples/downloadsample/MainAbility.java   |  3 +-
 .../slice/DownloadStateSlice.java             |  4 +-
 .../slice/MainAbilitySlice.java               |  4 +-
 .../samples/downloadsample/utils/LogUtil.java | 22 -----
 .../main/resources/base/element/string.json   | 80 +++++++++++++++++++
 .../base/layout/download_config_slice.xml     | 80 +++++++++----------
 .../base/layout/download_operation_slice.xml  | 24 +++---
 .../base/layout/download_state_slice.xml      | 66 +++++++--------
 .../base/layout/main_ability_slice.xml        | 18 ++---
 .../src/main/js/default/pages/index/index.js  |  2 +
 .../helloworld/slice/MainAbilitySlice.java    |  2 -
 .../base/layout/main_ability_slice.xml        |  4 +-
 .../timerpluginutils/CountDownTimer.java      | 14 +---
 .../timer/timerpluginutils/CountDownUtil.java | 16 ----
 .../timer/timerpluginutils/TimerPlugin.java   |  5 --
 .../main/java/ohos/timer/utils/Constant.java  |  5 --
 .../base/layout/main_ability_slice.xml        |  3 +-
 72 files changed, 496 insertions(+), 558 deletions(-)
 delete mode 100644 UI/CustomLayout/entry/src/main/java/ohos/samples/customlayout/MyApplication.java
 create mode 100644 UI/JsList/settings.gradle
 delete mode 100644 UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/MyApplication.java
 delete mode 100644 UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/MyApplication.java
 delete mode 100644 UI/UiComponents/entry/package.json
 delete mode 100644 UI/UserRegistration/entry/package.json

diff --git a/UI/Animation/entry/src/main/resources/base/layout/animator_frame_slice_layout.xml b/UI/Animation/entry/src/main/resources/base/layout/animator_frame_slice_layout.xml
index 7d0b29853a..cf19fd5932 100644
--- a/UI/Animation/entry/src/main/resources/base/layout/animator_frame_slice_layout.xml
+++ b/UI/Animation/entry/src/main/resources/base/layout/animator_frame_slice_layout.xml
@@ -33,8 +33,8 @@
         ohos:width="match_parent"
         ohos:background_element="$graphic:button_background"
         ohos:padding="10vp"
-        ohos:left_margin="24vp"
-        ohos:right_margin="24vp"
+        ohos:start_margin="24vp"
+        ohos:end_margin="24vp"
         ohos:text="$string:start"
         ohos:text_size="16vp"
         ohos:top_margin="20vp"/>
diff --git a/UI/Animation/entry/src/main/resources/base/layout/animator_group_slice_layout.xml b/UI/Animation/entry/src/main/resources/base/layout/animator_group_slice_layout.xml
index e547182967..7f9209b2f0 100644
--- a/UI/Animation/entry/src/main/resources/base/layout/animator_group_slice_layout.xml
+++ b/UI/Animation/entry/src/main/resources/base/layout/animator_group_slice_layout.xml
@@ -39,21 +39,24 @@
             ohos:height="60vp"
             ohos:width="60vp"
             ohos:background_element="#00ffff"
-            ohos:left_margin="10vp"/>
+            ohos:start_margin="10vp"
+            ohos:end_margin="10vp"/>
 
         <Component
             ohos:id="$+id:target_image3"
             ohos:height="60vp"
             ohos:width="60vp"
             ohos:background_element="#00ffff"
-            ohos:left_margin="10vp"/>
+            ohos:start_margin="10vp"
+            ohos:end_margin="10vp"/>
 
         <Component
             ohos:id="$+id:target_image4"
             ohos:height="60vp"
             ohos:width="60vp"
             ohos:background_element="#00ffff"
-            ohos:left_margin="10vp"/>
+            ohos:start_margin="10vp"
+            ohos:end_margin="10vp"/>
     </DirectionalLayout>
 
     <DirectionalLayout
diff --git a/UI/Animation/entry/src/main/resources/base/layout/animator_property_slice_layout.xml b/UI/Animation/entry/src/main/resources/base/layout/animator_property_slice_layout.xml
index b349bd06ed..074047bbf8 100644
--- a/UI/Animation/entry/src/main/resources/base/layout/animator_property_slice_layout.xml
+++ b/UI/Animation/entry/src/main/resources/base/layout/animator_property_slice_layout.xml
@@ -32,9 +32,9 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:background_element="$graphic:button_background"
-        ohos:left_margin="24vp"
+        ohos:start_margin="24vp"
         ohos:padding="10vp"
-        ohos:right_margin="24vp"
+        ohos:end_margin="24vp"
         ohos:text="$string:scale"
         ohos:text_size="16fp"
         ohos:top_margin="30vp"/>
@@ -44,9 +44,9 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:background_element="$graphic:button_background"
-        ohos:left_margin="24vp"
+        ohos:start_margin="24vp"
         ohos:padding="10vp"
-        ohos:right_margin="24vp"
+        ohos:end_margin="24vp"
         ohos:text="$string:rotate"
         ohos:text_size="16fp"
         ohos:top_margin="30vp"/>
@@ -56,9 +56,9 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:background_element="$graphic:button_background"
-        ohos:left_margin="24vp"
+        ohos:start_margin="24vp"
         ohos:padding="10vp"
-        ohos:right_margin="24vp"
+        ohos:end_margin="24vp"
         ohos:text="$string:alpha"
         ohos:text_size="16fp"
         ohos:top_margin="30vp"/>
@@ -68,9 +68,9 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:background_element="$graphic:button_background"
-        ohos:left_margin="24vp"
+        ohos:start_margin="24vp"
         ohos:padding="10vp"
-        ohos:right_margin="24vp"
+        ohos:end_margin="24vp"
         ohos:text="$string:translate"
         ohos:text_size="16fp"
         ohos:top_margin="30vp"/>
diff --git a/UI/Animation/entry/src/main/resources/base/layout/animator_value_slice_layout.xml b/UI/Animation/entry/src/main/resources/base/layout/animator_value_slice_layout.xml
index faab0d95bd..8843b06f91 100644
--- a/UI/Animation/entry/src/main/resources/base/layout/animator_value_slice_layout.xml
+++ b/UI/Animation/entry/src/main/resources/base/layout/animator_value_slice_layout.xml
@@ -31,9 +31,9 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:background_element="$graphic:button_background"
-        ohos:left_margin="24vp"
+        ohos:start_margin="24vp"
         ohos:padding="10vp"
-        ohos:right_margin="24vp"
+        ohos:end_margin="24vp"
         ohos:text="$string:spring"
         ohos:text_size="16vp"
         ohos:top_margin="30vp"/>
@@ -43,9 +43,9 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:background_element="$graphic:button_background"
-        ohos:left_margin="24vp"
+        ohos:start_margin="24vp"
         ohos:padding="10vp"
-        ohos:right_margin="24vp"
+        ohos:end_margin="24vp"
         ohos:text="$string:anticipate"
         ohos:text_size="16vp"
         ohos:top_margin="30vp"/>
@@ -55,9 +55,9 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:background_element="$graphic:button_background"
-        ohos:left_margin="24vp"
+        ohos:start_margin="24vp"
         ohos:padding="10vp"
-        ohos:right_margin="24vp"
+        ohos:end_margin="24vp"
         ohos:text="$string:cycle"
         ohos:text_size="16vp"
         ohos:top_margin="30vp"/>
@@ -67,9 +67,9 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:background_element="$graphic:button_background"
-        ohos:left_margin="24vp"
+        ohos:start_margin="24vp"
         ohos:padding="10vp"
-        ohos:right_margin="24vp"
+        ohos:end_margin="24vp"
         ohos:text="$string:Overshoot"
         ohos:text_size="16vp"
         ohos:top_margin="30vp"/>
@@ -79,9 +79,9 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:background_element="$graphic:button_background"
-        ohos:left_margin="24vp"
+        ohos:start_margin="24vp"
         ohos:padding="10vp"
-        ohos:right_margin="24vp"
+        ohos:end_margin="24vp"
         ohos:text="$string:smooth_step"
         ohos:text_size="16vp"
         ohos:top_margin="30vp"/>
@@ -91,9 +91,9 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:background_element="$graphic:button_background"
-        ohos:left_margin="24vp"
+        ohos:start_margin="24vp"
         ohos:padding="10vp"
-        ohos:right_margin="24vp"
+        ohos:end_margin="24vp"
         ohos:text="$string:cubic_hermit"
         ohos:text_size="16vp"
         ohos:top_margin="30vp"/>
diff --git a/UI/Animation/entry/src/main/resources/base/layout/main_ability_slice.xml b/UI/Animation/entry/src/main/resources/base/layout/main_ability_slice.xml
index 57e3430541..a02320e591 100644
--- a/UI/Animation/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/UI/Animation/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -24,7 +24,8 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:element_right="$media:ic_arrow_right"
-        ohos:left_padding="24vp"
+        ohos:start_padding="24vp"
+        ohos:end_padding="24vp"
         ohos:padding="10vp"
         ohos:text="$string:animator_framet"
         ohos:text_alignment="left"
@@ -35,7 +36,8 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:element_right="$media:ic_arrow_right"
-        ohos:left_padding="24vp"
+        ohos:start_padding="24vp"
+        ohos:end_padding="24vp"
         ohos:padding="10vp"
         ohos:text="$string:animator_value"
         ohos:text_alignment="left"
@@ -46,7 +48,8 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:element_right="$media:ic_arrow_right"
-        ohos:left_padding="24vp"
+        ohos:start_padding="24vp"
+        ohos:end_padding="24vp"
         ohos:padding="10vp"
         ohos:text="$string:animator_property"
         ohos:text_alignment="left"
@@ -57,7 +60,8 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:element_right="$media:ic_arrow_right"
-        ohos:left_padding="24vp"
+        ohos:start_padding="24vp"
+        ohos:end_padding="24vp"
         ohos:padding="10vp"
         ohos:text="$string:animator_group"
         ohos:text_alignment="left"
diff --git a/UI/CommonLayout/entry/src/main/resources/base/layout/dependentlayout_ability_slice.xml b/UI/CommonLayout/entry/src/main/resources/base/layout/dependentlayout_ability_slice.xml
index 487dfc59bd..13aa25e370 100644
--- a/UI/CommonLayout/entry/src/main/resources/base/layout/dependentlayout_ability_slice.xml
+++ b/UI/CommonLayout/entry/src/main/resources/base/layout/dependentlayout_ability_slice.xml
@@ -25,8 +25,8 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:background_element="$graphic:color_gray_element"
-        ohos:left_margin="15vp"
-        ohos:right_margin="15vp"
+        ohos:start_margin="15vp"
+        ohos:end_margin="15vp"
         ohos:text="$string:title"
         ohos:text_alignment="horizontal_center"
         ohos:text_size="25fp"
@@ -41,9 +41,9 @@
         ohos:background_element="$graphic:color_gray_element"
         ohos:below="$id:title_text"
         ohos:bottom_margin="15vp"
-        ohos:left_margin="15vp"
+        ohos:start_margin="15vp"
+        ohos:end_margin="15vp"
         ohos:multiple_lines="true"
-        ohos:right_margin="15vp"
         ohos:text="$string:catalog"
         ohos:text_alignment="center"
         ohos:text_font="$string:serif"
@@ -58,7 +58,8 @@
         ohos:below="$id:title_text"
         ohos:bottom_margin="15vp"
         ohos:end_of="$id:catalog_text"
-        ohos:right_margin="15vp"
+        ohos:start_margin="0vp"
+        ohos:end_margin="15vp"
         ohos:text="$string:content"
         ohos:text_alignment="center"
         ohos:text_font="$string:serif"
@@ -74,7 +75,8 @@
         ohos:bottom_margin="15vp"
         ohos:italic="false"
         ohos:left_of="$id:next_button"
-        ohos:right_margin="15vp"
+        ohos:start_margin="0vp"
+        ohos:end_margin="15vp"
         ohos:text="$string:previous"
         ohos:text_font="$string:serif"
         ohos:text_size="15fp"
@@ -89,7 +91,8 @@
         ohos:below="$id:content_text"
         ohos:bottom_margin="15vp"
         ohos:italic="false"
-        ohos:right_margin="15vp"
+        ohos:start_margin="0vp"
+        ohos:end_margin="15vp"
         ohos:text="$string:Next"
         ohos:text_font="$string:serif"
         ohos:text_size="15fp"
diff --git a/UI/CommonLayout/entry/src/main/resources/base/layout/directionalLayout_ability_slice.xml b/UI/CommonLayout/entry/src/main/resources/base/layout/directionalLayout_ability_slice.xml
index d839df851f..32f0e998c3 100644
--- a/UI/CommonLayout/entry/src/main/resources/base/layout/directionalLayout_ability_slice.xml
+++ b/UI/CommonLayout/entry/src/main/resources/base/layout/directionalLayout_ability_slice.xml
@@ -26,8 +26,8 @@
         ohos:background_element="#0d000000"
         ohos:bottom_margin="10vp"
         ohos:layout_alignment="horizontal_center"
-        ohos:left_margin="15vp"
-        ohos:right_margin="15vp"
+        ohos:start_margin="15vp"
+        ohos:end_margin="15vp"
         ohos:text="$string:vertical"
         ohos:text_size="16fp"
         ohos:top_margin="10vp"/>
@@ -42,7 +42,8 @@
             ohos:width="100vp"
             ohos:background_element="$graphic:color_light_gray_element"
             ohos:bottom_margin="3vp"
-            ohos:left_margin="15vp"
+            ohos:start_margin="15vp"
+            ohos:end_margin="0vp"
             ohos:text="$string:btn_1"
             ohos:text_size="16fp"/>
 
@@ -51,7 +52,8 @@
             ohos:width="100vp"
             ohos:background_element="$graphic:color_light_gray_element"
             ohos:bottom_margin="3vp"
-            ohos:left_margin="15vp"
+            ohos:start_margin="15vp"
+            ohos:end_margin="0vp"
             ohos:text="$string:btn_2"
             ohos:text_size="16fp"/>
 
@@ -60,7 +62,8 @@
             ohos:width="100vp"
             ohos:background_element="$graphic:color_light_gray_element"
             ohos:bottom_margin="3vp"
-            ohos:left_margin="15vp"
+            ohos:start_margin="15vp"
+            ohos:end_margin="0vp"
             ohos:text="$string:btn_3"
             ohos:text_size="16fp"/>
     </DirectionalLayout>
@@ -72,8 +75,8 @@
         ohos:background_element="#0d000000"
         ohos:bottom_margin="10vp"
         ohos:layout_alignment="horizontal_center"
-        ohos:left_margin="15vp"
-        ohos:right_margin="15vp"
+        ohos:start_margin="15vp"
+        ohos:end_margin="15vp"
         ohos:text="$string:horizontal"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
@@ -87,7 +90,8 @@
             ohos:height="30vp"
             ohos:width="100vp"
             ohos:background_element="$graphic:color_light_gray_element"
-            ohos:left_margin="15vp"
+            ohos:start_margin="15vp"
+            ohos:end_margin="0vp"
             ohos:text="$string:btn_1"
             ohos:text_size="16fp"/>
 
@@ -95,7 +99,8 @@
             ohos:height="30vp"
             ohos:width="100vp"
             ohos:background_element="$graphic:color_light_gray_element"
-            ohos:left_margin="15vp"
+            ohos:start_margin="15vp"
+            ohos:end_margin="0vp"
             ohos:text="$string:btn_2"
             ohos:text_size="16fp"/>
 
@@ -103,7 +108,8 @@
             ohos:height="30vp"
             ohos:width="100vp"
             ohos:background_element="$graphic:color_light_gray_element"
-            ohos:left_margin="15vp"
+            ohos:start_margin="15vp"
+            ohos:end_margin="0vp"
             ohos:text="$string:btn_3"
             ohos:text_size="16fp"/>
     </DirectionalLayout>
@@ -115,8 +121,8 @@
         ohos:background_element="#0d000000"
         ohos:bottom_margin="10vp"
         ohos:layout_alignment="horizontal_center"
-        ohos:left_margin="15vp"
-        ohos:right_margin="15vp"
+        ohos:start_margin="15vp"
+        ohos:end_margin="15vp"
         ohos:text="$string:alignment"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
@@ -124,8 +130,8 @@
     <DirectionalLayout
         ohos:height="match_content"
         ohos:width="match_parent"
-        ohos:left_margin="15vp"
-        ohos:right_margin="15vp">
+        ohos:start_margin="15vp"
+        ohos:end_margin="15vp">
 
         <Button
             ohos:height="30vp"
@@ -159,8 +165,8 @@
         ohos:background_element="#0d000000"
         ohos:bottom_margin="10vp"
         ohos:layout_alignment="horizontal_center"
-        ohos:left_margin="15vp"
-        ohos:right_margin="15vp"
+        ohos:start_margin="15vp"
+        ohos:end_margin="15vp"
         ohos:text="$string:weight"
         ohos:text_size="16fp"
         ohos:top_margin="20vp"/>
@@ -168,9 +174,9 @@
     <DirectionalLayout
         ohos:height="match_content"
         ohos:width="match_parent"
-        ohos:left_margin="15vp"
+        ohos:start_margin="15vp"
         ohos:orientation="horizontal"
-        ohos:right_margin="15vp">
+        ohos:end_margin="15vp">
 
         <Button
             ohos:height="30vp"
diff --git a/UI/CommonLayout/entry/src/main/resources/base/layout/main_ability_slice.xml b/UI/CommonLayout/entry/src/main/resources/base/layout/main_ability_slice.xml
index 4e53730f0d..a381873c5f 100644
--- a/UI/CommonLayout/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/UI/CommonLayout/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -25,7 +25,8 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:element_right="$media:ic_arrow_right"
-        ohos:left_padding="24vp"
+        ohos:start_padding="24vp"
+        ohos:end_padding="0vp"
         ohos:padding="10vp"
         ohos:text="$string:directional"
         ohos:text_alignment="left"
@@ -36,7 +37,8 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:element_right="$media:ic_arrow_right"
-        ohos:left_padding="24vp"
+        ohos:start_padding="24vp"
+        ohos:end_padding="0vp"
         ohos:padding="10vp"
         ohos:text="$string:dependent"
         ohos:text_alignment="left"
diff --git a/UI/Components/entry/src/main/resources/base/layout/button_example_slice.xml b/UI/Components/entry/src/main/resources/base/layout/button_example_slice.xml
index f4d58b1a4d..ce5bba35cd 100644
--- a/UI/Components/entry/src/main/resources/base/layout/button_example_slice.xml
+++ b/UI/Components/entry/src/main/resources/base/layout/button_example_slice.xml
@@ -53,8 +53,8 @@
             ohos:height="40vp"
             ohos:width="40vp"
             ohos:background_element="$graphic:green_circle_button_element"
-            ohos:left_margin="5vp"
-            ohos:right_margin="5vp"
+            ohos:start_margin="5vp"
+            ohos:end_margin="5vp"
             ohos:text="$string:two"
             ohos:text_alignment="center"
             ohos:text_size="15fp"/>
@@ -90,8 +90,8 @@
             ohos:height="40vp"
             ohos:width="40vp"
             ohos:background_element="$graphic:green_circle_button_element"
-            ohos:left_margin="5vp"
-            ohos:right_margin="5vp"
+            ohos:start_margin="5vp"
+            ohos:end_margin="5vp"
             ohos:text="$string:five"
             ohos:text_alignment="center"
             ohos:text_size="15fp"/>
@@ -127,8 +127,8 @@
             ohos:height="40vp"
             ohos:width="40vp"
             ohos:background_element="$graphic:green_circle_button_element"
-            ohos:left_margin="5vp"
-            ohos:right_margin="5vp"
+            ohos:start_margin="5vp"
+            ohos:end_margin="5vp"
             ohos:text="$string:eight"
             ohos:text_alignment="center"
             ohos:text_size="15fp"/>
@@ -164,8 +164,8 @@
             ohos:height="40vp"
             ohos:width="40vp"
             ohos:background_element="$graphic:green_circle_button_element"
-            ohos:left_margin="5vp"
-            ohos:right_margin="5vp"
+            ohos:start_margin="5vp"
+            ohos:end_margin="5vp"
             ohos:text="$string:zero"
             ohos:text_alignment="center"
             ohos:text_size="15fp"/>
@@ -188,8 +188,8 @@
         ohos:bottom_margin="5vp"
         ohos:bottom_padding="2vp"
         ohos:layout_alignment="horizontal_center"
-        ohos:left_padding="10vp"
-        ohos:right_padding="10vp"
+        ohos:start_padding="10vp"
+        ohos:end_padding="10vp"
         ohos:text="$string:call"
         ohos:text_alignment="center"
         ohos:text_size="15fp"
diff --git a/UI/Components/entry/src/main/resources/base/layout/button_main_ability.xml b/UI/Components/entry/src/main/resources/base/layout/button_main_ability.xml
index 20a60a9cfa..62904571f3 100644
--- a/UI/Components/entry/src/main/resources/base/layout/button_main_ability.xml
+++ b/UI/Components/entry/src/main/resources/base/layout/button_main_ability.xml
@@ -28,9 +28,10 @@
         ohos:background_element="$graphic:color_blue_element"
         ohos:bottom_margin="15vp"
         ohos:layout_alignment="horizontal_center"
-        ohos:left_margin="15vp"
-        ohos:left_padding="8vp"
-        ohos:right_padding="8vp"
+        ohos:start_margin="15vp"
+        ohos:end_margin="0vp"
+        ohos:start_padding="8vp"
+        ohos:end_padding="8vp"
         ohos:text="$string:button"
         ohos:text_size="18fp"
         ohos:top_margin="10vp"/>
@@ -42,9 +43,10 @@
         ohos:background_element="$graphic:oval_button_element"
         ohos:bottom_margin="15vp"
         ohos:layout_alignment="horizontal_center"
-        ohos:left_margin="15vp"
-        ohos:left_padding="8vp"
-        ohos:right_padding="8vp"
+        ohos:start_margin="15vp"
+        ohos:end_margin="0vp"
+        ohos:start_padding="8vp"
+        ohos:end_padding="8vp"
         ohos:text="$string:button"
         ohos:text_size="18fp"/>
 
@@ -55,9 +57,10 @@
         ohos:background_element="$graphic:capsule_button_element"
         ohos:bottom_margin="15vp"
         ohos:layout_alignment="horizontal_center"
-        ohos:left_margin="15vp"
-        ohos:left_padding="15vp"
-        ohos:right_padding="15vp"
+        ohos:start_margin="15vp"
+        ohos:end_margin="0vp"
+        ohos:start_padding="15vp"
+        ohos:end_padding="15vp"
         ohos:text="$string:button"
         ohos:text_size="18fp"/>
 
@@ -68,9 +71,10 @@
         ohos:background_element="$graphic:circle_button_element"
         ohos:bottom_margin="15vp"
         ohos:layout_alignment="horizontal_center"
-        ohos:left_margin="15vp"
-        ohos:left_padding="15vp"
-        ohos:right_padding="15vp"
+        ohos:start_margin="15vp"
+        ohos:end_margin="0vp"
+        ohos:start_padding="15vp"
+        ohos:end_padding="15vp"
         ohos:text="$string:add"
         ohos:text_size="18fp"/>
 
@@ -80,7 +84,8 @@
         ohos:width="match_parent"
         ohos:element_right="$media:ic_arrow_right"
         ohos:layout_alignment="horizontal_center"
-        ohos:left_padding="24vp"
+        ohos:start_padding="24vp"
+        ohos:end_padding="0vp"
         ohos:padding="10vp"
         ohos:text="$string:button_example_ability"
         ohos:text_alignment="left"
diff --git a/UI/Components/entry/src/main/resources/base/layout/main_ability_slice.xml b/UI/Components/entry/src/main/resources/base/layout/main_ability_slice.xml
index f8bc6b8230..8073579416 100644
--- a/UI/Components/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/UI/Components/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -27,7 +27,8 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:element_right="$media:ic_arrow_right"
-        ohos:left_padding="24vp"
+        ohos:start_padding="24vp"
+        ohos:end_padding="0vp"
         ohos:padding="10vp"
         ohos:text="$string:start_text"
         ohos:text_alignment="left"
@@ -39,7 +40,8 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:element_right="$media:ic_arrow_right"
-        ohos:left_padding="24vp"
+        ohos:start_padding="24vp"
+        ohos:end_padding="0vp"
         ohos:padding="10vp"
         ohos:text="$string:start_button"
         ohos:text_alignment="left"
diff --git a/UI/Components/entry/src/main/resources/base/layout/text_example_slice.xml b/UI/Components/entry/src/main/resources/base/layout/text_example_slice.xml
index ec313185e0..01341d5e07 100644
--- a/UI/Components/entry/src/main/resources/base/layout/text_example_slice.xml
+++ b/UI/Components/entry/src/main/resources/base/layout/text_example_slice.xml
@@ -25,8 +25,8 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:background_element="$graphic:text_element"
-        ohos:left_margin="15vp"
-        ohos:right_margin="15vp"
+        ohos:start_margin="15vp"
+        ohos:end_margin="15vp"
         ohos:text="$string:title"
         ohos:text_alignment="horizontal_center"
         ohos:text_size="18fp"
@@ -40,8 +40,8 @@
         ohos:background_element="$graphic:text_element"
         ohos:below="$id:text_title"
         ohos:bottom_margin="15vp"
-        ohos:left_margin="15vp"
-        ohos:right_margin="15vp"
+        ohos:start_margin="15vp"
+        ohos:end_margin="15vp"
         ohos:text="$string:content"
         ohos:text_alignment="center"
         ohos:text_font="$string:serif"
@@ -56,9 +56,10 @@
         ohos:below="$id:text_content"
         ohos:bottom_margin="15vp"
         ohos:left_of="$id:btn_next"
-        ohos:left_padding="5vp"
-        ohos:right_margin="25vp"
-        ohos:right_padding="5vp"
+        ohos:start_padding="5vp"
+        ohos:start_margin="0vp"
+        ohos:end_margin="25vp"
+        ohos:end_padding="5vp"
         ohos:text="$string:previous"
         ohos:text_font="$string:serif"
         ohos:text_size="18fp"/>
@@ -71,10 +72,11 @@
         ohos:background_element="$graphic:text_element"
         ohos:below="$id:text_content"
         ohos:bottom_margin="15vp"
-        ohos:left_padding="5vp"
-        ohos:right_margin="15vp"
-        ohos:right_padding="5vp"
-        ohos:text="Next"
+        ohos:start_padding="5vp"
+        ohos:start_margin="0vp"
+        ohos:end_margin="15vp"
+        ohos:end_padding="5vp"
+        ohos:text="$string:next"
         ohos:text_font="$string:serif"
         ohos:text_size="18fp"/>
 </DependentLayout>
\ No newline at end of file
diff --git a/UI/Components/entry/src/main/resources/base/layout/text_main_ability.xml b/UI/Components/entry/src/main/resources/base/layout/text_main_ability.xml
index eef52c49af..8f020358a5 100644
--- a/UI/Components/entry/src/main/resources/base/layout/text_main_ability.xml
+++ b/UI/Components/entry/src/main/resources/base/layout/text_main_ability.xml
@@ -47,9 +47,10 @@
         ohos:width="match_content"
         ohos:background_element="$graphic:text_element"
         ohos:bottom_margin="15vp"
-        ohos:left_margin="15vp"
-        ohos:left_padding="15vp"
-        ohos:right_padding="15vp"
+        ohos:start_margin="15vp"
+        ohos:end_margin="0vp"
+        ohos:start_padding="15vp"
+        ohos:end_padding="15vp"
         ohos:text="$string:text"
         ohos:text_alignment="center"
         ohos:text_color="blue"
@@ -63,9 +64,10 @@
         ohos:background_element="$graphic:text_element"
         ohos:bottom_margin="15vp"
         ohos:italic="true"
-        ohos:left_margin="15vp"
-        ohos:left_padding="15vp"
-        ohos:right_padding="15vp"
+        ohos:start_margin="15vp"
+        ohos:end_margin="0vp"
+        ohos:start_padding="15vp"
+        ohos:end_padding="15vp"
         ohos:text="$string:text"
         ohos:text_alignment="center"
         ohos:text_color="blue"
@@ -81,9 +83,10 @@
         ohos:background_element="$graphic:text_element"
         ohos:bottom_margin="15vp"
         ohos:italic="true"
-        ohos:left_margin="15vp"
-        ohos:left_padding="15vp"
-        ohos:right_padding="15vp"
+        ohos:start_margin="15vp"
+        ohos:end_margin="0vp"
+        ohos:start_padding="15vp"
+        ohos:end_padding="15vp"
         ohos:text="$string:text"
         ohos:text_alignment="horizontal_center|bottom"
         ohos:text_color="blue"
@@ -115,11 +118,11 @@
         ohos:auto_font_size="true"
         ohos:background_element="$graphic:text_element"
         ohos:italic="true"
-        ohos:left_padding="8vp"
+        ohos:start_padding="8vp"
         ohos:max_text_lines="1"
         ohos:min_height="30vp"
         ohos:multiple_lines="true"
-        ohos:right_padding="8vp"
+        ohos:end_padding="8vp"
         ohos:text="$string:T"
         ohos:text_alignment="center"
         ohos:text_color="blue"
@@ -146,7 +149,8 @@
         ohos:height="match_content"
         ohos:width="match_parent"
         ohos:element_right="$media:ic_arrow_right"
-        ohos:left_padding="24vp"
+        ohos:start_padding="24vp"
+        ohos:end_padding="0vp"
         ohos:padding="10vp"
         ohos:text="$string:text_example_ability"
         ohos:text_alignment="left"
diff --git a/UI/CustomLayout/entry/src/main/java/ohos/samples/customlayout/MyApplication.java b/UI/CustomLayout/entry/src/main/java/ohos/samples/customlayout/MyApplication.java
deleted file mode 100644
index 6a907bcbc7..0000000000
--- a/UI/CustomLayout/entry/src/main/java/ohos/samples/customlayout/MyApplication.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ohos.samples.customlayout;
-
-import ohos.aafwk.ability.AbilityPackage;
-
-/**
- * MyApplication
- *
- * @since 2021-07-03
- */
-public class MyApplication extends AbilityPackage {
-    @Override
-    public void onInitialize() {
-        super.onInitialize();
-    }
-}
diff --git a/UI/CustomLayout/entry/src/main/java/ohos/samples/customlayout/component/CustomLayout.java b/UI/CustomLayout/entry/src/main/java/ohos/samples/customlayout/component/CustomLayout.java
index c4143da9b8..052773f51f 100644
--- a/UI/CustomLayout/entry/src/main/java/ohos/samples/customlayout/component/CustomLayout.java
+++ b/UI/CustomLayout/entry/src/main/java/ohos/samples/customlayout/component/CustomLayout.java
@@ -71,8 +71,8 @@ public class CustomLayout extends ComponentContainer
 
     private void measureChild(Component childView, int widthEstimatedConfig, int heightEstimatedConfig) {
         LayoutConfig lc = childView.getLayoutConfig();
-        int childWidthMeasureSpec = 0;
-        int childHeightMeasureSpec = 0;
+        int childWidthMeasureSpec;
+        int childHeightMeasureSpec;
 
         if (lc.width == LayoutConfig.MATCH_CONTENT) {
             childWidthMeasureSpec = EstimateSpec.getSizeWithMode(lc.width, EstimateSpec.NOT_EXCEED);
diff --git a/UI/JsAdaptivePortalList/entry/src/main/js/default/pages/index/index.hml b/UI/JsAdaptivePortalList/entry/src/main/js/default/pages/index/index.hml
index 6c1d75d3d3..207a20f0dd 100644
--- a/UI/JsAdaptivePortalList/entry/src/main/js/default/pages/index/index.hml
+++ b/UI/JsAdaptivePortalList/entry/src/main/js/default/pages/index/index.hml
@@ -18,7 +18,7 @@
     <div class="bottom-bar-wrapper" if="{{ isTabletLandscape }}" >
         <tab-bar-group for="{{ tabBars }}" icon="{{ $item.icon }}" text="{{ $item.text }}" active="{{ $idx == menu_tabs_index }}"></tab-bar-group>
     </div>
-    <div class="div-content" index="{{ menu_tabs_index }}">
+    <div class="div-content">
         <div class="top-tool-bar">
             <image class="toolbar-image-add" src="/common/images/add.png" ></image>
             <image class="toolbar-image-add" src="/common/images/add.png" ></image>
diff --git a/UI/JsAnimation/entry/src/main/js/default/pages/index/index.hml b/UI/JsAnimation/entry/src/main/js/default/pages/index/index.hml
index 5b8f54a516..5ebc450909 100644
--- a/UI/JsAnimation/entry/src/main/js/default/pages/index/index.hml
+++ b/UI/JsAnimation/entry/src/main/js/default/pages/index/index.hml
@@ -39,31 +39,31 @@
             <video if="{{videomove_3}}" id="video2_1" class="videosmall {{video_center}}"
                     src="/common/animator/butterfly.mp4" controls="false" autoplay="true"
                     onfinish="playComplete2"></video>
-            <image if="{{imgflag[0]}}" showshadow="{{shadow}}" class="img {{img0}}" style="box-shadow: 0 0 20 0;"
+            <image if="{{imgflag[0]}}" class="img {{img0}}" style="box-shadow: 0 0 20 0;"
                     src="/common/gallery/001.png"></image>
-            <image if="{{imgflag[1]}}" showshadow="{{shadow}}" class="img {{img1}}" style="box-shadow: 20 20 20;"
+            <image if="{{imgflag[1]}}" class="img {{img1}}" style="box-shadow: 20 20 20;"
                     src="/common/gallery/002.png"></image>
-            <image if="{{imgflag[2]}}" showshadow="{{shadow}}" class="img {{img2}}" style="box-shadow: 0 0 20;"
+            <image if="{{imgflag[2]}}" class="img {{img2}}" style="box-shadow: 0 0 20;"
                     src="/common/gallery/003.png"></image>
-            <image if="{{imgflag[3]}}" showshadow="{{shadow}}" class="img {{img3}}" style="box-shadow: 20 20 20;"
+            <image if="{{imgflag[3]}}" class="img {{img3}}" style="box-shadow: 20 20 20;"
                     src="/common/gallery/004.png"></image>
-            <image if="{{imgflag[4]}}" showshadow="{{shadow}}" class="img {{img4}}" style="box-shadow: 0 0 20;"
+            <image if="{{imgflag[4]}}" class="img {{img4}}" style="box-shadow: 0 0 20;"
                     src="/common/gallery/005.png"></image>
-            <image if="{{imgflag[5]}}" showshadow="{{shadow}}" class="img {{img5}}" style="box-shadow: 20 20 20;"
+            <image if="{{imgflag[5]}}" class="img {{img5}}" style="box-shadow: 20 20 20;"
                     src="/common/gallery/006.png"></image>
-            <image if="{{imgflag[6]}}" showshadow="{{shadow}}" class="img {{img6}}" style="box-shadow: 0 0 20;"
+            <image if="{{imgflag[6]}}" class="img {{img6}}" style="box-shadow: 0 0 20;"
                     src="/common/gallery/006.png"></image>
-            <image if="{{imgflag[7]}}" showshadow="{{shadow}}" class="img {{img7}}" style="box-shadow: 20 20 20;"
+            <image if="{{imgflag[7]}}" class="img {{img7}}" style="box-shadow: 20 20 20;"
                     src="/common/gallery/008.png"></image>
-            <image if="{{imgflag[8]}}" showshadow="{{shadow}}" class="img {{img8}}" style="box-shadow: 0 0 20;"
+            <image if="{{imgflag[8]}}" class="img {{img8}}" style="box-shadow: 0 0 20;"
                     src="/common/gallery/009.png"></image>
-            <image if="{{imgflag[9]}}" showshadow="{{shadow}}" class="img {{img9}}" style="box-shadow: 20 20 20;"
+            <image if="{{imgflag[9]}}" class="img {{img9}}" style="box-shadow: 20 20 20;"
                     src="/common/gallery/010.png"></image>
-            <text class="text1" showshadow="{{shadow}}" show="{{flag1}}">
+            <text class="text1" show="{{flag1}}">
                 Harmony OS Harmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OS
                 Harmony OSHarmony OSHarmony
             </text>
-            <text class="text2" showshadow="{{shadow}}" show="{{flag2}}">
+            <text class="text2" show="{{flag2}}">
                 Harmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OS
                 Harmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OS
                 Harmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OSHarmony OS
diff --git a/UI/JsAnimation/entry/src/main/js/default/pages/index/index.js b/UI/JsAnimation/entry/src/main/js/default/pages/index/index.js
index 7e181f94c5..73d8916200 100644
--- a/UI/JsAnimation/entry/src/main/js/default/pages/index/index.js
+++ b/UI/JsAnimation/entry/src/main/js/default/pages/index/index.js
@@ -45,6 +45,7 @@ export default {
         shadow: true
     },
     onInit() {
+        console.info("ssss"+ JSON.stringify(animatordata.videoopa))
         this.pass = this.pass;
         if (this.pass === true) {
             if (this.message[0] == 1) {
diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.css b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.css
index d11b181cb5..fce3ae36db 100644
--- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.css
+++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.css
@@ -19,7 +19,7 @@
     background-color: #EBFFD7;
 }
 .div {
-    height: 600px;
+    height: 100%;
     flex-direction: column;
     align-items: center;
     justify-content: center;
diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.hml
index c4cb433431..513b0dc3f9 100644
--- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.hml
+++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/transitions/cardtargetpage/cardtargetpage.hml
@@ -15,6 +15,6 @@
 
 <div class="container">
     <div class="div">
-        <text style="font-size: 30px" on:click="jumpBack">{{ $t('strings.detail') }}</text>
+        <text style="font-size: 30px; width: 100%;height: 100%;" on:click="jumpBack">{{ $t('strings.detail') }}</text>
     </div>
 </div>
\ No newline at end of file
diff --git a/UI/JsCallJava/entry/src/main/js/default/common/css/common.css b/UI/JsCallJava/entry/src/main/js/default/common/css/common.css
index 8a27ea7474..a1bf8623ec 100644
--- a/UI/JsCallJava/entry/src/main/js/default/common/css/common.css
+++ b/UI/JsCallJava/entry/src/main/js/default/common/css/common.css
@@ -18,12 +18,6 @@
     background-color: white;
 }
 
-.nav-bar {
-    background-color: #1976D2;
-    title-color: white;
-    subtitle-color: #BBDEFB;
-}
-
 .rounded {
     border-radius: 1px;
     margin-right: 1px;
diff --git a/UI/JsComponents/entry/src/main/js/default/pages/index/index.js b/UI/JsComponents/entry/src/main/js/default/pages/index/index.js
index 844b662f5e..3381451bbe 100644
--- a/UI/JsComponents/entry/src/main/js/default/pages/index/index.js
+++ b/UI/JsComponents/entry/src/main/js/default/pages/index/index.js
@@ -70,16 +70,16 @@ export default {
     keyDown: function () {
         this.down = 'down keyed';
     },
-    touchCancel: function (event) {
+    touchCancel: function () {
         this.touchcancel = 'canceled';
     },
-    touchEnd: function (event) {
+    touchEnd: function () {
         this.touchend = 'ended';
     },
-    touchMove: function (event) {
+    touchMove: function () {
         this.touchmove = 'moved';
     },
-    touchStart: function (event) {
+    touchStart: function () {
         this.touchstart = 'touched';
     },
     longPress: function () {
diff --git a/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/ClockAbility.java b/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/ClockAbility.java
index 105bc8e5bd..2a91661f54 100644
--- a/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/ClockAbility.java
+++ b/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/ClockAbility.java
@@ -47,7 +47,7 @@ public class ClockAbility extends Ability {
 
     private OrmContext connect;
 
-    private DatabaseHelper helper = new DatabaseHelper(this);
+    private final DatabaseHelper helper = new DatabaseHelper(this);
 
     @Override
     public void onStart(Intent intent) {
@@ -77,7 +77,7 @@ public class ClockAbility extends Ability {
             return providerFormInfo;
         }
 
-        long formId = INVALID_FORM_ID;
+        long formId;
         if (intent.hasParameter(AbilitySlice.PARAM_FORM_IDENTITY_KEY)) {
             formId = intent.getLongParam(AbilitySlice.PARAM_FORM_IDENTITY_KEY, INVALID_FORM_ID);
         } else {
diff --git a/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/MainAbility.java b/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/MainAbility.java
index ad92e869bc..fcc2bf5598 100644
--- a/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/MainAbility.java
+++ b/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/MainAbility.java
@@ -81,7 +81,7 @@ public class MainAbility extends Ability {
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         byte[] bytes = new byte[CACHE_SIZE];
         try {
-            int len = 0;
+            int len;
             while (-1 != (len = resource.read(bytes))) {
                 byteArrayOutputStream.write(bytes, 0, len);
             }
diff --git a/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/TimerAbility.java b/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/TimerAbility.java
index d8c0d21fea..035f683923 100644
--- a/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/TimerAbility.java
+++ b/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/TimerAbility.java
@@ -48,7 +48,7 @@ public class TimerAbility extends Ability {
 
     private OrmContext connect;
 
-    private DatabaseHelper helper = new DatabaseHelper(this);
+    private final DatabaseHelper helper = new DatabaseHelper(this);
 
     @Override
     public void onStart(Intent intent) {
diff --git a/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/slice/ClockAbilitySlice.java b/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/slice/ClockAbilitySlice.java
index fb3abe9cda..c0b811c642 100644
--- a/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/slice/ClockAbilitySlice.java
+++ b/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/slice/ClockAbilitySlice.java
@@ -42,18 +42,16 @@ public class ClockAbilitySlice extends AbilitySlice {
 
     private Timer timer;
 
-    private EventRunner eventRunner;
-
     private MyEventHandler myEventHandler;
 
-    private Runnable runnable = new Runnable() {
+    private final Runnable runnable = new Runnable() {
         @Override
         public void run() {
             initHandler();
         }
 
         private void initHandler() {
-            eventRunner = EventRunner.getMainEventRunner();
+            EventRunner eventRunner = EventRunner.getMainEventRunner();
             if (eventRunner == null) {
                 return;
             }
diff --git a/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/utils/DateUtils.java b/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/utils/DateUtils.java
index eed2e895fd..1a868977a7 100644
--- a/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/utils/DateUtils.java
+++ b/UI/JsFACard/entry/src/main/java/ohos/samples/jsfacard/utils/DateUtils.java
@@ -39,8 +39,7 @@ public class DateUtils {
     public static String getCurrentDate(String format) {
         DateFormat dateFormat = new SimpleDateFormat(format);
         Date date = new Date();
-        String formatDate = dateFormat.format(date);
-        return formatDate;
+        return dateFormat.format(date);
     }
 
     /**
diff --git a/UI/JsGallery/entry/src/main/js/default/pages/index/index.hml b/UI/JsGallery/entry/src/main/js/default/pages/index/index.hml
index 14ba407921..b9c79015a2 100644
--- a/UI/JsGallery/entry/src/main/js/default/pages/index/index.hml
+++ b/UI/JsGallery/entry/src/main/js/default/pages/index/index.hml
@@ -23,7 +23,6 @@
         </div>
     </div>
     <list id="imglist" style="columns: {{columns}};" cachedcount="100" onrequestitem="buildItem"
-            beginindex="{{this.beginIndex}}" endindex="{{this.endIndex}}" repeatedlength="{{repeatedlength}}"
             onscrolltop="scrollTop" onscrollbottom="scrollBottom" ontouchstart="touchStart">
         <list-item type="common" for="{{tempList}}" style="flex-direction: column;">
             <image class="imgs" src="{{$item.SourceFile}}" data="{{$item.SourceFile}}" onclick="redirect"
diff --git a/UI/JsList/build.gradle b/UI/JsList/build.gradle
index c77bab38c2..c9d9b623cc 100644
--- a/UI/JsList/build.gradle
+++ b/UI/JsList/build.gradle
@@ -1,6 +1,17 @@
 apply plugin: 'com.huawei.ohos.app'
 
 ohos {
+    signingConfigs {
+        release {
+            storeFile file('D:\\HAP_Sign\\app.p12')
+            storePassword '0000001B11F61FBD130CDFB3549D1468E4F2382B2B46CC4DA934D6A0E2512ECF3D2BD44E1649051217D235'
+            keyAlias = 'app'
+            keyPassword '0000001B8A906A7BB7BC2CFCFBD41A85B150D66423537755513637789CF1FC3126EADF0C2B3BA4CC427A37'
+            signAlg = 'SHA256withECDSA'
+            profile file('D:\\HAP_Sign\\Profile\\jslist.p7b')
+            certpath file('D:\\HAP_Sign\\app.cer')
+        }
+    }
     compileSdkVersion 7
     supportSystem "standard"
 }
diff --git a/UI/JsList/settings.gradle b/UI/JsList/settings.gradle
new file mode 100644
index 0000000000..4773db7323
--- /dev/null
+++ b/UI/JsList/settings.gradle
@@ -0,0 +1 @@
+include ':entry'
diff --git a/UI/JsShopping/entry/src/main/js/default/pages/homePage/microAmoy/microAmoy.hml b/UI/JsShopping/entry/src/main/js/default/pages/homePage/microAmoy/microAmoy.hml
index 3d2734e4dd..010d09bc3a 100644
--- a/UI/JsShopping/entry/src/main/js/default/pages/homePage/microAmoy/microAmoy.hml
+++ b/UI/JsShopping/entry/src/main/js/default/pages/homePage/microAmoy/microAmoy.hml
@@ -13,7 +13,7 @@
   limitations under the License.
  -->
 <div class="container">
-     <list class="list" scrollbar="off" shapemode="rect" scrolleffect="fade" cachedcount="5" onrequestitem="buildItem" beginindex="{{this.beginIndex}}" endindex="{{this.endIndex}}" repeatedlength="700" indexoffset="2">
+     <list class="list" scrollbar="off" shapemode="rect" scrolleffect="fade" cachedcount="5" onrequestitem="buildItem">
         <list-item type="top" class="listitem-title">
             <div class="top-listitem">
                  <text class="top-text">商城</text>
diff --git a/UI/List/entry/src/main/resources/base/layout/list_item.xml b/UI/List/entry/src/main/resources/base/layout/list_item.xml
index 1a059c58c1..78bcb275e8 100644
--- a/UI/List/entry/src/main/resources/base/layout/list_item.xml
+++ b/UI/List/entry/src/main/resources/base/layout/list_item.xml
@@ -31,7 +31,8 @@
 
         <Text
             ohos:id="$+id:name"
-            ohos:left_margin="15vp"
+            ohos:start_margin="15vp"
+            ohos:end_margin="0vp"
             ohos:width="0px"
             ohos:layout_alignment="vertical_center"
             ohos:weight="1"
diff --git a/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/MyApplication.java b/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/MyApplication.java
deleted file mode 100644
index d82ee4bc2e..0000000000
--- a/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/MyApplication.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ohos.samples.multimodeinput;
-
-import ohos.aafwk.ability.AbilityPackage;
-
-/**
- * MyApplication
- *
- * @since 2021-05-20
- */
-public class MyApplication extends AbilityPackage {
-    @Override
-    public void onInitialize() {
-        super.onInitialize();
-    }
-}
diff --git a/UI/MultiModeInput/entry/src/main/resources/base/layout/first_main_ability_slice.xml b/UI/MultiModeInput/entry/src/main/resources/base/layout/first_main_ability_slice.xml
index a78c91629a..206639a494 100644
--- a/UI/MultiModeInput/entry/src/main/resources/base/layout/first_main_ability_slice.xml
+++ b/UI/MultiModeInput/entry/src/main/resources/base/layout/first_main_ability_slice.xml
@@ -25,12 +25,12 @@
         ohos:text="$string:touch_button"
         ohos:background_element="$graphic:button_bg"
         ohos:text_size="$float:button_text_size"
-        ohos:left_margin="$float:button_margin"
-        ohos:right_margin="$float:button_margin"
+        ohos:start_margin="$float:button_margin"
+        ohos:end_margin="$float:button_margin"
         ohos:top_margin="$float:button_margin"
         ohos:bottom_margin="$float:button_margin"
-        ohos:right_padding="$float:button_margin"
-        ohos:left_padding="$float:button_margin"
+        ohos:end_padding="$float:button_margin"
+        ohos:start_padding="$float:button_margin"
         ohos:enabled="true"
         ohos:layout_alignment="center"
         ohos:id="$+id:touch_event_button"/>
diff --git a/UI/MultiModeInput/entry/src/main/resources/base/layout/key_main_ability_slice.xml b/UI/MultiModeInput/entry/src/main/resources/base/layout/key_main_ability_slice.xml
index 4a567f1c85..fc6b2457b0 100644
--- a/UI/MultiModeInput/entry/src/main/resources/base/layout/key_main_ability_slice.xml
+++ b/UI/MultiModeInput/entry/src/main/resources/base/layout/key_main_ability_slice.xml
@@ -26,12 +26,12 @@
         ohos:text_color="#FFF61010"
         ohos:text_alignment="center"
         ohos:text_size="$float:button_text_size"
-        ohos:left_margin="$float:button_margin"
-        ohos:right_margin="$float:button_margin"
+        ohos:start_margin="$float:button_margin"
+        ohos:end_margin="$float:button_margin"
         ohos:top_margin="$float:button_margin"
         ohos:bottom_margin="$float:button_margin"
-        ohos:right_padding="$float:button_margin"
-        ohos:left_padding="$float:button_margin"
+        ohos:end_padding="$float:button_margin"
+        ohos:start_padding="$float:button_margin"
         ohos:enabled="true"
         ohos:layout_alignment="center"
         ohos:id="$+id:key_event_text"/>
diff --git a/UI/MultiModeInput/entry/src/main/resources/base/layout/main_ability_slice.xml b/UI/MultiModeInput/entry/src/main/resources/base/layout/main_ability_slice.xml
index 3c4b32806d..99a6d75445 100644
--- a/UI/MultiModeInput/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/UI/MultiModeInput/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -25,12 +25,12 @@
         ohos:text="$string:touch_event"
         ohos:text_size="$float:button_text_size"
         ohos:background_element="$graphic:button_bg"
-        ohos:left_margin="$float:button_margin"
-        ohos:right_margin="$float:button_margin"
+        ohos:start_margin="$float:button_margin"
+        ohos:end_margin="$float:button_margin"
         ohos:top_margin="$float:button_margin"
         ohos:bottom_margin="$float:button_margin"
-        ohos:right_padding="$float:button_margin"
-        ohos:left_padding="$float:button_margin"
+        ohos:end_padding="$float:button_margin"
+        ohos:start_padding="$float:button_margin"
         ohos:layout_alignment="center"
         ohos:id="$+id:touchEvent"/>
 
@@ -40,11 +40,11 @@
         ohos:text="$string:key_event"
         ohos:text_size="$float:button_text_size"
         ohos:background_element="$graphic:button_bg"
-        ohos:left_margin="$float:button_margin"
-        ohos:right_margin="$float:button_margin"
+        ohos:start_margin="$float:button_margin"
+        ohos:end_margin="$float:button_margin"
         ohos:bottom_margin="$float:button_margin"
-        ohos:right_padding="$float:button_margin"
-        ohos:left_padding="$float:button_margin"
+        ohos:end_padding="$float:button_margin"
+        ohos:start_padding="$float:button_margin"
         ohos:layout_alignment="center"
         ohos:id="$+id:keyEvent"/>
 
@@ -54,11 +54,11 @@
         ohos:text="$string:mouse_event"
         ohos:text_size="$float:button_text_size"
         ohos:background_element="$graphic:button_bg"
-        ohos:left_margin="$float:button_margin"
-        ohos:right_margin="$float:button_margin"
+        ohos:start_margin="$float:button_margin"
+        ohos:end_margin="$float:button_margin"
         ohos:bottom_margin="$float:button_margin"
-        ohos:right_padding="$float:button_margin"
-        ohos:left_padding="$float:button_margin"
+        ohos:end_padding="$float:button_margin"
+        ohos:start_padding="$float:button_margin"
         ohos:layout_alignment="center"
         ohos:id="$+id:mouseEvent"/>
 
@@ -68,11 +68,11 @@
         ohos:text="$string:speech_event"
         ohos:text_size="$float:button_text_size"
         ohos:background_element="$graphic:button_bg"
-        ohos:left_margin="$float:button_margin"
-        ohos:right_margin="$float:button_margin"
+        ohos:start_margin="$float:button_margin"
+        ohos:end_margin="$float:button_margin"
         ohos:bottom_margin="$float:button_margin"
-        ohos:right_padding="$float:button_margin"
-        ohos:left_padding="$float:button_margin"
+        ohos:end_padding="$float:button_margin"
+        ohos:start_padding="$float:button_margin"
         ohos:layout_alignment="center"
         ohos:id="$+id:speechEvent"/>
 </DirectionalLayout>
\ No newline at end of file
diff --git a/UI/MultiModeInput/entry/src/main/resources/base/layout/mouse_ability_slice.xml b/UI/MultiModeInput/entry/src/main/resources/base/layout/mouse_ability_slice.xml
index 3a033dd340..310be3a10a 100644
--- a/UI/MultiModeInput/entry/src/main/resources/base/layout/mouse_ability_slice.xml
+++ b/UI/MultiModeInput/entry/src/main/resources/base/layout/mouse_ability_slice.xml
@@ -25,12 +25,12 @@
         ohos:text="$string:mouse_button"
         ohos:background_element="$graphic:button_bg"
         ohos:text_size="$float:button_text_size"
-        ohos:left_margin="$float:button_margin"
-        ohos:right_margin="$float:button_margin"
+        ohos:start_margin="$float:button_margin"
+        ohos:end_margin="$float:button_margin"
         ohos:top_margin="$float:button_margin"
         ohos:bottom_margin="$float:button_margin"
-        ohos:right_padding="$float:button_margin"
-        ohos:left_padding="$float:button_margin"
+        ohos:end_padding="$float:button_margin"
+        ohos:start_padding="$float:button_margin"
         ohos:enabled="true"
         ohos:layout_alignment="center"
         ohos:id="$+id:mouse_event_button"/>
diff --git a/UI/MultiModeInput/entry/src/main/resources/base/layout/second_main_ability_slice.xml b/UI/MultiModeInput/entry/src/main/resources/base/layout/second_main_ability_slice.xml
index df0de1286d..38713b62e8 100644
--- a/UI/MultiModeInput/entry/src/main/resources/base/layout/second_main_ability_slice.xml
+++ b/UI/MultiModeInput/entry/src/main/resources/base/layout/second_main_ability_slice.xml
@@ -25,12 +25,12 @@
         ohos:text="$string:speech_button"
         ohos:background_element="$graphic:button_bg"
         ohos:text_size="$float:button_text_size"
-        ohos:left_margin="$float:button_margin"
-        ohos:right_margin="$float:button_margin"
+        ohos:start_margin="$float:button_margin"
+        ohos:end_margin="$float:button_margin"
         ohos:top_margin="$float:button_margin"
         ohos:bottom_margin="$float:button_margin"
-        ohos:right_padding="$float:button_margin"
-        ohos:left_padding="$float:button_margin"
+        ohos:end_padding="$float:button_margin"
+        ohos:start_padding="$float:button_margin"
         ohos:enabled="true"
         ohos:layout_alignment="center"
         ohos:id="$+id:speech_event_button"/>
diff --git a/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/MyApplication.java b/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/MyApplication.java
deleted file mode 100644
index d31a6d0181..0000000000
--- a/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/MyApplication.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ohos.samples.multimodalevent;
-
-import ohos.aafwk.ability.AbilityPackage;
-
-/**
- * MyApplication
- *
- * @since 2021-05-24
- */
-public class MyApplication extends AbilityPackage {
-    @Override
-    public void onInitialize() {
-        super.onInitialize();
-    }
-}
diff --git a/UI/MultimodalEvent/entry/src/main/resources/base/layout/common_event_ability_slice.xml b/UI/MultimodalEvent/entry/src/main/resources/base/layout/common_event_ability_slice.xml
index d2c748c693..110f3a72d9 100644
--- a/UI/MultimodalEvent/entry/src/main/resources/base/layout/common_event_ability_slice.xml
+++ b/UI/MultimodalEvent/entry/src/main/resources/base/layout/common_event_ability_slice.xml
@@ -27,12 +27,12 @@
         ohos:text_color="#FFF61010"
         ohos:text_alignment="center"
         ohos:text_size="$float:button_text_size"
-        ohos:left_margin="$float:button_margin"
-        ohos:right_margin="$float:button_margin"
+        ohos:start_margin="$float:button_margin"
+        ohos:end_margin="$float:button_margin"
         ohos:top_margin="$float:button_margin"
         ohos:bottom_margin="$float:button_margin"
-        ohos:right_padding="$float:button_margin"
-        ohos:left_padding="$float:button_margin"
+        ohos:end_padding="$float:button_margin"
+        ohos:start_padding="$float:button_margin"
         ohos:enabled="true"
         ohos:layout_alignment="center"
         ohos:id="$+id:common_event_text"/>
diff --git a/UI/MultimodalEvent/entry/src/main/resources/base/layout/main_ability_slice.xml b/UI/MultimodalEvent/entry/src/main/resources/base/layout/main_ability_slice.xml
index f8b4fbc387..f809058b5a 100644
--- a/UI/MultimodalEvent/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/UI/MultimodalEvent/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -25,12 +25,12 @@
         ohos:text="$string:touch_event_handle"
         ohos:text_size="$float:button_text_size"
         ohos:background_element="$graphic:button_bg"
-        ohos:left_margin="$float:button_margin"
-        ohos:right_margin="$float:button_margin"
+        ohos:start_margin="$float:button_margin"
+        ohos:end_margin="$float:button_margin"
         ohos:top_margin="$float:button_margin"
         ohos:bottom_margin="$float:button_margin"
-        ohos:right_padding="$float:button_margin"
-        ohos:left_padding="$float:button_margin"
+        ohos:end_padding="$float:button_margin"
+        ohos:start_padding="$float:button_margin"
         ohos:layout_alignment="center"
         ohos:id="$+id:touch_event"/>
 
@@ -40,11 +40,11 @@
         ohos:text="$string:key_event_handle"
         ohos:text_size="$float:button_text_size"
         ohos:background_element="$graphic:button_bg"
-        ohos:left_margin="$float:button_margin"
-        ohos:right_margin="$float:button_margin"
+        ohos:start_margin="$float:button_margin"
+        ohos:end_margin="$float:button_margin"
         ohos:bottom_margin="$float:button_margin"
-        ohos:right_padding="$float:button_margin"
-        ohos:left_padding="$float:button_margin"
+        ohos:end_padding="$float:button_margin"
+        ohos:start_padding="$float:button_margin"
         ohos:layout_alignment="center"
         ohos:id="$+id:key_event"/>
 
@@ -54,11 +54,11 @@
         ohos:text="$string:common_event_handle"
         ohos:text_size="$float:button_text_size"
         ohos:background_element="$graphic:button_bg"
-        ohos:left_margin="$float:button_margin"
-        ohos:right_margin="$float:button_margin"
+        ohos:start_margin="$float:button_margin"
+        ohos:end_margin="$float:button_margin"
         ohos:bottom_margin="$float:button_margin"
-        ohos:right_padding="$float:button_margin"
-        ohos:left_padding="$float:button_margin"
+        ohos:end_padding="$float:button_margin"
+        ohos:start_padding="$float:button_margin"
         ohos:layout_alignment="center"
         ohos:id="$+id:common_event"/>
 
@@ -68,11 +68,11 @@
         ohos:text="$string:media_event_handle"
         ohos:text_size="$float:button_text_size"
         ohos:background_element="$graphic:button_bg"
-        ohos:left_margin="$float:button_margin"
-        ohos:right_margin="$float:button_margin"
+        ohos:start_margin="$float:button_margin"
+        ohos:end_margin="$float:button_margin"
         ohos:bottom_margin="$float:button_margin"
-        ohos:right_padding="$float:button_margin"
-        ohos:left_padding="$float:button_margin"
+        ohos:end_padding="$float:button_margin"
+        ohos:start_padding="$float:button_margin"
         ohos:layout_alignment="center"
         ohos:id="$+id:media_event"/>
 
@@ -82,11 +82,11 @@
         ohos:text="$string:system_event_handle"
         ohos:text_size="$float:button_text_size"
         ohos:background_element="$graphic:button_bg"
-        ohos:left_margin="$float:button_margin"
-        ohos:right_margin="$float:button_margin"
+        ohos:start_margin="$float:button_margin"
+        ohos:end_margin="$float:button_margin"
         ohos:bottom_margin="$float:button_margin"
-        ohos:right_padding="$float:button_margin"
-        ohos:left_padding="$float:button_margin"
+        ohos:end_padding="$float:button_margin"
+        ohos:start_padding="$float:button_margin"
         ohos:layout_alignment="center"
         ohos:id="$+id:system_event"/>
 
@@ -96,11 +96,11 @@
         ohos:text="$string:telephone_event_handle"
         ohos:text_size="$float:button_text_size"
         ohos:background_element="$graphic:button_bg"
-        ohos:left_margin="$float:button_margin"
-        ohos:right_margin="$float:button_margin"
+        ohos:start_margin="$float:button_margin"
+        ohos:end_margin="$float:button_margin"
         ohos:bottom_margin="$float:button_margin"
-        ohos:right_padding="$float:button_margin"
-        ohos:left_padding="$float:button_margin"
+        ohos:end_padding="$float:button_margin"
+        ohos:start_padding="$float:button_margin"
         ohos:layout_alignment="center"
         ohos:id="$+id:telephone_event"/>
 </DirectionalLayout>
\ No newline at end of file
diff --git a/UI/MultimodalEvent/entry/src/main/resources/base/layout/tel_event_ability_slice.xml b/UI/MultimodalEvent/entry/src/main/resources/base/layout/tel_event_ability_slice.xml
index 67ee57cd22..17fb07ad1e 100644
--- a/UI/MultimodalEvent/entry/src/main/resources/base/layout/tel_event_ability_slice.xml
+++ b/UI/MultimodalEvent/entry/src/main/resources/base/layout/tel_event_ability_slice.xml
@@ -43,8 +43,8 @@
             ohos:text_size="20fp"
             ohos:background_element="$graphic:button_bg"
             ohos:text="$string:two"
-            ohos:left_margin="5vp"
-            ohos:right_margin="5vp"
+            ohos:start_margin="5vp"
+            ohos:end_margin="5vp"
             ohos:text_alignment="center"/>
 
         <Button
@@ -74,8 +74,8 @@
             ohos:width="60vp"
             ohos:height="60vp"
             ohos:text_size="20fp"
-            ohos:left_margin="5vp"
-            ohos:right_margin="5vp"
+            ohos:start_margin="5vp"
+            ohos:end_margin="5vp"
             ohos:background_element="$graphic:button_bg"
             ohos:text="$string:five"
             ohos:text_alignment="center"/>
@@ -107,8 +107,8 @@
             ohos:width="60vp"
             ohos:height="60vp"
             ohos:text_size="20fp"
-            ohos:left_margin="5vp"
-            ohos:right_margin="5vp"
+            ohos:start_margin="5vp"
+            ohos:end_margin="5vp"
             ohos:background_element="$graphic:button_bg"
             ohos:text="$string:eight"
             ohos:text_alignment="center"/>
@@ -140,8 +140,8 @@
             ohos:width="60vp"
             ohos:height="60vp"
             ohos:text_size="20fp"
-            ohos:left_margin="5vp"
-            ohos:right_margin="5vp"
+            ohos:start_margin="5vp"
+            ohos:end_margin="5vp"
             ohos:background_element="$graphic:button_bg"
             ohos:text="$string:zero"
             ohos:text_alignment="center"/>
@@ -163,8 +163,8 @@
         ohos:bottom_margin="5vp"
         ohos:text_alignment="center"
         ohos:layout_alignment="horizontal_center"
-        ohos:left_padding="30vp"
-        ohos:right_padding="30vp"
+        ohos:start_padding="30vp"
+        ohos:end_padding="30vp"
         ohos:top_padding="2vp"
         ohos:bottom_padding="2vp"/>
 </DirectionalLayout>
\ No newline at end of file
diff --git a/UI/MultimodalEvent/entry/src/main/resources/base/layout/touch_event_ability_slice.xml b/UI/MultimodalEvent/entry/src/main/resources/base/layout/touch_event_ability_slice.xml
index 90ce8af04f..c35f9e34f6 100644
--- a/UI/MultimodalEvent/entry/src/main/resources/base/layout/touch_event_ability_slice.xml
+++ b/UI/MultimodalEvent/entry/src/main/resources/base/layout/touch_event_ability_slice.xml
@@ -25,12 +25,12 @@
         ohos:text="$string:touch_event"
         ohos:background_element="$graphic:button_bg"
         ohos:text_size="$float:button_text_size"
-        ohos:left_margin="$float:button_margin"
-        ohos:right_margin="$float:button_margin"
+        ohos:start_margin="$float:button_margin"
+        ohos:end_margin="$float:button_margin"
         ohos:top_margin="$float:button_margin"
         ohos:bottom_margin="$float:button_margin"
-        ohos:right_padding="$float:button_margin"
-        ohos:left_padding="$float:button_margin"
+        ohos:end_padding="$float:button_margin"
+        ohos:start_padding="$float:button_margin"
         ohos:enabled="true"
         ohos:layout_alignment="center"
         ohos:id="$+id:touch_event_button"/>
diff --git a/UI/PositionLayout/entry/src/main/resources/base/layout/position_layout.xml b/UI/PositionLayout/entry/src/main/resources/base/layout/position_layout.xml
index 1c6ea005cf..349bce4798 100644
--- a/UI/PositionLayout/entry/src/main/resources/base/layout/position_layout.xml
+++ b/UI/PositionLayout/entry/src/main/resources/base/layout/position_layout.xml
@@ -23,7 +23,8 @@
             <Text
                     ohos:width="330vp"
                     ohos:height="35vp"
-                    ohos:left_margin="10vp"
+                    ohos:start_margin="10vp"
+                    ohos:end_margin="0vp"
                     ohos:text="$string:text_0"
                     ohos:text_alignment="center"
                     ohos:text_size="20fp"
@@ -32,7 +33,8 @@
             <Text
                     ohos:width="330vp"
                     ohos:height="35vp"
-                    ohos:left_margin="10vp"
+                    ohos:start_margin="10vp"
+                    ohos:end_margin="0vp"
                     ohos:top_margin="14vp"
                     ohos:text="$string:text_1"
                     ohos:text_alignment="center"
@@ -42,7 +44,8 @@
             <Text
                     ohos:width="330vp"
                     ohos:height="35vp"
-                    ohos:left_margin="10vp"
+                    ohos:start_margin="10vp"
+                    ohos:end_margin="0vp"
                     ohos:top_margin="14vp"
                     ohos:text="$string:text_2"
                     ohos:text_alignment="center"
@@ -52,7 +55,8 @@
             <Text
                     ohos:width="330vp"
                     ohos:height="35vp"
-                    ohos:left_margin="10vp"
+                    ohos:start_margin="10vp"
+                    ohos:end_margin="0vp"
                     ohos:top_margin="14vp"
                     ohos:bottom_margin="50vp"
                     ohos:text="$string:text_3"
@@ -64,9 +68,9 @@
             <Button
                     ohos:width="85vp"
                     ohos:height="43vp"
-                    ohos:left_margin="0vp"
+                    ohos:start_margin="0vp"
                     ohos:bottom_margin="7vp"
-                    ohos:right_margin="50vp"
+                    ohos:end_margin="50vp"
                     ohos:text="$string:btn_0"
                     ohos:text_size="17fp"
                     ohos:text_color="#ff000000"
@@ -75,7 +79,8 @@
                     ohos:width="85vp"
                     ohos:height="43vp"
                     ohos:bottom_margin="7vp"
-                    ohos:left_margin="36vp"
+                    ohos:start_margin="36vp"
+                    ohos:end_margin="0vp"
                     ohos:text="$string:btn_1"
                     ohos:text_size="17fp"
                     ohos:text_color="#ff000000"
@@ -84,7 +89,8 @@
                     ohos:width="85vp"
                     ohos:height="43vp"
                     ohos:bottom_margin="7vp"
-                    ohos:left_margin="72vp"
+                    ohos:start_margin="72vp"
+                    ohos:end_margin="0vp"
                     ohos:text="$string:btn_2"
                     ohos:text_size="17fp"
                     ohos:text_color="#ff000000"
@@ -93,7 +99,8 @@
                     ohos:width="85vp"
                     ohos:height="43vp"
                     ohos:bottom_margin="7vp"
-                    ohos:left_margin="108vp"
+                    ohos:start_margin="108vp"
+                    ohos:end_margin="0vp"
                     ohos:text="$string:btn_3"
                     ohos:text_size="17fp"
                     ohos:text_color="#ff000000"
@@ -102,7 +109,8 @@
                     ohos:width="85vp"
                     ohos:height="43vp"
                     ohos:bottom_margin="7vp"
-                    ohos:left_margin="144vp"
+                    ohos:start_margin="144vp"
+                    ohos:end_margin="0vp"
                     ohos:text="$string:btn_4"
                     ohos:text_size="17fp"
                     ohos:text_color="#ff000000"
@@ -111,7 +119,8 @@
                     ohos:width="85vp"
                     ohos:height="43vp"
                     ohos:bottom_margin="7vp"
-                    ohos:left_margin="178vp"
+                    ohos:start_margin="178vp"
+                    ohos:end_margin="0vp"
                     ohos:text="$string:btn_5"
                     ohos:text_size="17fp"
                     ohos:text_color="#ff000000"
@@ -120,7 +129,8 @@
                     ohos:width="85vp"
                     ohos:height="43vp"
                     ohos:bottom_margin="7vp"
-                    ohos:left_margin="216vp"
+                    ohos:start_margin="216vp"
+                    ohos:end_margin="0vp"
                     ohos:text="$string:btn_6"
                     ohos:text_size="17fp"
                     ohos:text_color="#ff000000"
@@ -129,7 +139,8 @@
                     ohos:width="85vp"
                     ohos:height="43vp"
                     ohos:bottom_margin="7vp"
-                    ohos:left_margin="252vp"
+                    ohos:start_margin="252vp"
+                    ohos:end_margin="0vp"
                     ohos:text="$string:btn_7"
                     ohos:text_size="17fp"
                     ohos:text_color="#ff000000"
@@ -138,7 +149,8 @@
                     ohos:width="85vp"
                     ohos:height="43vp"
                     ohos:bottom_margin="7vp"
-                    ohos:left_margin="288vp"
+                    ohos:start_margin="288vp"
+                    ohos:end_margin="0vp"
                     ohos:text="$string:btn_8"
                     ohos:text_size="17fp"
                     ohos:text_color="#ff000000"
@@ -147,7 +159,8 @@
                     ohos:width="85vp"
                     ohos:height="43vp"
                     ohos:bottom_margin="7vp"
-                    ohos:left_margin="324vp"
+                    ohos:start_margin="324vp"
+                    ohos:end_margin="0vp"
                     ohos:text="$string:btn_9"
                     ohos:text_size="17fp"
                     ohos:text_color="#ff000000"
diff --git a/UI/ProgressBar/entry/src/main/java/ohos/samples/progress/utils/LogUtil.java b/UI/ProgressBar/entry/src/main/java/ohos/samples/progress/utils/LogUtil.java
index 5b131c44f4..27e5b2b8aa 100644
--- a/UI/ProgressBar/entry/src/main/java/ohos/samples/progress/utils/LogUtil.java
+++ b/UI/ProgressBar/entry/src/main/java/ohos/samples/progress/utils/LogUtil.java
@@ -44,33 +44,4 @@ public class LogUtil {
         HiLog.debug(LABEL_LOG, LOG_FORMAT, tag, msg);
     }
 
-    /**
-     * Print info log
-     *
-     * @param tag log tag
-     * @param msg log message
-     */
-    public static void info(String tag, String msg) {
-        HiLog.info(LABEL_LOG, 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
-     *
-     * @param tag log tag
-     * @param msg log message
-     */
-    public static void error(String tag, String msg) {
-        HiLog.error(LABEL_LOG, LOG_FORMAT, tag, msg);
-    }
 }
diff --git a/UI/ProgressBar/entry/src/main/resources/base/layout/main_ability_slice.xml b/UI/ProgressBar/entry/src/main/resources/base/layout/main_ability_slice.xml
index 07333c08bc..9ec0d79bd4 100644
--- a/UI/ProgressBar/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/UI/ProgressBar/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -25,7 +25,8 @@
         ohos:top_margin="30vp"
         ohos:text_size="15fp"
         ohos:padding="5vp"
-        ohos:left_margin="10vp"/>
+        ohos:start_margin="10vp"
+        ohos:end_margin="0vp"/>
 
     <DirectionalLayout
         ohos:orientation="horizontal"
@@ -38,8 +39,8 @@
             ohos:width="0vp"
             ohos:weight="1"
             ohos:height="match_content"
-            ohos:left_padding="10vp"
-            ohos:right_padding="10vp"
+            ohos:start_padding="10vp"
+            ohos:end_padding="10vp"
             ohos:progress="0"
             ohos:layout_alignment="vertical_center"/>
 
@@ -50,7 +51,8 @@
             ohos:text="$string:zero"
             ohos:text_size="15fp"
             ohos:padding="5vp"
-            ohos:right_margin="10vp"/>
+            ohos:start_margin="0vp"
+            ohos:end_margin="10vp"/>
     </DirectionalLayout>
 
     <Text
@@ -60,7 +62,8 @@
         ohos:top_margin="30vp"
         ohos:text_size="15fp"
         ohos:padding="5vp"
-        ohos:left_margin="10vp"/>
+        ohos:start_margin="10vp"
+        ohos:end_margin="0vp"/>
 
     <DirectionalLayout
         ohos:orientation="horizontal"
@@ -75,8 +78,8 @@
             ohos:height="match_content"
             ohos:max="100"
             ohos:progress="100"
-            ohos:left_padding="10vp"
-            ohos:right_padding="10vp"
+            ohos:start_padding="10vp"
+            ohos:end_padding="10vp"
             ohos:layout_alignment="vertical_center"/>
 
         <Text
@@ -86,7 +89,8 @@
             ohos:text="$string:hundred"
             ohos:text_size="15fp"
             ohos:padding="5vp"
-            ohos:right_margin="10vp"/>
+            ohos:start_margin="0vp"
+            ohos:end_margin="10vp"/>
     </DirectionalLayout>
 
     <Text
@@ -96,7 +100,8 @@
         ohos:top_margin="30vp"
         ohos:text_size="15fp"
         ohos:padding="5vp"
-        ohos:left_margin="10vp"/>
+        ohos:start_margin="10vp"
+        ohos:end_margin="0vp"/>
 
     <DirectionalLayout
         ohos:orientation="horizontal"
@@ -112,8 +117,8 @@
             ohos:max="10"
             ohos:min="1"
             ohos:progress="10"
-            ohos:left_padding="10vp"
-            ohos:right_padding="10vp"
+            ohos:start_padding="10vp"
+            ohos:end_padding="10vp"
             ohos:layout_alignment="vertical_center"/>
 
         <Text
@@ -123,7 +128,8 @@
             ohos:text="$string:ten"
             ohos:text_size="15fp"
             ohos:padding="5vp"
-            ohos:right_margin="10vp"/>
+            ohos:start_margin="0vp"
+            ohos:end_margin="10vp"/>
     </DirectionalLayout>
 
     <Button
@@ -132,9 +138,9 @@
         ohos:width="match_parent"
         ohos:height="match_content"
         ohos:padding="5vp"
-        ohos:left_margin="20vp"
+        ohos:start_margin="20vp"
         ohos:top_margin="20vp"
-        ohos:right_margin="20vp"
+        ohos:end_margin="20vp"
         ohos:background_element="#4169E1"
         ohos:text_size="20fp"/>
 
diff --git a/UI/Stack/entry/src/main/resources/base/element/string.json b/UI/Stack/entry/src/main/resources/base/element/string.json
index 0bae6bd40f..e3e4070992 100644
--- a/UI/Stack/entry/src/main/resources/base/element/string.json
+++ b/UI/Stack/entry/src/main/resources/base/element/string.json
@@ -1,8 +1,8 @@
 {
   "string": [
     {
-      "name": "entry_MainAbility",
-      "value": "entry_MainAbility"
+      "name": "app_name",
+      "value": "Stack"
     },
     {
       "name": "mainability_description",
diff --git a/UI/UiComponents/entry/package.json b/UI/UiComponents/entry/package.json
deleted file mode 100644
index 0967ef424b..0000000000
--- a/UI/UiComponents/entry/package.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/UI/UiComponents/entry/src/main/java/ohos/samples/uicomponents/utils/LogUtil.java b/UI/UiComponents/entry/src/main/java/ohos/samples/uicomponents/utils/LogUtil.java
index d45af5b533..21dd63f811 100644
--- a/UI/UiComponents/entry/src/main/java/ohos/samples/uicomponents/utils/LogUtil.java
+++ b/UI/UiComponents/entry/src/main/java/ohos/samples/uicomponents/utils/LogUtil.java
@@ -56,16 +56,6 @@ public class LogUtil {
         HiLog.info(LABEL_LOG, String.format(Locale.ROOT, LOG_FORMAT, tag, msg));
     }
 
-    /**
-     * Print warn log
-     *
-     * @param tag log tag
-     * @param msg log message
-     */
-    public static void warn(String tag, String msg) {
-        HiLog.warn(LABEL_LOG, String.format(Locale.ROOT, LOG_FORMAT, tag, msg));
-    }
-
     /**
      * Print error log
      *
diff --git a/UI/UserRegistration/entry/package.json b/UI/UserRegistration/entry/package.json
deleted file mode 100644
index 0967ef424b..0000000000
--- a/UI/UserRegistration/entry/package.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/UI/UserRegistration/entry/src/main/js/default/pages/success/success.js b/UI/UserRegistration/entry/src/main/js/default/pages/success/success.js
index 3c8249b97b..92057e7dfc 100644
--- a/UI/UserRegistration/entry/src/main/js/default/pages/success/success.js
+++ b/UI/UserRegistration/entry/src/main/js/default/pages/success/success.js
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-import prompt from '@system.prompt'
 import router from '@system.router'
 
 export default {
diff --git a/common/Clock/entry/src/main/js/default/pages/index/index.hml b/common/Clock/entry/src/main/js/default/pages/index/index.hml
index 09ce5976fc..61032a70c7 100644
--- a/common/Clock/entry/src/main/js/default/pages/index/index.hml
+++ b/common/Clock/entry/src/main/js/default/pages/index/index.hml
@@ -17,11 +17,11 @@
     <stack class="stack">
         <image src="/common/clock_bg.png" class="clock-bg"></image>
         <image src="/common/hour_hand.png" class="clock-hand"
-               style="transform : rotate({{ hour * 30 + minute / 2 }}deg);"></image>
+               style="transform : rotate({{ hour * 30 + minute / 2 }});"></image>
         <image src="/common/minute_hand.png" class="clock-hand"
-               style="transform : rotate({{ minute * 6 + second / 10 }}deg);"></image>
+               style="transform : rotate({{ minute * 6 + second / 10 }});"></image>
         <image src="/common/second_hand.png" class="clock-hand"
-               style="transform : rotate({{ second * 6 }}deg);"></image>
+               style="transform : rotate({{ second * 6 }});"></image>
     </stack>
     <text class="digit-clock">{{ hour }}:{{ minute }}:{{ second }}</text>
 </div>
\ No newline at end of file
diff --git a/common/DistributeCalc/entry/src/main/js/default/common/RemoteDeviceModel.js b/common/DistributeCalc/entry/src/main/js/default/common/RemoteDeviceModel.js
index 971fcd7b89..9a9bfbfc4b 100644
--- a/common/DistributeCalc/entry/src/main/js/default/common/RemoteDeviceModel.js
+++ b/common/DistributeCalc/entry/src/main/js/default/common/RemoteDeviceModel.js
@@ -86,9 +86,9 @@ export default class RemoteDeviceModel {
                 case 1:
                     if (self.deviceList.length > 0) {
                         var list = new Array();
-                        for (var i = 0; i < self.deviceList.length; i++) {
-                            if (self.deviceList[i].deviceId != data.device.deviceId) {
-                                list[i] = data.device;
+                        for (var j = 0; j < self.deviceList.length; j++) {
+                            if (self.deviceList[j].deviceId != data.device.deviceId) {
+                                list[j] = data.device;
                             }
                         }
                         self.deviceList = list;
@@ -121,7 +121,7 @@ export default class RemoteDeviceModel {
                 "appThumbnail": '',
                 "extraInfo": extraInfo
             };
-            self.deviceManager_.authenticateDevice(data.device, authParam, (err, data) => {
+            self.deviceManager_.authenticateDevice(data.device, authParam, (err) => {
                 if (err) {
                     console.info('Calc[RemoteDeviceModel] authenticateDevice error:' + JSON.stringify(err));
                     return;
diff --git a/common/DistributeCalc/entry/src/main/js/default/pages/calc/calc.js b/common/DistributeCalc/entry/src/main/js/default/pages/calc/calc.js
index 0f1eb117ae..55f871a179 100644
--- a/common/DistributeCalc/entry/src/main/js/default/pages/calc/calc.js
+++ b/common/DistributeCalc/entry/src/main/js/default/pages/calc/calc.js
@@ -38,7 +38,7 @@ export default {
         });
     },
     dataChange(key, value){
-        kvStore.put(key,value).then((data)=>{
+        kvStore.put(key,value).then(()=>{
             console.log('Calc[CalcPage] put key value successed! value:'+value);
         }).catch((err)=>{
             console.log('Calc[CalcPage] put key value failed:'+err);
diff --git a/common/DistributeCalc/entry/src/main/js/default/pages/index/index.js b/common/DistributeCalc/entry/src/main/js/default/pages/index/index.js
index 3b29af6121..ac107a5784 100644
--- a/common/DistributeCalc/entry/src/main/js/default/pages/index/index.js
+++ b/common/DistributeCalc/entry/src/main/js/default/pages/index/index.js
@@ -57,7 +57,7 @@ export default {
         });
     },
     dataChange(key, value){
-        kvStore.put(key,value).then((data)=>{
+        kvStore.put(key,value).then(()=>{
             console.log('Calc[IndexPage] put key value successed value:'+value);
         }).catch((err)=>{
             console.log('Calc[IndexPage] put key value failed:'+err);
diff --git a/common/Download/entry/src/main/java/ohos/samples/downloadsample/MainAbility.java b/common/Download/entry/src/main/java/ohos/samples/downloadsample/MainAbility.java
index b823da676d..b19c20887a 100644
--- a/common/Download/entry/src/main/java/ohos/samples/downloadsample/MainAbility.java
+++ b/common/Download/entry/src/main/java/ohos/samples/downloadsample/MainAbility.java
@@ -15,10 +15,9 @@
 
 package ohos.samples.downloadsample;
 
-import ohos.samples.downloadsample.slice.MainAbilitySlice;
-import ohos.samples.downloadsample.utils.LogUtil;
 import ohos.aafwk.ability.Ability;
 import ohos.aafwk.content.Intent;
+import ohos.samples.downloadsample.slice.MainAbilitySlice;
 
 /**
  * MainAbility
diff --git a/common/Download/entry/src/main/java/ohos/samples/downloadsample/slice/DownloadStateSlice.java b/common/Download/entry/src/main/java/ohos/samples/downloadsample/slice/DownloadStateSlice.java
index 48b0a0db48..34f879d739 100644
--- a/common/Download/entry/src/main/java/ohos/samples/downloadsample/slice/DownloadStateSlice.java
+++ b/common/Download/entry/src/main/java/ohos/samples/downloadsample/slice/DownloadStateSlice.java
@@ -37,8 +37,6 @@ public class DownloadStateSlice extends AbilitySlice {
 
     private DownloadSession downloadWebpageSession = null;
 
-    private DownloadSession downloadErrorPageSession = null;
-
     private Text downloadAppStateText;
 
     private Text downloadWebPageStateText;
@@ -83,7 +81,7 @@ public class DownloadStateSlice extends AbilitySlice {
         LogUtil.info(TAG, "DownloadFailed button clicked ");
         Uri uri = Uri.parse(Const.ERROR_URL);
         DownloadConfig param = new DownloadConfig.Builder(DownloadStateSlice.this, uri).build();
-        downloadErrorPageSession = new DownloadSession(DownloadStateSlice.this, param);
+        DownloadSession downloadErrorPageSession = new DownloadSession(DownloadStateSlice.this, param);
         downloadErrorPageSession.start();
         downloadErrorPageSession.addListener(listener);
     }
diff --git a/common/Download/entry/src/main/java/ohos/samples/downloadsample/slice/MainAbilitySlice.java b/common/Download/entry/src/main/java/ohos/samples/downloadsample/slice/MainAbilitySlice.java
index b0a974c2b2..5bb7b0a210 100644
--- a/common/Download/entry/src/main/java/ohos/samples/downloadsample/slice/MainAbilitySlice.java
+++ b/common/Download/entry/src/main/java/ohos/samples/downloadsample/slice/MainAbilitySlice.java
@@ -15,11 +15,9 @@
 
 package ohos.samples.downloadsample.slice;
 
-import ohos.samples.downloadsample.ResourceTable;
-
 import ohos.aafwk.ability.AbilitySlice;
 import ohos.aafwk.content.Intent;
-import ohos.agp.components.Component;
+import ohos.samples.downloadsample.ResourceTable;
 
 /**
  * DownloadSample app main ability slice
diff --git a/common/Download/entry/src/main/java/ohos/samples/downloadsample/utils/LogUtil.java b/common/Download/entry/src/main/java/ohos/samples/downloadsample/utils/LogUtil.java
index 0934496e3a..a5133ec1f1 100644
--- a/common/Download/entry/src/main/java/ohos/samples/downloadsample/utils/LogUtil.java
+++ b/common/Download/entry/src/main/java/ohos/samples/downloadsample/utils/LogUtil.java
@@ -34,28 +34,6 @@ public class LogUtil {
         /* Do nothing */
     }
 
-    /**
-     * Print debug log
-     *
-     * @param classType class name
-     * @param msg log message
-     */
-    @SuppressWarnings("rawtypes")
-    public static void debug(Class classType, String msg) {
-        HiLog.debug(LABEL_LOG, String.format(Locale.ROOT, LOG_FORMAT, classType, msg));
-    }
-
-    /**
-     * Print info log
-     *
-     * @param classType class name
-     * @param msg log message
-     */
-    @SuppressWarnings("rawtypes")
-    public static void info(Class classType, String msg) {
-        HiLog.info(LABEL_LOG, String.format(Locale.ROOT, LOG_FORMAT, classType, msg));
-    }
-
     /**
      * Print info log
      *
diff --git a/common/Download/entry/src/main/resources/base/element/string.json b/common/Download/entry/src/main/resources/base/element/string.json
index 434ead415b..a272eb3a04 100644
--- a/common/Download/entry/src/main/resources/base/element/string.json
+++ b/common/Download/entry/src/main/resources/base/element/string.json
@@ -7,6 +7,86 @@
     {
       "name": "mainability_description",
       "value": "hap sample empty page"
+    },
+    {
+      "name": "startdownload",
+      "value": "StartDownload"
+    },
+    {
+      "name": "removedownload",
+      "value": "RemoveDownload"
+    },
+    {
+      "name": "attachdownload",
+      "value": "AttachDownload"
+    },
+    {
+      "name": "roam",
+      "value": "Roam"
+    },
+    {
+      "name": "metering",
+      "value": "Metering Network"
+    },
+    {
+      "name": "wifi",
+      "value": "Wi-Fi"
+    },
+    {
+      "name": "mobile",
+      "value": "Mobile"
+    },
+    {
+      "name": "session",
+      "value": "SessionID = -1"
+    },
+    {
+      "name": "stringfalse",
+      "value": "false"
+    },
+    {
+      "name": "stringtrue",
+      "value": "true"
+    },
+    {
+      "name": "querydownload",
+      "value": "QueryDownload"
+    },
+    {
+      "name": "openfile",
+      "value": "OpenFile"
+    },
+    {
+      "name": "downloadapp",
+      "value": "DownloadApp"
+    },
+    {
+      "name": "pauseddownload",
+      "value": "PausedDownload"
+    },
+    {
+      "name": "resumedownload",
+      "value": "ResumeDownload"
+    },
+    {
+      "name": "downloadwebpage",
+      "value": "DownloadWebPage"
+    },
+    {
+      "name": "downloadfailed",
+      "value": "DownloadFailed"
+    },
+    {
+      "name": "start",
+      "value": "Show the Start Tasks"
+    },
+    {
+      "name": "query",
+      "value": "Show the Query Tasks"
+    },
+    {
+      "name": "show",
+      "value": "Show the Suspension,Resumption and Listening Tasks"
     }
   ]
 }
\ No newline at end of file
diff --git a/common/Download/entry/src/main/resources/base/layout/download_config_slice.xml b/common/Download/entry/src/main/resources/base/layout/download_config_slice.xml
index 3dcec68285..71a0885245 100644
--- a/common/Download/entry/src/main/resources/base/layout/download_config_slice.xml
+++ b/common/Download/entry/src/main/resources/base/layout/download_config_slice.xml
@@ -26,10 +26,10 @@
             ohos:id="$+id:start_download_button"
             ohos:width="match_content"
             ohos:height="35vp"
-            ohos:text="StartDownload"
+            ohos:text="$string:startdownload"
             ohos:text_color="#00ff00"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
@@ -39,10 +39,10 @@
             ohos:id="$+id:remove_download_button"
             ohos:width="match_content"
             ohos:height="35vp"
-            ohos:text="RemoveDownload"
+            ohos:text="$string:removedownload"
             ohos:text_color="#00ff00"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
@@ -52,10 +52,10 @@
             ohos:id="$+id:attach_download_button"
             ohos:width="match_content"
             ohos:height="35vp"
-            ohos:text="AttachDownload"
+            ohos:text="$string:attachdownload"
             ohos:text_color="#00ff00"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
@@ -71,11 +71,11 @@
             ohos:weight="1"
             ohos:width="match_content"
             ohos:height="35vp"
-            ohos:text="Roam"
+            ohos:text="$string:roam"
             ohos:text_color="#000000"
             ohos:text_alignment="center"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
@@ -85,12 +85,12 @@
             ohos:id="$+id:roam_switch"
             ohos:width="350vp"
             ohos:height="35vp"
-            ohos:text_state_off="false"
-            ohos:text_state_on="true"
+            ohos:text_state_off="$string:stringfalse"
+            ohos:text_state_on="$string:stringtrue"
             ohos:text_color_off="#000000"
             ohos:text_color_on="#FFFAFA"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:text_size="14fp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
@@ -109,10 +109,10 @@
             ohos:weight="1"
             ohos:width="match_content"
             ohos:height="35vp"
-            ohos:text="Metering Network"
+            ohos:text="$string:metering"
             ohos:text_color="#000000"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
@@ -123,12 +123,12 @@
             ohos:id="$+id:metering_network_switch"
             ohos:width="350vp"
             ohos:height="35vp"
-            ohos:text_state_off="false"
-            ohos:text_state_on="true"
+            ohos:text_state_off="$string:stringfalse"
+            ohos:text_state_on="$string:stringtrue"
             ohos:text_color_off="#000000"
             ohos:text_color_on="#FFFAFA"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:text_size="14fp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
@@ -147,10 +147,10 @@
             ohos:weight="1"
             ohos:width="match_content"
             ohos:height="35vp"
-            ohos:text="Wi-Fi"
+            ohos:text="$string:wifi"
             ohos:text_color="#000000"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
@@ -161,12 +161,12 @@
             ohos:id="$+id:wifi_switch"
             ohos:width="350vp"
             ohos:height="35vp"
-            ohos:text_state_off="false"
-            ohos:text_state_on="true"
+            ohos:text_state_off="$string:stringfalse"
+            ohos:text_state_on="$string:stringtrue"
             ohos:text_color_off="#000000"
             ohos:text_color_on="#FFFAFA"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:text_size="14fp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
@@ -185,10 +185,10 @@
             ohos:weight="1"
             ohos:width="match_content"
             ohos:height="35vp"
-            ohos:text="Mobile"
+            ohos:text="$string:mobile"
             ohos:text_color="#000000"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
@@ -199,12 +199,12 @@
             ohos:id="$+id:mobile_switch"
             ohos:width="350vp"
             ohos:height="35vp"
-            ohos:text_state_off="false"
-            ohos:text_state_on="true"
+            ohos:text_state_off="$string:stringfalse"
+            ohos:text_state_on="$string:stringtrue"
             ohos:text_color_off="#000000"
             ohos:text_color_on="#FFFAFA"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:text_size="14fp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
@@ -224,10 +224,10 @@
             ohos:width="match_content"
             ohos:weight="1"
             ohos:height="35vp"
-            ohos:text="SessionID = -1"
+            ohos:text="$string:session"
             ohos:text_color="#000000"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
diff --git a/common/Download/entry/src/main/resources/base/layout/download_operation_slice.xml b/common/Download/entry/src/main/resources/base/layout/download_operation_slice.xml
index f0754532cf..f8d93bcf1f 100644
--- a/common/Download/entry/src/main/resources/base/layout/download_operation_slice.xml
+++ b/common/Download/entry/src/main/resources/base/layout/download_operation_slice.xml
@@ -21,10 +21,10 @@
         ohos:id="$+id:start_download_btn"
         ohos:width="match_parent"
         ohos:height="35vp"
-        ohos:text="StartDownload"
+        ohos:text="$string:startdownload"
         ohos:text_color="#00ff00"
-        ohos:left_margin="4vp"
-        ohos:right_margin="4vp"
+        ohos:start_margin="4vp"
+        ohos:end_margin="4vp"
         ohos:top_margin="10vp"
         ohos:bottom_margin="10vp"
         ohos:text_size="14fp"
@@ -34,10 +34,10 @@
         ohos:id="$+id:query_download_btn"
         ohos:width="match_parent"
         ohos:height="35vp"
-        ohos:text="QueryDownload"
+        ohos:text="$string:querydownload"
         ohos:text_color="#00ff00"
-        ohos:left_margin="4vp"
-        ohos:right_margin="4vp"
+        ohos:start_margin="4vp"
+        ohos:end_margin="4vp"
         ohos:top_margin="10vp"
         ohos:bottom_margin="10vp"
         ohos:text_size="14fp"
@@ -47,10 +47,10 @@
         ohos:id="$+id:open_file_btn"
         ohos:width="match_parent"
         ohos:height="35vp"
-        ohos:text="OpenFile"
+        ohos:text="$string:openfile"
         ohos:text_color="#00ff00"
-        ohos:left_margin="4vp"
-        ohos:right_margin="4vp"
+        ohos:start_margin="4vp"
+        ohos:end_margin="4vp"
         ohos:top_margin="10vp"
         ohos:bottom_margin="10vp"
         ohos:text_size="14fp"
@@ -60,10 +60,10 @@
         ohos:id="$+id:remove_download_btn"
         ohos:width="match_parent"
         ohos:height="35vp"
-        ohos:text="RemoveDownload"
+        ohos:text="$string:removedownload"
         ohos:text_color="#00ff00"
-        ohos:left_margin="4vp"
-        ohos:right_margin="4vp"
+        ohos:start_margin="4vp"
+        ohos:end_margin="4vp"
         ohos:top_margin="10vp"
         ohos:bottom_margin="10vp"
         ohos:text_size="14fp"
diff --git a/common/Download/entry/src/main/resources/base/layout/download_state_slice.xml b/common/Download/entry/src/main/resources/base/layout/download_state_slice.xml
index cefebb1d35..c9c2006d52 100644
--- a/common/Download/entry/src/main/resources/base/layout/download_state_slice.xml
+++ b/common/Download/entry/src/main/resources/base/layout/download_state_slice.xml
@@ -26,10 +26,10 @@
             ohos:width="match_content"
             ohos:weight="1"
             ohos:height="35vp"
-            ohos:text="DownloadApp"
+            ohos:text="$string:downloadapp"
             ohos:text_color="#00ff00"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
@@ -40,10 +40,10 @@
             ohos:width="match_content"
             ohos:weight="1"
             ohos:height="35vp"
-            ohos:text="RemoveDownload"
+            ohos:text="$string:removedownload"
             ohos:text_color="#00ff00"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
@@ -64,10 +64,10 @@
             ohos:width="match_content"
             ohos:weight="1"
             ohos:height="35vp"
-            ohos:text="PausedDownload"
+            ohos:text="$string:pauseddownload"
             ohos:text_color="#00ff00"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
@@ -78,10 +78,10 @@
             ohos:width="match_content"
             ohos:weight="1"
             ohos:height="35vp"
-            ohos:text="ResumeDownload"
+            ohos:text="$string:resumedownload"
             ohos:text_color="#00ff00"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
@@ -103,8 +103,8 @@
             ohos:weight="1"
             ohos:height="35vp"
             ohos:text_color="#000000"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
@@ -130,10 +130,10 @@
             ohos:width="match_content"
             ohos:weight="1"
             ohos:height="35vp"
-            ohos:text="DownloadWebPage"
+            ohos:text="$string:downloadwebpage"
             ohos:text_color="#00ff00"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="13fp"
@@ -144,10 +144,10 @@
             ohos:width="match_content"
             ohos:weight="1"
             ohos:height="35vp"
-            ohos:text="RemoveDownload"
+            ohos:text="$string:removedownload"
             ohos:text_color="#00ff00"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
@@ -168,10 +168,10 @@
             ohos:width="match_content"
             ohos:weight="1"
             ohos:height="35vp"
-            ohos:text="PausedDownload"
+            ohos:text="$string:pauseddownload"
             ohos:text_color="#00ff00"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
@@ -182,10 +182,10 @@
             ohos:width="match_content"
             ohos:weight="1"
             ohos:height="35vp"
-            ohos:text="ResumeDownload"
+            ohos:text="$string:resumedownload"
             ohos:text_color="#00ff00"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
@@ -207,8 +207,8 @@
             ohos:weight="1"
             ohos:height="35vp"
             ohos:text_color="#000000"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
@@ -233,11 +233,11 @@
             ohos:id="$+id:download_failed_button"
             ohos:width="120vp"
             ohos:height="35vp"
-            ohos:text="DownloadFailed"
+            ohos:text="$string:downloadfailed"
             ohos:text_color="#00ff00"
             ohos:top_margin="10vp"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:bottom_margin="10vp"
             ohos:text_size="14fp"
             ohos:text_alignment="center"
@@ -246,8 +246,8 @@
             ohos:id="$+id:download_failed_state_text"
             ohos:width="120vp"
             ohos:height="35vp"
-            ohos:left_margin="2vp"
-            ohos:right_margin="2vp"
+            ohos:start_margin="2vp"
+            ohos:end_margin="2vp"
             ohos:text_color="#000000"
             ohos:top_margin="10vp"
             ohos:bottom_margin="10vp"
diff --git a/common/Download/entry/src/main/resources/base/layout/main_ability_slice.xml b/common/Download/entry/src/main/resources/base/layout/main_ability_slice.xml
index b765c15df7..b5d714c3bb 100644
--- a/common/Download/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/common/Download/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -21,10 +21,10 @@
         ohos:id="$+id:start_tasks_button"
         ohos:width="match_parent"
         ohos:height="35vp"
-        ohos:text="Show the Start Tasks"
+        ohos:text="$string:start"
         ohos:text_color="#00ff00"
-        ohos:left_margin="4vp"
-        ohos:right_margin="4vp"
+        ohos:start_margin="4vp"
+        ohos:end_margin="4vp"
         ohos:top_margin="10vp"
         ohos:bottom_margin="10vp"
         ohos:text_size="14fp"
@@ -33,10 +33,10 @@
         ohos:id="$+id:query_tasks_button"
         ohos:width="match_parent"
         ohos:height="35vp"
-        ohos:text="Show the Query Tasks"
+        ohos:text="$string:query"
         ohos:text_color="#00ff00"
-        ohos:left_margin="4vp"
-        ohos:right_margin="4vp"
+        ohos:start_margin="4vp"
+        ohos:end_margin="4vp"
         ohos:top_margin="10vp"
         ohos:bottom_margin="10vp"
         ohos:text_size="14fp"
@@ -45,10 +45,10 @@
         ohos:id="$+id:listen_tasks_button"
         ohos:width="match_parent"
         ohos:height="35vp"
-        ohos:text="Show the Suspension,Resumption and Listening Tasks"
+        ohos:text="$string:show"
         ohos:text_color="#00ff00"
-        ohos:left_margin="4vp"
-        ohos:right_margin="4vp"
+        ohos:start_margin="4vp"
+        ohos:end_margin="4vp"
         ohos:top_margin="10vp"
         ohos:bottom_margin="10vp"
         ohos:text_size="14fp"
diff --git a/common/Flashlight/entry/src/main/js/default/pages/index/index.js b/common/Flashlight/entry/src/main/js/default/pages/index/index.js
index 097d94d2c0..4be071386e 100644
--- a/common/Flashlight/entry/src/main/js/default/pages/index/index.js
+++ b/common/Flashlight/entry/src/main/js/default/pages/index/index.js
@@ -12,6 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import app from '@system.app';
+
 export default {
     data: {
         lightShow: true,
diff --git a/common/HelloWorld/entry/src/main/java/ohos/samples/helloworld/slice/MainAbilitySlice.java b/common/HelloWorld/entry/src/main/java/ohos/samples/helloworld/slice/MainAbilitySlice.java
index 3d758fa602..ac7c3912fd 100644
--- a/common/HelloWorld/entry/src/main/java/ohos/samples/helloworld/slice/MainAbilitySlice.java
+++ b/common/HelloWorld/entry/src/main/java/ohos/samples/helloworld/slice/MainAbilitySlice.java
@@ -36,5 +36,3 @@ public class MainAbilitySlice extends AbilitySlice {
         button.setClickedListener(listener -> present(new SecondAbilitySlice(), new Intent()));
     }
 }
-
-
diff --git a/common/HelloWorld/entry/src/main/resources/base/layout/main_ability_slice.xml b/common/HelloWorld/entry/src/main/resources/base/layout/main_ability_slice.xml
index 6aa2d1931f..ea176f7fc2 100644
--- a/common/HelloWorld/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/common/HelloWorld/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -36,8 +36,8 @@
         ohos:background_element="$graphic:background_button"
         ohos:top_padding="8vp"
         ohos:bottom_padding="8vp"
-        ohos:right_padding="70vp"
-        ohos:left_padding="70vp"
+        ohos:end_padding="70vp"
+        ohos:start_padding="70vp"
         ohos:center_in_parent="true"
         ohos:below="$id:text"
         ohos:margin="10vp"/>
diff --git a/common/Timer/entry/src/main/java/ohos/timer/timerpluginutils/CountDownTimer.java b/common/Timer/entry/src/main/java/ohos/timer/timerpluginutils/CountDownTimer.java
index bbe75558f0..ad2e01b00b 100644
--- a/common/Timer/entry/src/main/java/ohos/timer/timerpluginutils/CountDownTimer.java
+++ b/common/Timer/entry/src/main/java/ohos/timer/timerpluginutils/CountDownTimer.java
@@ -36,8 +36,6 @@ public abstract class CountDownTimer {
 
     private InnerEvent innerEvent;
 
-    private Handler handler;
-
     /**
      * Constructor for CountDownTimer
      *
@@ -48,16 +46,6 @@ public abstract class CountDownTimer {
         millisInFuture = millis;
     }
 
-    /**
-     * Cancel the countdown.
-     */
-    public final synchronized void cancel() {
-        isCancelled = true;
-        if (handler != null) {
-            handler.removeEvent(innerEvent.eventId);
-        }
-    }
-
     /**
      * Start the countdown.
      *
@@ -74,7 +62,7 @@ public abstract class CountDownTimer {
         if (runner == null) {
             return this;
         }
-        handler = new Handler(runner);
+        Handler handler = new Handler(runner);
         int eventId = 0;
         long param = 0L;
 
diff --git a/common/Timer/entry/src/main/java/ohos/timer/timerpluginutils/CountDownUtil.java b/common/Timer/entry/src/main/java/ohos/timer/timerpluginutils/CountDownUtil.java
index ac8691879b..fea2119781 100644
--- a/common/Timer/entry/src/main/java/ohos/timer/timerpluginutils/CountDownUtil.java
+++ b/common/Timer/entry/src/main/java/ohos/timer/timerpluginutils/CountDownUtil.java
@@ -57,17 +57,6 @@ public class CountDownUtil {
         }
     }
 
-    /**
-     * Stop the count down
-     */
-    public void stopCountDown() {
-        if (countDownTimer != null && !isCancel) {
-            countDownTimer.cancel();
-            isCancel = true;
-            LogUtil.info(TAG, "Timer cancelled or stopped, stop callback!");
-            countDownCallback.countDownCancel();
-        }
-    }
 
     private CountDownTimer getCountDownTimer() {
         return new CountDownTimer(millisInFuture) {
@@ -112,10 +101,5 @@ public class CountDownUtil {
          * @param millisUntilFinished Remaining time
          */
         void countDownTick(long millisUntilFinished);
-
-        /**
-         * Cancel the countdown.
-         */
-        void countDownCancel();
     }
 }
diff --git a/common/Timer/entry/src/main/java/ohos/timer/timerpluginutils/TimerPlugin.java b/common/Timer/entry/src/main/java/ohos/timer/timerpluginutils/TimerPlugin.java
index ecf1eed7b7..d86e9d44e5 100644
--- a/common/Timer/entry/src/main/java/ohos/timer/timerpluginutils/TimerPlugin.java
+++ b/common/Timer/entry/src/main/java/ohos/timer/timerpluginutils/TimerPlugin.java
@@ -203,9 +203,4 @@ public class TimerPlugin implements CountDownUtil.CountDownCallback {
             Constant.TIME_FORMAT, remainingSeconds);
         handler.sendEvent(EVENT_CODE);
     }
-
-    @Override
-    public void countDownCancel() {
-        LogUtil.info(TAG, "countdown cancel");
-    }
 }
diff --git a/common/Timer/entry/src/main/java/ohos/timer/utils/Constant.java b/common/Timer/entry/src/main/java/ohos/timer/utils/Constant.java
index 331b5ac50d..9cfda1c1a1 100644
--- a/common/Timer/entry/src/main/java/ohos/timer/utils/Constant.java
+++ b/common/Timer/entry/src/main/java/ohos/timer/utils/Constant.java
@@ -19,11 +19,6 @@ package ohos.timer.utils;
  * Constants class
  */
 public class Constant {
-    /**
-     * Application name
-     */
-    public static final String APP_NAME = "Timer";
-
     /**
      * Time in milliseconds
      */
diff --git a/common/Timer/entry/src/main/resources/base/layout/main_ability_slice.xml b/common/Timer/entry/src/main/resources/base/layout/main_ability_slice.xml
index 01228210b7..01fc262e8d 100644
--- a/common/Timer/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/common/Timer/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -127,7 +127,8 @@
                     ohos:layout_alignment="center"
                     ohos:text_size="18fp"
                     ohos:text_color="#FF000000"
-                    ohos:left_padding="20vp"/>
+                    ohos:start_padding="20vp"
+                    ohos:end_padding="20vp"/>
             </DirectionalLayout>
 
             <DirectionalLayout
-- 
Gitee


From fefcef7c3e474413dee0a9e8cc3f47132eea33f0 Mon Sep 17 00:00:00 2001
From: adslk <liuxin283@huawei.com>
Date: Fri, 15 Oct 2021 17:46:56 +0800
Subject: [PATCH 2/2] Clean up the alarm

Signed-off-by: adslk <liuxin283@huawei.com>
---
 .../base/layout/animator_group_slice_layout.xml       |  6 +++---
 .../main/resources/base/layout/main_ability_slice.xml |  8 ++++----
 UI/JsList/build.gradle                                | 11 -----------
 ability/AbilityConnection/entry/src/main/config.json  |  4 ++--
 ability/AbilityForm/build.gradle                      |  7 ++-----
 ability/AbilityForm/entry/build.gradle                |  4 ++--
 ability/AbilityForm/entry/src/main/config.json        |  8 +++++++-
 ability/Intent/secondapp/src/main/config.json         |  8 +++++++-
 8 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/UI/Animation/entry/src/main/resources/base/layout/animator_group_slice_layout.xml b/UI/Animation/entry/src/main/resources/base/layout/animator_group_slice_layout.xml
index 7f9209b2f0..4b54728621 100644
--- a/UI/Animation/entry/src/main/resources/base/layout/animator_group_slice_layout.xml
+++ b/UI/Animation/entry/src/main/resources/base/layout/animator_group_slice_layout.xml
@@ -40,7 +40,7 @@
             ohos:width="60vp"
             ohos:background_element="#00ffff"
             ohos:start_margin="10vp"
-            ohos:end_margin="10vp"/>
+            ohos:end_margin="0vp"/>
 
         <Component
             ohos:id="$+id:target_image3"
@@ -48,7 +48,7 @@
             ohos:width="60vp"
             ohos:background_element="#00ffff"
             ohos:start_margin="10vp"
-            ohos:end_margin="10vp"/>
+            ohos:end_margin="0vp"/>
 
         <Component
             ohos:id="$+id:target_image4"
@@ -56,7 +56,7 @@
             ohos:width="60vp"
             ohos:background_element="#00ffff"
             ohos:start_margin="10vp"
-            ohos:end_margin="10vp"/>
+            ohos:end_margin="0vp"/>
     </DirectionalLayout>
 
     <DirectionalLayout
diff --git a/UI/Animation/entry/src/main/resources/base/layout/main_ability_slice.xml b/UI/Animation/entry/src/main/resources/base/layout/main_ability_slice.xml
index a02320e591..df3b0ba832 100644
--- a/UI/Animation/entry/src/main/resources/base/layout/main_ability_slice.xml
+++ b/UI/Animation/entry/src/main/resources/base/layout/main_ability_slice.xml
@@ -25,7 +25,7 @@
         ohos:width="match_parent"
         ohos:element_right="$media:ic_arrow_right"
         ohos:start_padding="24vp"
-        ohos:end_padding="24vp"
+        ohos:end_padding="0vp"
         ohos:padding="10vp"
         ohos:text="$string:animator_framet"
         ohos:text_alignment="left"
@@ -37,7 +37,7 @@
         ohos:width="match_parent"
         ohos:element_right="$media:ic_arrow_right"
         ohos:start_padding="24vp"
-        ohos:end_padding="24vp"
+        ohos:end_padding="0vp"
         ohos:padding="10vp"
         ohos:text="$string:animator_value"
         ohos:text_alignment="left"
@@ -49,7 +49,7 @@
         ohos:width="match_parent"
         ohos:element_right="$media:ic_arrow_right"
         ohos:start_padding="24vp"
-        ohos:end_padding="24vp"
+        ohos:end_padding="0vp"
         ohos:padding="10vp"
         ohos:text="$string:animator_property"
         ohos:text_alignment="left"
@@ -61,7 +61,7 @@
         ohos:width="match_parent"
         ohos:element_right="$media:ic_arrow_right"
         ohos:start_padding="24vp"
-        ohos:end_padding="24vp"
+        ohos:end_padding="0vp"
         ohos:padding="10vp"
         ohos:text="$string:animator_group"
         ohos:text_alignment="left"
diff --git a/UI/JsList/build.gradle b/UI/JsList/build.gradle
index c9d9b623cc..c77bab38c2 100644
--- a/UI/JsList/build.gradle
+++ b/UI/JsList/build.gradle
@@ -1,17 +1,6 @@
 apply plugin: 'com.huawei.ohos.app'
 
 ohos {
-    signingConfigs {
-        release {
-            storeFile file('D:\\HAP_Sign\\app.p12')
-            storePassword '0000001B11F61FBD130CDFB3549D1468E4F2382B2B46CC4DA934D6A0E2512ECF3D2BD44E1649051217D235'
-            keyAlias = 'app'
-            keyPassword '0000001B8A906A7BB7BC2CFCFBD41A85B150D66423537755513637789CF1FC3126EADF0C2B3BA4CC427A37'
-            signAlg = 'SHA256withECDSA'
-            profile file('D:\\HAP_Sign\\Profile\\jslist.p7b')
-            certpath file('D:\\HAP_Sign\\app.cer')
-        }
-    }
     compileSdkVersion 7
     supportSystem "standard"
 }
diff --git a/ability/AbilityConnection/entry/src/main/config.json b/ability/AbilityConnection/entry/src/main/config.json
index 1ac90100be..c984fee8c9 100644
--- a/ability/AbilityConnection/entry/src/main/config.json
+++ b/ability/AbilityConnection/entry/src/main/config.json
@@ -2,8 +2,8 @@
   "app": {
     "bundleName": "ohos.samples.backgrounddownload",
     "version": {
-      "code": 2000000,
-      "name": "2.0"
+      "code": 1000000,
+      "name": "1.0"
     }
   },
   "deviceConfig": {},
diff --git a/ability/AbilityForm/build.gradle b/ability/AbilityForm/build.gradle
index 0585877a75..58829d6411 100644
--- a/ability/AbilityForm/build.gradle
+++ b/ability/AbilityForm/build.gradle
@@ -1,10 +1,7 @@
 apply plugin: 'com.huawei.ohos.app'
 
 ohos {
-    compileSdkVersion 5
-    defaultConfig {
-        compatibleSdkVersion 4
-    }
+    compileSdkVersion 6
 }
 buildscript {
     repositories {
@@ -17,7 +14,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.huawei.ohos:hap:2.4.4.2'
+        classpath 'com.huawei.ohos:hap:3.0.3.2'
     }
 }
 allprojects {
diff --git a/ability/AbilityForm/entry/build.gradle b/ability/AbilityForm/entry/build.gradle
index 1324a93eda..14a543565f 100644
--- a/ability/AbilityForm/entry/build.gradle
+++ b/ability/AbilityForm/entry/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.huawei.ohos.hap'
 ohos {
-    compileSdkVersion 5
+    compileSdkVersion 6
     defaultConfig {
-        compatibleSdkVersion 4
+        compatibleSdkVersion 6
     }
     buildTypes {
         release {
diff --git a/ability/AbilityForm/entry/src/main/config.json b/ability/AbilityForm/entry/src/main/config.json
index 193534c581..412cd3b284 100644
--- a/ability/AbilityForm/entry/src/main/config.json
+++ b/ability/AbilityForm/entry/src/main/config.json
@@ -54,6 +54,12 @@
       {
         "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
       }
-    ]
+    ],
+    "distroFilter": {
+      "apiVersion": {
+        "policy": "include",
+        "value": []
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/ability/Intent/secondapp/src/main/config.json b/ability/Intent/secondapp/src/main/config.json
index 74a5c58239..2878b6f4ad 100644
--- a/ability/Intent/secondapp/src/main/config.json
+++ b/ability/Intent/secondapp/src/main/config.json
@@ -45,6 +45,12 @@
         "type": "page",
         "launchType": "standard"
       }
-    ]
+    ],
+    "distroFilter": {
+      "apiVersion": {
+        "policy": "include",
+        "value": [5,6]
+      }
+    }
   }
 }
\ No newline at end of file
-- 
Gitee