From 9e27dd705be3cae5a0a7c09ffe1dcf3c5709218e Mon Sep 17 00:00:00 2001 From: dhf <1511447814@qq.com> Date: Tue, 4 Nov 2025 09:32:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ets/common/network/ConnectionUtils.ets | 50 +++-- .../src/main/ets/common/network/HttpUtils.ets | 67 +++---- .../src/main/ets/common/network/RCPUtils.ets | 42 ++-- .../entry/src/main/ets/pages/LoginPage.ets | 6 +- .../entry/src/main/ets/view/test.ets | 182 ------------------ 5 files changed, 82 insertions(+), 265 deletions(-) delete mode 100644 PageAndData03/03_Complete/entry/src/main/ets/view/test.ets diff --git a/PageAndData03/03_Complete/entry/src/main/ets/common/network/ConnectionUtils.ets b/PageAndData03/03_Complete/entry/src/main/ets/common/network/ConnectionUtils.ets index 62c8de4..8b1823a 100644 --- a/PageAndData03/03_Complete/entry/src/main/ets/common/network/ConnectionUtils.ets +++ b/PageAndData03/03_Complete/entry/src/main/ets/common/network/ConnectionUtils.ets @@ -28,37 +28,35 @@ export class ConnectionUtils { /** *The method of checking whether the monitoring network is connected.. */ - async isNetworkConnected(): Promise { + isNetworkConnected(): boolean { let result: boolean = false; - await connection.getDefaultNet().then(async (data: connection.NetHandle) => { + + try { + let data = connection.getDefaultNetSync() if (data.netId === 0) { hilog.info(0x0000, TAG, 'network error'); - return; + return false; + } + let netCapabilities = connection.getNetCapabilitiesSync(data); + let bearerTypes: Set = new Set(netCapabilities.bearerTypes); + let bearerTypesNum = Array.from(bearerTypes.values()); + for (let item of bearerTypesNum) { + if (item === 0) { + result = true; + hilog.info(0x0000, TAG, 'BEARER_CELLULAR'); + } else if (item === 1) { + result = true; + hilog.info(0x0000, TAG, 'BEARER_WIFI'); + } else if (item === 3) { + result = true; + hilog.info(0x0000, TAG, 'BEARER_ETHERNET'); + } else { + hilog.info(0x0000, TAG, 'OTHER TYPE'); + } } - await connection.getNetCapabilities(data).then( - (data: connection.NetCapabilities) => { - let bearerTypes: Set = new Set(data.bearerTypes); - let bearerTypesNum = Array.from(bearerTypes.values()); - for (let item of bearerTypesNum) { - if (item === 0) { - result = true; - hilog.info(0x0000, TAG, 'BEARER_CELLULAR'); - } else if (item === 1) { - result = true; - hilog.info(0x0000, TAG, 'BEARER_WIFI'); - } else if (item === 3) { - result = true; - hilog.info(0x0000, TAG, 'BEARER_ETHERNET'); - } else { - return; - } - } - }).catch((error: BusinessError) => { - hilog.error(0x00, TAG, `getNetCapabilities failed, code = ${error.code}, message = ${error.message}`); - }) - }).catch((error: BusinessError) => { + } catch (error) { hilog.error(0x00, TAG, `getDefaultNet failed, code = ${error.code}, message = ${error.message}`); - }) + } return result; } diff --git a/PageAndData03/03_Complete/entry/src/main/ets/common/network/HttpUtils.ets b/PageAndData03/03_Complete/entry/src/main/ets/common/network/HttpUtils.ets index d21e2ae..c27da2f 100644 --- a/PageAndData03/03_Complete/entry/src/main/ets/common/network/HttpUtils.ets +++ b/PageAndData03/03_Complete/entry/src/main/ets/common/network/HttpUtils.ets @@ -52,21 +52,21 @@ export class HttpUtils { */ async getHttpRequest(cacheDir: string): Promise { let responsePictureUri: string = ''; - await this.httpRequest.request(IMAGE_URL, { method: http.RequestMethod.GET }) - .then((data: http.HttpResponse) => { - let filePath = cacheDir + '/test.svg'; - try { - let file = fileIo.openSync(filePath, fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE); - responsePictureUri = fileUri.getUriFromPath(filePath); - fileIo.writeSync(file.fd, data.result as ArrayBuffer); - fileIo.closeSync(file.fd); - } catch (error) { - let err = error as BusinessError; - hilog.error(0x00, TAG, `openSync failed, code = ${err.code}, message = ${err.message}`); - } - }).catch((error: BusinessError) => { - hilog.error(0x00, TAG, `request failed, code = ${error.code}, message = ${error.message}`); - }) + try { + let httpResponse = await this.httpRequest.request(IMAGE_URL, { method: http.RequestMethod.GET }) + let filePath = cacheDir + '/test.svg'; + try { + let file = fileIo.openSync(filePath, fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE); + responsePictureUri = fileUri.getUriFromPath(filePath); + fileIo.writeSync(file.fd, httpResponse.result as ArrayBuffer); + fileIo.closeSync(file.fd); + } catch (error) { + let err = error as BusinessError; + hilog.error(0x00, TAG, `openSync failed, code = ${err.code}, message = ${err.message}`); + } + } catch (error) { + hilog.error(0x00, TAG, `request failed, code = ${error.code}, message = ${error.message}`); + } return responsePictureUri; } @@ -75,25 +75,26 @@ export class HttpUtils { */ async postHttpRequest(): Promise { let responseData: Array = []; - await this.httpRequest.request(RESOURCE_URL, - { - method: http.RequestMethod.POST, extraData: { - 'status': '1', - 'belong': '1', - 'language': 'cn', - 'needTop': 1, - 'displayChannel': [1, 3], - 'count': 4, - 'pagestart': 1, - 'type': '1,4,5,6' - }, - header: new Header('application/json;charset=UTF-8') - }).then((data: http.HttpResponse) => { - let result: ResponseData = JSON.parse(data.result as string); + try { + let httpResponse = await this.httpRequest.request(RESOURCE_URL, + { + method: http.RequestMethod.POST, extraData: { + 'status': '1', + 'belong': '1', + 'language': 'cn', + 'needTop': 1, + 'displayChannel': [1, 3], + 'count': 4, + 'pagestart': 1, + 'type': '1,4,5,6' + }, + header: new Header('application/json;charset=UTF-8') + }); + let result: ResponseData = JSON.parse(httpResponse.result as string); responseData = result.value.list; - }).catch((err: Error) => { - hilog.info(0x0000, TAG, JSON.stringify(err)); - }); + } catch (error) { + hilog.error(0x00, TAG, `request failed, code = ${error.code}, message = ${error.message}`); + } return responseData; } diff --git a/PageAndData03/03_Complete/entry/src/main/ets/common/network/RCPUtils.ets b/PageAndData03/03_Complete/entry/src/main/ets/common/network/RCPUtils.ets index 9c31c66..7750384 100644 --- a/PageAndData03/03_Complete/entry/src/main/ets/common/network/RCPUtils.ets +++ b/PageAndData03/03_Complete/entry/src/main/ets/common/network/RCPUtils.ets @@ -44,22 +44,23 @@ export class RCPUtils { */ async getRCPRequest(cacheDir: string): Promise { let responsePictureUri: string = ''; - await this.rcpSession!.get('https://developer.huawei.com/system/modules/org.opencms.portal.template.core/' + - 'resources/harmony/img/jiantou_right.svg') - .then((response) => { - let filePath = cacheDir + '/test.svg'; - try { - let file = fileIo.openSync(filePath, fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE); - responsePictureUri = fileUri.getUriFromPath(filePath); - fileIo.writeSync(file.fd, response.body); - fileIo.closeSync(file.fd); - } catch (error) { - let err = error as BusinessError; - hilog.error(0x00, TAG, `openSync failed, code = ${err.code}, message = ${err.message}`); - } - }).catch((err: BusinessError) => { - hilog.error(0x0000, TAG, `err: err code is ${err.code}, err message is ${JSON.stringify(err)}`); - }); + try { + let response = + await this.rcpSession!.get('https://developer.huawei.com/system/modules/org.opencms.portal.template.core/' + + 'resources/harmony/img/jiantou_right.svg') + let filePath = cacheDir + '/test.svg'; + try { + let file = fileIo.openSync(filePath, fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE); + responsePictureUri = fileUri.getUriFromPath(filePath); + fileIo.writeSync(file.fd, response.body); + fileIo.closeSync(file.fd); + } catch (error) { + let err = error as BusinessError; + hilog.error(0x00, TAG, `openSync failed, code = ${err.code}, message = ${err.message}`); + } + } catch (error) { + hilog.error(0x0000, TAG, `err: err code is ${error.code}, err message is ${error.message}`); + } return responsePictureUri; } @@ -79,12 +80,13 @@ export class RCPUtils { 'pagestart': 1, 'type': '1,4,5,6' } - await this.rcpSession!.post(list_source, requestContent).then((response) => { + try { + let response = await this.rcpSession!.post(list_source, requestContent); let result: ResponseData = response.toJSON() as ResponseData; responseData = result.value.list; - }).catch((err: BusinessError) => { - hilog.error(0x0000, TAG, `err: err code is ${err.code}, err message is ${JSON.stringify(err)}`); - }); + } catch (error) { + hilog.error(0x0000, TAG, `err: err code is ${error.code}, err message is ${error.message}`); + } return responseData; } diff --git a/PageAndData03/03_Complete/entry/src/main/ets/pages/LoginPage.ets b/PageAndData03/03_Complete/entry/src/main/ets/pages/LoginPage.ets index afefeae..a470100 100644 --- a/PageAndData03/03_Complete/entry/src/main/ets/pages/LoginPage.ets +++ b/PageAndData03/03_Complete/entry/src/main/ets/pages/LoginPage.ets @@ -159,10 +159,8 @@ struct LoginPage { top: '48vp', bottom: '12vp' }) - .onClick(async () => { - await ConnectionUtils.isNetworkConnected().then((value) => { - this.login(value); - }) + .onClick(() => { + this.login(ConnectionUtils.isNetworkConnected()); }) Text($r('app.string.register_account')) .fontColor('#007DFF') diff --git a/PageAndData03/03_Complete/entry/src/main/ets/view/test.ets b/PageAndData03/03_Complete/entry/src/main/ets/view/test.ets deleted file mode 100644 index a120ae7..0000000 --- a/PageAndData03/03_Complete/entry/src/main/ets/view/test.ets +++ /dev/null @@ -1,182 +0,0 @@ -/* - * Copyright (c) 2024 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 { common } from '@kit.AbilityKit'; -import mainViewModel from '../viewmodel/MainViewModel'; -import ItemData from '../viewmodel/ItemData'; -import ListInfo from '../viewmodel/ResponseData/ListInfo'; -import { HttpUtils } from '../common/network/HttpUtils'; -import { RCPUtils } from '../common/network/RCPUtils'; - -@Component -export default struct Home { - @State httpGridItems: Array = []; - @State pictureUri: string = ''; - private swiperController: SwiperController = new SwiperController(); - private context = this.getUIContext().getHostContext() as common.UIAbilityContext; - private applicationContext = this.context.getApplicationContext(); - private cacheDir = this.applicationContext.filesDir; - - async aboutToAppear(): Promise { - // let httpUtil: HttpUtils = new HttpUtils(); - // await httpUtil.postHttpRequest().then((value : Array)=>{ - // this.httpGridItems = value; - // }); - // await httpUtil.getHttpRequest(this.cacheDir).then((value: string) => { - // this.pictureUri = value; - // }); - // httpUtil.destroyHttpRequest(); - - let rcpUtil: RCPUtils = new RCPUtils(); - await rcpUtil.postRCPRequest().then((value: Array) => { - this.httpGridItems = value; - }); - await rcpUtil.getRCPRequest(this.cacheDir).then((value: string) => { - this.pictureUri = value; - }); - rcpUtil.destroySession(); - } - - build() { - Column() { - Text($r('app.string.mainPage_tabTitles_home')) - .width('100%') - .margin({ - top: '48vp', - bottom: '12vp' - }) - .fontWeight(700) - .fontSize('26fp') - - Scroll() { - Column() { - Swiper(this.swiperController) { - ForEach(mainViewModel.getSwiperImages(), (img: Resource) => { - Image(img) - .width('100%') - .borderRadius('16vp') - }, (img: Resource) => JSON.stringify(img.id)) - } - .autoPlay(true) - - Grid() { - ForEach(mainViewModel.getFirstGridData(), (item: ItemData) => { - GridItem() { - Column() { - Image(item.img) - .width('40vp') - .height('40vp') - Text(item.title) - .fontSize('12fp') - .margin({ top: '4vp' }) - } - } - }, (item: ItemData) => JSON.stringify(item)) - } - .backgroundImage($r('app.media.backgroundImage')) - .backgroundImageSize({ - width: '100%', - height: '156vp' - }) - .columnsTemplate('1fr 1fr 1fr 1fr') - .rowsTemplate('1fr 1fr') - .columnsGap('8vp') - .rowsGap('12vp') - .margin({ top: '12vp' }) - .padding({ - top: '12vp', - bottom: '12vp' - }) - .height('156vp') - .backgroundColor(Color.White) - .borderRadius('16vp') - - Text($r('app.string.home_list')) - .fontSize('18fp') - .fontWeight(700) - .width('100%') - .margin({ - top: '18vp', - bottom: '8vp' - }) - - List() { - ForEach(this.httpGridItems, (secondItem: ListInfo) => { - ListItem() { - Row() { - Image(secondItem.indexNavPic) - .width('130vp') - .height('80vp') - .objectFit(ImageFit.TOP_START) - .borderRadius('8vp') - .margin({ right: '12vp' }) - - Column() { - Text(secondItem.activityName) - .width('190vp') - .textOverflow({ overflow: TextOverflow.Ellipsis }) - .maxLines(1) - .fontSize('16fp') - .fontWeight(FontWeight.Medium) - Text(secondItem.theme) - .width('190vp') - .textOverflow({ overflow: TextOverflow.Ellipsis }) - .maxLines(2) - .margin({ top: '4vp' }) - .fontSize('12fp') - .fontColor('#99182431') - Row() { - Image(this.pictureUri) - .width('20vp') - .opacity(0.5) - } - .width('170vp') - .margin({ top: '10.5vp' }) - .justifyContent(FlexAlign.End) - .alignItems(VerticalAlign.Bottom) - } - .alignItems(HorizontalAlign.Start) - } - .width('100%') - .padding({ - left: '12vp', - right: '12vp', - top: '12vp', - bottom: '12vp' - }) - .justifyContent(FlexAlign.SpaceBetween) - } - .margin({ bottom: '8vp' }) - .borderRadius('16vp') - .backgroundColor('#ffffff') - .borderRadius($r('app.float.home_backgroundImage_borderRadius')) - .align(Alignment.TopStart) - .width('100%') - }, (secondItem: ListInfo) => JSON.stringify(secondItem)) - } - .scrollBar(BarState.Off) - .width('100%') - } - } - .height('660vp') - .align(Alignment.TopStart) - .scrollBar(BarState.Off) - } - .justifyContent(FlexAlign.Start) - .alignItems(HorizontalAlign.Start) - .width('100%') - .height('100%') - } -} \ No newline at end of file -- Gitee From 842de6596b5a8682ed659ed7e4a2a6e33d3ee8a3 Mon Sep 17 00:00:00 2001 From: dhf <1511447814@qq.com> Date: Tue, 4 Nov 2025 09:37:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ets/common/network/ConnectionUtils.ets | 50 +++-- .../src/main/ets/common/network/HttpUtils.ets | 67 +++---- .../src/main/ets/common/network/RCPUtils.ets | 42 ++-- .../entry/src/main/ets/pages/LoginPage.ets | 6 +- .../entry/src/main/ets/view/test.ets | 182 ------------------ 5 files changed, 82 insertions(+), 265 deletions(-) delete mode 100644 PageAndData04/04_StartingPoint/entry/src/main/ets/view/test.ets diff --git a/PageAndData04/04_StartingPoint/entry/src/main/ets/common/network/ConnectionUtils.ets b/PageAndData04/04_StartingPoint/entry/src/main/ets/common/network/ConnectionUtils.ets index 62c8de4..081c00d 100644 --- a/PageAndData04/04_StartingPoint/entry/src/main/ets/common/network/ConnectionUtils.ets +++ b/PageAndData04/04_StartingPoint/entry/src/main/ets/common/network/ConnectionUtils.ets @@ -28,37 +28,35 @@ export class ConnectionUtils { /** *The method of checking whether the monitoring network is connected.. */ - async isNetworkConnected(): Promise { + isNetworkConnected(): boolean { let result: boolean = false; - await connection.getDefaultNet().then(async (data: connection.NetHandle) => { + + try { + let data = connection.getDefaultNetSync(); if (data.netId === 0) { hilog.info(0x0000, TAG, 'network error'); - return; + return false; + } + let netCapabilities = connection.getNetCapabilitiesSync(data); + let bearerTypes: Set = new Set(netCapabilities.bearerTypes); + let bearerTypesNum = Array.from(bearerTypes.values()); + for (let item of bearerTypesNum) { + if (item === 0) { + result = true; + hilog.info(0x0000, TAG, 'BEARER_CELLULAR'); + } else if (item === 1) { + result = true; + hilog.info(0x0000, TAG, 'BEARER_WIFI'); + } else if (item === 3) { + result = true; + hilog.info(0x0000, TAG, 'BEARER_ETHERNET'); + } else { + hilog.info(0x0000, TAG, 'OTHER TYPE'); + } } - await connection.getNetCapabilities(data).then( - (data: connection.NetCapabilities) => { - let bearerTypes: Set = new Set(data.bearerTypes); - let bearerTypesNum = Array.from(bearerTypes.values()); - for (let item of bearerTypesNum) { - if (item === 0) { - result = true; - hilog.info(0x0000, TAG, 'BEARER_CELLULAR'); - } else if (item === 1) { - result = true; - hilog.info(0x0000, TAG, 'BEARER_WIFI'); - } else if (item === 3) { - result = true; - hilog.info(0x0000, TAG, 'BEARER_ETHERNET'); - } else { - return; - } - } - }).catch((error: BusinessError) => { - hilog.error(0x00, TAG, `getNetCapabilities failed, code = ${error.code}, message = ${error.message}`); - }) - }).catch((error: BusinessError) => { + } catch (error) { hilog.error(0x00, TAG, `getDefaultNet failed, code = ${error.code}, message = ${error.message}`); - }) + } return result; } diff --git a/PageAndData04/04_StartingPoint/entry/src/main/ets/common/network/HttpUtils.ets b/PageAndData04/04_StartingPoint/entry/src/main/ets/common/network/HttpUtils.ets index d21e2ae..c27da2f 100644 --- a/PageAndData04/04_StartingPoint/entry/src/main/ets/common/network/HttpUtils.ets +++ b/PageAndData04/04_StartingPoint/entry/src/main/ets/common/network/HttpUtils.ets @@ -52,21 +52,21 @@ export class HttpUtils { */ async getHttpRequest(cacheDir: string): Promise { let responsePictureUri: string = ''; - await this.httpRequest.request(IMAGE_URL, { method: http.RequestMethod.GET }) - .then((data: http.HttpResponse) => { - let filePath = cacheDir + '/test.svg'; - try { - let file = fileIo.openSync(filePath, fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE); - responsePictureUri = fileUri.getUriFromPath(filePath); - fileIo.writeSync(file.fd, data.result as ArrayBuffer); - fileIo.closeSync(file.fd); - } catch (error) { - let err = error as BusinessError; - hilog.error(0x00, TAG, `openSync failed, code = ${err.code}, message = ${err.message}`); - } - }).catch((error: BusinessError) => { - hilog.error(0x00, TAG, `request failed, code = ${error.code}, message = ${error.message}`); - }) + try { + let httpResponse = await this.httpRequest.request(IMAGE_URL, { method: http.RequestMethod.GET }) + let filePath = cacheDir + '/test.svg'; + try { + let file = fileIo.openSync(filePath, fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE); + responsePictureUri = fileUri.getUriFromPath(filePath); + fileIo.writeSync(file.fd, httpResponse.result as ArrayBuffer); + fileIo.closeSync(file.fd); + } catch (error) { + let err = error as BusinessError; + hilog.error(0x00, TAG, `openSync failed, code = ${err.code}, message = ${err.message}`); + } + } catch (error) { + hilog.error(0x00, TAG, `request failed, code = ${error.code}, message = ${error.message}`); + } return responsePictureUri; } @@ -75,25 +75,26 @@ export class HttpUtils { */ async postHttpRequest(): Promise { let responseData: Array = []; - await this.httpRequest.request(RESOURCE_URL, - { - method: http.RequestMethod.POST, extraData: { - 'status': '1', - 'belong': '1', - 'language': 'cn', - 'needTop': 1, - 'displayChannel': [1, 3], - 'count': 4, - 'pagestart': 1, - 'type': '1,4,5,6' - }, - header: new Header('application/json;charset=UTF-8') - }).then((data: http.HttpResponse) => { - let result: ResponseData = JSON.parse(data.result as string); + try { + let httpResponse = await this.httpRequest.request(RESOURCE_URL, + { + method: http.RequestMethod.POST, extraData: { + 'status': '1', + 'belong': '1', + 'language': 'cn', + 'needTop': 1, + 'displayChannel': [1, 3], + 'count': 4, + 'pagestart': 1, + 'type': '1,4,5,6' + }, + header: new Header('application/json;charset=UTF-8') + }); + let result: ResponseData = JSON.parse(httpResponse.result as string); responseData = result.value.list; - }).catch((err: Error) => { - hilog.info(0x0000, TAG, JSON.stringify(err)); - }); + } catch (error) { + hilog.error(0x00, TAG, `request failed, code = ${error.code}, message = ${error.message}`); + } return responseData; } diff --git a/PageAndData04/04_StartingPoint/entry/src/main/ets/common/network/RCPUtils.ets b/PageAndData04/04_StartingPoint/entry/src/main/ets/common/network/RCPUtils.ets index 9c31c66..7750384 100644 --- a/PageAndData04/04_StartingPoint/entry/src/main/ets/common/network/RCPUtils.ets +++ b/PageAndData04/04_StartingPoint/entry/src/main/ets/common/network/RCPUtils.ets @@ -44,22 +44,23 @@ export class RCPUtils { */ async getRCPRequest(cacheDir: string): Promise { let responsePictureUri: string = ''; - await this.rcpSession!.get('https://developer.huawei.com/system/modules/org.opencms.portal.template.core/' + - 'resources/harmony/img/jiantou_right.svg') - .then((response) => { - let filePath = cacheDir + '/test.svg'; - try { - let file = fileIo.openSync(filePath, fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE); - responsePictureUri = fileUri.getUriFromPath(filePath); - fileIo.writeSync(file.fd, response.body); - fileIo.closeSync(file.fd); - } catch (error) { - let err = error as BusinessError; - hilog.error(0x00, TAG, `openSync failed, code = ${err.code}, message = ${err.message}`); - } - }).catch((err: BusinessError) => { - hilog.error(0x0000, TAG, `err: err code is ${err.code}, err message is ${JSON.stringify(err)}`); - }); + try { + let response = + await this.rcpSession!.get('https://developer.huawei.com/system/modules/org.opencms.portal.template.core/' + + 'resources/harmony/img/jiantou_right.svg') + let filePath = cacheDir + '/test.svg'; + try { + let file = fileIo.openSync(filePath, fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE); + responsePictureUri = fileUri.getUriFromPath(filePath); + fileIo.writeSync(file.fd, response.body); + fileIo.closeSync(file.fd); + } catch (error) { + let err = error as BusinessError; + hilog.error(0x00, TAG, `openSync failed, code = ${err.code}, message = ${err.message}`); + } + } catch (error) { + hilog.error(0x0000, TAG, `err: err code is ${error.code}, err message is ${error.message}`); + } return responsePictureUri; } @@ -79,12 +80,13 @@ export class RCPUtils { 'pagestart': 1, 'type': '1,4,5,6' } - await this.rcpSession!.post(list_source, requestContent).then((response) => { + try { + let response = await this.rcpSession!.post(list_source, requestContent); let result: ResponseData = response.toJSON() as ResponseData; responseData = result.value.list; - }).catch((err: BusinessError) => { - hilog.error(0x0000, TAG, `err: err code is ${err.code}, err message is ${JSON.stringify(err)}`); - }); + } catch (error) { + hilog.error(0x0000, TAG, `err: err code is ${error.code}, err message is ${error.message}`); + } return responseData; } diff --git a/PageAndData04/04_StartingPoint/entry/src/main/ets/pages/LoginPage.ets b/PageAndData04/04_StartingPoint/entry/src/main/ets/pages/LoginPage.ets index afefeae..a470100 100644 --- a/PageAndData04/04_StartingPoint/entry/src/main/ets/pages/LoginPage.ets +++ b/PageAndData04/04_StartingPoint/entry/src/main/ets/pages/LoginPage.ets @@ -159,10 +159,8 @@ struct LoginPage { top: '48vp', bottom: '12vp' }) - .onClick(async () => { - await ConnectionUtils.isNetworkConnected().then((value) => { - this.login(value); - }) + .onClick(() => { + this.login(ConnectionUtils.isNetworkConnected()); }) Text($r('app.string.register_account')) .fontColor('#007DFF') diff --git a/PageAndData04/04_StartingPoint/entry/src/main/ets/view/test.ets b/PageAndData04/04_StartingPoint/entry/src/main/ets/view/test.ets deleted file mode 100644 index a120ae7..0000000 --- a/PageAndData04/04_StartingPoint/entry/src/main/ets/view/test.ets +++ /dev/null @@ -1,182 +0,0 @@ -/* - * Copyright (c) 2024 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 { common } from '@kit.AbilityKit'; -import mainViewModel from '../viewmodel/MainViewModel'; -import ItemData from '../viewmodel/ItemData'; -import ListInfo from '../viewmodel/ResponseData/ListInfo'; -import { HttpUtils } from '../common/network/HttpUtils'; -import { RCPUtils } from '../common/network/RCPUtils'; - -@Component -export default struct Home { - @State httpGridItems: Array = []; - @State pictureUri: string = ''; - private swiperController: SwiperController = new SwiperController(); - private context = this.getUIContext().getHostContext() as common.UIAbilityContext; - private applicationContext = this.context.getApplicationContext(); - private cacheDir = this.applicationContext.filesDir; - - async aboutToAppear(): Promise { - // let httpUtil: HttpUtils = new HttpUtils(); - // await httpUtil.postHttpRequest().then((value : Array)=>{ - // this.httpGridItems = value; - // }); - // await httpUtil.getHttpRequest(this.cacheDir).then((value: string) => { - // this.pictureUri = value; - // }); - // httpUtil.destroyHttpRequest(); - - let rcpUtil: RCPUtils = new RCPUtils(); - await rcpUtil.postRCPRequest().then((value: Array) => { - this.httpGridItems = value; - }); - await rcpUtil.getRCPRequest(this.cacheDir).then((value: string) => { - this.pictureUri = value; - }); - rcpUtil.destroySession(); - } - - build() { - Column() { - Text($r('app.string.mainPage_tabTitles_home')) - .width('100%') - .margin({ - top: '48vp', - bottom: '12vp' - }) - .fontWeight(700) - .fontSize('26fp') - - Scroll() { - Column() { - Swiper(this.swiperController) { - ForEach(mainViewModel.getSwiperImages(), (img: Resource) => { - Image(img) - .width('100%') - .borderRadius('16vp') - }, (img: Resource) => JSON.stringify(img.id)) - } - .autoPlay(true) - - Grid() { - ForEach(mainViewModel.getFirstGridData(), (item: ItemData) => { - GridItem() { - Column() { - Image(item.img) - .width('40vp') - .height('40vp') - Text(item.title) - .fontSize('12fp') - .margin({ top: '4vp' }) - } - } - }, (item: ItemData) => JSON.stringify(item)) - } - .backgroundImage($r('app.media.backgroundImage')) - .backgroundImageSize({ - width: '100%', - height: '156vp' - }) - .columnsTemplate('1fr 1fr 1fr 1fr') - .rowsTemplate('1fr 1fr') - .columnsGap('8vp') - .rowsGap('12vp') - .margin({ top: '12vp' }) - .padding({ - top: '12vp', - bottom: '12vp' - }) - .height('156vp') - .backgroundColor(Color.White) - .borderRadius('16vp') - - Text($r('app.string.home_list')) - .fontSize('18fp') - .fontWeight(700) - .width('100%') - .margin({ - top: '18vp', - bottom: '8vp' - }) - - List() { - ForEach(this.httpGridItems, (secondItem: ListInfo) => { - ListItem() { - Row() { - Image(secondItem.indexNavPic) - .width('130vp') - .height('80vp') - .objectFit(ImageFit.TOP_START) - .borderRadius('8vp') - .margin({ right: '12vp' }) - - Column() { - Text(secondItem.activityName) - .width('190vp') - .textOverflow({ overflow: TextOverflow.Ellipsis }) - .maxLines(1) - .fontSize('16fp') - .fontWeight(FontWeight.Medium) - Text(secondItem.theme) - .width('190vp') - .textOverflow({ overflow: TextOverflow.Ellipsis }) - .maxLines(2) - .margin({ top: '4vp' }) - .fontSize('12fp') - .fontColor('#99182431') - Row() { - Image(this.pictureUri) - .width('20vp') - .opacity(0.5) - } - .width('170vp') - .margin({ top: '10.5vp' }) - .justifyContent(FlexAlign.End) - .alignItems(VerticalAlign.Bottom) - } - .alignItems(HorizontalAlign.Start) - } - .width('100%') - .padding({ - left: '12vp', - right: '12vp', - top: '12vp', - bottom: '12vp' - }) - .justifyContent(FlexAlign.SpaceBetween) - } - .margin({ bottom: '8vp' }) - .borderRadius('16vp') - .backgroundColor('#ffffff') - .borderRadius($r('app.float.home_backgroundImage_borderRadius')) - .align(Alignment.TopStart) - .width('100%') - }, (secondItem: ListInfo) => JSON.stringify(secondItem)) - } - .scrollBar(BarState.Off) - .width('100%') - } - } - .height('660vp') - .align(Alignment.TopStart) - .scrollBar(BarState.Off) - } - .justifyContent(FlexAlign.Start) - .alignItems(HorizontalAlign.Start) - .width('100%') - .height('100%') - } -} \ No newline at end of file -- Gitee From 7c6bf490c94e887bd5eb79816fdf2667302d851c Mon Sep 17 00:00:00 2001 From: dhf <1511447814@qq.com> Date: Tue, 4 Nov 2025 09:55:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E4=B8=8E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=B7=A5=E5=85=B7=E7=B1=BB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ets/common/database/PreferencesUtil.ets | 2 +- .../main/ets/common/database/RDBStoreUtil.ets | 85 ++++++++++--------- .../ets/common/network/ConnectionUtils.ets | 50 ++++++----- .../src/main/ets/common/network/HttpUtils.ets | 67 ++++++++------- .../src/main/ets/common/network/RCPUtils.ets | 42 ++++----- .../entry/src/main/ets/pages/GoalPage.ets | 28 ++---- .../entry/src/main/ets/pages/LoginPage.ets | 6 +- 7 files changed, 135 insertions(+), 145 deletions(-) diff --git a/PageAndData04/04_Complete/entry/src/main/ets/common/database/PreferencesUtil.ets b/PageAndData04/04_Complete/entry/src/main/ets/common/database/PreferencesUtil.ets index d7b28ce..625be4a 100644 --- a/PageAndData04/04_Complete/entry/src/main/ets/common/database/PreferencesUtil.ets +++ b/PageAndData04/04_Complete/entry/src/main/ets/common/database/PreferencesUtil.ets @@ -78,7 +78,7 @@ export class PreferencesUtil { */ isKeyExist(): boolean { let isKeyExist: boolean = false; - this.preference?.has(KEY_APP_FONT_SIZE).then(async (isExist: boolean) => { + this.preference?.has(KEY_APP_FONT_SIZE).then((isExist: boolean) => { isKeyExist = isExist; }).catch((err: Error) => { hilog.error(0x0000, TAG, 'Has the value failed with err: ' + err); diff --git a/PageAndData04/04_Complete/entry/src/main/ets/common/database/RDBStoreUtil.ets b/PageAndData04/04_Complete/entry/src/main/ets/common/database/RDBStoreUtil.ets index b4ac528..8728fe3 100644 --- a/PageAndData04/04_Complete/entry/src/main/ets/common/database/RDBStoreUtil.ets +++ b/PageAndData04/04_Complete/entry/src/main/ets/common/database/RDBStoreUtil.ets @@ -102,39 +102,40 @@ export class RDBStoreUtil { /** *The method of querying all durations in all plans. */ - async queryAllPlansDuration(): Promise { + queryAllPlansDuration(): number[] { let plansSet: Array = []; - await this.objectiveRDB?.querySql(CommonConstants.QUERY_ALL_DURATIONS_SQL).then((resultSet: relationalStore.ResultSet) => { + try { + let resultSet = this.objectiveRDB!.querySqlSync(CommonConstants.QUERY_ALL_DURATIONS_SQL); while (resultSet.goToNextRow()) { let duration: number = resultSet.getValue(resultSet.getColumnIndex('DURATION')) as number; plansSet.push(duration); } resultSet.close(); - }).catch((err: BusinessError) => { - hilog.error(0x0000, TAG, `Query failed, code is ${err.code},message is ${err.message}`); - }) + } catch (error) { + hilog.error(0x0000, TAG, `Query failed, code is ${error.code},message is ${error.message}`); + } return plansSet; } /** *The method of querying all plans. */ - async queryAllPlans(): Promise { + queryAllPlans(): GoalItem[] { let plansSet: Array = []; - await this.objectiveRDB?.querySql(CommonConstants.QUERY_ALL_PLANS_SQL) - .then((resultSet: relationalStore.ResultSet) => { - while (resultSet.goToNextRow()) { - const id = resultSet.getValue(resultSet.getColumnIndex('ID')) as number; - const name = resultSet.getValue(resultSet.getColumnIndex('NAME')) as string; - const type = resultSet.getValue(resultSet.getColumnIndex('TYPE')) as string; - const duration = resultSet.getValue(resultSet.getColumnIndex('DURATION')) as number; - const status = resultSet.getValue(resultSet.getColumnIndex('STATUS')) as string; - plansSet.push(new GoalItem(id, name, type, duration, status)); - } - resultSet.close(); - }).catch((err: BusinessError) => { - hilog.error(0x0000, TAG, `Query failed, code is ${err.code},message is ${err.message}`); - }) + try { + let resultSet = this.objectiveRDB!.querySqlSync(CommonConstants.QUERY_ALL_PLANS_SQL); + while (resultSet.goToNextRow()) { + const id = resultSet.getValue(resultSet.getColumnIndex('ID')) as number; + const name = resultSet.getValue(resultSet.getColumnIndex('NAME')) as string; + const type = resultSet.getValue(resultSet.getColumnIndex('TYPE')) as string; + const duration = resultSet.getValue(resultSet.getColumnIndex('DURATION')) as number; + const status = resultSet.getValue(resultSet.getColumnIndex('STATUS')) as string; + plansSet.push(new GoalItem(id, name, type, duration, status)); + } + resultSet.close(); + } catch (error) { + hilog.error(0x0000, TAG, `Query failed, code is ${error.code},message is ${error.message}`); + } return plansSet; } @@ -147,12 +148,13 @@ export class RDBStoreUtil { 'DURATION': duration, 'STATUS': status ? '已完成' : '未完成' }; - await this.objectiveRDB?.insert('PLANS', sportData, - relationalStore.ConflictResolution.ON_CONFLICT_REPLACE).then((rowId: number) => { - hilog.info(0x0000, TAG, `Insert is successful, rowId = ${rowId}`); - }).catch((err: BusinessError) => { - hilog.error(0x0000, TAG, `Insert is failed, code is ${err.code},message is ${err.message}`); - }) + + try { + await this.objectiveRDB?.insert('PLANS', sportData, + relationalStore.ConflictResolution.ON_CONFLICT_REPLACE); + } catch (error) { + hilog.error(0x0000, TAG, `Insert is failed, code is ${error.code},message is ${error.message}`); + } } /** @@ -165,12 +167,12 @@ export class RDBStoreUtil { }; let predicates = new relationalStore.RdbPredicates('PLANS'); predicates.equalTo('ID', planID); - await this.objectiveRDB?.update(planData, predicates, - relationalStore.ConflictResolution.ON_CONFLICT_REPLACE).then(async (rows: Number) => { - hilog.info(0x0000, TAG, `Updated row count: ${rows}`); - }).catch((err: BusinessError) => { - hilog.error(0x0000, TAG, `Updated failed, code is ${err.code},message is ${err.message}`); - }) + try { + await this.objectiveRDB?.update(planData, predicates, + relationalStore.ConflictResolution.ON_CONFLICT_REPLACE); + } catch (error) { + hilog.error(0x0000, TAG, `Updated failed, code is ${error.code},message is ${error.message}`); + } } /** @@ -179,11 +181,11 @@ export class RDBStoreUtil { async deletePlan(planID: number) { let predicates = new relationalStore.RdbPredicates('PLANS'); predicates.equalTo('ID', planID); - await this.objectiveRDB?.delete(predicates).then((rows: Number) => { - hilog.info(0x0000, TAG, `Delete rows: ${rows}`); - }).catch((err: BusinessError) => { - hilog.error(0x0000, TAG, `Delete failed, code is ${err.code},message is ${err.message}`); - }) + try { + await this.objectiveRDB?.delete(predicates) + } catch (error) { + hilog.error(0x0000, TAG, `Delete failed, code is ${error.code},message is ${error.message}`); + } } /** @@ -206,7 +208,8 @@ export class RDBStoreUtil { querySql = CommonConstants.QUERY_PLANS_BY_STATUS_SQL + statusCondition + '" and p.DURATION = ' + duration; } } - await this.objectiveRDB?.querySql(querySql).then((resultSet: relationalStore.ResultSet) => { + try { + let resultSet = this.objectiveRDB!.querySqlSync(querySql); while (resultSet.goToNextRow()) { const id = resultSet.getValue(resultSet.getColumnIndex('ID')) as number; const name = resultSet.getValue(resultSet.getColumnIndex('NAME')) as string; @@ -216,9 +219,9 @@ export class RDBStoreUtil { plansSet.push(new GoalItem(id, name, type, duration, status)); } resultSet.close(); - }).catch((err: BusinessError) => { - hilog.error(0x0000, TAG, `Query failed, code is ${err.code},message is ${err.message}`); - }) + } catch (error) { + hilog.error(0x0000, TAG, `Query failed, code is ${error.code},message is ${error.message}`); + } return plansSet; } } diff --git a/PageAndData04/04_Complete/entry/src/main/ets/common/network/ConnectionUtils.ets b/PageAndData04/04_Complete/entry/src/main/ets/common/network/ConnectionUtils.ets index 62c8de4..081c00d 100644 --- a/PageAndData04/04_Complete/entry/src/main/ets/common/network/ConnectionUtils.ets +++ b/PageAndData04/04_Complete/entry/src/main/ets/common/network/ConnectionUtils.ets @@ -28,37 +28,35 @@ export class ConnectionUtils { /** *The method of checking whether the monitoring network is connected.. */ - async isNetworkConnected(): Promise { + isNetworkConnected(): boolean { let result: boolean = false; - await connection.getDefaultNet().then(async (data: connection.NetHandle) => { + + try { + let data = connection.getDefaultNetSync(); if (data.netId === 0) { hilog.info(0x0000, TAG, 'network error'); - return; + return false; + } + let netCapabilities = connection.getNetCapabilitiesSync(data); + let bearerTypes: Set = new Set(netCapabilities.bearerTypes); + let bearerTypesNum = Array.from(bearerTypes.values()); + for (let item of bearerTypesNum) { + if (item === 0) { + result = true; + hilog.info(0x0000, TAG, 'BEARER_CELLULAR'); + } else if (item === 1) { + result = true; + hilog.info(0x0000, TAG, 'BEARER_WIFI'); + } else if (item === 3) { + result = true; + hilog.info(0x0000, TAG, 'BEARER_ETHERNET'); + } else { + hilog.info(0x0000, TAG, 'OTHER TYPE'); + } } - await connection.getNetCapabilities(data).then( - (data: connection.NetCapabilities) => { - let bearerTypes: Set = new Set(data.bearerTypes); - let bearerTypesNum = Array.from(bearerTypes.values()); - for (let item of bearerTypesNum) { - if (item === 0) { - result = true; - hilog.info(0x0000, TAG, 'BEARER_CELLULAR'); - } else if (item === 1) { - result = true; - hilog.info(0x0000, TAG, 'BEARER_WIFI'); - } else if (item === 3) { - result = true; - hilog.info(0x0000, TAG, 'BEARER_ETHERNET'); - } else { - return; - } - } - }).catch((error: BusinessError) => { - hilog.error(0x00, TAG, `getNetCapabilities failed, code = ${error.code}, message = ${error.message}`); - }) - }).catch((error: BusinessError) => { + } catch (error) { hilog.error(0x00, TAG, `getDefaultNet failed, code = ${error.code}, message = ${error.message}`); - }) + } return result; } diff --git a/PageAndData04/04_Complete/entry/src/main/ets/common/network/HttpUtils.ets b/PageAndData04/04_Complete/entry/src/main/ets/common/network/HttpUtils.ets index d21e2ae..c27da2f 100644 --- a/PageAndData04/04_Complete/entry/src/main/ets/common/network/HttpUtils.ets +++ b/PageAndData04/04_Complete/entry/src/main/ets/common/network/HttpUtils.ets @@ -52,21 +52,21 @@ export class HttpUtils { */ async getHttpRequest(cacheDir: string): Promise { let responsePictureUri: string = ''; - await this.httpRequest.request(IMAGE_URL, { method: http.RequestMethod.GET }) - .then((data: http.HttpResponse) => { - let filePath = cacheDir + '/test.svg'; - try { - let file = fileIo.openSync(filePath, fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE); - responsePictureUri = fileUri.getUriFromPath(filePath); - fileIo.writeSync(file.fd, data.result as ArrayBuffer); - fileIo.closeSync(file.fd); - } catch (error) { - let err = error as BusinessError; - hilog.error(0x00, TAG, `openSync failed, code = ${err.code}, message = ${err.message}`); - } - }).catch((error: BusinessError) => { - hilog.error(0x00, TAG, `request failed, code = ${error.code}, message = ${error.message}`); - }) + try { + let httpResponse = await this.httpRequest.request(IMAGE_URL, { method: http.RequestMethod.GET }) + let filePath = cacheDir + '/test.svg'; + try { + let file = fileIo.openSync(filePath, fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE); + responsePictureUri = fileUri.getUriFromPath(filePath); + fileIo.writeSync(file.fd, httpResponse.result as ArrayBuffer); + fileIo.closeSync(file.fd); + } catch (error) { + let err = error as BusinessError; + hilog.error(0x00, TAG, `openSync failed, code = ${err.code}, message = ${err.message}`); + } + } catch (error) { + hilog.error(0x00, TAG, `request failed, code = ${error.code}, message = ${error.message}`); + } return responsePictureUri; } @@ -75,25 +75,26 @@ export class HttpUtils { */ async postHttpRequest(): Promise { let responseData: Array = []; - await this.httpRequest.request(RESOURCE_URL, - { - method: http.RequestMethod.POST, extraData: { - 'status': '1', - 'belong': '1', - 'language': 'cn', - 'needTop': 1, - 'displayChannel': [1, 3], - 'count': 4, - 'pagestart': 1, - 'type': '1,4,5,6' - }, - header: new Header('application/json;charset=UTF-8') - }).then((data: http.HttpResponse) => { - let result: ResponseData = JSON.parse(data.result as string); + try { + let httpResponse = await this.httpRequest.request(RESOURCE_URL, + { + method: http.RequestMethod.POST, extraData: { + 'status': '1', + 'belong': '1', + 'language': 'cn', + 'needTop': 1, + 'displayChannel': [1, 3], + 'count': 4, + 'pagestart': 1, + 'type': '1,4,5,6' + }, + header: new Header('application/json;charset=UTF-8') + }); + let result: ResponseData = JSON.parse(httpResponse.result as string); responseData = result.value.list; - }).catch((err: Error) => { - hilog.info(0x0000, TAG, JSON.stringify(err)); - }); + } catch (error) { + hilog.error(0x00, TAG, `request failed, code = ${error.code}, message = ${error.message}`); + } return responseData; } diff --git a/PageAndData04/04_Complete/entry/src/main/ets/common/network/RCPUtils.ets b/PageAndData04/04_Complete/entry/src/main/ets/common/network/RCPUtils.ets index 9c31c66..7750384 100644 --- a/PageAndData04/04_Complete/entry/src/main/ets/common/network/RCPUtils.ets +++ b/PageAndData04/04_Complete/entry/src/main/ets/common/network/RCPUtils.ets @@ -44,22 +44,23 @@ export class RCPUtils { */ async getRCPRequest(cacheDir: string): Promise { let responsePictureUri: string = ''; - await this.rcpSession!.get('https://developer.huawei.com/system/modules/org.opencms.portal.template.core/' + - 'resources/harmony/img/jiantou_right.svg') - .then((response) => { - let filePath = cacheDir + '/test.svg'; - try { - let file = fileIo.openSync(filePath, fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE); - responsePictureUri = fileUri.getUriFromPath(filePath); - fileIo.writeSync(file.fd, response.body); - fileIo.closeSync(file.fd); - } catch (error) { - let err = error as BusinessError; - hilog.error(0x00, TAG, `openSync failed, code = ${err.code}, message = ${err.message}`); - } - }).catch((err: BusinessError) => { - hilog.error(0x0000, TAG, `err: err code is ${err.code}, err message is ${JSON.stringify(err)}`); - }); + try { + let response = + await this.rcpSession!.get('https://developer.huawei.com/system/modules/org.opencms.portal.template.core/' + + 'resources/harmony/img/jiantou_right.svg') + let filePath = cacheDir + '/test.svg'; + try { + let file = fileIo.openSync(filePath, fileIo.OpenMode.CREATE | fileIo.OpenMode.READ_WRITE); + responsePictureUri = fileUri.getUriFromPath(filePath); + fileIo.writeSync(file.fd, response.body); + fileIo.closeSync(file.fd); + } catch (error) { + let err = error as BusinessError; + hilog.error(0x00, TAG, `openSync failed, code = ${err.code}, message = ${err.message}`); + } + } catch (error) { + hilog.error(0x0000, TAG, `err: err code is ${error.code}, err message is ${error.message}`); + } return responsePictureUri; } @@ -79,12 +80,13 @@ export class RCPUtils { 'pagestart': 1, 'type': '1,4,5,6' } - await this.rcpSession!.post(list_source, requestContent).then((response) => { + try { + let response = await this.rcpSession!.post(list_source, requestContent); let result: ResponseData = response.toJSON() as ResponseData; responseData = result.value.list; - }).catch((err: BusinessError) => { - hilog.error(0x0000, TAG, `err: err code is ${err.code}, err message is ${JSON.stringify(err)}`); - }); + } catch (error) { + hilog.error(0x0000, TAG, `err: err code is ${error.code}, err message is ${error.message}`); + } return responseData; } diff --git a/PageAndData04/04_Complete/entry/src/main/ets/pages/GoalPage.ets b/PageAndData04/04_Complete/entry/src/main/ets/pages/GoalPage.ets index de1dddc..d48fa16 100644 --- a/PageAndData04/04_Complete/entry/src/main/ets/pages/GoalPage.ets +++ b/PageAndData04/04_Complete/entry/src/main/ets/pages/GoalPage.ets @@ -114,9 +114,7 @@ export struct GoalPage { .width('288vp') .onClick(async () => { await RDBStoreUtil.updatePlan(planData.id, this.duration, this.status); - await RDBStoreUtil.queryAllPlans().then((value) => { - this.plansSet = value; - }); + this.plansSet = RDBStoreUtil.queryAllPlans(); this.refreshSelectOption(); this.isUpdateShow = false; }) @@ -199,9 +197,7 @@ export struct GoalPage { .width('288vp') .onClick(async () => { await RDBStoreUtil.insertPlan(this.addSportID, this.addDuration, this.addStatus); - await RDBStoreUtil.queryAllPlans().then((value) => { - this.plansSet = value; - }); + this.plansSet = RDBStoreUtil.queryAllPlans(); this.refreshSelectOption(); this.isInsetShow = false; }) @@ -214,16 +210,12 @@ export struct GoalPage { RDBStoreUtil.createSportTable(); RDBStoreUtil.initSportTable(); RDBStoreUtil.createPlanTable(); - await RDBStoreUtil.queryAllPlans().then((value) => { - this.plansSet = value; - }); + this.plansSet = RDBStoreUtil.queryAllPlans(); this.refreshSelectOption(); } - async refreshSelectOption() { - await RDBStoreUtil.queryAllPlansDuration().then((value) => { - this.durationSet = value; - }); + refreshSelectOption() { + this.durationSet = RDBStoreUtil.queryAllPlansDuration(); this.durationSelectOptions = [{ value: $r('app.string.ALL') }]; for (let i = 0; i < this.durationSet.length; i++) { this.durationSelectOptions.push({ value: this.durationSet[i] + 'min' }); @@ -271,10 +263,8 @@ export struct GoalPage { .margin({ right: '25vp' }) Image($r('app.media.reset')) .width(40) - .onClick(async () => { - await RDBStoreUtil.queryAllPlans().then((value) => { - this.plansSet = value; - }); + .onClick(() => { + this.plansSet = RDBStoreUtil.queryAllPlans(); }) .margin({ right: '16vp' }) Image($r('app.media.sift')) @@ -354,9 +344,7 @@ export struct GoalPage { action: async () => { await RDBStoreUtil.deletePlan(item.id); this.refreshSelectOption(); - await RDBStoreUtil.queryAllPlans().then((value) => { - this.plansSet = value; - }); + this.plansSet = RDBStoreUtil.queryAllPlans(); } }, cancel: () => { diff --git a/PageAndData04/04_Complete/entry/src/main/ets/pages/LoginPage.ets b/PageAndData04/04_Complete/entry/src/main/ets/pages/LoginPage.ets index c6eaa53..a68406b 100644 --- a/PageAndData04/04_Complete/entry/src/main/ets/pages/LoginPage.ets +++ b/PageAndData04/04_Complete/entry/src/main/ets/pages/LoginPage.ets @@ -161,10 +161,8 @@ struct LoginPage { top: '48vp', bottom: '12vp' }) - .onClick(async () => { - await ConnectionUtils.isNetworkConnected().then((value) => { - this.login(value); - }) + .onClick(() => { + this.login(ConnectionUtils.isNetworkConnected()); }) Text($r('app.string.register_account')) .fontColor('#007DFF') -- Gitee