update openharmony 1.0.1

2026-07-01 19:54:03 -04:00 · 2021-03-11 18:40:44 +08:00
parent a224a54015
commit 85a4d017f0
1770 changed files with 58745 additions and 6057 deletions
@@ -122,7 +122,7 @@ PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 # 在一个字符串字面量中引入换行的penalty
 PenaltyBreakString: 1000
-# 对于每个在行字符数限制之外的字符的penalt
+# 对于每个在行字符数限制之外的字符的penalty
 PenaltyExcessCharacter: 1000000
 # 将函数的返回类型放到它自己的行的penalty
 PenaltyReturnTypeOnItsOwnLine: 60
@@ -5,4 +5,4 @@ x32

 target/
 node_modules/
-moduletest/
+frameworks/test/
@@ -1,222 +0,0 @@
-#Copyright (c) 2020 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.
-
-import("//build/lite/config/component/lite_component.gni")
-import("//build/lite/config/subsystem/aafwk/config.gni")
-
-declare_args() {
-  LOSCFG_TEST_JS_BUILD = false
-}
-
-lite_component("jsfwk") {
-  features = [ ":ace_lite" ]
-}
-
-config("ace_lite_config") {
-  include_dirs = [
-    "//foundation/graphic/lite/interfaces/innerkits/ui",
-    "//foundation/graphic/lite/interfaces/innerkits/ui/dock",
-    "//foundation/graphic/lite/interfaces/innerkits/ui/common",
-    "//foundation/graphic/lite/interfaces/kits",
-    "//foundation/graphic/lite/interfaces/kits/config",
-    "//foundation/graphic/lite/interfaces/kits/surface",
-    "//foundation/graphic/lite/interfaces/kits/ui",
-    "//foundation/graphic/lite/interfaces/kits/ui/animator",
-    "//foundation/graphic/lite/interfaces/kits/ui/common",
-    "//foundation/graphic/lite/interfaces/kits/ui/components",
-    "//foundation/graphic/lite/interfaces/kits/ui/dfx",
-    "//foundation/graphic/lite/interfaces/kits/ui/events",
-    "//foundation/graphic/lite/interfaces/kits/ui/font",
-    "//foundation/graphic/lite/interfaces/kits/ui/layout",
-    "//foundation/graphic/lite/interfaces/kits/ui/themes",
-    "//foundation/graphic/lite/interfaces/kits/utils",
-    "//utils/native/lite/include",
-    "//foundation/aafwk/interfaces/kits/ability_lite",
-    "//foundation/aafwk/interfaces/kits/want_lite",
-    "//foundation/aafwk/interfaces/innerkits/abilitymgr_lite",
-    "//foundation/appexecfwk/interfaces/kits/bundle_lite",
-    "//foundation/appexecfwk/utils/bundle_lite",
-    "//foundation/ace/lite/tools/simulator/config",
-  ]
-
-  include_dirs += [
-    "//third_party/bounds_checking_function/include",
-    "//foundation/ace/interfaces/innerkits/builtin/async",
-    "//foundation/ace/interfaces/innerkits/builtin/base",
-    "//foundation/ace/interfaces/innerkits/builtin/jsi",
-    "include/context",
-    "include/base",
-    "include/modules",
-    "include/resource",
-    "src/core",
-    "src/core/animation",
-    "src/core/base",
-    "src/core/components",
-    "src/core/context",
-    "src/core/directive",
-    "src/core/router",
-    "src/core/jsi",
-    "src/core/modules",
-    "src/core/router",
-    "src/core/stylemgr",
-    "src/core/wrapper",
-    "targets",
-    "//kernel/liteos_a/kernel/include/",
-    "//kernel/liteos_a/kernel/common",
-    "//third_party/jerryscript/jerry-core/include",
-    "//third_party/jerryscript/jerry-ext/include/jerryscript-ext",
-    "///third_party/jerryscript/jerry-port/default/include",
-    "//third_party/cJSON",
-    "//utils/native/lite/timer_task/include/",
-    "//third_party/freetype/include",
-  ]
-  if (ohos_kernel_type == "liteos_a" || ohos_kernel_type == "liteos_m") {
-    include_dirs += [ "targets/liteos_a" ]
-  } else if (ohos_kernel_type == "linux") {
-    include_dirs += [ "targets/linux" ]
-  }
-
-  ldflags = [ "-lstdc++" ]
-  ldflags += [ "-lpthread" ]
-  ldflags += [ "-Wl,-rpath-link=$ohos_root_path/$root_out_dir" ]
-}
-
-shared_library("ace_lite") {
-  configs -= [ "//build/lite/config:language_cpp" ]
-  cflags = [
-    "-Wall",
-    "-Wno-format",
-    "-Wno-format-extra-args",
-  ]
-  cflags_cc = [ "-std=c++14" ]
-  cflags_cc += cflags
-  configs += [ ":ace_lite_config" ]
-
-  sources = [
-    "src/core/animation/transition_impl.cpp",
-    "src/core/async/js_async_work.cpp",
-    "src/core/async/message_queue_utils.cpp",
-    "src/core/base/ace_log.cpp",
-    "src/core/base/ace_mem_base.cpp",
-    "src/core/base/js_debugger_config.cpp",
-    "src/core/base/js_fwk_common.cpp",
-    "src/core/base/key_parser.cpp",
-    "src/core/base/memory_heap.cpp",
-    "src/core/base/string_util.cpp",
-    "src/core/base/time_util.cpp",
-    "src/core/components/analog_clock_component.cpp",
-    "src/core/components/camera_component.cpp",
-    "src/core/components/canvas_component.cpp",
-    "src/core/components/chart_component.cpp",
-    "src/core/components/clock_hand_component.cpp",
-    "src/core/components/component.cpp",
-    "src/core/components/component_utils.cpp",
-    "src/core/components/div_component.cpp",
-    "src/core/components/event_listener.cpp",
-    "src/core/components/image_animator_component.cpp",
-    "src/core/components/image_component.cpp",
-    "src/core/components/input_component.cpp",
-    "src/core/components/list_adapter.cpp",
-    "src/core/components/list_component.cpp",
-    "src/core/components/marquee_component.cpp",
-    "src/core/components/panel_view.cpp",
-    "src/core/components/picker_view_component.cpp",
-    "src/core/components/progress_component.cpp",
-    "src/core/components/scroll_layer.cpp",
-    "src/core/components/slider_component.cpp",
-    "src/core/components/swiper_component.cpp",
-    "src/core/components/switch_component.cpp",
-    "src/core/components/tab_bar_component.cpp",
-    "src/core/components/tab_content_component.cpp",
-    "src/core/components/tabs_component.cpp",
-    "src/core/components/text_component.cpp",
-    "src/core/components/video_component.cpp",
-    "src/core/components/video_view.cpp",
-    "src/core/context/ace_ability.cpp",
-    "src/core/context/ace_event_error_code.cpp",
-    "src/core/context/fatal_handler.cpp",
-    "src/core/context/js_ability.cpp",
-    "src/core/context/js_ability_impl.cpp",
-    "src/core/context/js_app_context.cpp",
-    "src/core/context/js_app_environment.cpp",
-    "src/core/context/js_framework_raw.cpp",
-    "src/core/context/js_profiler.cpp",
-    "src/core/context/js_timer_list.cpp",
-    "src/core/directive/descriptor_utils.cpp",
-    "src/core/directive/directive_watcher_callback.cpp",
-    "src/core/jsi/jsi.cpp",
-    "src/core/modules/app_module.cpp",
-    "src/core/modules/dfx_module.cpp",
-    "src/core/modules/module_manager.cpp",
-    "src/core/modules/presets/cjson_parser.cpp",
-    "src/core/modules/presets/console_log_impl.cpp",
-    "src/core/modules/presets/console_module.cpp",
-    "src/core/modules/presets/localization_module.cpp",
-
-    #"src/core/modules/presets/feature_ability_module.cpp",
-    "src/core/modules/presets/preset_module.cpp",
-    "src/core/modules/presets/profiler_module.cpp",
-    "src/core/modules/presets/render_module.cpp",
-    "src/core/modules/presets/require_module.cpp",
-
-    #"src/core/modules/presets/jstest_module.cpp",
-    "src/core/modules/presets/timer_module.cpp",
-    "src/core/modules/presets/version_module.cpp",
-    "src/core/modules/router_module.cpp",
-    "src/core/modules/sample_module.cpp",
-    "src/core/resource/video_muted_image_res.cpp",
-    "src/core/resource/video_play_image_res.cpp",
-    "src/core/router/js_page_state.cpp",
-    "src/core/router/js_page_state_machine.cpp",
-    "src/core/router/js_router.cpp",
-    "src/core/stylemgr/app_style.cpp",
-    "src/core/stylemgr/app_style_item.cpp",
-    "src/core/stylemgr/app_style_list.cpp",
-    "src/core/stylemgr/app_style_manager.cpp",
-    "src/core/stylemgr/app_style_sheet.cpp",
-    "src/core/wrapper/js.cpp",
-    "targets/platform_adapter.cpp",
-  ]
-
-  public_deps = [
-    "//base/security/frameworks/crypto_lite/js/builtin:ace_kit_cipher",
-    "//foundation/graphic/lite/frameworks/surface:surface",
-    "//foundation/multimedia/frameworks/camera_lite:camera",
-    "//foundation/multimedia/frameworks/player_lite:player",
-    "//foundation/multimedia/interfaces/kits/player_lite/js/builtin:audio_api",
-    "//third_party/bounds_checking_function:libsec_shared",
-    "//third_party/cJSON:cjson_shared",
-    "//third_party/jerryscript/jerry-core:jerry-core_shared",
-    "//third_party/jerryscript/jerry-ext:jerry-ext_shared",
-    "//third_party/jerryscript/jerry-libm:jerry-libm_shared",
-    "//third_party/jerryscript/jerry-port/default:jerry-port-default_shared",
-    "//utils/native/lite/js/builtin:ace_utils_kits",
-    "//utils/native/lite/timer_task:ace_kit_timer",
-  ]
-
-  defines = []
-
-  if (ohos_build_type == "debug") {
-    defines += [ "JS_PROFILER=1" ]
-  } else {
-    defines += [ "JS_PROFILER=0" ]
-  }
-
-  if (LOSCFG_TEST_JS_BUILD) {
-    defines += [ "JSFWK_TEST" ]
-  }
-
-  if (enable_ohos_appexecfwk_feature_ability == true) {
-    defines += [ "ABILITY_WINDOW_SUPPORT" ]
-  }
-}
@@ -0,0 +1,66 @@
+# JS Application Framework<a name="EN-US_TOPIC_0000001125689015"></a>
+
+-   [Introduction](#section11660541593)
+-   [Directory Structure](#section1464106163817)
+-   [Available APIs](#section1096322014288)
+-   [Usage](#section1529834174016)
+-   [Repositories Involved](#section11683135113011)
+
+## Introduction<a name="section11660541593"></a>
+
+The JS application framework is provided for you to develop OpenHarmony JavaScript applications. The following figure shows the framework architecture.
+
+**Figure  1**  Framework architecture<a name="fig11520531310"></a>
+
+![](figures/framework-architecture.png "framework-architecture")
+
+The JS application framework consists of the JavaScript data binding framework, JavaScript runtime, and JavaScript framework.
+
+-   **JavaScript data binding**
+
+    Provides a set of basic data binding capabilities through JavaScript.
+
+
+-   **JavaScript runtime**
+
+    Supports parsing and execution of JavaScript code.
+
+
+-   **JavaScript framework**
+
+    Provides the framework mechanism of JavaScript APIs and components through the C++ language.
+
+
+## Directory Structure<a name="section1464106163817"></a>
+
+The source code of the framework is stored in  **/foundation/ace/ace\_engine\_lite**. The directory structure is as follows:
+
+```
+/foundation/ace/ace_engine_lite
+├── frameworks      # Framework code
+│   ├── examples    # Sample code
+│   ├── include     # Header files
+│   ├── packages    # JavaScript implementation
+│   ├── src         # Source code
+│   ├── targets     # Configuration files of target devices
+│   └── tools       # Tool code
+├── interfaces      # APIs exposed externally
+│   └── innerkits   # Header files for internal subsystems
+│       └── builtin # JavaScript third-party module APIs exposed by the JS application framework
+└── test            # Test cases
+```
+
+## Available APIs<a name="section1096322014288"></a>
+
+For details about the APIs, see the  [JS Application Development](https://device.harmonyos.com/en/docs/apiref/js-framework-file-0000000000616658).
+
+## Usage<a name="section1529834174016"></a>
+
+For details, go to the  **readme**  repository:
+
+[https://gitee.com/openharmony/docs/blob/master/docs-en/readme/js-application-framework.md](https://gitee.com/openharmony/docs/blob/master/docs-en/readme/js-application-framework.md)
+
+## Repositories Involved<a name="section11683135113011"></a>
+
+ace\_engine\_lite
+
@@ -0,0 +1,65 @@
+# JS应用开发框架组件<a name="ZH-CN_TOPIC_0000001125689015"></a>
+
+-   [简介](#section11660541593)
+-   [目录](#section1464106163817)
+-   [接口](#section1096322014288)
+-   [使用](#section1529834174016)
+-   [相关仓](#section11683135113011)
+
+## 简介<a name="section11660541593"></a>
+
+**JS应用开发框架**，是OpenHarmony为开发者提供的一套开发OpenHarmony JS应用的开发框架。其组成如下所示：
+
+**图 1**  JS应用开发框架<a name="fig11520531310"></a>
+![](figures/JS应用开发框架.png "JS应用开发框架")
+
+JS应用开发框架包括JS数据绑定框架（JS Data binding）、JS运行时（JS runtime）和JS框架（JS framework）。
+
+-   **JS Data binding**
+
+    JS数据绑定框架使用JavaScript语言提供一套基础的数据绑定能力。
+
+
+-   **JS runtime**
+
+    JS运行时用以支持JS代码的解析和执行。
+
+
+-   **JS framework**
+
+    JS框架部分使用C++语言提供JS API和组件的框架机制。
+
+
+## 目录<a name="section1464106163817"></a>
+
+JS应用开发框架源代码在/foundation/ace/ace\_engine\_lite下，目录结构如下图所示：
+
+```
+/foundation/ace/ace_engine_lite
+├── frameworks      # 框架代码目录
+│   ├── examples    # 示例代码目录
+│   ├── include     # 头文件目录
+│   ├── packages    # 框架JS实现存放目录
+│   ├── src         # 源代码存放目录
+│   ├── targets     # 各目标设备配置文件存放目录
+│   └── tools       # 工具代码存放目录
+├── interfaces      # 对外接口存放目录
+│   └── innerkits   # 对内部子系统暴露的头文件存放目录
+│       └── builtin # JS应用框架对外暴露JS三方module API接口存放目录
+└── test            # 测试用例目录
+```
+
+## 接口<a name="section1096322014288"></a>
+
+API介绍请参考[《OpenHarmony Device开发API参考》](https://device.harmonyos.com/cn/docs/develop/apiref/js-framework-file-0000000000611396)
+
+## 使用<a name="section1529834174016"></a>
+
+详见：
+
+[https://gitee.com/openharmony/docs/blob/master/readme/JS应用开发框架README.md](https://gitee.com/openharmony/docs/blob/master/readme/JS应用开发框架README.md)
+
+## 相关仓<a name="section11683135113011"></a>
+
+ace\_engine\_lite
+
@@ -0,0 +1,191 @@
+#Copyright (c) 2020 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.
+
+import("//build/lite/config/subsystem/aafwk/path.gni")
+
+ACE_LITE_PATH = "//foundation/ace/ace_engine_lite/frameworks"
+GRAPHIC_LITE_PATH = "//foundation/graphic/ui"
+
+ace_lite_include_dirs = [
+  "$GRAPHIC_LITE_PATH/interfaces/kits/config",
+  "$GRAPHIC_LITE_PATH/interfaces/kits/animator",
+  "$GRAPHIC_LITE_PATH/interfaces/kits/common",
+  "$GRAPHIC_LITE_PATH/interfaces/kits/components",
+  "$GRAPHIC_LITE_PATH/interfaces/kits/dfx",
+  "$GRAPHIC_LITE_PATH/interfaces/kits/events",
+  "$GRAPHIC_LITE_PATH/interfaces/kits/font",
+  "$GRAPHIC_LITE_PATH/interfaces/kits/layout",
+  "$GRAPHIC_LITE_PATH/interfaces/kits/themes",
+  "$GRAPHIC_LITE_PATH/interfaces/innerkits/common",
+  "//foundation/communication/ipc_lite/interfaces/kits",
+  "//utils/native/lite/include",
+  "${aafwk_lite_path}/interfaces/kits/ability_lite",
+  "${aafwk_lite_path}/interfaces/kits/want_lite",
+  "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite",
+  "${appexecfwk_lite_path}/interfaces/kits/bundle_lite",
+  "${appexecfwk_lite_path}/utils/bundle_lite",
+]
+
+ace_lite_include_dirs += [
+  "//third_party/bounds_checking_function/include",
+  "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/async",
+  "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/base",
+  "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/jsi",
+  "$ACE_LITE_PATH/include/context",
+  "$ACE_LITE_PATH/include/base",
+  "$ACE_LITE_PATH/include/modules",
+  "$ACE_LITE_PATH/include/resource",
+  "$ACE_LITE_PATH/src/core",
+  "$ACE_LITE_PATH/src/core/animation",
+  "$ACE_LITE_PATH/src/core/base",
+  "$ACE_LITE_PATH/src/core/base/cache",
+  "$ACE_LITE_PATH/src/core/components",
+  "$ACE_LITE_PATH/src/core/context",
+  "$ACE_LITE_PATH/src/core/directive",
+  "$ACE_LITE_PATH/src/core/router",
+  "$ACE_LITE_PATH/src/core/jsi",
+  "$ACE_LITE_PATH/src/core/modules",
+  "$ACE_LITE_PATH/src/core/router",
+  "$ACE_LITE_PATH/src/core/stylemgr",
+  "$ACE_LITE_PATH/src/core/wrapper",
+  "$ACE_LITE_PATH/targets",
+  "//kernel/liteos_a/kernel/include/",
+  "//kernel/liteos_a/kernel/common",
+  "//third_party/jerryscript/jerry-core/include",
+  "//third_party/jerryscript/jerry-ext/include/jerryscript-ext",
+  "///third_party/jerryscript/jerry-port/default/include",
+  "//third_party/cJSON",
+  "//utils/native/lite/timer_task/include/",
+  "//third_party/freetype/include",
+  "//base/global/resmgr_lite/interfaces/innerkits/include",
+  "//base/global/i18n_lite/interfaces/kits/i18n/include",
+]
+
+ace_lite_include_dirs_simulator = [
+  "$GRAPHIC_LITE_PATH/interfaces/kits/config",
+  "$GRAPHIC_LITE_PATH/interfaces/kits/ui/animator",
+  "$GRAPHIC_LITE_PATH/interfaces/kits/ui/common",
+  "$GRAPHIC_LITE_PATH/interfaces/kits/ui/components",
+  "$GRAPHIC_LITE_PATH/interfaces/kits/ui/dfx",
+  "$GRAPHIC_LITE_PATH/interfaces/kits/ui/events",
+  "$GRAPHIC_LITE_PATH/interfaces/kits/ui/font",
+  "$GRAPHIC_LITE_PATH/interfaces/kits/ui/layout",
+  "$GRAPHIC_LITE_PATH/interfaces/kits/ui/themes",
+  "$GRAPHIC_LITE_PATH/interfaces/innerkits/ui/common",
+  "//foundation/communication/ipc_lite/interfaces/kits",
+  "//base/hiviewdfx/hilog_lite/interfaces/native/kits",
+  "${aafwk_lite_path}/frameworks/abilitymgr_lite/include",
+  "//foundation/communication/ipc_lite/liteipc/include",
+]
+
+ace_lite_sources = [
+  "$ACE_LITE_PATH/src/core/animation/transition_impl.cpp",
+  "$ACE_LITE_PATH/src/core/async/js_async_work.cpp",
+  "$ACE_LITE_PATH/src/core/async/message_queue_utils.cpp",
+  "$ACE_LITE_PATH/src/core/base/ace_log.cpp",
+  "$ACE_LITE_PATH/src/core/base/ace_mem_base.cpp",
+  "$ACE_LITE_PATH/src/core/base/async_task_manager.cpp",
+  "$ACE_LITE_PATH/src/core/base/cache/cache_manager.cpp",
+  "$ACE_LITE_PATH/src/core/base/dfx_assist.cpp",
+  "$ACE_LITE_PATH/src/core/base/event_util.cpp",
+  "$ACE_LITE_PATH/src/core/base/js_debugger_config.cpp",
+  "$ACE_LITE_PATH/src/core/base/js_fwk_common.cpp",
+  "$ACE_LITE_PATH/src/core/base/key_parser.cpp",
+  "$ACE_LITE_PATH/src/core/base/lazy_load_manager.cpp",
+  "$ACE_LITE_PATH/src/core/base/lazy_load_watcher.cpp",
+  "$ACE_LITE_PATH/src/core/base/locale_util.cpp",
+  "$ACE_LITE_PATH/src/core/base/mem_proc.cpp",
+  "$ACE_LITE_PATH/src/core/base/memory_heap.cpp",
+  "$ACE_LITE_PATH/src/core/base/number_parser.cpp",
+  "$ACE_LITE_PATH/src/core/base/product_adapter.cpp",
+  "$ACE_LITE_PATH/src/core/base/string_util.cpp",
+  "$ACE_LITE_PATH/src/core/base/time_util.cpp",
+  "$ACE_LITE_PATH/src/core/components/analog_clock_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/camera_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/canvas_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/chart_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/circle_progress_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/clock_hand_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/component.cpp",
+  "$ACE_LITE_PATH/src/core/components/component_utils.cpp",
+  "$ACE_LITE_PATH/src/core/components/div_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/event_listener.cpp",
+  "$ACE_LITE_PATH/src/core/components/horizon_progress_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/image_animator_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/image_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/input_button_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/input_checkbox_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/input_radio_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/list_adapter.cpp",
+  "$ACE_LITE_PATH/src/core/components/list_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/marquee_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/panel_view.cpp",
+  "$ACE_LITE_PATH/src/core/components/picker_view_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/qrcode_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/scroll_layer.cpp",
+  "$ACE_LITE_PATH/src/core/components/slider_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/stack_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/swiper_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/switch_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/tab_bar_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/tab_content_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/tabs_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/text_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/video_component.cpp",
+  "$ACE_LITE_PATH/src/core/components/video_view.cpp",
+  "$ACE_LITE_PATH/src/core/context/ace_ability.cpp",
+  "$ACE_LITE_PATH/src/core/context/ace_event_error_code.cpp",
+  "$ACE_LITE_PATH/src/core/context/fatal_handler.cpp",
+  "$ACE_LITE_PATH/src/core/context/js_ability.cpp",
+  "$ACE_LITE_PATH/src/core/context/js_ability_impl.cpp",
+  "$ACE_LITE_PATH/src/core/context/js_app_context.cpp",
+  "$ACE_LITE_PATH/src/core/context/js_app_environment.cpp",
+  "$ACE_LITE_PATH/src/core/context/js_framework_raw.cpp",
+  "$ACE_LITE_PATH/src/core/context/js_profiler.cpp",
+  "$ACE_LITE_PATH/src/core/context/js_timer_list.cpp",
+  "$ACE_LITE_PATH/src/core/dialog/js_dialog.cpp",
+  "$ACE_LITE_PATH/src/core/directive/descriptor_utils.cpp",
+  "$ACE_LITE_PATH/src/core/directive/directive_watcher_callback.cpp",
+  "$ACE_LITE_PATH/src/core/jsi/jsi.cpp",
+  "$ACE_LITE_PATH/src/core/modules/app_module.cpp",
+  "$ACE_LITE_PATH/src/core/modules/dfx_module.cpp",
+  "$ACE_LITE_PATH/src/core/modules/dialog_module.cpp",
+  "$ACE_LITE_PATH/src/core/modules/module_manager.cpp",
+  "$ACE_LITE_PATH/src/core/modules/presets/cjson_parser.cpp",
+  "$ACE_LITE_PATH/src/core/modules/presets/console_log_impl.cpp",
+  "$ACE_LITE_PATH/src/core/modules/presets/console_module.cpp",
+  "$ACE_LITE_PATH/src/core/modules/presets/date_time_format_module.cpp",
+  "$ACE_LITE_PATH/src/core/modules/presets/intl_module.cpp",
+  "$ACE_LITE_PATH/src/core/modules/presets/localization_module.cpp",
+  "$ACE_LITE_PATH/src/core/modules/presets/number_format_module.cpp",
+  "$ACE_LITE_PATH/src/core/modules/presets/preset_module.cpp",
+  "$ACE_LITE_PATH/src/core/modules/presets/profiler_module.cpp",
+  "$ACE_LITE_PATH/src/core/modules/presets/render_module.cpp",
+  "$ACE_LITE_PATH/src/core/modules/presets/require_module.cpp",
+  "$ACE_LITE_PATH/src/core/modules/presets/timer_module.cpp",
+  "$ACE_LITE_PATH/src/core/modules/presets/version_module.cpp",
+  "$ACE_LITE_PATH/src/core/modules/router_module.cpp",
+  "$ACE_LITE_PATH/src/core/modules/sample_module.cpp",
+  "$ACE_LITE_PATH/src/core/resource/video_muted_image_res.cpp",
+  "$ACE_LITE_PATH/src/core/resource/video_play_image_res.cpp",
+  "$ACE_LITE_PATH/src/core/router/js_page_state.cpp",
+  "$ACE_LITE_PATH/src/core/router/js_page_state_machine.cpp",
+  "$ACE_LITE_PATH/src/core/router/js_router.cpp",
+  "$ACE_LITE_PATH/src/core/stylemgr/app_style.cpp",
+  "$ACE_LITE_PATH/src/core/stylemgr/app_style_item.cpp",
+  "$ACE_LITE_PATH/src/core/stylemgr/app_style_list.cpp",
+  "$ACE_LITE_PATH/src/core/stylemgr/app_style_manager.cpp",
+  "$ACE_LITE_PATH/src/core/stylemgr/app_style_sheet.cpp",
+  "$ACE_LITE_PATH/src/core/wrapper/js.cpp",
+  "$ACE_LITE_PATH/targets/platform_adapter.cpp",
+]
@@ -1,8 +0,0 @@
-export default {
-    onCreate() {
-        console.info("Application onCreate");
-    },
-    onDestroy() {
-        console.info("Application onDestroy");
-    }
-};
@@ -1,34 +0,0 @@
-<!--
-Copyright (c) 2020 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.
-->
-
-<div style="width: 454; height: 454; left: 0; top: 0; flex-direction: column">
-  <stack style="width: 454; height: 80; margin-top: 80">
-    <input type="button" style="left: 85; width: 130; height: 60; top: 10" value="首页" onclick="backMain" />
-    <input type="button" style="left: 235; width: 130; height: 60; top: 10" value="上一页" onclick="backSuperior" />
-  </stack>
-  <canvas
-    ref="canvas1"
-    show="{{ status }}"
-    style="margin-left: 130; width: 200; height: 150; background-color: #ffff00"
-  >
-  </canvas>
-  <div style="width: 454; height: 60; margin-left: 85">
-    <input type="button" style="width: 140; height: 60" value="fillRect" onclick="fillRectFunc" />
-    <input type="button" style="width: 140; height: 60" value="show" onclick="changeStatus" />
-  </div>
-  <text class="text" style="margin-left: 105">
-    {{ text1 }}
-  </text>
-</div>
@@ -1,34 +0,0 @@
-<!--
-Copyright (c) 2020 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.
-->
-
-<div style="width: 454; height: 454; left: 0; top: 0; flex-direction: column">
-  <stack style="width: 454; height: 80; margin-top: 80">
-    <input type="button" style="left: 85; width: 130; height: 60; top: 10" value="首页" onclick="backMain" />
-    <input type="button" style="left: 235; width: 130; height: 60; top: 10" value="上一页" onclick="backSuperior" />
-  </stack>
-  <canvas
-    ref="canvas1"
-    if="{{ ifStatus }}"
-    style="margin-left: 130; width: 200; height: 150; background-color: #ffff00"
-  >
-  </canvas>
-  <div style="width: 454; height: 60; margin-left: 85">
-    <input type="button" style="width: 140; height: 60" value="fillRect" onclick="fillRectFunc" />
-    <input type="button" style="width: 140; height: 60" value="if" onclick="changeIf" />
-  </div>
-  <text class="text" style="margin-left: 105">
-    {{ text1 }}
-  </text>
-</div>
@@ -1,33 +0,0 @@
-<!--
-Copyright (c) 2020 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.
-->
-
-<div style="width: 454; height: 454; left: 0; top: 0; flex-direction: column">
-  <stack style="width: 454; height: 80; margin-top: 80">
-    <input type="button" style="left: 85; width: 130; height: 60; top: 10" value="首页" onclick="backMain" />
-    <input type="button" style="left: 235; width: 130; height: 60; top: 10" value="上一页" onclick="backSuperior" />
-  </stack>
-  <canvas
-    ref="canvas{{ $item }}"
-    for="{{ listData }}"
-    style="margin-left: 130; margin-top: 10; width: 200; height: 75; background-color: #ffff00"
-  >
-  </canvas>
-  <div style="width: 454; height: 60; margin-left: 160">
-    <input type="button" style="width: 140; height: 60" value="fillRect" onclick="fillRectFunc" />
-  </div>
-  <text class="text" style="margin-left: 105">
-    {{ text1 }}
-  </text>
-</div>
@@ -1,31 +0,0 @@
-<!--
-Copyright (c) 2020 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.
-->
-
-<div style="height: 450; width: 450; border-width: 1; border-color: #ff0000; flex-direction: column">
-  <stack style="width: 454; height: 80; margin-top: 80; border-width: 1; border-color: #0000ff">
-    <input type="button" style="left: 85; width: 130; height: 60" value="首页" onclick="backMain" />
-    <input type="button" style="left: 235; width: 130; height: 60" value="上一页" onclick="backSuperior" />
-  </stack>
-  <canvas ref="canvasObj" style="width: 280; height: 80; margin: 20; background-color: #ffff00"> </canvas>
-  <text class="text" style="margin-left: 40; width: 360">
-    {{ text1 }}
-  </text>
-  <text class="text" style="margin-left: 40; width: 360">
-    {{ text2 }}
-  </text>
-  <text class="text" style="margin-left: 40; width: 360">
-    {{ text3 }}
-  </text>
-</div>
@@ -1,44 +0,0 @@
-<!--
-Copyright (c) 2020 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.
-->
-
-<div style="height: 450; width: 450; flex-direction: column; border-width: 1; border-color: #ff0000">
-  <stack style="width: 454; height: 80; margin-top: 80; border-width: 1; border-color: #0000ff">
-    <input type="button" style="left: 85; width: 130; height: 60" value="首页" onclick="backMain" />
-    <input type="button" style="left: 235; width: 130; height: 60" value="上一页" onclick="backSuperior" />
-  </stack>
-  <canvas
-    style="
-      width: 280;
-      height: 60;
-      margin-left: 40;
-      margin-top: 15;
-      margin-right: 10;
-      margin-bottom: 20;
-      background-color: #00ff00;
-      border-width: 1;
-      border-color: #ffa500;
-    "
-  >
-  </canvas>
-  <text class="text" style="margin-left: 40; width: 320">
-    {{ text1 }}
-  </text>
-  <text class="text" style="margin-left: 40; width: 320">
-    {{ text2 }}
-  </text>
-  <text class="text" style="margin-left: 40; width: 320">
-    {{ text3 }}
-  </text>
-</div>
@@ -1,37 +0,0 @@
-<!--
-Copyright (c) 2020 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.
-->
-
-<div style="height: 454; width: 454; flex-direction: column">
-  <stack style="width: 454; height: 80; margin-top: 80; border-width: 1; border-color: #0000ff">
-    <input type="button" style="left: 85; width: 130; height: 60" value="首页" onclick="backMain" />
-    <input type="button" style="left: 235; width: 130; height: 60" value="上一页" onclick="backSuperior" />
-  </stack>
-  <canvas
-    style="width:280;height:60;margin-left:85;background-color:#00ff00;border-width:1;border-color:#ffa500;display:{{
-      displayValue
-    }}"
-  >
-  </canvas>
-  <input type="button" style="width: 140; height: 60; margin-left: 160" value="display" onclick="changeDisplay" />
-  <text class="text" style="margin-left: 45; width: 330">
-    {{ text1 }}
-  </text>
-  <text class="text" style="margin-left: 45; width: 330">
-    {{ text2 }}
-  </text>
-  <text class="text" style="margin-left: 45; width: 330">
-    {{ text3 }}
-  </text>
-</div>
@@ -1,63 +0,0 @@
-<!--
-Copyright (c) 2020 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.
-->
-
-<stack style="left: 0; right: 0; width: 454; height: 454">
-  <list style="left: 0; right: 0; width: 454; height: 454; flex-direction: column">
-    <list-item style="width: 454; height: 60"> </list-item>
-    <list-item style="width: 454; height: 80">
-      <input type="button" style="margin-left: 85; width: 130; height: 60" value="返回首页" onclick="backMain" />
-      <input type="button" style="margin-left: 20; width: 130; height: 60" value="返回上级" onclick="backSuperior" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item class="titleContainerStyle">
-      <text class="titleTextStyle"> canvas属性接口 </text>
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 170">
-      <canvas id="cvs1" ref="canvas1" style="margin-left: 45; width: 200; height: 150; background-color: #ffff00">
-      </canvas>
-      <input type="button" style="margin-left: 10; width: 180; height: 60" value="fillStyle" onclick="fillStyleFunc" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 170">
-      <canvas ref="canvas2" style="margin-left: 45; width: 200; height: 150; background-color: #ffff00"> </canvas>
-      <input
-        type="button"
-        style="margin-left: 10; width: 180; height: 60"
-        value="strokeStyle"
-        onclick="strokeStyleFunc"
-      />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 170">
-      <canvas ref="canvas3" style="margin-left: 45; width: 200; height: 150; background-color: #ffff00"> </canvas>
-      <input type="button" style="margin-left: 10; width: 180; height: 60" value="lineWidth" onclick="lineWidthFunc" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 170">
-      <canvas ref="canvas4" style="margin-left: 45; width: 200; height: 150; background-color: #ffff00"> </canvas>
-      <input type="button" style="margin-left: 10; width: 180; height: 60" value="font" onclick="fontFunc" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 170">
-      <canvas ref="canvas5" style="margin-left: 45; width: 200; height: 150; background-color: #ffff00"> </canvas>
-      <input type="button" style="margin-left: 10; width: 180; height: 60" value="textAlign" onclick="textAlignFunc" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 170">
-      <input type="button" style="margin-left: 10; width: 180; height: 60" value="jump" onclick="jumpFunc" />
-    </list-item>
-  </list>
-</stack>
@@ -1,53 +0,0 @@
-<!--
-Copyright (c) 2020 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.
-->
-
-<stack style="left: 0; right: 0; width: 454; height: 454">
-  <list style="left: 0; right: 0; width: 454; height: 454; flex-direction: column">
-    <list-item style="width: 454; height: 60"> </list-item>
-    <list-item style="width: 454; height: 80">
-      <input type="button" style="margin-left: 85; width: 130; height: 60" value="返回首页" onclick="backMain" />
-      <input type="button" style="margin-left: 20; width: 130; height: 60" value="返回上级" onclick="backSuperior" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item class="titleContainerStyle">
-      <text class="titleTextStyle"> canvas绘图接口 </text>
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 170">
-      <canvas ref="canvas1" style="margin-left: 45; width: 200; height: 150; background-color: #ffff00"> </canvas>
-      <input type="button" style="margin-left: 10; width: 180; height: 60" value="fillRect" onclick="fillRectFunc" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 170">
-      <canvas ref="canvas2" style="margin-left: 45; width: 200; height: 150; background-color: #ffff00"> </canvas>
-      <input
-        type="button"
-        style="margin-left: 10; width: 180; height: 60"
-        value="strokeRect"
-        onclick="strokeRectFunc"
-      />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 170">
-      <canvas ref="canvas3" style="margin-left: 45; width: 200; height: 150; background-color: #ffff00"> </canvas>
-      <input type="button" style="margin-left: 10; width: 180; height: 60" value="fillText" onclick="fillTextFunc" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 170">
-      <canvas ref="canvas4" style="margin-left: 45; width: 200; height: 150; background-color: #ffff00"> </canvas>
-      <input type="button" style="margin-left: 10; width: 180; height: 60" value="arc" onclick="arcFunc" />
-    </list-item>
-  </list>
-</stack>
@@ -1,49 +0,0 @@
-<!--
-Copyright (c) 2020 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.
-->
-
-<stack style="left: 0; right: 0; width: 454; height: 454">
-  <list style="left: 0; right: 0; width: 454; height: 454; flex-direction: column">
-    <list-item style="width: 454; height: 60"> </list-item>
-    <list-item style="width: 454; height: 80">
-      <input type="button" style="margin-left: 85; width: 130; height: 60" value="返回首页" onclick="backMain" />
-      <input type="button" style="margin-left: 20; width: 130; height: 60" value="返回上级" onclick="backSuperior" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item class="titleContainerStyle">
-      <text class="titleTextStyle"> canvas通用属性 </text>
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 120">
-      <stack style="width: 200; height: 120; margin-left: 30">
-        <text style="width: 200; height: 40; top: 40"> show </text>
-      </stack>
-      <input type="button" style="width: 140; height: 60; margin-right: 30" value="点击进入" onclick="changePage1" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 120">
-      <stack style="width: 200; height: 120; margin-left: 30">
-        <text style="width: 200; height: 40; top: 40"> if </text>
-      </stack>
-      <input type="button" style="width: 140; height: 60; margin-right: 30" value="点击进入" onclick="changePage2" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 120">
-      <stack style="width: 200; height: 120; margin-left: 30">
-        <text style="width: 200; height: 40; top: 40"> for </text>
-      </stack>
-      <input type="button" style="width: 140; height: 60; margin-right: 30" value="点击进入" onclick="changePage3" />
-    </list-item>
-  </list>
-</stack>
@@ -1,71 +0,0 @@
-<!--
-Copyright (c) 2020 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.
-->
-
-<stack style="left: 0; right: 0; width: 454; height: 454">
-  <list style="left: 0; right: 0; width: 454; height: 454; flex-direction: column">
-    <list-item style="width: 454; height: 60"> </list-item>
-    <list-item style="width: 454; height: 80">
-      <input type="button" style="margin-left: 85; width: 130; height: 60" value="返回首页" onclick="backMain" />
-      <input type="button" style="margin-left: 20; width: 130; height: 60" value="返回上级" onclick="backSuperior" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item class="titleContainerStyle">
-      <text class="titleTextStyle"> canvas通用样式 </text>
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 200">
-      <stack style="width: 200; height: 160; margin-left: 30">
-        <text style="width: 200; height: 40; top: 20"> 背景色 </text>
-        <text style="width: 200; height: 40; top: 60"> left </text>
-        <text style="width: 200; height: 40; top: 100"> top </text>
-      </stack>
-      <input type="button" style="width: 140; height: 60; margin-right: 30" value="点击进入" onclick="changePage1" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 200">
-      <stack style="width: 200; height: 160; margin-left: 30">
-        <text style="width: 200; height: 40; top: 20"> margin </text>
-        <text style="width: 200; height: 40; top: 60"> height </text>
-        <text style="width: 200; height: 40; top: 100"> width </text>
-      </stack>
-      <input type="button" style="width: 140; height: 60; margin-right: 30" value="点击进入" onclick="changePage2" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 200">
-      <stack style="width: 200; height: 160; margin-left: 30">
-        <text style="width: 200; height: 40; top: 40"> border </text>
-        <text style="width: 200; height: 40; top: 80"> padding </text>
-      </stack>
-      <input type="button" style="width: 140; height: 60; margin-right: 30" value="点击进入" onclick="changePage3" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 200">
-      <stack style="width: 260; height: 160; margin-left: 30">
-        <text style="width: 260; height: 40; top: 0"> margin-left </text>
-        <text style="width: 260; height: 40; top: 40"> margin-top </text>
-        <text style="width: 260; height: 40; top: 80"> margin-right </text>
-        <text style="width: 260; height: 40; top: 120"> margin-bottom </text>
-      </stack>
-      <input type="button" style="width: 140; height: 60; margin-right: 30" value="点击进入" onclick="changePage4" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 200">
-      <stack style="width: 200; height: 160; margin-left: 30">
-        <text style="width: 200; height: 40; top: 80"> display </text>
-      </stack>
-      <input type="button" style="width: 140; height: 60; margin-right: 30" value="点击进入" onclick="changePage5" />
-    </list-item>
-  </list>
-</stack>
@@ -1,37 +0,0 @@
-<!--
-Copyright (c) 2020 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.
-->
-
-<stack style="left: 0; right: 0; width: 454; height: 454">
-  <list style="left: 0; right: 0; width: 454; height: 454; flex-direction: column">
-    <list-item style="width: 454; height: 60"> </list-item>
-    <list-item style="width: 454; height: 80">
-      <input type="button" style="margin-left: 85; width: 130; height: 60" value="返回首页" onclick="backMain" />
-      <input type="button" style="margin-left: 20; width: 130; height: 60" value="返回上级" onclick="backSuperior" />
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item class="titleContainerStyle">
-      <text class="titleTextStyle"> canvas通用事件 </text>
-    </list-item>
-    <list-item class="separatorContainerStyle"> </list-item>
-    <list-item style="width: 454; height: 170">
-      <stack style="width: 200; height: 160; margin-left: 30">
-        <text style="width: 200; height: 40; top: 40"> click </text>
-        <text style="width: 200; height: 40; top: 80"> longpress </text>
-        <text style="width: 200; height: 40; top: 120"> swipe </text>
-      </stack>
-      <input type="button" style="width: 140; height: 60; margin-right: 30" value="点击进入" onclick="changePage1" />
-    </list-item>
-  </list>
-</stack>
@@ -1,34 +0,0 @@
-<!--
-Copyright (c) 2020 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.
-->
-
-<div style="width: 454; height: 454; left: 0; top: 0; flex-direction: column">
-  <stack style="width: 454; height: 80; margin-top: 80">
-    <input type="button" style="left: 85; width: 130; height: 60; top: 10" value="首页" onclick="backMain" />
-    <input type="button" style="left: 235; width: 130; height: 60; top: 10" value="上一页" onclick="backSuperior" />
-  </stack>
-  <list
-    id="list1"
-    ref="listObj"
-    style="width: 280; height: 200; margin-left: 85; flex-direction: column; border-width: 1; border-color: #ff0000"
-    onclick="listClick"
-    onscrollend="scrollEnd"
-  >
-    <list-item style="width: 280; height: 50" for="{{ listData }}">
-      <text style="width: 280; height: 50"> item-{{ $idx }} </text>
-    </list-item>
-  </list>
-  <input type="button" style="width: 130; height: 40; margin-left: 170" value="scrollTo" onclick="clickscrollTo" />
-  <text class="text" style="margin-left: 45"> 点击button回到item-2 </text>
-</div>
@@ -1,35 +0,0 @@
-<!--
-Copyright (c) 2020 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.
-->
-
-<stack class="stack" >
-    <stack style="width:454px;height:80px;top:80px;">
-      <input type="button" style="left:85px;width:130px;height:60px;top:10px;" value="首页" onclick=backMain/>
-      <input type="button" style="left:235px;width:130px;height:60px;top:10px;" value="上一页" onclick=backSuperior/>
-    </stack>
-    <stack style="width:280px;height:60px;top:170px;left:85px;background-color:#00ff00;">
-      <text style="width:280px;height:50px;font-size:30px;">
-        stack已设置样式
-      </text>
-    </stack>
-    <text class="text" style="left:105px;width:280px;top:260px;">
-      {{text1}}
-    </text>
-    <text class="text" style="left:105px;width:280px;top:300px;">
-      {{text2}}
-    </text>
-    <text class="text" style="left:105px;width:280px;top:340px;">
-      {{text3}}
-    </text>
-</stack>
@@ -0,0 +1,87 @@
+#Copyright (c) 2020-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.
+
+import("//build/lite/config/component/lite_component.gni")
+import("//build/lite/config/subsystem/aafwk/config.gni")
+import("//foundation/ace/ace_engine_lite/ace_lite.gni")
+
+declare_args() {
+  LOSCFG_TEST_JS_BUILD = false
+}
+
+lite_component("jsfwk") {
+  features = [ ":ace_lite" ]
+}
+
+config("ace_lite_config") {
+  include_dirs = ace_lite_include_dirs
+  if (ohos_kernel_type == "liteos_a" || ohos_kernel_type == "liteos_m") {
+    include_dirs += [ "targets/liteos_a" ]
+  } else if (ohos_kernel_type == "linux") {
+    include_dirs += [ "targets/linux" ]
+  }
+  cflags_cc = [ "-std=c++14" ]
+  ldflags = [ "-lstdc++" ]
+  ldflags += [ "-lpthread" ]
+  ldflags += [ "-Wl,-rpath-link=$ohos_root_path/$root_out_dir" ]
+}
+
+shared_library("ace_lite") {
+  configs -= [ "//build/lite/config:language_cpp" ]
+  cflags = [
+    "-Wall",
+    "-Wno-format",
+    "-Wno-format-extra-args",
+  ]
+  cflags_cc = cflags
+  configs += [ ":ace_lite_config" ]
+  public_configs = configs
+
+  sources = ace_lite_sources
+
+  public_deps = [
+    "${appexecfwk_lite_path}/interfaces/kits/bundle_lite/js/builtin:capability_api",
+    "//base/global/i18n_lite/frameworks/i18n:global_i18n",
+    "//base/global/resmgr_lite/frameworks/resmgr_lite:global_resmgr",
+    "//base/security/huks/frameworks/crypto_lite/js/builtin:ace_kit_cipher",
+    "//build/lite/config/component/cJSON:cjson_shared",
+    "//foundation/graphic/surface:lite_surface",
+    "//foundation/graphic/ui:lite_ui",
+    "//foundation/multimedia/camera_lite/frameworks:camera_lite",
+    "//foundation/multimedia/media_lite/frameworks/player_lite:player_lite",
+    "//foundation/multimedia/media_lite/interfaces/kits/player_lite/js/builtin:audio_lite_api",
+    "//third_party/bounds_checking_function:libsec_shared",
+    "//third_party/jerryscript/jerry-core:jerry-core_shared",
+    "//third_party/jerryscript/jerry-ext:jerry-ext_shared",
+    "//third_party/jerryscript/jerry-libm:jerry-libm_shared",
+    "//third_party/jerryscript/jerry-port/default:jerry-port-default_shared",
+    "//utils/native/lite/js/builtin:ace_utils_kits",
+    "//utils/native/lite/timer_task:ace_kit_timer",
+  ]
+
+  defines = []
+
+  if (ohos_build_type == "debug") {
+    defines += [ "JS_PROFILER=1" ]
+  } else {
+    defines += [ "JS_PROFILER=0" ]
+  }
+
+  if (LOSCFG_TEST_JS_BUILD) {
+    defines += [ "JSFWK_TEST" ]
+  }
+
+  if (enable_ohos_appexecfwk_feature_ability == true) {
+    defines += [ "ABILITY_WINDOW_SUPPORT" ]
+  }
+}
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Huawei Device Co., Ltd.
+# Copyright (c) 2020-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
@@ -23,19 +23,19 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_compile_options(-fpermissive -Wno-narrowing)

 set(ACE_LITE_CONFIG_PATH "${CMAKE_CURRENT_SOURCE_DIR}/targets/simulator")
-set(ACE_LITE_INNERKITS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces/innerkits/builtin")
+set(ACE_LITE_INNERKITS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/innerkits/builtin")
 set(JSFWK_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/include")
-set(JSFWK_INNERKITS_BUILTIN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../foundation/ace/interfaces/innerkits/builtin")
+set(JSFWK_INNERKITS_BUILTIN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../foundation/ace/ace_engine_lite/interfaces/innerkits/builtin")
 set(JSFWK_SOURCE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/core")
-set(UIKIT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../foundation/graphic/lite")
+set(UIKIT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../foundation/graphic/ui")
 set(THIRTY_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../third_party")
 set(JSFWK_SIMULATOR_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../tools/developer_tools_lite/graphic_tool/simulator")
-set(AAFWK_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../aafwk")
+set(AAFWK_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../aafwk/aafwk_lite")
 set(UTILS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../utils/native/lite")

 # add definitions
 # temporarily set, when ui and graphic unifid, this can be removed
-add_definitions(-DSCREENRESOLUTION_CMAKE)
+add_definitions(-DSCREENSIZE_SPECIFIED)

 # setup jerryscript
 include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
@@ -66,6 +66,7 @@ include_directories(
    ${JSFWK_SOURCE_PATH}
    ${JSFWK_SOURCE_PATH}/animation
    ${JSFWK_SOURCE_PATH}/base
+    ${JSFWK_SOURCE_PATH}/base/cache
    ${JSFWK_SOURCE_PATH}/components
    ${JSFWK_SOURCE_PATH}/context
    ${JSFWK_SOURCE_PATH}/directive
@@ -92,6 +93,7 @@ include_directories(
 # source files
 aux_source_directory(${JSFWK_SOURCE_PATH}/animation ANIMATION)
 aux_source_directory(${JSFWK_SOURCE_PATH}/base BASE)
+aux_source_directory(${JSFWK_SOURCE_PATH}/base/cache CACHE)
 aux_source_directory(${JSFWK_SOURCE_PATH}/components COMPONENTS)
 aux_source_directory(${JSFWK_SOURCE_PATH}/context CONTEXT)
 aux_source_directory(${JSFWK_SOURCE_PATH}/directive DIRECTIVE)
@@ -102,8 +104,8 @@ aux_source_directory(${JSFWK_SOURCE_PATH}/router ROUTER)
 aux_source_directory(${JSFWK_SOURCE_PATH}/stylemgr STYLEMGR)
 aux_source_directory(${JSFWK_SOURCE_PATH}/wrapper WRAPPER)
 aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/targets TARGETS)
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/test TEST)
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/test/unittest UNITTEST)
+#aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/test TEST)
+#aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/test/unittest UNITTEST)

 list(REMOVE_ITEM CONTEXT "${JSFWK_SOURCE_PATH}/context/ace_ability.cpp")
 list(REMOVE_ITEM MODULES_PRESETS "${JSFWK_SOURCE_PATH}/modules/presets/jstest_module.cpp")
@@ -115,6 +117,7 @@ list(REMOVE_ITEM UNITTEST
 add_library(jsfwk STATIC
    ${ANIMATION}
    ${BASE}
+    ${CACHE}
    ${COMPONENTS}
    ${CONTEXT}
    ${DIRECTIVE}
@@ -124,7 +127,7 @@ add_library(jsfwk STATIC
    ${ROUTER}
    ${STYLEMGR}
    ${WRAPPER}
-    ${TEST}
+    #${TEST}
    ${TARGETS}
    )
 target_include_directories(jsfwk PUBLIC
@@ -142,7 +145,7 @@ target_link_directories(jsfwk PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/jerryscript/lib
 if(UNIX)
    target_link_libraries(jsfwk global_resmgr ui jerry-port-default jerry-ext jerry-core)
 else()
-    target_link_libraries(jsfwk global_resmgr ui -Wl,--whole-archive jerry-port-default jerry-ext jerry-core -Wl,--no-whole-archive)
+    target_link_libraries(jsfwk global_resmgr ui -Wl,--whole-archive jerry-port-default jerry-ext jerry-core -Wl,--no-whole-archive psapi)
 endif()

 if (${JERRY_EXTERNAL_CONTEXT} STREQUAL ON)
@@ -17,7 +17,6 @@
    },
    "module": {
        "deviceType": [
-            "liteWearable",
            "smartVision"
        ],
        "distro": {
@@ -47,7 +47,7 @@
    <div
      style="width: 321px; height: 220px; background-color: #000000; flex-direction: column; align-items: flex-start"
    >
-      <text class="config-info">{{ updated }}:{{ udpateStatus }}</text>
+      <text class="config-info">{{ updated }}:{{ updateStatus }}</text>
      <text class="config-info">{{ dataSourceName }}:{{ dataSource }}</text>
      <div class="line-div"></div>
      <div style="width: 321px; height: 55px; align-items: center; margin-top: 20px">
@@ -55,7 +55,7 @@
          type="button"
          value="History"
          style="border-width: 3px; margin-left: 10px; border-color: #90ee90; width: 146px; height: 50px"
-          onclick="openHistroy"
+          onclick="openHistory"
        />
        <input
          type="button"
@@ -17,7 +17,7 @@ import router from "@system.router";
 export default {
  data: {
    location: "HangZhou",
-    udpateStatus: "15:13",
+    updateStatus: "15:13",
    dataSource: "tianqi.com",
    updated: "Updated",
    dataSourceName: "Data Source",
@@ -32,7 +32,7 @@ export default {
    this.monitoringStation = this.$t("monitoringStation");
    this.selectedIndex = this.selectedCityIndex;
  },
-  openHistroy() {
+  openHistory() {
    router.replace({
      uri: "pages/history/history"
    });
@@ -57,11 +57,11 @@ export default {
        console.log("[mainPage init] mode: " + this.dataWrapper.alarmItemIndex);
      }

-      this.unPackOriginData(); // apply origin data to current enviroment
+      this.unPackOriginData(); // apply origin data to current environment

      var modeDeleteAlarmIndex = 3;
      if (this.dataWrapper.mode === this.mode[0] && typeof (this.cancelAlarm) == "undefined") { // add alarm
-        this.time.push(this.transforTimeToTwelvehour(this.dataWrapper.time));
+        this.time.push(this.transformTimeToTwelveHour(this.dataWrapper.time));
        this.repeat.push(this.dataWrapper.repeat);
        this.switchStatus.push(false);
      } else if (this.dataWrapper.mode === this.mode[1]) { // edit alarm
@@ -70,7 +70,7 @@ export default {
          this.repeat.splice(this.dataWrapper.alarmItemIndex, 1);
          this.switchStatus.splice(this.dataWrapper.alarmItemIndex, 1);
        } else {
-          this.time[this.dataWrapper.alarmItemIndex] = this.transforTimeToTwelvehour(this.dataWrapper.time);
+          this.time[this.dataWrapper.alarmItemIndex] = this.transformTimeToTwelveHour(this.dataWrapper.time);
          this.repeat[this.dataWrapper.alarmItemIndex] = this.dataWrapper.repeat;
          this.switchStatus[this.dataWrapper.alarmItemIndex] = true;
        }
@@ -79,10 +79,10 @@ export default {
        this.switchStatus[this.dataWrapper.alarmItemIndex] = switchValue;
      }

-      this.packOriginData(); // wrap current enviroment data as origin data
+      this.packOriginData(); // wrap current environment data as origin data
    }
  },
-  transforTimeToTwelvehour(time) {
+  transformTimeToTwelveHour(time) {
    var timeArray = time.split(" ")[0].split(":");
    var hour = timeArray[0];
    var minute = timeArray[1];
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2020 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.
+ */
+export default {
+    onCreate() {
+        console.info("Application onCreate");
+    },
+    onDestroy() {
+        console.info("Application onDestroy");
+    }
+};
@@ -1,3 +1,17 @@
+/*
+ * Copyright (c) 2020 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.
+ */
 const OperatorLevels = {
    "+": 0,
    "-": 0,
@@ -1,3 +1,17 @@
+/*
+ * Copyright (c) 2020 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.
+ */
 .calc-container {
    height: 480px;
    width: 960px;
@@ -1,3 +1,18 @@
+<!--
+Copyright (c) 2020 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.
+-->
+
 <stack class="calc-container" @swipe="handleTerminate">
    <stack class="calc-titlebar" @click="handleExist">
        <image class="calc-icon calc-back-btn" src="/common/ic_back.png" />
@@ -1,3 +1,17 @@
+/*
+ * Copyright (c) 2020 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.
+ */
 import {calc, isOperator} from '../../common/calculator.js';
 import app from '@system.app';

@@ -17,7 +17,6 @@
  },
  "module": {
    "deviceType": [
-      "liteWearable",
      "smartVision"
    ],
    "abilities": [
@@ -56,7 +56,7 @@
    text-align: center;
 }

-.songer {
+.singer {
    width: 114px;
    height: 42px;
    margin-left: 423px;
@@ -20,7 +20,7 @@ limitations under the License.
           <text class="title">音乐</text>
       </div>
       <marquee class="musicName" scrollamount="15">{{curMusic.curMusicName}}</marquee>
-       <marquee class="songer" scrollamount="15">{{curMusic.songer}}</marquee>
+       <marquee class="singer" scrollamount="15">{{curMusic.singer}}</marquee>
       <div class="progress-Wrapper">
           <text class="playTime">{{curMusic.playTime}}</text>
           <slider class="progressBar" min="0" max="100" value="{{playProgress}}" onchange="changeProgress"></slider>
@@ -44,7 +44,7 @@ limitations under the License.
                            {{$item.name}}
                        </text>
                        <text class="itemSonger">
-                            {{$item.songer}}
+                            {{$item.singer}}
                        </text>
                    </div>
                </div>
@@ -30,7 +30,7 @@ export default {
    playStatus: 2,  //0:play,1:pause,2:stop
    curMusic: {  //current music info
      curMusicName: "",
-      songer: "",
+      singer: "",
      playTime: "00:00",
      allTime: "00:00"
    },
@@ -45,6 +45,9 @@ export default {
    };
    //update play progress
    audio.ontimeupdate = () => {
+      if (audio.duration == null || audio.duration <= 0) {
+        return;
+      }
      console.log("ontime update:");
      this.curMusic.playTime = this.timeChange(audio.currentTime);
      console.log("ontime update:" + this.curMusic.playTime);
@@ -126,7 +129,7 @@ export default {
    if (music != null) {
      this.playProgress = 0;
      this.curMusic.curMusicName = music.name;
-      this.curMusic.songer = music.songer;
+      this.curMusic.singer = music.singer;
      audio.src = music.src;
      console.log("playMusic:src:" + music.src);
      audio.play();
@@ -181,7 +184,7 @@ export default {
      console.log("ChangeSong:next" + this.curMusicIndex);
    }
    this.curMusic.curMusicName = this.musicList[this.curMusicIndex].name;
-    this.curMusic.songer = this.musicList[this.curMusicIndex].songer;
+    this.curMusic.singer = this.musicList[this.curMusicIndex].singer;
    this.playMusic(this.curMusicIndex);
    if(this.showMusicList){
      this.$refs.musicList.scrollTo({ index: (this.curMusicIndex == 0?0:this.curMusicIndex-1) });
@@ -13,7 +13,7 @@
  },
  "deviceConfig": {},
  "module": {
-    "deviceType": ["liteWearable", "smartVision"],
+    "deviceType": ["smartVision"],
    "distro": {
      "deliveryWithInstall": true,
      "moduleName": "entry",
--- a/Show More
+++ b/Show More