diff --git a/ETSUI/CustomDialogEts/README.md b/ETSUI/CustomDialogEts/README.md
index 49470f23451e1359df8334e1203e61da330ee905..e2b8c8c4a4729be0dff5e3433be63905ab3b8d25 100644
--- a/ETSUI/CustomDialogEts/README.md
+++ b/ETSUI/CustomDialogEts/README.md
@@ -37,16 +37,9 @@
2. [完成Hi3516开发板的烧录](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3516-burn.md)
3. 搭建开发环境
-
- 1. 开始前请参考[下载与安装软件](https://developer.harmonyos.com/cn/docs/documentation/doc-guides/software_install-0000001053582415)、[配置开发环境](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/configuring-openharmony-sdk.md),完成DevEco Studio的安装和开发环境配置。
- 2. 开发环境配置完成后,请参考[使用工程向导](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/use-wizard-to-create-project.md)创建工程,使用JS或者eTS语言开发、“Application”为例,模板选择“\[Standard\]Empty Ability”。
- 3. 工程创建完成后,可参考下面章节进行代码编写,使用真机进行调测:
-
- - [配置OpenHarmony应用签名信息](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/configuring-openharmony-app-signature.md)
- - [hap包安装指导](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/installing-openharmony-app.md)
- - 工程示例:
-
- 
+ 1. 开始前请参考[工具准备](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/start-overview.md#%E5%B7%A5%E5%85%B7%E5%87%86%E5%A4%87),完成DevEco Studio的安装和开发环境配置。
+ 2. 开发环境配置完成后,请参考[使用工程向导](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/start-with-ets.md#%E5%88%9B%E5%BB%BAets%E5%B7%A5%E7%A8%8B)创建工程(模板选择“Empty Ability”),选择JS或者eTS语言开发。
+ 3. 工程创建完成后,选择使用[真机进行调测](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/start-with-ets.md#%E4%BD%BF%E7%94%A8%E7%9C%9F%E6%9C%BA%E8%BF%90%E8%A1%8C%E5%BA%94%E7%94%A8)。
# 4.添加按钮Button组件
diff --git a/ETSUI/CustomDialogEts/build-profile.json5 b/ETSUI/CustomDialogEts/build-profile.json5
new file mode 100644
index 0000000000000000000000000000000000000000..bded64428ea1c8145603c4145540dcbf66b91db4
--- /dev/null
+++ b/ETSUI/CustomDialogEts/build-profile.json5
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+{
+ "app": {
+ "signingConfigs": [],
+ "compileSdkVersion": 8,
+ "compatibleSdkVersion": 8,
+ "products": [
+ {
+ "name": "default"
+ },
+ ],
+ },
+ "modules": [
+ {
+ "name": "entry",
+ "srcPath": "./entry",
+ "targets": [
+ {
+ "name": "default",
+ "applyToProducts": [
+ "default",
+ ],
+ },
+ ],
+ },
+ ],
+}
\ No newline at end of file
diff --git a/ETSUI/CustomDialogEts/build.gradle b/ETSUI/CustomDialogEts/build.gradle
deleted file mode 100644
index 8091e0ece10575993ba570722aadd6788144f460..0000000000000000000000000000000000000000
--- a/ETSUI/CustomDialogEts/build.gradle
+++ /dev/null
@@ -1,34 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-apply plugin: 'com.huawei.ohos.app'
-
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
- compileSdkVersion 7
- supportSystem "standard"
-}
-
-buildscript {
- repositories {
- maven {
- url 'https://repo.huaweicloud.com/repository/maven/'
- }
- maven {
- url 'https://developer.huawei.com/repo/'
- }
- }
- dependencies {
- classpath 'com.huawei.ohos:hap:3.0.3.4'
- classpath 'com.huawei.ohos:decctest:1.2.6.0'
- }
-}
-
-allprojects {
- repositories {
- maven {
- url 'https://repo.huaweicloud.com/repository/maven/'
- }
- maven {
- url 'https://developer.huawei.com/repo/'
- }
- }
-}
diff --git a/ETSUI/CustomDialogEts/entry/.gitignore b/ETSUI/CustomDialogEts/entry/.gitignore
deleted file mode 100644
index 7d5b7a94f4dcf381f03ff21f28f8a2494b58023f..0000000000000000000000000000000000000000
--- a/ETSUI/CustomDialogEts/entry/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build
-/node_modules
diff --git a/ETSUI/CustomDialogEts/entry/README.md b/ETSUI/CustomDialogEts/entry/README.md
deleted file mode 100644
index 45de83cf619da78d57b7e00f8e0614a53e84c8ea..0000000000000000000000000000000000000000
--- a/ETSUI/CustomDialogEts/entry/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# CustomDialogOpenH
-简介
-• 此demo是展示基于ETS的全局UI中警告弹框与自定义弹框的的实现。
-
diff --git a/ETSUI/CustomDialogEts/entry/build-profile.json5 b/ETSUI/CustomDialogEts/entry/build-profile.json5
new file mode 100644
index 0000000000000000000000000000000000000000..62a5100a430b12691a4b79f8c05362c9d5d5f4a1
--- /dev/null
+++ b/ETSUI/CustomDialogEts/entry/build-profile.json5
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+{
+ "apiType": 'faMode',
+ "buildOption": {
+ },
+ "targets": [
+ {
+ "name": "default",
+ },
+ {
+ "name": "ohosTest",
+ }
+ ]
+}
\ No newline at end of file
diff --git a/ETSUI/CustomDialogEts/entry/build.gradle b/ETSUI/CustomDialogEts/entry/build.gradle
deleted file mode 100644
index 1587dd1948941f3eaaf092ae6cae7969cb6895ff..0000000000000000000000000000000000000000
--- a/ETSUI/CustomDialogEts/entry/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-apply plugin: 'com.huawei.ohos.hap'
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
- compileSdkVersion 7
- defaultConfig {
- compatibleSdkVersion 7
- }
- buildTypes {
- release {
- proguardOpt {
- proguardEnabled false
- rulesFiles 'proguard-rules.pro'
- }
- }
- }
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar', '*.har'])
- testImplementation 'junit:junit:4.13.1'
-}
diff --git a/ETSUI/CustomDialogEts/entry/hvigorfile.js b/ETSUI/CustomDialogEts/entry/hvigorfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..10bf2171a235d29f7a9c074f18552981b8f7882f
--- /dev/null
+++ b/ETSUI/CustomDialogEts/entry/hvigorfile.js
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').legacyHapTasks
diff --git a/ETSUI/CustomDialogEts/entry/package.json b/ETSUI/CustomDialogEts/entry/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..f8964f7a229e8f1de91bcd74a9eac702cca31283
--- /dev/null
+++ b/ETSUI/CustomDialogEts/entry/package.json
@@ -0,0 +1,10 @@
+{
+ "name": "entry",
+ "version": "1.0.0",
+ "ohos": {
+ "org": "huawei",
+ "buildTool": "hvigor",
+ "directoryLevel": "module"
+ },
+ "dependencies": {}
+}
diff --git a/ETSUI/CustomDialogEts/entry/proguard-rules.pro b/ETSUI/CustomDialogEts/entry/proguard-rules.pro
deleted file mode 100644
index f7666e47561d514b2a76d5a7dfbb43ede86da92a..0000000000000000000000000000000000000000
--- a/ETSUI/CustomDialogEts/entry/proguard-rules.pro
+++ /dev/null
@@ -1 +0,0 @@
-# config module specific ProGuard rules here.
\ No newline at end of file
diff --git a/ETSUI/CustomDialogEts/entry/src/main/config.json b/ETSUI/CustomDialogEts/entry/src/main/config.json
index 022f80d80d65b9df6f8693f2ef7564ba9f6707b9..dc6b300c71daf4a90a754facc3769641210bd372 100644
--- a/ETSUI/CustomDialogEts/entry/src/main/config.json
+++ b/ETSUI/CustomDialogEts/entry/src/main/config.json
@@ -1,7 +1,7 @@
{
"app": {
- "bundleName": "com.huawei.customdialogopenh",
- "vendor": "huawei",
+ "vendor": "example",
+ "bundleName": "com.huawei.cookbook",
"version": {
"code": 1000000,
"name": "1.0.0"
@@ -9,18 +9,11 @@
},
"deviceConfig": {},
"module": {
- "package": "com.huawei.customdialogopenh",
- "name": ".MyApplication",
"mainAbility": ".MainAbility",
"deviceType": [
- "phone"
+ "phone",
+ "tablet"
],
- "distro": {
- "deliveryWithInstall": true,
- "moduleName": "entry",
- "moduleType": "entry",
- "installationFree": false
- },
"abilities": [
{
"skills": [
@@ -39,13 +32,22 @@
"name": ".MainAbility",
"srcLanguage": "ets",
"icon": "$media:icon",
- "description": "$string:description_mainability",
+ "description": "$string:MainAbility_desc",
"formsEnabled": false,
- "label": "$string:entry_MainAbility",
+ "label": "$string:MainAbility_label",
"type": "page",
"launchType": "standard"
}
],
+ "distro": {
+ "moduleType": "entry",
+ "installationFree": false,
+ "deliveryWithInstall": true,
+ "moduleName": "entry"
+ },
+ "package": "com.example.entry",
+ "srcPath": "",
+ "name": ".entry",
"js": [
{
"mode": {
diff --git a/ETSUI/CustomDialogEts/entry/src/main/resources/base/element/string.json b/ETSUI/CustomDialogEts/entry/src/main/resources/base/element/string.json
index 03b8532c53ca563f8ed6b1e21d20ad3f67a68906..490210a3908f47722dc942d49dacc98b97669a5f 100644
--- a/ETSUI/CustomDialogEts/entry/src/main/resources/base/element/string.json
+++ b/ETSUI/CustomDialogEts/entry/src/main/resources/base/element/string.json
@@ -1,12 +1,16 @@
{
"string": [
{
- "name": "entry_MainAbility",
- "value": "entry_MainAbility"
+ "name": "entry_desc",
+ "value": "description"
},
{
- "name": "description_mainability",
- "value": "ETS_Empty Ability"
+ "name": "MainAbility_desc",
+ "value": "description"
+ },
+ {
+ "name": "MainAbility_label",
+ "value": "label"
}
]
}
\ No newline at end of file
diff --git a/ETSUI/CustomDialogEts/gradle/wrapper/gradle-wrapper.jar b/ETSUI/CustomDialogEts/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 490fda8577df6c95960ba7077c43220e5bb2c0d9..0000000000000000000000000000000000000000
Binary files a/ETSUI/CustomDialogEts/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/ETSUI/CustomDialogEts/gradle/wrapper/gradle-wrapper.properties b/ETSUI/CustomDialogEts/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index f59159e865d4b59feb1b8c44b001f62fc5d58df4..0000000000000000000000000000000000000000
--- a/ETSUI/CustomDialogEts/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://repo.huaweicloud.com/gradle/gradle-6.3-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/ETSUI/CustomDialogEts/hvigorfile.js b/ETSUI/CustomDialogEts/hvigorfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..ae70b6f5380f9933e1bceaea54787ce080715807
--- /dev/null
+++ b/ETSUI/CustomDialogEts/hvigorfile.js
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').legacyAppTasks
\ No newline at end of file
diff --git a/ETSUI/CustomDialogEts/package.json b/ETSUI/CustomDialogEts/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..7fc345454cba5ac09c5c5b465ddb41a1b19c3998
--- /dev/null
+++ b/ETSUI/CustomDialogEts/package.json
@@ -0,0 +1,13 @@
+{
+ "name": "example",
+ "version": "1.0.0",
+ "ohos": {
+ "org": "huawei",
+ "buildTool": "hvigor",
+ "directoryLevel": "project"
+ },
+ "dependencies": {
+ "@ohos/hvigor": "1.0.6",
+ "@ohos/hvigor-ohos-plugin": "1.0.6"
+ }
+}
diff --git a/ETSUI/CustomDialogEts/settings.gradle b/ETSUI/CustomDialogEts/settings.gradle
deleted file mode 100644
index 4773db73233a570c2d0c01a22e75321acfbf7a07..0000000000000000000000000000000000000000
--- a/ETSUI/CustomDialogEts/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':entry'
diff --git a/ETSUI/FlowLayoutEts/README.md b/ETSUI/FlowLayoutEts/README.md
index 3c988654181a1b5198e38fe7b2ee21e93585f049..609f6c1db025e1fd0a34e07cba260730e901be64 100644
--- a/ETSUI/FlowLayoutEts/README.md
+++ b/ETSUI/FlowLayoutEts/README.md
@@ -30,15 +30,10 @@ TextInput:提供单行文本输入组件。
3. 搭建开发环境
- 1. 开始前请参考[下载与安装软件](https://developer.harmonyos.com/cn/docs/documentation/doc-guides/software_install-0000001053582415)、[配置开发环境](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/configuring-openharmony-sdk.md),完成DevEco Studio的安装和开发环境配置。
- 2. 开发环境配置完成后,请参考[使用工程向导](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/use-wizard-to-create-project.md)创建工程,使用JS或者eTS语言开发、“Application”为例,模板选择“\[Standard\]Empty Ability”。
- 3. 工程创建完成后,可参考下面章节进行代码编写,使用真机进行调测:
+ 1. 开始前请参考[工具准备](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/start-overview.md#%E5%B7%A5%E5%85%B7%E5%87%86%E5%A4%87),完成DevEco Studio的安装和开发环境配置。
+ 2. 开发环境配置完成后,请参考[使用工程向导](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/start-with-ets.md#%E5%88%9B%E5%BB%BAets%E5%B7%A5%E7%A8%8B)创建工程(模板选择“Empty Ability”),选择JS或者eTS语言开发。
+ 3. 工程创建完成后,选择使用[真机进行调测](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/start-with-ets.md#%E4%BD%BF%E7%94%A8%E7%9C%9F%E6%9C%BA%E8%BF%90%E8%A1%8C%E5%BA%94%E7%94%A8)。
- - [配置OpenHarmony应用签名信息](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/configuring-openharmony-app-signature.md)
- - [hap包安装指导](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/installing-openharmony-app.md)
- - 工程示例:
-
- 
# 4.编写输入框布局
diff --git a/ETSUI/FlowLayoutEts/build-profile.json5 b/ETSUI/FlowLayoutEts/build-profile.json5
new file mode 100644
index 0000000000000000000000000000000000000000..bded64428ea1c8145603c4145540dcbf66b91db4
--- /dev/null
+++ b/ETSUI/FlowLayoutEts/build-profile.json5
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+{
+ "app": {
+ "signingConfigs": [],
+ "compileSdkVersion": 8,
+ "compatibleSdkVersion": 8,
+ "products": [
+ {
+ "name": "default"
+ },
+ ],
+ },
+ "modules": [
+ {
+ "name": "entry",
+ "srcPath": "./entry",
+ "targets": [
+ {
+ "name": "default",
+ "applyToProducts": [
+ "default",
+ ],
+ },
+ ],
+ },
+ ],
+}
\ No newline at end of file
diff --git a/ETSUI/FlowLayoutEts/build.gradle b/ETSUI/FlowLayoutEts/build.gradle
deleted file mode 100644
index 8091e0ece10575993ba570722aadd6788144f460..0000000000000000000000000000000000000000
--- a/ETSUI/FlowLayoutEts/build.gradle
+++ /dev/null
@@ -1,34 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-apply plugin: 'com.huawei.ohos.app'
-
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
- compileSdkVersion 7
- supportSystem "standard"
-}
-
-buildscript {
- repositories {
- maven {
- url 'https://repo.huaweicloud.com/repository/maven/'
- }
- maven {
- url 'https://developer.huawei.com/repo/'
- }
- }
- dependencies {
- classpath 'com.huawei.ohos:hap:3.0.3.4'
- classpath 'com.huawei.ohos:decctest:1.2.6.0'
- }
-}
-
-allprojects {
- repositories {
- maven {
- url 'https://repo.huaweicloud.com/repository/maven/'
- }
- maven {
- url 'https://developer.huawei.com/repo/'
- }
- }
-}
diff --git a/ETSUI/FlowLayoutEts/entry/build-profile.json5 b/ETSUI/FlowLayoutEts/entry/build-profile.json5
new file mode 100644
index 0000000000000000000000000000000000000000..62a5100a430b12691a4b79f8c05362c9d5d5f4a1
--- /dev/null
+++ b/ETSUI/FlowLayoutEts/entry/build-profile.json5
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+{
+ "apiType": 'faMode',
+ "buildOption": {
+ },
+ "targets": [
+ {
+ "name": "default",
+ },
+ {
+ "name": "ohosTest",
+ }
+ ]
+}
\ No newline at end of file
diff --git a/ETSUI/FlowLayoutEts/entry/build.gradle b/ETSUI/FlowLayoutEts/entry/build.gradle
deleted file mode 100644
index 1587dd1948941f3eaaf092ae6cae7969cb6895ff..0000000000000000000000000000000000000000
--- a/ETSUI/FlowLayoutEts/entry/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-apply plugin: 'com.huawei.ohos.hap'
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
- compileSdkVersion 7
- defaultConfig {
- compatibleSdkVersion 7
- }
- buildTypes {
- release {
- proguardOpt {
- proguardEnabled false
- rulesFiles 'proguard-rules.pro'
- }
- }
- }
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar', '*.har'])
- testImplementation 'junit:junit:4.13.1'
-}
diff --git a/ETSUI/FlowLayoutEts/entry/hvigorfile.js b/ETSUI/FlowLayoutEts/entry/hvigorfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..10bf2171a235d29f7a9c074f18552981b8f7882f
--- /dev/null
+++ b/ETSUI/FlowLayoutEts/entry/hvigorfile.js
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').legacyHapTasks
diff --git a/ETSUI/FlowLayoutEts/entry/package.json b/ETSUI/FlowLayoutEts/entry/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..f8964f7a229e8f1de91bcd74a9eac702cca31283
--- /dev/null
+++ b/ETSUI/FlowLayoutEts/entry/package.json
@@ -0,0 +1,10 @@
+{
+ "name": "entry",
+ "version": "1.0.0",
+ "ohos": {
+ "org": "huawei",
+ "buildTool": "hvigor",
+ "directoryLevel": "module"
+ },
+ "dependencies": {}
+}
diff --git a/ETSUI/FlowLayoutEts/entry/proguard-rules.pro b/ETSUI/FlowLayoutEts/entry/proguard-rules.pro
deleted file mode 100644
index f7666e47561d514b2a76d5a7dfbb43ede86da92a..0000000000000000000000000000000000000000
--- a/ETSUI/FlowLayoutEts/entry/proguard-rules.pro
+++ /dev/null
@@ -1 +0,0 @@
-# config module specific ProGuard rules here.
\ No newline at end of file
diff --git a/ETSUI/FlowLayoutEts/entry/src/main/config.json b/ETSUI/FlowLayoutEts/entry/src/main/config.json
index 40c1f080aa9fdc4663bcd94b7296dd5b4e3fca85..a2e58a89a5678079071e9b94f005b59d51338337 100644
--- a/ETSUI/FlowLayoutEts/entry/src/main/config.json
+++ b/ETSUI/FlowLayoutEts/entry/src/main/config.json
@@ -1,6 +1,6 @@
{
"app": {
- "bundleName": "com.huawei.test66",
+ "bundleName": "com.example.test66",
"vendor": "huawei",
"version": {
"code": 1000000,
diff --git a/ETSUI/FlowLayoutEts/gradle/wrapper/gradle-wrapper.jar b/ETSUI/FlowLayoutEts/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 490fda8577df6c95960ba7077c43220e5bb2c0d9..0000000000000000000000000000000000000000
Binary files a/ETSUI/FlowLayoutEts/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/ETSUI/FlowLayoutEts/gradle/wrapper/gradle-wrapper.properties b/ETSUI/FlowLayoutEts/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index f59159e865d4b59feb1b8c44b001f62fc5d58df4..0000000000000000000000000000000000000000
--- a/ETSUI/FlowLayoutEts/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://repo.huaweicloud.com/gradle/gradle-6.3-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/ETSUI/FlowLayoutEts/hvigorfile.js b/ETSUI/FlowLayoutEts/hvigorfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..ae70b6f5380f9933e1bceaea54787ce080715807
--- /dev/null
+++ b/ETSUI/FlowLayoutEts/hvigorfile.js
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').legacyAppTasks
\ No newline at end of file
diff --git a/ETSUI/FlowLayoutEts/package.json b/ETSUI/FlowLayoutEts/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..7fc345454cba5ac09c5c5b465ddb41a1b19c3998
--- /dev/null
+++ b/ETSUI/FlowLayoutEts/package.json
@@ -0,0 +1,13 @@
+{
+ "name": "example",
+ "version": "1.0.0",
+ "ohos": {
+ "org": "huawei",
+ "buildTool": "hvigor",
+ "directoryLevel": "project"
+ },
+ "dependencies": {
+ "@ohos/hvigor": "1.0.6",
+ "@ohos/hvigor-ohos-plugin": "1.0.6"
+ }
+}
diff --git a/ETSUI/FlowLayoutEts/settings.gradle b/ETSUI/FlowLayoutEts/settings.gradle
deleted file mode 100644
index 4773db73233a570c2d0c01a22e75321acfbf7a07..0000000000000000000000000000000000000000
--- a/ETSUI/FlowLayoutEts/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':entry'
diff --git a/ETSUI/MultiDeploymentEts/build-profile.json5 b/ETSUI/MultiDeploymentEts/build-profile.json5
new file mode 100644
index 0000000000000000000000000000000000000000..bded64428ea1c8145603c4145540dcbf66b91db4
--- /dev/null
+++ b/ETSUI/MultiDeploymentEts/build-profile.json5
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+{
+ "app": {
+ "signingConfigs": [],
+ "compileSdkVersion": 8,
+ "compatibleSdkVersion": 8,
+ "products": [
+ {
+ "name": "default"
+ },
+ ],
+ },
+ "modules": [
+ {
+ "name": "entry",
+ "srcPath": "./entry",
+ "targets": [
+ {
+ "name": "default",
+ "applyToProducts": [
+ "default",
+ ],
+ },
+ ],
+ },
+ ],
+}
\ No newline at end of file
diff --git a/ETSUI/MultiDeploymentEts/build.gradle b/ETSUI/MultiDeploymentEts/build.gradle
deleted file mode 100644
index 8091e0ece10575993ba570722aadd6788144f460..0000000000000000000000000000000000000000
--- a/ETSUI/MultiDeploymentEts/build.gradle
+++ /dev/null
@@ -1,34 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-apply plugin: 'com.huawei.ohos.app'
-
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
- compileSdkVersion 7
- supportSystem "standard"
-}
-
-buildscript {
- repositories {
- maven {
- url 'https://repo.huaweicloud.com/repository/maven/'
- }
- maven {
- url 'https://developer.huawei.com/repo/'
- }
- }
- dependencies {
- classpath 'com.huawei.ohos:hap:3.0.3.4'
- classpath 'com.huawei.ohos:decctest:1.2.6.0'
- }
-}
-
-allprojects {
- repositories {
- maven {
- url 'https://repo.huaweicloud.com/repository/maven/'
- }
- maven {
- url 'https://developer.huawei.com/repo/'
- }
- }
-}
diff --git a/ETSUI/MultiDeploymentEts/entry/.gitignore b/ETSUI/MultiDeploymentEts/entry/.gitignore
deleted file mode 100644
index 7d5b7a94f4dcf381f03ff21f28f8a2494b58023f..0000000000000000000000000000000000000000
--- a/ETSUI/MultiDeploymentEts/entry/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build
-/node_modules
diff --git a/ETSUI/MultiDeploymentEts/entry/build-profile.json5 b/ETSUI/MultiDeploymentEts/entry/build-profile.json5
new file mode 100644
index 0000000000000000000000000000000000000000..62a5100a430b12691a4b79f8c05362c9d5d5f4a1
--- /dev/null
+++ b/ETSUI/MultiDeploymentEts/entry/build-profile.json5
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+{
+ "apiType": 'faMode',
+ "buildOption": {
+ },
+ "targets": [
+ {
+ "name": "default",
+ },
+ {
+ "name": "ohosTest",
+ }
+ ]
+}
\ No newline at end of file
diff --git a/ETSUI/MultiDeploymentEts/entry/build.gradle b/ETSUI/MultiDeploymentEts/entry/build.gradle
deleted file mode 100644
index 1587dd1948941f3eaaf092ae6cae7969cb6895ff..0000000000000000000000000000000000000000
--- a/ETSUI/MultiDeploymentEts/entry/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-apply plugin: 'com.huawei.ohos.hap'
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
- compileSdkVersion 7
- defaultConfig {
- compatibleSdkVersion 7
- }
- buildTypes {
- release {
- proguardOpt {
- proguardEnabled false
- rulesFiles 'proguard-rules.pro'
- }
- }
- }
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar', '*.har'])
- testImplementation 'junit:junit:4.13.1'
-}
diff --git a/ETSUI/MultiDeploymentEts/entry/hvigorfile.js b/ETSUI/MultiDeploymentEts/entry/hvigorfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..10bf2171a235d29f7a9c074f18552981b8f7882f
--- /dev/null
+++ b/ETSUI/MultiDeploymentEts/entry/hvigorfile.js
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').legacyHapTasks
diff --git a/ETSUI/MultiDeploymentEts/entry/package.json b/ETSUI/MultiDeploymentEts/entry/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..f8964f7a229e8f1de91bcd74a9eac702cca31283
--- /dev/null
+++ b/ETSUI/MultiDeploymentEts/entry/package.json
@@ -0,0 +1,10 @@
+{
+ "name": "entry",
+ "version": "1.0.0",
+ "ohos": {
+ "org": "huawei",
+ "buildTool": "hvigor",
+ "directoryLevel": "module"
+ },
+ "dependencies": {}
+}
diff --git a/ETSUI/MultiDeploymentEts/entry/proguard-rules.pro b/ETSUI/MultiDeploymentEts/entry/proguard-rules.pro
deleted file mode 100644
index f7666e47561d514b2a76d5a7dfbb43ede86da92a..0000000000000000000000000000000000000000
--- a/ETSUI/MultiDeploymentEts/entry/proguard-rules.pro
+++ /dev/null
@@ -1 +0,0 @@
-# config module specific ProGuard rules here.
\ No newline at end of file
diff --git a/ETSUI/MultiDeploymentEts/entry/src/main/config.json b/ETSUI/MultiDeploymentEts/entry/src/main/config.json
index e2ac41d23f256ffa2561c9fba2df242a3d20a045..da880f071d5e997a413bc38b2f2468ea059cdb0a 100644
--- a/ETSUI/MultiDeploymentEts/entry/src/main/config.json
+++ b/ETSUI/MultiDeploymentEts/entry/src/main/config.json
@@ -39,7 +39,7 @@
"name": ".MainAbility",
"srcLanguage": "ets",
"icon": "$media:icon",
- "description": "$string:description_mainability",
+ "description": "$string:mainability_description",
"formsEnabled": false,
"label": "$string:entry_MainAbility",
"type": "page",
diff --git a/ETSUI/MultiDeploymentEts/entry/src/main/ets/MainAbility/pages/image.ets b/ETSUI/MultiDeploymentEts/entry/src/main/ets/MainAbility/pages/image.ets
index d49e6c678fbe16ac7ba3cf660e62426fbfcd9530..6931d0343c2d3c7befe9144712d4238f2506255f 100644
--- a/ETSUI/MultiDeploymentEts/entry/src/main/ets/MainAbility/pages/image.ets
+++ b/ETSUI/MultiDeploymentEts/entry/src/main/ets/MainAbility/pages/image.ets
@@ -1,3 +1,4 @@
+// @ts-nocheck
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +17,7 @@
import router from '@system.router'
import {ImageData, initializeImageData, initializeTodayData} from '../model/homeListDataModel'
+
@Entry
@Component
struct ImageComponent {
diff --git a/ETSUI/MultiDeploymentEts/gradle/wrapper/gradle-wrapper.jar b/ETSUI/MultiDeploymentEts/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 490fda8577df6c95960ba7077c43220e5bb2c0d9..0000000000000000000000000000000000000000
Binary files a/ETSUI/MultiDeploymentEts/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/ETSUI/MultiDeploymentEts/gradle/wrapper/gradle-wrapper.properties b/ETSUI/MultiDeploymentEts/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index f59159e865d4b59feb1b8c44b001f62fc5d58df4..0000000000000000000000000000000000000000
--- a/ETSUI/MultiDeploymentEts/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://repo.huaweicloud.com/gradle/gradle-6.3-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/ETSUI/MultiDeploymentEts/hvigorfile.js b/ETSUI/MultiDeploymentEts/hvigorfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..ae70b6f5380f9933e1bceaea54787ce080715807
--- /dev/null
+++ b/ETSUI/MultiDeploymentEts/hvigorfile.js
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').legacyAppTasks
\ No newline at end of file
diff --git a/ETSUI/MultiDeploymentEts/package.json b/ETSUI/MultiDeploymentEts/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..7fc345454cba5ac09c5c5b465ddb41a1b19c3998
--- /dev/null
+++ b/ETSUI/MultiDeploymentEts/package.json
@@ -0,0 +1,13 @@
+{
+ "name": "example",
+ "version": "1.0.0",
+ "ohos": {
+ "org": "huawei",
+ "buildTool": "hvigor",
+ "directoryLevel": "project"
+ },
+ "dependencies": {
+ "@ohos/hvigor": "1.0.6",
+ "@ohos/hvigor-ohos-plugin": "1.0.6"
+ }
+}
diff --git a/ETSUI/MultiDeploymentEts/settings.gradle b/ETSUI/MultiDeploymentEts/settings.gradle
deleted file mode 100644
index 4773db73233a570c2d0c01a22e75321acfbf7a07..0000000000000000000000000000000000000000
--- a/ETSUI/MultiDeploymentEts/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':entry'
diff --git a/ETSUI/ShoppingEts/RELEASE-NOTES.md b/ETSUI/ShoppingEts/RELEASE-NOTES.md
deleted file mode 100644
index ea23a13e3d4407d06cba3aa7155a23e5081b50b4..0000000000000000000000000000000000000000
--- a/ETSUI/ShoppingEts/RELEASE-NOTES.md
+++ /dev/null
@@ -1,2 +0,0 @@
-1.0.0
-1.Initial version
\ No newline at end of file
diff --git a/ETSUI/ShoppingEts/build-profile.json5 b/ETSUI/ShoppingEts/build-profile.json5
new file mode 100644
index 0000000000000000000000000000000000000000..bded64428ea1c8145603c4145540dcbf66b91db4
--- /dev/null
+++ b/ETSUI/ShoppingEts/build-profile.json5
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+{
+ "app": {
+ "signingConfigs": [],
+ "compileSdkVersion": 8,
+ "compatibleSdkVersion": 8,
+ "products": [
+ {
+ "name": "default"
+ },
+ ],
+ },
+ "modules": [
+ {
+ "name": "entry",
+ "srcPath": "./entry",
+ "targets": [
+ {
+ "name": "default",
+ "applyToProducts": [
+ "default",
+ ],
+ },
+ ],
+ },
+ ],
+}
\ No newline at end of file
diff --git a/ETSUI/ShoppingEts/build.gradle b/ETSUI/ShoppingEts/build.gradle
deleted file mode 100644
index 61b473ade5001661566d1814a517fad8fac436bf..0000000000000000000000000000000000000000
--- a/ETSUI/ShoppingEts/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-apply plugin: 'com.huawei.ohos.app'
-
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
- compileSdkVersion 7
- supportSystem "standard"
-}
-
-buildscript {
- repositories {
- maven {
- url 'https://repo.huaweicloud.com/repository/maven/'
- }
- maven {
- url 'https://developer.huawei.com/repo/'
- }
- }
- dependencies {
- classpath 'com.huawei.ohos:hap:3.0.3.4'
- classpath 'com.huawei.ohos:decctest:1.2.6.0'
- }
-}
-
-allprojects {
- repositories {
- maven {
- url 'https://repo.huaweicloud.com/repository/maven/'
- }
- maven {
- url 'https://developer.huawei.com/repo/'
- }
- }
-}
-
diff --git a/ETSUI/ShoppingEts/entry/.gitignore b/ETSUI/ShoppingEts/entry/.gitignore
deleted file mode 100644
index 7d5b7a94f4dcf381f03ff21f28f8a2494b58023f..0000000000000000000000000000000000000000
--- a/ETSUI/ShoppingEts/entry/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build
-/node_modules
diff --git a/ETSUI/ShoppingEts/entry/build-profile.json5 b/ETSUI/ShoppingEts/entry/build-profile.json5
new file mode 100644
index 0000000000000000000000000000000000000000..62a5100a430b12691a4b79f8c05362c9d5d5f4a1
--- /dev/null
+++ b/ETSUI/ShoppingEts/entry/build-profile.json5
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+{
+ "apiType": 'faMode',
+ "buildOption": {
+ },
+ "targets": [
+ {
+ "name": "default",
+ },
+ {
+ "name": "ohosTest",
+ }
+ ]
+}
\ No newline at end of file
diff --git a/ETSUI/ShoppingEts/entry/build.gradle b/ETSUI/ShoppingEts/entry/build.gradle
deleted file mode 100644
index a4d33f15106d843d0649c349d723579f0c592204..0000000000000000000000000000000000000000
--- a/ETSUI/ShoppingEts/entry/build.gradle
+++ /dev/null
@@ -1,22 +0,0 @@
-apply plugin: 'com.huawei.ohos.hap'
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
-
- compileSdkVersion 7
- defaultConfig {
- compatibleSdkVersion 7
- }
- buildTypes {
- release {
- proguardOpt {
- proguardEnabled false
- rulesFiles 'proguard-rules.pro'
- }
- }
- }
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar', '*.har'])
- testImplementation 'junit:junit:4.13.1'
-}
diff --git a/ETSUI/ShoppingEts/entry/hvigorfile.js b/ETSUI/ShoppingEts/entry/hvigorfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..10bf2171a235d29f7a9c074f18552981b8f7882f
--- /dev/null
+++ b/ETSUI/ShoppingEts/entry/hvigorfile.js
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').legacyHapTasks
diff --git a/ETSUI/ShoppingEts/entry/package.json b/ETSUI/ShoppingEts/entry/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..f8964f7a229e8f1de91bcd74a9eac702cca31283
--- /dev/null
+++ b/ETSUI/ShoppingEts/entry/package.json
@@ -0,0 +1,10 @@
+{
+ "name": "entry",
+ "version": "1.0.0",
+ "ohos": {
+ "org": "huawei",
+ "buildTool": "hvigor",
+ "directoryLevel": "module"
+ },
+ "dependencies": {}
+}
diff --git a/ETSUI/ShoppingEts/entry/proguard-rules.pro b/ETSUI/ShoppingEts/entry/proguard-rules.pro
deleted file mode 100644
index f7666e47561d514b2a76d5a7dfbb43ede86da92a..0000000000000000000000000000000000000000
--- a/ETSUI/ShoppingEts/entry/proguard-rules.pro
+++ /dev/null
@@ -1 +0,0 @@
-# config module specific ProGuard rules here.
\ No newline at end of file
diff --git a/ETSUI/ShoppingEts/gradle/wrapper/gradle-wrapper.jar b/ETSUI/ShoppingEts/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 490fda8577df6c95960ba7077c43220e5bb2c0d9..0000000000000000000000000000000000000000
Binary files a/ETSUI/ShoppingEts/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/ETSUI/ShoppingEts/gradle/wrapper/gradle-wrapper.properties b/ETSUI/ShoppingEts/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index f59159e865d4b59feb1b8c44b001f62fc5d58df4..0000000000000000000000000000000000000000
--- a/ETSUI/ShoppingEts/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://repo.huaweicloud.com/gradle/gradle-6.3-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/ETSUI/ShoppingEts/hvigorfile.js b/ETSUI/ShoppingEts/hvigorfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..ae70b6f5380f9933e1bceaea54787ce080715807
--- /dev/null
+++ b/ETSUI/ShoppingEts/hvigorfile.js
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').legacyAppTasks
\ No newline at end of file
diff --git a/ETSUI/ShoppingEts/package.json b/ETSUI/ShoppingEts/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..7fc345454cba5ac09c5c5b465ddb41a1b19c3998
--- /dev/null
+++ b/ETSUI/ShoppingEts/package.json
@@ -0,0 +1,13 @@
+{
+ "name": "example",
+ "version": "1.0.0",
+ "ohos": {
+ "org": "huawei",
+ "buildTool": "hvigor",
+ "directoryLevel": "project"
+ },
+ "dependencies": {
+ "@ohos/hvigor": "1.0.6",
+ "@ohos/hvigor-ohos-plugin": "1.0.6"
+ }
+}
diff --git a/ETSUI/ShoppingEts/settings.gradle b/ETSUI/ShoppingEts/settings.gradle
deleted file mode 100644
index 4773db73233a570c2d0c01a22e75321acfbf7a07..0000000000000000000000000000000000000000
--- a/ETSUI/ShoppingEts/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':entry'
diff --git a/ETSUI/SimpleGalleryEts/README.md b/ETSUI/SimpleGalleryEts/README.md
index 945fc18a3120f8b61bfb68dda321404548d94956..de846b73b528d431c7c7a2badf5913ad5045fef3 100644
--- a/ETSUI/SimpleGalleryEts/README.md
+++ b/ETSUI/SimpleGalleryEts/README.md
@@ -36,16 +36,9 @@
2. [完成Hi3516开发板的烧录](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3516-burn.md)
3. 搭建开发环境
-
- 1. 开始前请参考[下载与安装软件](https://developer.harmonyos.com/cn/docs/documentation/doc-guides/software_install-0000001053582415)、[配置开发环境](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/configuring-openharmony-sdk.md),完成DevEco Studio的安装和开发环境配置。
- 2. 开发环境配置完成后,请参考[使用工程向导](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/use-wizard-to-create-project.md)创建工程,使用JS或者eTS语言开发、“Application”为例,模板选择“\[Standard\]Empty Ability”。
- 3. 工程创建完成后,可参考下面章节进行代码编写,使用真机进行调测:
-
- - [配置OpenHarmony应用签名信息](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/configuring-openharmony-app-signature.md)
- - [hap包安装指导](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/installing-openharmony-app.md)
- - 工程示例:
-
- 
+ 1. 开始前请参考[工具准备](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/start-overview.md#%E5%B7%A5%E5%85%B7%E5%87%86%E5%A4%87),完成DevEco Studio的安装和开发环境配置。
+ 2. 开发环境配置完成后,请参考[使用工程向导](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/start-with-ets.md#%E5%88%9B%E5%BB%BAets%E5%B7%A5%E7%A8%8B)创建工程(模板选择“Empty Ability”),选择JS或者eTS语言开发。
+ 3. 工程创建完成后,选择使用[真机进行调测](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/start-with-ets.md#%E4%BD%BF%E7%94%A8%E7%9C%9F%E6%9C%BA%E8%BF%90%E8%A1%8C%E5%BA%94%E7%94%A8)。
# 代码结构解读
diff --git a/ETSUI/SimpleGalleryEts/build-profile.json5 b/ETSUI/SimpleGalleryEts/build-profile.json5
new file mode 100644
index 0000000000000000000000000000000000000000..bded64428ea1c8145603c4145540dcbf66b91db4
--- /dev/null
+++ b/ETSUI/SimpleGalleryEts/build-profile.json5
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+{
+ "app": {
+ "signingConfigs": [],
+ "compileSdkVersion": 8,
+ "compatibleSdkVersion": 8,
+ "products": [
+ {
+ "name": "default"
+ },
+ ],
+ },
+ "modules": [
+ {
+ "name": "entry",
+ "srcPath": "./entry",
+ "targets": [
+ {
+ "name": "default",
+ "applyToProducts": [
+ "default",
+ ],
+ },
+ ],
+ },
+ ],
+}
\ No newline at end of file
diff --git a/ETSUI/SimpleGalleryEts/build.gradle b/ETSUI/SimpleGalleryEts/build.gradle
deleted file mode 100644
index 8091e0ece10575993ba570722aadd6788144f460..0000000000000000000000000000000000000000
--- a/ETSUI/SimpleGalleryEts/build.gradle
+++ /dev/null
@@ -1,34 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-apply plugin: 'com.huawei.ohos.app'
-
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
- compileSdkVersion 7
- supportSystem "standard"
-}
-
-buildscript {
- repositories {
- maven {
- url 'https://repo.huaweicloud.com/repository/maven/'
- }
- maven {
- url 'https://developer.huawei.com/repo/'
- }
- }
- dependencies {
- classpath 'com.huawei.ohos:hap:3.0.3.4'
- classpath 'com.huawei.ohos:decctest:1.2.6.0'
- }
-}
-
-allprojects {
- repositories {
- maven {
- url 'https://repo.huaweicloud.com/repository/maven/'
- }
- maven {
- url 'https://developer.huawei.com/repo/'
- }
- }
-}
diff --git a/ETSUI/SimpleGalleryEts/entry/.gitignore b/ETSUI/SimpleGalleryEts/entry/.gitignore
deleted file mode 100644
index 7d5b7a94f4dcf381f03ff21f28f8a2494b58023f..0000000000000000000000000000000000000000
--- a/ETSUI/SimpleGalleryEts/entry/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build
-/node_modules
diff --git a/ETSUI/SimpleGalleryEts/entry/build-profile.json5 b/ETSUI/SimpleGalleryEts/entry/build-profile.json5
new file mode 100644
index 0000000000000000000000000000000000000000..62a5100a430b12691a4b79f8c05362c9d5d5f4a1
--- /dev/null
+++ b/ETSUI/SimpleGalleryEts/entry/build-profile.json5
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+{
+ "apiType": 'faMode',
+ "buildOption": {
+ },
+ "targets": [
+ {
+ "name": "default",
+ },
+ {
+ "name": "ohosTest",
+ }
+ ]
+}
\ No newline at end of file
diff --git a/ETSUI/SimpleGalleryEts/entry/build.gradle b/ETSUI/SimpleGalleryEts/entry/build.gradle
deleted file mode 100644
index 1587dd1948941f3eaaf092ae6cae7969cb6895ff..0000000000000000000000000000000000000000
--- a/ETSUI/SimpleGalleryEts/entry/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-apply plugin: 'com.huawei.ohos.hap'
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
- compileSdkVersion 7
- defaultConfig {
- compatibleSdkVersion 7
- }
- buildTypes {
- release {
- proguardOpt {
- proguardEnabled false
- rulesFiles 'proguard-rules.pro'
- }
- }
- }
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar', '*.har'])
- testImplementation 'junit:junit:4.13.1'
-}
diff --git a/ETSUI/SimpleGalleryEts/entry/hvigorfile.js b/ETSUI/SimpleGalleryEts/entry/hvigorfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..10bf2171a235d29f7a9c074f18552981b8f7882f
--- /dev/null
+++ b/ETSUI/SimpleGalleryEts/entry/hvigorfile.js
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').legacyHapTasks
diff --git a/ETSUI/SimpleGalleryEts/entry/package.json b/ETSUI/SimpleGalleryEts/entry/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..f8964f7a229e8f1de91bcd74a9eac702cca31283
--- /dev/null
+++ b/ETSUI/SimpleGalleryEts/entry/package.json
@@ -0,0 +1,10 @@
+{
+ "name": "entry",
+ "version": "1.0.0",
+ "ohos": {
+ "org": "huawei",
+ "buildTool": "hvigor",
+ "directoryLevel": "module"
+ },
+ "dependencies": {}
+}
diff --git a/ETSUI/SimpleGalleryEts/entry/proguard-rules.pro b/ETSUI/SimpleGalleryEts/entry/proguard-rules.pro
deleted file mode 100644
index f7666e47561d514b2a76d5a7dfbb43ede86da92a..0000000000000000000000000000000000000000
--- a/ETSUI/SimpleGalleryEts/entry/proguard-rules.pro
+++ /dev/null
@@ -1 +0,0 @@
-# config module specific ProGuard rules here.
\ No newline at end of file
diff --git a/ETSUI/SimpleGalleryEts/entry/src/main/config.json b/ETSUI/SimpleGalleryEts/entry/src/main/config.json
index e2ac41d23f256ffa2561c9fba2df242a3d20a045..da880f071d5e997a413bc38b2f2468ea059cdb0a 100644
--- a/ETSUI/SimpleGalleryEts/entry/src/main/config.json
+++ b/ETSUI/SimpleGalleryEts/entry/src/main/config.json
@@ -39,7 +39,7 @@
"name": ".MainAbility",
"srcLanguage": "ets",
"icon": "$media:icon",
- "description": "$string:description_mainability",
+ "description": "$string:mainability_description",
"formsEnabled": false,
"label": "$string:entry_MainAbility",
"type": "page",
diff --git a/ETSUI/SimpleGalleryEts/entry/src/main/ets/MainAbility/pages/image.ets b/ETSUI/SimpleGalleryEts/entry/src/main/ets/MainAbility/pages/image.ets
index d49e6c678fbe16ac7ba3cf660e62426fbfcd9530..5ecff4249bb2b4a111938e3fc7bf5b3c66d69bbf 100644
--- a/ETSUI/SimpleGalleryEts/entry/src/main/ets/MainAbility/pages/image.ets
+++ b/ETSUI/SimpleGalleryEts/entry/src/main/ets/MainAbility/pages/image.ets
@@ -1,3 +1,4 @@
+// @ts-nocheck
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ETSUI/SimpleGalleryEts/gradle/wrapper/gradle-wrapper.jar b/ETSUI/SimpleGalleryEts/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 490fda8577df6c95960ba7077c43220e5bb2c0d9..0000000000000000000000000000000000000000
Binary files a/ETSUI/SimpleGalleryEts/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/ETSUI/SimpleGalleryEts/gradle/wrapper/gradle-wrapper.properties b/ETSUI/SimpleGalleryEts/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index f59159e865d4b59feb1b8c44b001f62fc5d58df4..0000000000000000000000000000000000000000
--- a/ETSUI/SimpleGalleryEts/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://repo.huaweicloud.com/gradle/gradle-6.3-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/ETSUI/SimpleGalleryEts/hvigorfile.js b/ETSUI/SimpleGalleryEts/hvigorfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..ae70b6f5380f9933e1bceaea54787ce080715807
--- /dev/null
+++ b/ETSUI/SimpleGalleryEts/hvigorfile.js
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').legacyAppTasks
\ No newline at end of file
diff --git a/ETSUI/SimpleGalleryEts/package.json b/ETSUI/SimpleGalleryEts/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..7fc345454cba5ac09c5c5b465ddb41a1b19c3998
--- /dev/null
+++ b/ETSUI/SimpleGalleryEts/package.json
@@ -0,0 +1,13 @@
+{
+ "name": "example",
+ "version": "1.0.0",
+ "ohos": {
+ "org": "huawei",
+ "buildTool": "hvigor",
+ "directoryLevel": "project"
+ },
+ "dependencies": {
+ "@ohos/hvigor": "1.0.6",
+ "@ohos/hvigor-ohos-plugin": "1.0.6"
+ }
+}
diff --git a/ETSUI/SimpleGalleryEts/settings.gradle b/ETSUI/SimpleGalleryEts/settings.gradle
deleted file mode 100644
index 4773db73233a570c2d0c01a22e75321acfbf7a07..0000000000000000000000000000000000000000
--- a/ETSUI/SimpleGalleryEts/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':entry'
diff --git a/ETSUI/SliderApplicationEts/README.md b/ETSUI/SliderApplicationEts/README.md
index b260b15d65fb4d51f31ee1faa290e865cd1cf04d..2faee01522f761f1fdf558fafdb08bf80c150526 100644
--- a/ETSUI/SliderApplicationEts/README.md
+++ b/ETSUI/SliderApplicationEts/README.md
@@ -50,15 +50,10 @@ OpenHarmony eTS提供了丰富的接口和组件,开发者可以根据实际
3. 搭建开发环境
- 1. 开始前请参考[下载与安装软件](https://developer.harmonyos.com/cn/docs/documentation/doc-guides/software_install-0000001053582415)、[配置开发环境](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/configuring-openharmony-sdk.md),完成DevEco Studio的安装和开发环境配置。
- 2. 开发环境配置完成后,请参考[使用工程向导](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/use-wizard-to-create-project.md)创建工程,使用JS或者eTS语言开发、“Application”为例,模板选择“\[Standard\]Empty Ability”。
- 3. 工程创建完成后,可参考下面章节进行代码编写,使用真机进行调测:
+ 1. 开始前请参考[工具准备](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/start-overview.md#%E5%B7%A5%E5%85%B7%E5%87%86%E5%A4%87),完成DevEco Studio的安装和开发环境配置。
+ 2. 开发环境配置完成后,请参考[使用工程向导](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/start-with-ets.md#%E5%88%9B%E5%BB%BAets%E5%B7%A5%E7%A8%8B)创建工程(模板选择“Empty Ability”),选择JS或者eTS语言开发。
+ 3. 工程创建完成后,选择使用[真机进行调测](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/start-with-ets.md#%E4%BD%BF%E7%94%A8%E7%9C%9F%E6%9C%BA%E8%BF%90%E8%A1%8C%E5%BA%94%E7%94%A8)。
- - [配置OpenHarmony应用签名信息](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/configuring-openharmony-app-signature.md)
- - [hap包安装指导](https://gitee.com/openharmony/docs/blob/master/zh-cn/application-dev/quick-start/installing-openharmony-app.md)
- - 工程示例:
-
- 
# 任务一:如何让风车动起来
diff --git a/ETSUI/SliderApplicationEts/build-profile.json5 b/ETSUI/SliderApplicationEts/build-profile.json5
new file mode 100644
index 0000000000000000000000000000000000000000..bded64428ea1c8145603c4145540dcbf66b91db4
--- /dev/null
+++ b/ETSUI/SliderApplicationEts/build-profile.json5
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+{
+ "app": {
+ "signingConfigs": [],
+ "compileSdkVersion": 8,
+ "compatibleSdkVersion": 8,
+ "products": [
+ {
+ "name": "default"
+ },
+ ],
+ },
+ "modules": [
+ {
+ "name": "entry",
+ "srcPath": "./entry",
+ "targets": [
+ {
+ "name": "default",
+ "applyToProducts": [
+ "default",
+ ],
+ },
+ ],
+ },
+ ],
+}
\ No newline at end of file
diff --git a/ETSUI/SliderApplicationEts/build.gradle b/ETSUI/SliderApplicationEts/build.gradle
deleted file mode 100644
index 8091e0ece10575993ba570722aadd6788144f460..0000000000000000000000000000000000000000
--- a/ETSUI/SliderApplicationEts/build.gradle
+++ /dev/null
@@ -1,34 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-apply plugin: 'com.huawei.ohos.app'
-
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
- compileSdkVersion 7
- supportSystem "standard"
-}
-
-buildscript {
- repositories {
- maven {
- url 'https://repo.huaweicloud.com/repository/maven/'
- }
- maven {
- url 'https://developer.huawei.com/repo/'
- }
- }
- dependencies {
- classpath 'com.huawei.ohos:hap:3.0.3.4'
- classpath 'com.huawei.ohos:decctest:1.2.6.0'
- }
-}
-
-allprojects {
- repositories {
- maven {
- url 'https://repo.huaweicloud.com/repository/maven/'
- }
- maven {
- url 'https://developer.huawei.com/repo/'
- }
- }
-}
diff --git a/ETSUI/SliderApplicationEts/entry/.gitignore b/ETSUI/SliderApplicationEts/entry/.gitignore
deleted file mode 100644
index 7d5b7a94f4dcf381f03ff21f28f8a2494b58023f..0000000000000000000000000000000000000000
--- a/ETSUI/SliderApplicationEts/entry/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build
-/node_modules
diff --git a/ETSUI/SliderApplicationEts/entry/build-profile.json5 b/ETSUI/SliderApplicationEts/entry/build-profile.json5
new file mode 100644
index 0000000000000000000000000000000000000000..62a5100a430b12691a4b79f8c05362c9d5d5f4a1
--- /dev/null
+++ b/ETSUI/SliderApplicationEts/entry/build-profile.json5
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+{
+ "apiType": 'faMode',
+ "buildOption": {
+ },
+ "targets": [
+ {
+ "name": "default",
+ },
+ {
+ "name": "ohosTest",
+ }
+ ]
+}
\ No newline at end of file
diff --git a/ETSUI/SliderApplicationEts/entry/build.gradle b/ETSUI/SliderApplicationEts/entry/build.gradle
deleted file mode 100644
index 1587dd1948941f3eaaf092ae6cae7969cb6895ff..0000000000000000000000000000000000000000
--- a/ETSUI/SliderApplicationEts/entry/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-apply plugin: 'com.huawei.ohos.hap'
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
- compileSdkVersion 7
- defaultConfig {
- compatibleSdkVersion 7
- }
- buildTypes {
- release {
- proguardOpt {
- proguardEnabled false
- rulesFiles 'proguard-rules.pro'
- }
- }
- }
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar', '*.har'])
- testImplementation 'junit:junit:4.13.1'
-}
diff --git a/ETSUI/SliderApplicationEts/entry/hvigorfile.js b/ETSUI/SliderApplicationEts/entry/hvigorfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..10bf2171a235d29f7a9c074f18552981b8f7882f
--- /dev/null
+++ b/ETSUI/SliderApplicationEts/entry/hvigorfile.js
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').legacyHapTasks
diff --git a/ETSUI/SliderApplicationEts/entry/package.json b/ETSUI/SliderApplicationEts/entry/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..f8964f7a229e8f1de91bcd74a9eac702cca31283
--- /dev/null
+++ b/ETSUI/SliderApplicationEts/entry/package.json
@@ -0,0 +1,10 @@
+{
+ "name": "entry",
+ "version": "1.0.0",
+ "ohos": {
+ "org": "huawei",
+ "buildTool": "hvigor",
+ "directoryLevel": "module"
+ },
+ "dependencies": {}
+}
diff --git a/ETSUI/SliderApplicationEts/entry/proguard-rules.pro b/ETSUI/SliderApplicationEts/entry/proguard-rules.pro
deleted file mode 100644
index f7666e47561d514b2a76d5a7dfbb43ede86da92a..0000000000000000000000000000000000000000
--- a/ETSUI/SliderApplicationEts/entry/proguard-rules.pro
+++ /dev/null
@@ -1 +0,0 @@
-# config module specific ProGuard rules here.
\ No newline at end of file
diff --git a/ETSUI/SliderApplicationEts/entry/src/main/ets/MainAbility/pages/index.ets b/ETSUI/SliderApplicationEts/entry/src/main/ets/MainAbility/pages/index.ets
index cba6476e375c68a4959d95253f2de1568e2081cd..69f2af57bcc7ef342b0e56bb69fdac171032db38 100644
--- a/ETSUI/SliderApplicationEts/entry/src/main/ets/MainAbility/pages/index.ets
+++ b/ETSUI/SliderApplicationEts/entry/src/main/ets/MainAbility/pages/index.ets
@@ -36,7 +36,7 @@ struct Index {
min: 1,
max: 10,
step: 1,
- style: SliderStyle.OUTSET
+ style: SliderStyle.OutSet
})
.showTips(true)
.blockColor(Color.Blue)
@@ -54,7 +54,7 @@ struct Index {
min: 0.5,
max: 2.5,
step: 0.1,
- style: SliderStyle.OUTSET
+ style: SliderStyle.OutSet
})
.showTips(true)
.blockColor(Color.Blue)
diff --git a/ETSUI/SliderApplicationEts/gradle/wrapper/gradle-wrapper.jar b/ETSUI/SliderApplicationEts/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 490fda8577df6c95960ba7077c43220e5bb2c0d9..0000000000000000000000000000000000000000
Binary files a/ETSUI/SliderApplicationEts/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/ETSUI/SliderApplicationEts/gradle/wrapper/gradle-wrapper.properties b/ETSUI/SliderApplicationEts/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index f59159e865d4b59feb1b8c44b001f62fc5d58df4..0000000000000000000000000000000000000000
--- a/ETSUI/SliderApplicationEts/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://repo.huaweicloud.com/gradle/gradle-6.3-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/ETSUI/SliderApplicationEts/hvigorfile.js b/ETSUI/SliderApplicationEts/hvigorfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..ae70b6f5380f9933e1bceaea54787ce080715807
--- /dev/null
+++ b/ETSUI/SliderApplicationEts/hvigorfile.js
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').legacyAppTasks
\ No newline at end of file
diff --git a/ETSUI/SliderApplicationEts/package.json b/ETSUI/SliderApplicationEts/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..7fc345454cba5ac09c5c5b465ddb41a1b19c3998
--- /dev/null
+++ b/ETSUI/SliderApplicationEts/package.json
@@ -0,0 +1,13 @@
+{
+ "name": "example",
+ "version": "1.0.0",
+ "ohos": {
+ "org": "huawei",
+ "buildTool": "hvigor",
+ "directoryLevel": "project"
+ },
+ "dependencies": {
+ "@ohos/hvigor": "1.0.6",
+ "@ohos/hvigor-ohos-plugin": "1.0.6"
+ }
+}
diff --git a/ETSUI/SliderApplicationEts/settings.gradle b/ETSUI/SliderApplicationEts/settings.gradle
deleted file mode 100644
index 4773db73233a570c2d0c01a22e75321acfbf7a07..0000000000000000000000000000000000000000
--- a/ETSUI/SliderApplicationEts/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':entry'
diff --git a/ETSUI/TransitionAnimtaionEts/build-profile.json5 b/ETSUI/TransitionAnimtaionEts/build-profile.json5
new file mode 100644
index 0000000000000000000000000000000000000000..bded64428ea1c8145603c4145540dcbf66b91db4
--- /dev/null
+++ b/ETSUI/TransitionAnimtaionEts/build-profile.json5
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+{
+ "app": {
+ "signingConfigs": [],
+ "compileSdkVersion": 8,
+ "compatibleSdkVersion": 8,
+ "products": [
+ {
+ "name": "default"
+ },
+ ],
+ },
+ "modules": [
+ {
+ "name": "entry",
+ "srcPath": "./entry",
+ "targets": [
+ {
+ "name": "default",
+ "applyToProducts": [
+ "default",
+ ],
+ },
+ ],
+ },
+ ],
+}
\ No newline at end of file
diff --git a/ETSUI/TransitionAnimtaionEts/build.gradle b/ETSUI/TransitionAnimtaionEts/build.gradle
deleted file mode 100644
index 8091e0ece10575993ba570722aadd6788144f460..0000000000000000000000000000000000000000
--- a/ETSUI/TransitionAnimtaionEts/build.gradle
+++ /dev/null
@@ -1,34 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-apply plugin: 'com.huawei.ohos.app'
-
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
- compileSdkVersion 7
- supportSystem "standard"
-}
-
-buildscript {
- repositories {
- maven {
- url 'https://repo.huaweicloud.com/repository/maven/'
- }
- maven {
- url 'https://developer.huawei.com/repo/'
- }
- }
- dependencies {
- classpath 'com.huawei.ohos:hap:3.0.3.4'
- classpath 'com.huawei.ohos:decctest:1.2.6.0'
- }
-}
-
-allprojects {
- repositories {
- maven {
- url 'https://repo.huaweicloud.com/repository/maven/'
- }
- maven {
- url 'https://developer.huawei.com/repo/'
- }
- }
-}
diff --git a/ETSUI/TransitionAnimtaionEts/entry/build-profile.json5 b/ETSUI/TransitionAnimtaionEts/entry/build-profile.json5
new file mode 100644
index 0000000000000000000000000000000000000000..62a5100a430b12691a4b79f8c05362c9d5d5f4a1
--- /dev/null
+++ b/ETSUI/TransitionAnimtaionEts/entry/build-profile.json5
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+{
+ "apiType": 'faMode',
+ "buildOption": {
+ },
+ "targets": [
+ {
+ "name": "default",
+ },
+ {
+ "name": "ohosTest",
+ }
+ ]
+}
\ No newline at end of file
diff --git a/ETSUI/TransitionAnimtaionEts/entry/build.gradle b/ETSUI/TransitionAnimtaionEts/entry/build.gradle
deleted file mode 100644
index 1587dd1948941f3eaaf092ae6cae7969cb6895ff..0000000000000000000000000000000000000000
--- a/ETSUI/TransitionAnimtaionEts/entry/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-apply plugin: 'com.huawei.ohos.hap'
-//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510
-ohos {
- compileSdkVersion 7
- defaultConfig {
- compatibleSdkVersion 7
- }
- buildTypes {
- release {
- proguardOpt {
- proguardEnabled false
- rulesFiles 'proguard-rules.pro'
- }
- }
- }
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar', '*.har'])
- testImplementation 'junit:junit:4.13.1'
-}
diff --git a/ETSUI/TransitionAnimtaionEts/entry/hvigorfile.js b/ETSUI/TransitionAnimtaionEts/entry/hvigorfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..10bf2171a235d29f7a9c074f18552981b8f7882f
--- /dev/null
+++ b/ETSUI/TransitionAnimtaionEts/entry/hvigorfile.js
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').legacyHapTasks
diff --git a/ETSUI/TransitionAnimtaionEts/entry/package.json b/ETSUI/TransitionAnimtaionEts/entry/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..f8964f7a229e8f1de91bcd74a9eac702cca31283
--- /dev/null
+++ b/ETSUI/TransitionAnimtaionEts/entry/package.json
@@ -0,0 +1,10 @@
+{
+ "name": "entry",
+ "version": "1.0.0",
+ "ohos": {
+ "org": "huawei",
+ "buildTool": "hvigor",
+ "directoryLevel": "module"
+ },
+ "dependencies": {}
+}
diff --git a/ETSUI/TransitionAnimtaionEts/entry/proguard-rules.pro b/ETSUI/TransitionAnimtaionEts/entry/proguard-rules.pro
deleted file mode 100644
index f7666e47561d514b2a76d5a7dfbb43ede86da92a..0000000000000000000000000000000000000000
--- a/ETSUI/TransitionAnimtaionEts/entry/proguard-rules.pro
+++ /dev/null
@@ -1 +0,0 @@
-# config module specific ProGuard rules here.
\ No newline at end of file
diff --git a/ETSUI/TransitionAnimtaionEts/gradle/wrapper/gradle-wrapper.jar b/ETSUI/TransitionAnimtaionEts/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 490fda8577df6c95960ba7077c43220e5bb2c0d9..0000000000000000000000000000000000000000
Binary files a/ETSUI/TransitionAnimtaionEts/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/ETSUI/TransitionAnimtaionEts/gradle/wrapper/gradle-wrapper.properties b/ETSUI/TransitionAnimtaionEts/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index f59159e865d4b59feb1b8c44b001f62fc5d58df4..0000000000000000000000000000000000000000
--- a/ETSUI/TransitionAnimtaionEts/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://repo.huaweicloud.com/gradle/gradle-6.3-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/ETSUI/TransitionAnimtaionEts/hvigorfile.js b/ETSUI/TransitionAnimtaionEts/hvigorfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..ae70b6f5380f9933e1bceaea54787ce080715807
--- /dev/null
+++ b/ETSUI/TransitionAnimtaionEts/hvigorfile.js
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').legacyAppTasks
\ No newline at end of file
diff --git a/ETSUI/TransitionAnimtaionEts/package.json b/ETSUI/TransitionAnimtaionEts/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..7fc345454cba5ac09c5c5b465ddb41a1b19c3998
--- /dev/null
+++ b/ETSUI/TransitionAnimtaionEts/package.json
@@ -0,0 +1,13 @@
+{
+ "name": "example",
+ "version": "1.0.0",
+ "ohos": {
+ "org": "huawei",
+ "buildTool": "hvigor",
+ "directoryLevel": "project"
+ },
+ "dependencies": {
+ "@ohos/hvigor": "1.0.6",
+ "@ohos/hvigor-ohos-plugin": "1.0.6"
+ }
+}
diff --git a/ETSUI/TransitionAnimtaionEts/settings.gradle b/ETSUI/TransitionAnimtaionEts/settings.gradle
deleted file mode 100644
index 4773db73233a570c2d0c01a22e75321acfbf7a07..0000000000000000000000000000000000000000
--- a/ETSUI/TransitionAnimtaionEts/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':entry'