diff --git a/DFX/JsDotTest/.gitignore b/DFX/JsDotTest/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..4222b99195171f6433f7abe1fecaf4121895cce4
--- /dev/null
+++ b/DFX/JsDotTest/.gitignore
@@ -0,0 +1,8 @@
+/node_modules
+/local.properties
+/.idea
+**/build
+/.hvigor
+/build-profile.json5
+/package-lock.json
+/entry/package-lock.json
\ No newline at end of file
diff --git a/DFX/JsDotTest/README_zh.md b/DFX/JsDotTest/README_zh.md
index b63a7108d5b84c1e0b2acaf6032615cb86dfafc1..11fb27fd210bb562d8046c0e8c0cac27cf0089a1 100644
--- a/DFX/JsDotTest/README_zh.md
+++ b/DFX/JsDotTest/README_zh.md
@@ -32,4 +32,4 @@
2.性能打点验证只能通过上述命令获取日志来进行验证。
-3.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。
\ No newline at end of file
+3.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。
\ No newline at end of file
diff --git a/DFX/JsDotTest/entry/src/main/js/MainAbility/pages/index/index.hml b/DFX/JsDotTest/entry/src/main/js/MainAbility/pages/index/index.hml
index c30232738cb1c30c1363b5d82a9a6de419d80510..d9987717140cee11646a297b01058a31138975fa 100644
--- a/DFX/JsDotTest/entry/src/main/js/MainAbility/pages/index/index.hml
+++ b/DFX/JsDotTest/entry/src/main/js/MainAbility/pages/index/index.hml
@@ -14,14 +14,14 @@
-->
- {{ $t('strings.appName') }}
- {{ this.Text }}
-
-
-
-
- {{ $t('strings.disable') }}
-
-
+ {{ $t('strings.appName') }}
+ {{ this.Text }}
+
+
+
+
+ {{ $t('strings.disable') }}
+
+
diff --git a/DFX/JsDotTest/package.json b/DFX/JsDotTest/package.json
index 890101f4d1f566f936302ead461e00937feafe11..511a79fe1fa930e6f7a71070e5af7b9779877538 100644
--- a/DFX/JsDotTest/package.json
+++ b/DFX/JsDotTest/package.json
@@ -11,8 +11,8 @@
"repository": {},
"version": "1.0.0",
"dependencies": {
- "@ohos/hypium": "1.0.0",
- "@ohos/hvigor-ohos-plugin": "1.1.3",
- "@ohos/hvigor": "1.1.3"
+ "@ohos/hypium": "1.0.1",
+ "@ohos/hvigor-ohos-plugin": "1.1.6",
+ "@ohos/hvigor": "1.1.6"
}
}
diff --git a/FileManager/FileIo/.gitignore b/FileManager/FileIo/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..4222b99195171f6433f7abe1fecaf4121895cce4
--- /dev/null
+++ b/FileManager/FileIo/.gitignore
@@ -0,0 +1,8 @@
+/node_modules
+/local.properties
+/.idea
+**/build
+/.hvigor
+/build-profile.json5
+/package-lock.json
+/entry/package-lock.json
\ No newline at end of file
diff --git a/FileManager/FileIo/README_zh.md b/FileManager/FileIo/README_zh.md
index 04425af9a9afa56fe702d84a6d07783cd7ed0083..000ea8c458f7a15bf144a4f9534a745adc03b5a2 100644
--- a/FileManager/FileIo/README_zh.md
+++ b/FileManager/FileIo/README_zh.md
@@ -30,4 +30,4 @@
1.本示例仅支持在标准系统上运行。
-2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。
\ No newline at end of file
+2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。
\ No newline at end of file
diff --git a/FileManager/FileIo/entry/src/main/ets/MainAbility/pages/Index.ets b/FileManager/FileIo/entry/src/main/ets/MainAbility/pages/Index.ets
index 0faf3eadb8d50f48a96c8ff04fe536010841f3b1..107df277e9728563bebe79bdf141dfdebaaf3f56 100644
--- a/FileManager/FileIo/entry/src/main/ets/MainAbility/pages/Index.ets
+++ b/FileManager/FileIo/entry/src/main/ets/MainAbility/pages/Index.ets
@@ -39,7 +39,7 @@ struct Index {
$r('app.string.read_fileIo'),
$r('app.string.delete_fileIo')
]
- private stream: fileIo.Stream
+ private stream: fileIo.Stream
create_fileIo() {
this.result = path + '/xxx.txt'
diff --git a/MultiDeviceAppDev/AdaptiveCapabilities/.gitignore b/MultiDeviceAppDev/AdaptiveCapabilities/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..4222b99195171f6433f7abe1fecaf4121895cce4
--- /dev/null
+++ b/MultiDeviceAppDev/AdaptiveCapabilities/.gitignore
@@ -0,0 +1,8 @@
+/node_modules
+/local.properties
+/.idea
+**/build
+/.hvigor
+/build-profile.json5
+/package-lock.json
+/entry/package-lock.json
\ No newline at end of file
diff --git a/MultiDeviceAppDev/AdaptiveCapabilities/README_zh.md b/MultiDeviceAppDev/AdaptiveCapabilities/README_zh.md
index 8d55bbac287fe4545c38875244c8129b6083e92b..649f0f45f29e01fef264958e89186a4cd750c19b 100644
--- a/MultiDeviceAppDev/AdaptiveCapabilities/README_zh.md
+++ b/MultiDeviceAppDev/AdaptiveCapabilities/README_zh.md
@@ -32,6 +32,6 @@
2.本示例为Stage模型，从API version 9开始支持。
-3.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。
+3.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。
4.本示例着重介绍了一多的自适应布局能力，未引入断点能力，建议查看相关能力在IDE提供的MatePadPro预览器中运行和查看效果。
\ No newline at end of file
diff --git a/MultiDeviceAppDev/AdaptiveCapabilities/package.json b/MultiDeviceAppDev/AdaptiveCapabilities/package.json
index fcad2c1b2e13eb44e165b34e47cf762e7db2f59f..5e5384cfda5328cba091f6c24cef5f2884e82071 100644
--- a/MultiDeviceAppDev/AdaptiveCapabilities/package.json
+++ b/MultiDeviceAppDev/AdaptiveCapabilities/package.json
@@ -11,8 +11,8 @@
"repository": {},
"version": "1.0.0",
"dependencies": {
- "@ohos/hypium": "1.0.0",
- "@ohos/hvigor-ohos-plugin": "1.1.3",
- "@ohos/hvigor": "1.1.3"
+ "@ohos/hypium": "1.0.1",
+ "@ohos/hvigor-ohos-plugin": "1.1.6",
+ "@ohos/hvigor": "1.1.6"
}
}
diff --git a/MultiDeviceAppDev/JsAdaptiveCapabilities/.gitignore b/MultiDeviceAppDev/JsAdaptiveCapabilities/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..4222b99195171f6433f7abe1fecaf4121895cce4
--- /dev/null
+++ b/MultiDeviceAppDev/JsAdaptiveCapabilities/.gitignore
@@ -0,0 +1,8 @@
+/node_modules
+/local.properties
+/.idea
+**/build
+/.hvigor
+/build-profile.json5
+/package-lock.json
+/entry/package-lock.json
\ No newline at end of file
diff --git a/MultiDeviceAppDev/JsAdaptiveCapabilities/README_zh.md b/MultiDeviceAppDev/JsAdaptiveCapabilities/README_zh.md
index 5569177a6db5014a7e2262a3e0b963e2b41bb075..4fb766f0c83feada8d8d17721e2a607401d326f2 100644
--- a/MultiDeviceAppDev/JsAdaptiveCapabilities/README_zh.md
+++ b/MultiDeviceAppDev/JsAdaptiveCapabilities/README_zh.md
@@ -36,6 +36,6 @@
2.本示例为FA模型，从API version 8开始支持。
-3.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。
+3.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。
4.本示例着重介绍了一多的自适应布局能力，未引入断点能力，建议查看相关能力在IDE提供的MatePadPro预览器中运行和查看效果。
\ No newline at end of file
diff --git a/MultiDeviceAppDev/JsAdaptiveCapabilities/entry/package.json b/MultiDeviceAppDev/JsAdaptiveCapabilities/entry/package.json
index 992c771b9e6be8904ce4204f075df58a9b0902cc..db08bbf9d7439623fcfa4093ab7f013633c62d48 100644
--- a/MultiDeviceAppDev/JsAdaptiveCapabilities/entry/package.json
+++ b/MultiDeviceAppDev/JsAdaptiveCapabilities/entry/package.json
@@ -1,14 +1,14 @@
{
- "license":"ISC",
- "devDependencies":{},
- "name":"entry",
- "ohos":{
- "org":"huawei",
- "directoryLevel":"module",
- "buildTool":"hvigor"
- },
- "description":"example description",
- "repository":{},
- "version":"1.0.0",
- "dependencies":{}
+ "license": "ISC",
+ "devDependencies": {},
+ "name": "entry",
+ "ohos": {
+ "org": "huawei",
+ "directoryLevel": "module",
+ "buildTool": "hvigor"
+ },
+ "description": "example description",
+ "repository": {},
+ "version": "1.0.0",
+ "dependencies": {}
}
\ No newline at end of file
diff --git a/MultiDeviceAppDev/JsAdaptiveCapabilities/package.json b/MultiDeviceAppDev/JsAdaptiveCapabilities/package.json
index 95bb764612c6d0b3456bc3dff0fef7a4676800c8..8a465e39e112a7fb4b1c7d6545597e34934bce53 100644
--- a/MultiDeviceAppDev/JsAdaptiveCapabilities/package.json
+++ b/MultiDeviceAppDev/JsAdaptiveCapabilities/package.json
@@ -1,18 +1,18 @@
{
- "license":"ISC",
- "devDependencies":{},
- "name":"jsadaptivecapabilities",
- "ohos":{
- "org":"huawei",
- "directoryLevel":"project",
- "buildTool":"hvigor"
+ "license": "ISC",
+ "devDependencies": {},
+ "name": "jsadaptivecapabilities",
+ "ohos": {
+ "org": "huawei",
+ "directoryLevel": "project",
+ "buildTool": "hvigor"
},
- "description":"example description",
- "repository":{},
- "version":"1.0.0",
- "dependencies":{
- "@ohos/hypium":"1.0.1",
- "@ohos/hvigor-ohos-plugin":"1.1.6",
- "@ohos/hvigor":"1.1.6"
+ "description": "example description",
+ "repository": {},
+ "version": "1.0.0",
+ "dependencies": {
+ "@ohos/hypium": "1.0.1",
+ "@ohos/hvigor-ohos-plugin": "1.1.6",
+ "@ohos/hvigor": "1.1.6"
}
}
\ No newline at end of file
diff --git a/Network/UploadDownload/entry/package.json b/Network/UploadDownload/entry/package.json
index 29732ffea047ab4e9d897d4cc7092f5e7fe3493f..c7685ac4e7c0d79df04c96744f0d8f22cb4a9025 100644
--- a/Network/UploadDownload/entry/package.json
+++ b/Network/UploadDownload/entry/package.json
@@ -1,14 +1,14 @@
{
- "license": "ISC",
- "devDependencies": {},
- "name": "entry",
- "ohos": {
- "org": "huawei",
- "directoryLevel": "module",
- "buildTool": "hvigor"
- },
- "description": "example description",
- "repository": {},
- "version": "1.0.0",
- "dependencies": {}
+ "license": "ISC",
+ "devDependencies": {},
+ "name": "entry",
+ "ohos": {
+ "org": "huawei",
+ "directoryLevel": "module",
+ "buildTool": "hvigor"
+ },
+ "description": "example description",
+ "repository": {},
+ "version": "1.0.0",
+ "dependencies": {}
}
diff --git a/Network/UploadDownload/entry/src/main/ets/MainAbility/pages/Index.ets b/Network/UploadDownload/entry/src/main/ets/MainAbility/pages/Index.ets
index 5734a8b414a1a24da68a6fc63bc12b778245f395..c3680b8191a4dd3b9711bb507d226c3d1361d673 100644
--- a/Network/UploadDownload/entry/src/main/ets/MainAbility/pages/Index.ets
+++ b/Network/UploadDownload/entry/src/main/ets/MainAbility/pages/Index.ets
@@ -19,7 +19,6 @@ import resourceManager from '@ohos.resourceManager'
import featureAbility from '@ohos.ability.featureAbility'
import logger from '../model/Logger'
import { TitleBar } from '../common/TitleBar'
-import { UploadDownSource } from "../model/DataSource"
const TAG: string = 'Index'
@@ -29,8 +28,8 @@ struct Index {
@State receivedSize: number = 0
@State totalSize: number = 0
@State message: string = ''
- @State files: UploadDownSource = new UploadDownSource([])
- @State uploads: UploadDownSource = new UploadDownSource([])
+ @State files: Array = []
+ @State uploads: Array = []
private downloadConfig = {
url: '',
filePath: ''
@@ -65,10 +64,10 @@ struct Index {
let splitFiles = tempFiles[i].split('//')[1].split('/')
logger.info(TAG, `splitFiles = ${JSON.stringify(splitFiles)}`)
if (splitFiles.indexOf('upload') === -1) {
- this.files.pushData(tempFiles[i])
+ this.files.push(tempFiles[i])
}
}
- logger.info(TAG, `files = ${JSON.stringify(this.files['uploadDownData'])}`)
+ logger.info(TAG, `files = ${JSON.stringify(this.files)}`)
} else {
logger.info(TAG, `error: ${JSON.stringify(err)}`)
httpRequest.destroy()
@@ -85,7 +84,7 @@ struct Index {
.fontSize(25)
.alignSelf(ItemAlign.Start)
.margin({ top: 20, left: 10 })
- LazyForEach(this.files, (item, index) => {
+ ForEach(this.files, (item, index) => {
Divider()
.margin({ top: 20 })
Row() {
@@ -121,11 +120,8 @@ struct Index {
})
downloadTask.on('complete', async () => {
- await this.files['uploadDownData'].splice(index, 1)
- await this.files.notifyDataReload()
- await this.uploads['uploadDownData'].push(item)
- await this.uploads.notifyDataReload()
-
+ await this.files.splice(index, 1)
+ await this.uploads.push(item)
AlertDialog.show({
message: `${item}${downloadSuccess}`,
confirm: {
@@ -161,7 +157,7 @@ struct Index {
}
.width('100%')
- if (index === this.files['uploadDownData'].length - 1) {
+ if (index === this.files.length - 1) {
Divider()
.margin({ top: 20 })
}
@@ -182,7 +178,7 @@ struct Index {
}
.constraintSize({ maxHeight: '87%' })
- if (this.receivedSize !== 0 && this.totalSize !== 0 && this.files['uploadDownData'].length > 0) {
+ if (this.receivedSize !== 0 && this.totalSize !== 0 && this.files.length > 0) {
Row() {
Text($r('app.string.download_progress'))
.fontSize(25)
diff --git a/Network/UploadDownload/entry/src/main/ets/MainAbility/pages/Upload.ets b/Network/UploadDownload/entry/src/main/ets/MainAbility/pages/Upload.ets
index 80bc2f5e7b38789aa70f22619f9c817193126733..90cbf8277575f8777213ef4e812a99af1ce2d909 100644
--- a/Network/UploadDownload/entry/src/main/ets/MainAbility/pages/Upload.ets
+++ b/Network/UploadDownload/entry/src/main/ets/MainAbility/pages/Upload.ets
@@ -17,9 +17,8 @@ import request from '@ohos.request'
import logger from '../model/Logger'
import { TitleBar } from '../common/TitleBar'
import { UploadFile } from '../model/UploadFile'
-import { UploadConfigs } from '../model/UploadConfigs'
+import { UploadConfigs } from '../model/UploadConfigs'
import { UploadRequestData } from '../model/UploadRequestData'
-import { UploadDownSource } from "../model/DataSource"
const TAG: string = 'Upload'
@@ -30,7 +29,7 @@ struct Upload {
private uploadConfig: UploadConfigs = new UploadConfigs()
@State uploadedSize: number = 0
@State totalSize: number = 0
- @State uploads: UploadDownSource = router.getParams()['uploads']
+ @State uploads: Array = router.getParams()['uploads']
@State isDialog: boolean = false
@State selectIndex: number = -1
handlerClickButton = () => {
@@ -46,7 +45,7 @@ struct Upload {
.fontSize(25)
.alignSelf(ItemAlign.Start)
.margin({ top: 20, left: 10 })
- LazyForEach(this.uploads, (item, index) => {
+ ForEach(this.uploads, (item, index) => {
Divider()
.margin({ top: 20 })
Row() {
@@ -121,7 +120,7 @@ struct Upload {
.width('100%')
.margin({ top: 10, left: 10 })
- if (index === this.uploads['uploadDownData'].length - 1) {
+ if (index === this.uploads.length - 1) {
Divider()
.margin({ top: 20 })
}
@@ -131,7 +130,7 @@ struct Upload {
}
.constraintSize({ maxHeight: '87%' })
- if (this.uploadedSize !== 0 && this.totalSize !== 0 && this.uploads['uploadDownData'].length > 0) {
+ if (this.uploadedSize !== 0 && this.totalSize !== 0 && this.uploads.length > 0) {
Row() {
Text($r('app.string.upload_progress'))
.fontSize(25)
diff --git a/Network/UploadDownload/package.json b/Network/UploadDownload/package.json
index 7f69c1ec10879f468bd6dcaa980c2301a119c38a..b8ef18e8599ef89336eeed1cb5003634852051ff 100644
--- a/Network/UploadDownload/package.json
+++ b/Network/UploadDownload/package.json
@@ -1,19 +1,19 @@
{
- "license": "ISC",
- "devDependencies": {},
- "name": "uploaddownload",
- "ohos": {
- "org": "huawei",
- "directoryLevel": "project",
- "buildTool": "hvigor"
- },
- "description": "example description",
- "repository": {},
- "version": "1.0.0",
- "dependencies": {
- "@ohos/hvigor-ohos-plugin": "1.1.6",
- "hypium": "^1.0.0",
- "@ohos/hvigor": "1.1.6",
- "@ohos/hypium": "1.0.1"
- }
-}
+ "license":"ISC",
+ "devDependencies":{},
+ "name":"uploaddownload",
+ "ohos":{
+ "org":"huawei",
+ "directoryLevel":"project",
+ "buildTool":"hvigor"
+ },
+ "description":"example description",
+ "repository":{},
+ "version":"1.0.0",
+ "dependencies":{
+ "@ohos/hypium":"1.0.1",
+ "@ohos/hvigor-ohos-plugin":"1.1.6",
+ "hypium":"^1.0.0",
+ "@ohos/hvigor":"1.1.6"
+ }
+}
\ No newline at end of file
diff --git a/Notification/CommonEvent/entry/src/main/ets/MainAbility/pages/index.ets b/Notification/CommonEvent/entry/src/main/ets/MainAbility/pages/index.ets
index e21e886ff4374371bdb3e293952a286ebbe6b7c8..9a0fccfc27dc108d22feac07f196227c4115e7fa 100644
--- a/Notification/CommonEvent/entry/src/main/ets/MainAbility/pages/index.ets
+++ b/Notification/CommonEvent/entry/src/main/ets/MainAbility/pages/index.ets
@@ -12,8 +12,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import {PublishEventView} from '../common/publishEvent'
-import {SubscribeEventView} from '../common/subscribeEvent'
+import { PublishEventView } from '../common/publishEvent'
+import { SubscribeEventView } from '../common/subscribeEvent'
@Entry
@Component
@@ -36,7 +36,7 @@ struct Index {
Line()
.width("100%").height(2)
.backgroundColor("#D5D5D5")
- .margin({ top: 15})
+ .margin({ top: 15 })
PublishEventView()
diff --git a/Preset/DistributedMusicPlayer/entry/src/main/ets/pages/Index.ets b/Preset/DistributedMusicPlayer/entry/src/main/ets/pages/Index.ets
index 61b90a8559754fad186b38f2dc3699783f2f0573..f697bd104c5f24372a97d463f8157a6d8cf7da41 100644
--- a/Preset/DistributedMusicPlayer/entry/src/main/ets/pages/Index.ets
+++ b/Preset/DistributedMusicPlayer/entry/src/main/ets/pages/Index.ets
@@ -203,13 +203,24 @@ struct Index {
}
getShownTimer(ms) {
- let seconds = Math.floor(ms / ONE_THOUSAND)
- let sec = seconds % SIXTY
let minStr: string
let secStr: string
+ let seconds = Math.floor(ms / ONE_THOUSAND)
+ let sec = seconds % SIXTY
+ Logger.info(TAG, `getShownTimer sec = ${sec}`)
let min = (seconds - sec) / SIXTY
- sec < 10 ? secStr = '0' + sec : '' + sec
- min < 10 ? minStr = '0' + min : '' + min
+ Logger.info(TAG, `getShownTimer min = ${min}`)
+ if (sec < 10) {
+ secStr = '0' + sec
+ } else {
+ secStr = sec.toString(10)
+ }
+ if (min < 10) {
+ minStr = '0' + min
+ } else {
+ minStr = min.toString(10)
+ }
+ Logger.warn(TAG, `getShownTimer = ${minStr}:${secStr}`)
return minStr + ':' + secStr
}
@@ -287,7 +298,7 @@ struct Index {
PlayerModel.pause()
this.imageArrays[2] = $r('app.media.ic_play')
} else {
- PlayerModel.preLoad(0, () => {
+ PlayerModel.preLoad(PlayerModel.index, () => {
PlayerModel.play(-1, true)
this.imageArrays[2] = $r('app.media.ic_pause')
})
diff --git a/ResourcesSchedule/BackgroundTaskManager/entry/src/main/ets/MainAbility/pages/Index.ets b/ResourcesSchedule/BackgroundTaskManager/entry/src/main/ets/MainAbility/pages/Index.ets
index c6a77d567e210fb148e0f8703bdc2fe5ea82b11b..b55969d0459a68e56a46b089c88ce260a1218245 100644
--- a/ResourcesSchedule/BackgroundTaskManager/entry/src/main/ets/MainAbility/pages/Index.ets
+++ b/ResourcesSchedule/BackgroundTaskManager/entry/src/main/ets/MainAbility/pages/Index.ets
@@ -39,18 +39,18 @@ struct Index {
Image($r('app.media.file'))
.width('100%')
.height('30%')
- .margin({top:30})
+ .margin({ top: 30 })
.objectFit(ImageFit.Contain)
Text($r('app.string.fileName'))
.fontSize(30)
Button() {
Text($r('app.string.download'))
- .fontSize(20)
+ .fontSize(20)
}
.margin({ top: 60 })
.type(ButtonType.Capsule)
.backgroundColor('#0D9FFB')
- .size({width:'60%'})
+ .size({ width: '60%' })
.onClick(() => {
Logger.info(TAG, 'ServiceAbility Start')
startServiceAbility()
diff --git a/ResourcesSchedule/BackgroundTaskManager/entry/src/main/ets/ServiceAbility/service.ts b/ResourcesSchedule/BackgroundTaskManager/entry/src/main/ets/ServiceAbility/service.ts
index 6598759f1a8c440f2eb9ae92c6fd7297cb8e1721..df9c3d6c1d368cd9a9405b1a08ffe94d57bda2b0 100644
--- a/ResourcesSchedule/BackgroundTaskManager/entry/src/main/ets/ServiceAbility/service.ts
+++ b/ResourcesSchedule/BackgroundTaskManager/entry/src/main/ets/ServiceAbility/service.ts
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2022 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 wantAgent from '@ohos.wantAgent'
import backgroundTaskManager from '@ohos.backgroundTaskManager'
import featureAbility from '@ohos.ability.featureAbility'
@@ -9,67 +24,67 @@ let num: number = 0
let timerID: number = 0
let notificationRequest = {
- content: {
- contentType: Notification.ContentType.NOTIFICATION_CONTENT_BASIC_TEXT,
- normal: {
- title: '文件名',
- text: ''
- }
- },
- id: 1
+ content: {
+ contentType: Notification.ContentType.NOTIFICATION_CONTENT_BASIC_TEXT,
+ normal: {
+ title: '文件名',
+ text: ''
+ }
+ },
+ id: 1
}
function callback(err, data) {
- if (err) {
- Logger.error(TAG, `Operation failed Cause: ${err}`)
- return
- }
- if (timerID !== 0) {
- clearInterval(timerID)
+ if (err) {
+ Logger.error(TAG, `Operation failed Cause: ${err}`)
+ return
+ }
+ if (timerID !== 0) {
+ clearInterval(timerID)
+ }
+ Logger.info(TAG, `Operation startBackgroundRunning succeeded`)
+ timerID = setInterval(() => {
+ notificationRequest.content.normal.text = `${num}%`
+ Notification.publish(notificationRequest).then(() => {
+ Logger.info(TAG, `==========================>publishCallback=======================>`);
+ })
+ num += 5
+ if (num > 20) {
+ clearInterval(timerID)
}
- Logger.info(TAG, `Operation startBackgroundRunning succeeded`)
- timerID = setInterval(() => {
- notificationRequest.content.normal.text = `${num}%`
- Notification.publish(notificationRequest).then(() => {
- Logger.info(TAG, `==========================>publishCallback=======================>`);
- })
- num += 5
- if (num > 20) {
- clearInterval(timerID)
- }
- }, 5000)
+ }, 5000)
}
function startContinuousTask() {
- Logger.info(TAG, `startBackground use new api`)
- let wantAgentInfo = {
- wants: [
- {
- bundleName: "ohos.samples.backgroundtaskmanager",
- abilityName: "ohos.samples.backgroundtaskmanager.MainAbility"
- }
- ],
- operationType: wantAgent.OperationType.START_ABILITIES,
- requestCode: 0,
- wantAgentFlags: [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG]
- };
+ Logger.info(TAG, `startBackground use new api`)
+ let wantAgentInfo = {
+ wants: [
+ {
+ bundleName: "ohos.samples.backgroundtaskmanager",
+ abilityName: "ohos.samples.backgroundtaskmanager.MainAbility"
+ }
+ ],
+ operationType: wantAgent.OperationType.START_ABILITIES,
+ requestCode: 0,
+ wantAgentFlags: [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG]
+ };
- wantAgent.getWantAgent(wantAgentInfo).then((data) => {
- Logger.info(TAG, `startBackground begin`)
- backgroundTaskManager.startBackgroundRunning(featureAbility.getContext(), backgroundTaskManager.BackgroundMode.DATA_TRANSFER, data, callback)
- })
+ wantAgent.getWantAgent(wantAgentInfo).then((data) => {
+ Logger.info(TAG, `startBackground begin`)
+ backgroundTaskManager.startBackgroundRunning(featureAbility.getContext(), backgroundTaskManager.BackgroundMode.DATA_TRANSFER, data, callback)
+ })
}
export default {
- onStart() {
- Logger.info(TAG, 'ServiceAbility onStart')
- startContinuousTask()
- },
- onStop() {
- Logger.info(TAG, 'ServiceAbility onStop')
- backgroundTaskManager.stopBackgroundRunning(featureAbility.getContext())
- },
- onCommand(want, startId) {
- Logger.info(TAG, 'ServiceAbility onCommand')
- }
+ onStart() {
+ Logger.info(TAG, 'ServiceAbility onStart')
+ startContinuousTask()
+ },
+ onStop() {
+ Logger.info(TAG, 'ServiceAbility onStop')
+ backgroundTaskManager.stopBackgroundRunning(featureAbility.getContext())
+ },
+ onCommand(want, startId) {
+ Logger.info(TAG, 'ServiceAbility onCommand')
+ }
}
\ No newline at end of file
diff --git a/Telephony/Contact/entry/src/main/ets/MainAbility/component/ContactInfo.ets b/Telephony/Contact/entry/src/main/ets/MainAbility/component/ContactInfo.ets
index 881d481f05bcef3d50ca78dcba6f6fcb344dbc97..9bf188916522801e54c91f245721294636923de5 100644
--- a/Telephony/Contact/entry/src/main/ets/MainAbility/component/ContactInfo.ets
+++ b/Telephony/Contact/entry/src/main/ets/MainAbility/component/ContactInfo.ets
@@ -15,6 +15,7 @@
import router from '@ohos.router'
import contact from '@ohos.contact'
+import resourceManager from '@ohos.resourceManager';
import Logger from '../data/Logger'
const TAG: string = 'ContactInfo'
@@ -22,9 +23,9 @@ const TAG: string = 'ContactInfo'
@Preview
@Component
export struct ContactInfo {
- @State phone: string | Resource = ''
- @State email: string | Resource = ''
- @State address: string | Resource = ''
+ @State phone: string = ''
+ @State email: string = ''
+ @State address: string = ''
private contact: contact.Contact
build() {
@@ -185,17 +186,29 @@ export struct ContactInfo {
try {
this.phone = this.contact.phoneNumbers[0].phoneNumber
} catch (err) {
- this.phone = $r('app.string.not_fill')
+ resourceManager.getResourceManager((error, msg) => {
+ msg.getString($r('app.string.not_fill').id).then(value => {
+ this.phone = value
+ })
+ })
}
try {
this.email = this.contact.emails[0].email
} catch (err) {
- this.email = $r('app.string.not_fill')
+ resourceManager.getResourceManager((error, msg) => {
+ msg.getString($r('app.string.not_fill').id).then(value => {
+ this.email = value
+ })
+ })
}
try {
this.address = this.contact.postalAddresses[0].postalAddress
} catch (err) {
- this.address = $r('app.string.not_fill')
+ resourceManager.getResourceManager((error, msg) => {
+ msg.getString($r('app.string.not_fill').id).then(value => {
+ this.address = value
+ })
+ })
}
}
}
\ No newline at end of file
diff --git a/Telephony/MobileNetwork/entry/src/main/ets/Application/AbilityStage.ts b/Telephony/MobileNetwork/entry/src/main/ets/Application/AbilityStage.ts
index 809ccc5abc925924a81023bd36a14e32515a8b7b..6e24bab18187b9b0a375692434223b0f60461609 100644
--- a/Telephony/MobileNetwork/entry/src/main/ets/Application/AbilityStage.ts
+++ b/Telephony/MobileNetwork/entry/src/main/ets/Application/AbilityStage.ts
@@ -19,7 +19,7 @@ import AbilityStage from '@ohos.application.AbilityStage'
const TAG: string = '[AbilityStage]'
export default class MyAbilityStage extends AbilityStage {
- onCreate() {
- Logger.info(TAG, `[Demo] MyAbilityStage onCreate`)
- }
+ onCreate() {
+ Logger.info(TAG, `[Demo] MyAbilityStage onCreate`)
+ }
}
\ No newline at end of file
diff --git a/Telephony/MobileNetwork/entry/src/main/ets/MainAbility/MainAbility.ts b/Telephony/MobileNetwork/entry/src/main/ets/MainAbility/MainAbility.ts
index f2aafcbe8019d2f0530418e717d627a7d991c8d2..5966390b7c11c705d3775c06ee158c59623c5d6e 100644
--- a/Telephony/MobileNetwork/entry/src/main/ets/MainAbility/MainAbility.ts
+++ b/Telephony/MobileNetwork/entry/src/main/ets/MainAbility/MainAbility.ts
@@ -16,38 +16,38 @@
import Logger from '../model/Logger'
import Ability from '@ohos.application.Ability'
-const TAG: string = '[MainAbility]'
+const TAG:string = '[MainAbility]'
export default class MainAbility extends Ability {
- onCreate(want, launchParam) {
- Logger.info(TAG, `[Demo] MainAbility onCreate`)
- globalThis.abilityWant = want
- globalThis.context = this.context
- }
-
- onDestroy() {
- Logger.info(TAG, `[Demo] MainAbility onDestroy`)
- }
-
- onWindowStageCreate(windowStage) {
- // Main window is created, set main page for this ability
- Logger.info(TAG, `[Demo] MainAbility onWindowStageCreate`)
-
- windowStage.setUIContent(this.context, 'pages/Index', null)
- }
-
- onWindowStageDestroy() {
- // Main window is destroyed, release UI related resources
- Logger.info(TAG, `[Demo] MainAbility onWindowStageDestroy`)
- }
-
- onForeground() {
- // Ability has brought to foreground
- Logger.info(TAG, `[Demo] MainAbility onForeground`)
- }
-
- onBackground() {
- // Ability has back to background
- Logger.info(TAG, `[Demo] MainAbility onBackground`)
- }
+ onCreate(want, launchParam) {
+ Logger.info(TAG, `[Demo] MainAbility onCreate`)
+ globalThis.abilityWant = want
+ globalThis.context = this.context
+ }
+
+ onDestroy() {
+ Logger.info(TAG, `[Demo] MainAbility onDestroy`)
+ }
+
+ onWindowStageCreate(windowStage) {
+ // Main window is created, set main page for this ability
+ Logger.info(TAG, `[Demo] MainAbility onWindowStageCreate`)
+
+ windowStage.setUIContent(this.context, 'pages/Index', null)
+ }
+
+ onWindowStageDestroy() {
+ // Main window is destroyed, release UI related resources
+ Logger.info(TAG, `[Demo] MainAbility onWindowStageDestroy`)
+ }
+
+ onForeground() {
+ // Ability has brought to foreground
+ Logger.info(TAG, `[Demo] MainAbility onForeground`)
+ }
+
+ onBackground() {
+ // Ability has back to background
+ Logger.info(TAG, `[Demo] MainAbility onBackground`)
+ }
};
diff --git a/Telephony/MobileNetwork/entry/src/main/ets/model/Logger.ts b/Telephony/MobileNetwork/entry/src/main/ets/model/Logger.ts
index 554025733475238d51190e9c27e335cbbbac7d6e..c00b8013e45814ef764c55360c072a7ee95698c8 100644
--- a/Telephony/MobileNetwork/entry/src/main/ets/model/Logger.ts
+++ b/Telephony/MobileNetwork/entry/src/main/ets/model/Logger.ts
@@ -16,34 +16,34 @@
import hilog from '@ohos.hilog'
export class Logger {
- private domain: number
- private prefix: string
- private format: string = `%{public}s, %{public}s`
-
- constructor(prefix: string) {
- this.prefix = prefix
- this.domain = 0xFF00
- }
-
- debug(...args: any[]) {
- hilog.debug(this.domain, this.prefix, this.format, args)
- }
-
- info(...args: any[]) {
- hilog.info(this.domain, this.prefix, this.format, args)
- }
-
- warn(...args: any[]) {
- hilog.warn(this.domain, this.prefix, this.format, args)
- }
-
- error(...args: any[]) {
- hilog.error(this.domain, this.prefix, this.format, args)
- }
-
- fatal(...args: any[]) {
- hilog.fatal(this.domain, this.prefix, this.format, args)
- }
+ private domain: number
+ private prefix: string
+ private format: string = `%{public}s, %{public}s`
+
+ constructor(prefix: string) {
+ this.prefix = prefix
+ this.domain = 0xFF00
+ }
+
+ debug(...args: any[]) {
+ hilog.debug(this.domain, this.prefix, this.format, args)
+ }
+
+ info(...args: any[]) {
+ hilog.info(this.domain, this.prefix, this.format, args)
+ }
+
+ warn(...args: any[]) {
+ hilog.warn(this.domain, this.prefix, this.format, args)
+ }
+
+ error(...args: any[]) {
+ hilog.error(this.domain, this.prefix, this.format, args)
+ }
+
+ fatal(...args: any[]) {
+ hilog.fatal(this.domain, this.prefix, this.format, args)
+ }
}
export default new Logger('[MobileNetwork]')
\ No newline at end of file
diff --git a/Telephony/MobileNetwork/package.json b/Telephony/MobileNetwork/package.json
index 504228df6b5717370edd9c691fca20cd0fa3a334..a3510f0cde264731d7bb9ca18ad37a3802b34275 100644
--- a/Telephony/MobileNetwork/package.json
+++ b/Telephony/MobileNetwork/package.json
@@ -1,18 +1,18 @@
{
- "license": "ISC",
- "devDependencies": {},
- "name": "mobilenetwork",
- "ohos": {
- "org": "huawei",
- "directoryLevel": "project",
- "buildTool": "hvigor"
+ "license":"ISC",
+ "devDependencies":{},
+ "name":"mobilenetwork",
+ "ohos":{
+ "org":"huawei",
+ "directoryLevel":"project",
+ "buildTool":"hvigor"
},
- "description": "example description",
- "repository": {},
- "version": "1.0.0",
- "dependencies": {
- "@ohos/hypium": "1.0.1",
- "@ohos/hvigor-ohos-plugin": "1.1.6",
- "@ohos/hvigor": "1.1.6"
+ "description":"example description",
+ "repository":{},
+ "version":"1.0.0",
+ "dependencies":{
+ "@ohos/hypium":"1.0.1",
+ "@ohos/hvigor-ohos-plugin":"1.1.6",
+ "@ohos/hvigor":"1.1.6"
}
-}
+}
\ No newline at end of file
diff --git a/Telephony/MobileNetwork/screenshots/device/index.png b/Telephony/MobileNetwork/screenshots/device/index.png
index 1b26b62b4c5ce4c53ec8ab6cd59b00b7c8da39d2..00220fb2afdb5a5d2197bc3aa41e8ede7b26ba7b 100644
Binary files a/Telephony/MobileNetwork/screenshots/device/index.png and b/Telephony/MobileNetwork/screenshots/device/index.png differ
diff --git a/UI/AtomicLayout/.gitignore b/UI/AtomicLayout/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..4222b99195171f6433f7abe1fecaf4121895cce4
--- /dev/null
+++ b/UI/AtomicLayout/.gitignore
@@ -0,0 +1,8 @@
+/node_modules
+/local.properties
+/.idea
+**/build
+/.hvigor
+/build-profile.json5
+/package-lock.json
+/entry/package-lock.json
\ No newline at end of file
diff --git a/UI/AtomicLayout/README_zh.md b/UI/AtomicLayout/README_zh.md
index 7af3f31867f33322f7793a09e8acca61010642c8..f5bac2ed1dbe0cf59ad726f2b067ffde3e45a5cc 100644
--- a/UI/AtomicLayout/README_zh.md
+++ b/UI/AtomicLayout/README_zh.md
@@ -32,4 +32,4 @@
2.本示例支持在标准系统使用。
-3.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。
\ No newline at end of file
+3.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。
\ No newline at end of file
diff --git a/UI/AtomicLayout/entry/src/main/js/default/app.js b/UI/AtomicLayout/entry/src/main/js/default/app.js
index 8e47afff13e928a74fdcc01a108e4422404b9ac9..50007322f38c5c4328aa0e7386255727629eb48d 100644
--- a/UI/AtomicLayout/entry/src/main/js/default/app.js
+++ b/UI/AtomicLayout/entry/src/main/js/default/app.js
@@ -14,10 +14,10 @@
*/
export default {
- onCreate() {
- console.info('AceApplication onCreate');
- },
- onDestroy() {
- console.info('AceApplication onDestroy');
- }
+ onCreate() {
+ console.info('AceApplication onCreate');
+ },
+ onDestroy() {
+ console.info('AceApplication onDestroy');
+ }
};
diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.hml b/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.hml
index 43cea8b30fc78cca9b3649eff96054133d9c87c9..ec243cb0beda85b1bc0c10f8b5fec73527253047 100644
--- a/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.hml
+++ b/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.hml
@@ -14,11 +14,11 @@
-->
+
\ No newline at end of file
diff --git a/UI/JSComponments/entry/src/main/js/MainAbility/pages/index/index.js b/UI/JSComponments/entry/src/main/js/MainAbility/pages/index/index.js
index cc499d3a38f401f710174fdde127155c173d4429..b0e54d48c13c55dc042160bcbbf8e7010a38d596 100644
--- a/UI/JSComponments/entry/src/main/js/MainAbility/pages/index/index.js
+++ b/UI/JSComponments/entry/src/main/js/MainAbility/pages/index/index.js
@@ -16,106 +16,106 @@
import router from '@ohos.router';
export default {
- data: {
- inputValue: '',
- commentText: false,
- likeImage: '/common/unlike.png',
- isPressed: false,
- total: 20,
- headTitle: 'Capture the Beauty in This Moment',
- paragraphFirst: 'Capture the beauty of light during the transition and fusion of ice and water. At the instant of movement and stillness, softness and rigidity, force and beauty, condensing moving moments.',
- paragraphSecond: 'Reflecting the purity of nature, the innovative design upgrades your visual entertainment and ergonomic comfort. Effortlessly capture what you see and let it speak for what you feel.',
- middleImage: '/common/common.png',
- textList: [{
- value0: 'JS FA'
- }, {
- value1: 'JS AA'
- }, {
- value2: 'Java FA'
- }, {
- value3: 'Java AA'
- }],
- tabImage: '/common/ice.png',
- colorParam: '',
- opacityParam: '',
- touchstart: 'touchstart',
- touchmove: 'touchmove',
- touchend: 'touchend',
- touchcancel: 'touchcancel',
- onClick: 'onclick',
- onLongPress: 'onlongpress',
- up: 'up',
- down: 'down',
- text: 'start',
- showState: false
- },
- textClicked(e) {
- this.text = e.detail.text;
- },
- focusUp: function () {
- this.up = 'up focused';
- },
- blurUp: function () {
- this.up = 'up';
- },
- keyUp: function () {
- this.up = 'up keyed';
- },
- focusDown: function () {
- this.down = 'down focused';
- },
- blurDown: function () {
- this.down = 'down';
- },
- keyDown: function () {
- this.down = 'down keyed';
- },
- touchEnd: function () {
- this.touchend = 'ended';
- },
- touchMove: function () {
- this.touchmove = 'moved';
- },
- touchStart: function () {
- this.touchstart = 'touched';
- },
- longPress: function () {
- this.onLongPress = 'longpressed';
- },
- click: function () {
- this.onClick = 'clicked';
- },
- showAnimation: function () {
- this.colorParam = '';
- this.opacityParam = '';
- this.colorParam = 'animation-color';
- this.opacityParam = 'animation-opacity';
- },
- update() {
- this.commentText = !this.commentText;
- },
- delete() {
- this.inputValue = ''
- this.commentText = !this.commentText;
- },
- updateValue(e) {
- this.inputValue = e.text;
- },
- likeClick() {
- var temp;
- if (!this.isPressed) {
- temp = this.total + 1;
- this.likeImage = '/common/like.png';
- } else {
- temp = this.total - 1;
- this.likeImage = '/common/unlike.png';
- }
- this.total = temp;
- this.isPressed = !this.isPressed;
- },
- launch: function () {
- router.push({
- url: 'pages/details/details',
- });
+ data: {
+ inputValue: '',
+ commentText: false,
+ likeImage: '/common/unlike.png',
+ isPressed: false,
+ total: 20,
+ headTitle: 'Capture the Beauty in This Moment',
+ paragraphFirst: 'Capture the beauty of light during the transition and fusion of ice and water. At the instant of movement and stillness, softness and rigidity, force and beauty, condensing moving moments.',
+ paragraphSecond: 'Reflecting the purity of nature, the innovative design upgrades your visual entertainment and ergonomic comfort. Effortlessly capture what you see and let it speak for what you feel.',
+ middleImage: '/common/common.png',
+ textList: [{
+ value0: 'JS FA'
+ }, {
+ value1: 'JS AA'
+ }, {
+ value2: 'Java FA'
+ }, {
+ value3: 'Java AA'
+ }],
+ tabImage: '/common/ice.png',
+ colorParam: '',
+ opacityParam: '',
+ touchstart: 'touchstart',
+ touchmove: 'touchmove',
+ touchend: 'touchend',
+ touchcancel: 'touchcancel',
+ onClick: 'onclick',
+ onLongPress: 'onlongpress',
+ up: 'up',
+ down: 'down',
+ text: 'start',
+ showState: false
+ },
+ textClicked(e) {
+ this.text = e.detail.text;
+ },
+ focusUp: function () {
+ this.up = 'up focused';
+ },
+ blurUp: function () {
+ this.up = 'up';
+ },
+ keyUp: function () {
+ this.up = 'up keyed';
+ },
+ focusDown: function () {
+ this.down = 'down focused';
+ },
+ blurDown: function () {
+ this.down = 'down';
+ },
+ keyDown: function () {
+ this.down = 'down keyed';
+ },
+ touchEnd: function () {
+ this.touchend = 'ended';
+ },
+ touchMove: function () {
+ this.touchmove = 'moved';
+ },
+ touchStart: function () {
+ this.touchstart = 'touched';
+ },
+ longPress: function () {
+ this.onLongPress = 'longpressed';
+ },
+ click: function () {
+ this.onClick = 'clicked';
+ },
+ showAnimation: function () {
+ this.colorParam = '';
+ this.opacityParam = '';
+ this.colorParam = 'animation-color';
+ this.opacityParam = 'animation-opacity';
+ },
+ update() {
+ this.commentText = !this.commentText;
+ },
+ delete() {
+ this.inputValue = ''
+ this.commentText = !this.commentText;
+ },
+ updateValue(e) {
+ this.inputValue = e.text;
+ },
+ likeClick() {
+ var temp;
+ if (!this.isPressed) {
+ temp = this.total + 1;
+ this.likeImage = '/common/like.png';
+ } else {
+ temp = this.total - 1;
+ this.likeImage = '/common/unlike.png';
}
+ this.total = temp;
+ this.isPressed = !this.isPressed;
+ },
+ launch: function () {
+ router.push({
+ url: 'pages/details/details',
+ });
+ }
}
\ No newline at end of file
diff --git a/UI/JSComponments/package.json b/UI/JSComponments/package.json
index 02f5a336341ca59f1cbec064a1e7bc1b00bddf78..1d823ce9da38ad684aba40bb0318d19922c0f7cf 100644
--- a/UI/JSComponments/package.json
+++ b/UI/JSComponments/package.json
@@ -11,8 +11,8 @@
"repository": {},
"version": "1.0.0",
"dependencies": {
- "@ohos/hypium": "^1.0.0",
- "@ohos/hvigor-ohos-plugin": "1.1.3",
- "@ohos/hvigor": "1.1.3"
+ "@ohos/hypium": "1.0.1",
+ "@ohos/hvigor-ohos-plugin": "1.1.6",
+ "@ohos/hvigor": "1.1.6"
}
}
diff --git a/UI/JSUICustomComponent/entry/src/main/js/default/pages/index/index.hml b/UI/JSUICustomComponent/entry/src/main/js/default/pages/index/index.hml
index a95dab97f4210bfe66da298c85bc9d4eb5ae51aa..83def44f245b94b196c2ad8fc98930b36b09c04e 100644
--- a/UI/JSUICustomComponent/entry/src/main/js/default/pages/index/index.hml
+++ b/UI/JSUICustomComponent/entry/src/main/js/default/pages/index/index.hml
@@ -1,3 +1,4 @@
+
-
-
-
- {{ text }}
+
+
+
+ {{ text }}
\ No newline at end of file
diff --git a/UI/JsAdaptivePortalList/entry/src/main/js/MainAbility/pages/index/index.hml b/UI/JsAdaptivePortalList/entry/src/main/js/MainAbility/pages/index/index.hml
index 755df01d922ec72c98f6871193413cca7afc9b5d..905c9257d6792093abd1173ab9141f3c486b178e 100644
--- a/UI/JsAdaptivePortalList/entry/src/main/js/MainAbility/pages/index/index.hml
+++ b/UI/JsAdaptivePortalList/entry/src/main/js/MainAbility/pages/index/index.hml
@@ -15,57 +15,57 @@
\ No newline at end of file
diff --git a/UI/JsAdaptivePortalList/entry/src/main/js/MainAbility/pages/index/index.js b/UI/JsAdaptivePortalList/entry/src/main/js/MainAbility/pages/index/index.js
index 2b22f51febd00e7741cfd6f39b8343fd1125299b..73baa5d4e8341fac507ed354b5b75f81fe4b8f87 100644
--- a/UI/JsAdaptivePortalList/entry/src/main/js/MainAbility/pages/index/index.js
+++ b/UI/JsAdaptivePortalList/entry/src/main/js/MainAbility/pages/index/index.js
@@ -16,30 +16,30 @@
import mediaquery from '@ohos.mediaquery';
export default {
- data: {
- list_data: Array(16).fill().map((_, index) => ({
- id: "item_" + index
- })),
- tabBars: [
- {
- icon: "icon_person_blue.png", text: "页签"
- },
- {
- icon: "icon_person_gray.png", text: "页签"
- },
- {
- icon: "icon_person_gray.png", text: "页签"
- },
- {
- icon: "icon_person_gray.png", text: "页签"
- },
- ],
- menu_tabs_index: 0,
- isTabletLandscape: false
- },
- onInit() {
- mediaquery.matchMediaSync('screen and (min-aspect-ratio: 1.5) or (orientation: landscape)').on("change", (data) => {
- this.isTabletLandscape = data.matches
- })
- }
+ data: {
+ list_data: Array(16).fill().map((_, index) => ({
+ id: "item_" + index
+ })),
+ tabBars: [
+ {
+ icon: "icon_person_blue.png", text: "页签"
+ },
+ {
+ icon: "icon_person_gray.png", text: "页签"
+ },
+ {
+ icon: "icon_person_gray.png", text: "页签"
+ },
+ {
+ icon: "icon_person_gray.png", text: "页签"
+ },
+ ],
+ menu_tabs_index: 0,
+ isTabletLandscape: false
+ },
+ onInit() {
+ mediaquery.matchMediaSync('screen and (min-aspect-ratio: 1.5) or (orientation: landscape)').on("change", (data) => {
+ this.isTabletLandscape = data.matches
+ })
+ }
}
\ No newline at end of file
diff --git a/UI/JsAdaptivePortalList/package.json b/UI/JsAdaptivePortalList/package.json
index d8a911bd20c5ffab6c1e3f3f2d0adadc4b5f5c89..ed01f6a14889a1ef2e1cf0642f235ce50397fed7 100644
--- a/UI/JsAdaptivePortalList/package.json
+++ b/UI/JsAdaptivePortalList/package.json
@@ -8,8 +8,8 @@
},
"version": "1.0.0",
"dependencies": {
- "@ohos/hypium": "1.0.0",
- "@ohos/hvigor-ohos-plugin": "1.1.3",
- "@ohos/hvigor": "1.1.3"
+ "@ohos/hypium": "1.0.1",
+ "@ohos/hvigor-ohos-plugin": "1.1.6",
+ "@ohos/hvigor": "1.1.6"
}
}
\ No newline at end of file
diff --git a/UI/JsAdaptivePortalPage/.gitignore b/UI/JsAdaptivePortalPage/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..4222b99195171f6433f7abe1fecaf4121895cce4
--- /dev/null
+++ b/UI/JsAdaptivePortalPage/.gitignore
@@ -0,0 +1,8 @@
+/node_modules
+/local.properties
+/.idea
+**/build
+/.hvigor
+/build-profile.json5
+/package-lock.json
+/entry/package-lock.json
\ No newline at end of file
diff --git a/UI/JsAdaptivePortalPage/README_zh.md b/UI/JsAdaptivePortalPage/README_zh.md
index 9b8779f9a6bdc78f9ac4f72cca75b6034f13e62c..e0600efc0d83194e25510c265b9160c10261cdd0 100644
--- a/UI/JsAdaptivePortalPage/README_zh.md
+++ b/UI/JsAdaptivePortalPage/README_zh.md
@@ -30,4 +30,4 @@
1.本示例仅支持在大型系统上运行。
-2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。
\ No newline at end of file
+2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。
\ No newline at end of file
diff --git a/UI/JsAdaptivePortalPage/entry/package.json b/UI/JsAdaptivePortalPage/entry/package.json
index db08bbf9d7439623fcfa4093ab7f013633c62d48..29732ffea047ab4e9d897d4cc7092f5e7fe3493f 100644
--- a/UI/JsAdaptivePortalPage/entry/package.json
+++ b/UI/JsAdaptivePortalPage/entry/package.json
@@ -11,4 +11,4 @@
"repository": {},
"version": "1.0.0",
"dependencies": {}
-}
\ No newline at end of file
+}
diff --git a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/app.js b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/app.js
index c158442201abb1888ae8fb1d57f150c5ec26c36b..524b4481da6fb0a7ab96a7ce0db2e2d1e79b9bd6 100644
--- a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/app.js
+++ b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/app.js
@@ -13,10 +13,10 @@
* limitations under the License.
*/
export default {
- onCreate() {
- console.info('AceApplication onCreate');
- },
- onDestroy() {
- console.info('AceApplication onDestroy');
- }
+ onCreate() {
+ console.info('AceApplication onCreate');
+ },
+ onDestroy() {
+ console.info('AceApplication onDestroy');
+ }
};
diff --git a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-card-item.css b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-card-item.css
index 7bffbb4b401524f671eeb7b1e11e68818f6c8b0a..ce47261890859ed7f49779045b084cf009f2a0c3 100644
--- a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-card-item.css
+++ b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-card-item.css
@@ -25,7 +25,7 @@
.img-hmqs-three {
width: 48px;
height: 48px;
- background-image:url('/common/images/item.png');
+ background-image: url('/common/images/item.png');
background-size: contain;
background-repeat: no-repeat;
}
diff --git a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-card-item.hml b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-card-item.hml
index 54b83193f00b752c97a766063aa5056f5fde124c..37e47fed3d245b3b0c15f40c71c5566ccc60b057 100644
--- a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-card-item.hml
+++ b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-card-item.hml
@@ -14,12 +14,12 @@
-->
-
-
- {{ title }}
-
-
- {{ author }}
-
+
+
+ {{ title }}
+
+
+ {{ author }}
+
\ No newline at end of file
diff --git a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-group-header.hml b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-group-header.hml
index 10309345686b860e5a1e33f68e4dfd59351ba904..c9c5a1da92a99a6920e9845cc17d97d3aea702b4 100644
--- a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-group-header.hml
+++ b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-group-header.hml
@@ -14,11 +14,11 @@
-->
-
- {{ $t('strings.txt-content-title')}}
-
-
- {{ $t('strings.txt-content-more') }}
-
-
+
+ {{ $t('strings.txt-content-title') }}
+
+
+ {{ $t('strings.txt-content-more') }}
+
+
\ No newline at end of file
diff --git a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-tabbar.css b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-tabbar.css
index c8debbd21076def237c5b164928311dcaf529f49..9614f64f57113eca92941e9a88789594ec0b50fb 100644
--- a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-tabbar.css
+++ b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-tabbar.css
@@ -45,9 +45,11 @@
width: 100%;
height: 20%;
}
+
.img-tab-bar-bottom {
margin-bottom: 2px;
}
+
.txt-tab-bar-bottom {
font-size: 10px;
text-align: center;
diff --git a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-tabbar.hml b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-tabbar.hml
index 35ebf5dabba7ee3b4f71cf4c09cf3667e660f962..c30e59456bd6537660226f095747ce3e2313b7fd 100644
--- a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-tabbar.hml
+++ b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/common/template-tabbar.hml
@@ -14,8 +14,8 @@
-->
-
-
-
- {{ text }}
+
+
+
+ {{ text }}
\ No newline at end of file
diff --git a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/pages/index/index.hml b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/pages/index/index.hml
index 2ba1ee2018282a40dcc69401c68f400ffa6012da..06b4c9261c3e4b4c21b6a34b2fb9803e3b8d16a0 100644
--- a/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/pages/index/index.hml
+++ b/UI/JsAdaptivePortalPage/entry/src/main/js/MainAbility/pages/index/index.hml
@@ -18,185 +18,185 @@
\ No newline at end of file
diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/grid/pages/index/index.css b/UI/JsAdaptiveServiceWidget/entry/src/main/js/grid/pages/index/index.css
index 4cf68faa1c91972069c20e54289069a4b7f1848b..a498a7f3911bb37463b2adf502b22f489ebb871f 100644
--- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/grid/pages/index/index.css
+++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/grid/pages/index/index.css
@@ -74,6 +74,7 @@
align-items: flex-end;
align-content: flex-end;
}
+
.stack-right {
margin-left: 5%;
justify-content: flex-end;
diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/grid/pages/index/index.hml b/UI/JsAdaptiveServiceWidget/entry/src/main/js/grid/pages/index/index.hml
index 4f2fa11cde251c26a7fb140cb44ff1d3f3dbbddf..5f0618820d49b865be07a950dddefcd2a854e83d 100644
--- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/grid/pages/index/index.hml
+++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/grid/pages/index/index.hml
@@ -14,28 +14,28 @@
-->
-
-
- {{ $t('strings.title') }}
-
-
-
-
- 0.33
-
-
-
- 0.33
-
-
-
-
-
- 0.33
-
-
-
- 0.33
-
-
+
+
+ {{ $t('strings.title') }}
+
+
+
+
+ 0.33
+
+
+
+ 0.33
+
+
+
+
+
+ 0.33
+
+
+
+ 0.33
+
+
\ No newline at end of file
diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/imgText/pages/index/index.hml b/UI/JsAdaptiveServiceWidget/entry/src/main/js/imgText/pages/index/index.hml
index 4523b3c5c33f8ad208deaf7ccb0443d6022c3175..e6fc60922d0ffc7b5c804d6bcec835ab557b078b 100644
--- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/imgText/pages/index/index.hml
+++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/imgText/pages/index/index.hml
@@ -14,19 +14,19 @@
-->
-
-
-
-
-
- {{title}}
-
-
-
-
-
- {{ $item.title }}
- {{ $item.detail }}
-
+
+
+
+
+ {{ title }}
+
+
+
+
+
+ {{ $item.title }}
+ {{ $item.detail }}
+
+
\ No newline at end of file
diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/immersive/pages/index/index.hml b/UI/JsAdaptiveServiceWidget/entry/src/main/js/immersive/pages/index/index.hml
index d15d47279b4597b051ebdca2ca9bc1fc2137006e..4ce2593b3b47ff9e9c951c1bcb636c4f641c2943 100644
--- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/immersive/pages/index/index.hml
+++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/immersive/pages/index/index.hml
@@ -14,10 +14,10 @@
-->
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UI/JsAdaptiveServiceWidget/entry/src/main/js/text/pages/index/index.hml b/UI/JsAdaptiveServiceWidget/entry/src/main/js/text/pages/index/index.hml
index 434ea8fb8863ff58a3e41dfc3136cd35e66fed82..1c23ccaad3979f990661a18342423ea48988f554 100644
--- a/UI/JsAdaptiveServiceWidget/entry/src/main/js/text/pages/index/index.hml
+++ b/UI/JsAdaptiveServiceWidget/entry/src/main/js/text/pages/index/index.hml
@@ -14,14 +14,14 @@
-->
-
-
- {{ $item.name }}
- {{ $item.exponent }}
-
-
- {{ $item.coded }}
- {{ $item.per }}
-
+
+
+ {{ $item.name }}
+ {{ $item.exponent }}
+
+ {{ $item.coded }}
+ {{ $item.per }}
+
+
\ No newline at end of file
diff --git a/UI/JsAdaptiveServiceWidget/package.json b/UI/JsAdaptiveServiceWidget/package.json
index 45f295749165b1bb3b68030fb4195e8c8e79df2d..ce0caaf36da9d8d60db531c85d1cff6ca3762da7 100644
--- a/UI/JsAdaptiveServiceWidget/package.json
+++ b/UI/JsAdaptiveServiceWidget/package.json
@@ -11,8 +11,8 @@
"repository": {},
"version": "1.0.0",
"dependencies": {
- "@ohos/hypium": "1.0.0",
- "@ohos/hvigor-ohos-plugin": "1.1.3",
- "@ohos/hvigor": "1.1.3"
+ "@ohos/hypium": "1.0.1",
+ "@ohos/hvigor-ohos-plugin": "1.1.6",
+ "@ohos/hvigor": "1.1.6"
}
}
diff --git a/UI/JsAnimation/.gitignore b/UI/JsAnimation/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..4222b99195171f6433f7abe1fecaf4121895cce4
--- /dev/null
+++ b/UI/JsAnimation/.gitignore
@@ -0,0 +1,8 @@
+/node_modules
+/local.properties
+/.idea
+**/build
+/.hvigor
+/build-profile.json5
+/package-lock.json
+/entry/package-lock.json
\ No newline at end of file
diff --git a/UI/JsAnimation/README_zh.md b/UI/JsAnimation/README_zh.md
index 1e81fa3d8ba52ebd4da4e455323a2891ac219110..d9b57e179ca8c36779bd30b1eadc6aee11766ab3 100644
--- a/UI/JsAnimation/README_zh.md
+++ b/UI/JsAnimation/README_zh.md
@@ -22,4 +22,4 @@
1.本示例仅支持在大型系统上运行，且参考内存 ≥ 1GiB。
-2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。
\ No newline at end of file
+2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。
\ No newline at end of file
diff --git a/UI/JsAnimation/package.json b/UI/JsAnimation/package.json
index e9b2e36988b0659f95270cd33d94c7e97bd6304e..b6dc6701393450c911172eefdce700889e42472f 100644
--- a/UI/JsAnimation/package.json
+++ b/UI/JsAnimation/package.json
@@ -11,8 +11,8 @@
"repository": {},
"version": "1.0.0",
"dependencies": {
- "@ohos/hypium": "1.0.0",
- "@ohos/hvigor-ohos-plugin": "1.1.3",
- "@ohos/hvigor": "1.1.3"
+ "@ohos/hypium": "1.0.1",
+ "@ohos/hvigor-ohos-plugin": "1.1.6",
+ "@ohos/hvigor": "1.1.6"
}
}
diff --git a/UI/JsAnimationStyle/.gitignore b/UI/JsAnimationStyle/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..4222b99195171f6433f7abe1fecaf4121895cce4
--- /dev/null
+++ b/UI/JsAnimationStyle/.gitignore
@@ -0,0 +1,8 @@
+/node_modules
+/local.properties
+/.idea
+**/build
+/.hvigor
+/build-profile.json5
+/package-lock.json
+/entry/package-lock.json
\ No newline at end of file
diff --git a/UI/JsAnimationStyle/README_zh.md b/UI/JsAnimationStyle/README_zh.md
index c1e0f8d3926432f88c1e4546920866bae0871d8f..9c44120837b49f4c8d9bc70e285468dce9280360 100644
--- a/UI/JsAnimationStyle/README_zh.md
+++ b/UI/JsAnimationStyle/README_zh.md
@@ -32,5 +32,5 @@
1.本示例仅支持在标准系统上运行。
-2.本示例需要使用DevEco Studio 3.0 Beta3 (Build Version: 3.0.0.901, built on May 30, 2022)才可编译运行。
+2.本示例需要使用DevEco Studio 3.0 Beta4 (Build Version: 3.0.0.992, built on July 14, 2022)才可编译运行。
diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/app.js b/UI/JsAnimationStyle/entry/src/main/js/default/app.js
index 8e47afff13e928a74fdcc01a108e4422404b9ac9..50007322f38c5c4328aa0e7386255727629eb48d 100644
--- a/UI/JsAnimationStyle/entry/src/main/js/default/app.js
+++ b/UI/JsAnimationStyle/entry/src/main/js/default/app.js
@@ -14,10 +14,10 @@
*/
export default {
- onCreate() {
- console.info('AceApplication onCreate');
- },
- onDestroy() {
- console.info('AceApplication onDestroy');
- }
+ onCreate() {
+ console.info('AceApplication onCreate');
+ },
+ onDestroy() {
+ console.info('AceApplication onDestroy');
+ }
};
diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.css b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.css
index b9308ce621726f4f0f22b84cea92ccc8414f310a..0f438433da8a47c41666e757b8d31e3952f1e54f 100644
--- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.css
+++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.css
@@ -26,20 +26,21 @@
background-color: #f76160;
width: 100px;
height: 100px;
- animation-name:compositeAnimation ;
+ animation-name: compositeAnimation;
animation-duration: 4s;
animation-delay: 0s;
animation-iteration-count: infinite;
animation-timing-function: linear;
}
-@keyframes compositeAnimation
-{
+
+@keyframes compositeAnimation {
from {
background-color: #f76160;
- transform:translate(100px,100px) rotate(0deg) scale(1.0);
+ transform: translate(100px, 100px) rotate(0deg) scale(1.0);
}
+
to {
background-color: #09ba07;
- transform:translate(200px,200px) rotate(180deg) scale(1.5);
+ transform: translate(200px, 200px) rotate(180deg) scale(1.5);
}
}
\ No newline at end of file
diff --git a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.hml b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.hml
index dd10b0876116d0699a74cf3b7f19af06bd1bc549..ebe2bd346b884dfcfad8c6ea55927ae6afc312e2 100644
--- a/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.hml
+++ b/UI/JsAnimationStyle/entry/src/main/js/default/pages/animation/compositeanimation/compositeanimation.hml
@@ -14,7 +14,7 @@
-->