diff --git a/AppScope/app.json5 b/AppScope/app.json5 index c133347aea4c3d13c4f07c0c2f2fcbb0b2df1224..cf5d85636f7fe27f30d7173baaf3d4b429ea1ca8 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -3,7 +3,7 @@ "bundleName": "com.example.vcard", "vendor": "example", "versionCode": 1000000, - "versionName": "3.0.3", + "versionName": "3.0.4-rc.0", "icon": "$media:app_icon", "label": "$string:app_name", "distributedNotificationEnabled": true diff --git a/CHANGELOG.md b/CHANGELOG.md index c38dff96b392fb9f1877798a12c37ed052ec0981..9c3fd635436c8c77534eaa86cf554b27ce0265bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.0.4-rc.0 +Clear build warnings + ## 3.0.3 在DevEco Studio: NEXT Beta1-5.0.3.806, SDK: API12 Release (5.0.0.66)验证通过 diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index 312744918fde24a0ec3341f26ce6cb7c579eda90..f21c220301743fd5fcddc49f7aff43b76f10ac1a 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -4,7 +4,7 @@ "name": "entry", "description": "example description", "repository": "", - "version": "3.0.3", + "version": "3.0.4-rc.0", "dependencies": { "@ohos/vcard": "file:../library" } diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index a35731ad989518f8aea1a84628bc7c86a4eebe42..1b7f8be396243a53ff17b1eb5a0aa413fafef2e6 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -343,7 +343,7 @@ struct FlexExample1 { vcardBuilder.appendRelation(contactall) vcardBuilder.appendGroupMemberShip(contactall) console.log(vcardBuilder.toString()+"这是啥") - router.push({ + router.pushUrl({ url: "pages/third", params: { ontactalls: vcardBuilder.toString(), diff --git a/library/oh-package.json5 b/library/oh-package.json5 index e4ddcbf53a51fd3ebf763a6c0dba362f1c7e0377..ee9a0f77f8d23877ed60333a86ba51cba8527647 100644 --- a/library/oh-package.json5 +++ b/library/oh-package.json5 @@ -12,6 +12,6 @@ "main": "index.ets", "type": "module", "repository": "https://gitee.com/openharmony-tpc/VCard", - "version": "3.0.3", + "version": "3.0.4-rc.0", "dependencies": {} } diff --git a/library/src/main/ets/components/PlatformInterface/HOSBase64.ets b/library/src/main/ets/components/PlatformInterface/HOSBase64.ets index 509ddd44d202a3b79fe39420f4900a30f70aef32..d84802516f4aa9b86a74cb14a9aae9bb01f61870 100644 --- a/library/src/main/ets/components/PlatformInterface/HOSBase64.ets +++ b/library/src/main/ets/components/PlatformInterface/HOSBase64.ets @@ -19,12 +19,12 @@ import util from '@ohos.util'; export class HOSBase64 implements Base64Interface { - private base64Util = new util.Base64() + private base64Util = new util.Base64Helper() private textDecoder = new util.TextDecoder() private textEncoder = new util.TextEncoder() encode(str: string): string { //todo - let encoded = this.textEncoder.encode(str) + let encoded = this.textEncoder.encodeInto(str) let result = this.base64Util.encodeToStringSync(encoded) return result; diff --git a/library/src/main/ets/components/PlatformInterface/HOSLineReader.ets b/library/src/main/ets/components/PlatformInterface/HOSLineReader.ets index d7671933cc4bbbe45b679f65ff1fe4c8f29d3d98..cc812d0c2b16769fc84e8688d59c76b79037c050 100644 --- a/library/src/main/ets/components/PlatformInterface/HOSLineReader.ets +++ b/library/src/main/ets/components/PlatformInterface/HOSLineReader.ets @@ -15,8 +15,7 @@ import { LineReaderInterface } from "./LineReaderInterface"; import { Utf8ArrayToStr } from "../utils/Utf"; -import {Log} from '../Log'; -import fileio from '@ohos.fileio'; +import fs from '@ohos.file.fs'; export class HOSLineReader extends LineReaderInterface { private mLineIndex = 0 @@ -26,14 +25,14 @@ export class HOSLineReader extends LineReaderInterface { private mNextLine:string|null = null openFile(path: string): number { - return fileio.openSync(path,0o2) + return fs.openSync(path,0o2).fd; } constructor(pathOrFd:string|number){ super(pathOrFd) - let fstat = fileio.fstatSync(this.fd) + let fstat = fs.statSync(this.fd) let buffer = new ArrayBuffer(fstat.size) - fileio.readSync(this.fd,buffer) + fs.readSync(this.fd, buffer); let stringBuffer = new Uint8Array(buffer) let resultString = Utf8ArrayToStr(stringBuffer) this.mInternalBuffer = resultString.split("\r\n") diff --git a/library/src/main/ets/components/VCardEntryConstructor.ets b/library/src/main/ets/components/VCardEntryConstructor.ets index e58555f0a84eb5d99e1588423c1df23770bc5b8a..db2acd5f13034496b1c43f6d7d377f3ad094ba0d 100644 --- a/library/src/main/ets/components/VCardEntryConstructor.ets +++ b/library/src/main/ets/components/VCardEntryConstructor.ets @@ -33,7 +33,7 @@ class Account{} constructor(vcardType:number,) constructor(vcardType:number,accoun:Account) constructor(vcardType:number,accoun:Account,targetCharset:string) - constructor(vcardType?:number,readonly account?:Account,targetCharset?:string){ + constructor(vcardType?:number,account?:Account,targetCharset?:string){ } diff --git a/library/src/main/ets/components/utils/LineReader.ets b/library/src/main/ets/components/utils/LineReader.ets index 4b10f2851afece2b41a98c5651fa83c101966d48..d5cb7178230d82dc6947fe78dbda3294c6e9eaea 100644 --- a/library/src/main/ets/components/utils/LineReader.ets +++ b/library/src/main/ets/components/utils/LineReader.ets @@ -23,7 +23,7 @@ export class LineReader { private MAX_SIZE:number = 1024 * 1024 //100KB private fileContent:string - constructor(private fd:number){ + constructor(fd:number){ let arrayBuffer:ArrayBuffer = new ArrayBuffer(this.MAX_SIZE) let num = fileio.readSync(fd,arrayBuffer) let view = new Uint8Array(arrayBuffer) diff --git a/oh-package.json5 b/oh-package.json5 index 5167b9edc7b6335e9f001c98aef189001f068d1f..9b7ca3dd3b844f56f1c2de84bb309dfc7e512edc 100644 --- a/oh-package.json5 +++ b/oh-package.json5 @@ -6,6 +6,6 @@ "name": "vcard", "description": "example description", "repository": "", - "version": "3.0.3", + "version": "3.0.4-rc.0", "dependencies": {} }