From 29ac8c51fba003a54d34079c4874b8b8cf5419cd Mon Sep 17 00:00:00 2001 From: zhengshubin2233 Date: Mon, 18 Aug 2025 19:15:09 +0800 Subject: [PATCH 1/2] Kit Files Modification Signed-off-by: zhengshubin2233 --- kits/@kit.ArkTS.d.ets | 48 ------------------------------------------- kits/@kit.ArkTS.d.ts | 35 +++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 59 deletions(-) delete mode 100644 kits/@kit.ArkTS.d.ets diff --git a/kits/@kit.ArkTS.d.ets b/kits/@kit.ArkTS.d.ets deleted file mode 100644 index 9f99ee05bb..0000000000 --- a/kits/@kit.ArkTS.d.ets +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2022-2023 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. - */ - -/** - * @file - * @kit ArkTS - * @arkts 1.2 - */ - -import buffer from '@ohos.buffer'; -import uri from '@ohos.uri'; -import url from '@ohos.url'; -import ArrayList from '@ohos.util.ArrayList'; -import util from '@ohos.util'; -import Deque from '@ohos.util.Deque'; -import LightWeightMap from '@ohos.util.LightWeightMap'; -import Queue from '@ohos.util.Queue'; -import stream from '@ohos.util.stream'; -import HashMap from '@ohos.util.HashMap'; -import HashSet from '@ohos.util.HashSet'; -import LightWeightSet from '@ohos.util.LightWeightSet'; -import LinkedList from '@ohos.util.LinkedList'; -import List from '@ohos.util.List'; -import PlainArray from '@ohos.util.PlainArray'; -import Stack from '@ohos.util.Stack'; -import TreeMap from '@ohos.util.TreeMap'; -import TreeSet from '@ohos.util.TreeSet'; -import xml from '@ohos.xml'; -import transfer from '@ohos.transfer'; -import collections from '@arkts.collections'; -import Decimal from '@arkts.math.Decimal'; - -export { - ArrayList, Deque, HashMap, HashSet, LightWeightMap, LightWeightSet, LinkedList, List, - PlainArray, Queue, Stack, TreeMap, TreeSet, buffer, uri, url, util, stream, xml, transfer, collections, Decimal -}; diff --git a/kits/@kit.ArkTS.d.ts b/kits/@kit.ArkTS.d.ts index bc31b0b4ee..3f75bbbd2a 100644 --- a/kits/@kit.ArkTS.d.ts +++ b/kits/@kit.ArkTS.d.ts @@ -18,26 +18,36 @@ * @kit ArkTS */ +/* 共用部分*/ +/*** if arkts 1.1&1.2 */ import buffer from '@ohos.buffer'; -import convertxml from '@ohos.convertxml'; -import process from '@ohos.process'; -import taskpool from '@ohos.taskpool'; import uri from '@ohos.uri'; import url from '@ohos.url'; import ArrayList from '@ohos.util.ArrayList'; import util from '@ohos.util'; import Deque from '@ohos.util.Deque'; +import LightWeightMap from '@ohos.util.LightWeightMap'; +import Queue from '@ohos.util.Queue'; +import JSON from '@ohos.util.json'; +import stream from '@ohos.util.stream'; import HashMap from '@ohos.util.HashMap'; import HashSet from '@ohos.util.HashSet'; -import LightWeightMap from '@ohos.util.LightWeightMap'; import LightWeightSet from '@ohos.util.LightWeightSet'; import LinkedList from '@ohos.util.LinkedList'; import List from '@ohos.util.List'; import PlainArray from '@ohos.util.PlainArray'; -import Queue from '@ohos.util.Queue'; import Stack from '@ohos.util.Stack'; import TreeMap from '@ohos.util.TreeMap'; import TreeSet from '@ohos.util.TreeSet'; +import xml from '@ohos.xml'; +import collections from '@arkts.collections'; +import Decimal from '@arkts.math.Decimal'; +/*** endif */ + +/* 1.1独有部分 */ +import convertxml from '@ohos.convertxml'; +import process from '@ohos.process'; +import taskpool from '@ohos.taskpool'; import Vector from '@ohos.util.Vector'; import fastbuffer from '@ohos.fastbuffer'; import worker, { @@ -45,14 +55,8 @@ import worker, { MessageEvent, MessageEvents, PostMessageOptions, ThreadWorkerGlobalScope, WorkerEventListener, WorkerEventTarget, WorkerOptions, ThreadWorkerPriority } from '@ohos.worker'; -import xml from '@ohos.xml'; -import JSON from '@ohos.util.json'; import lang from '@arkts.lang'; import ArkTSUtils from '@arkts.utils'; -import collections from '@arkts.collections'; -import stream from '@ohos.util.stream'; -import Decimal from '@arkts.math.Decimal'; - export { ArrayList, convertxml, DedicatedWorkerGlobalScope, Deque, ErrorEvent, Event, EventListener, EventTarget, HashMap, HashSet, LightWeightMap, LightWeightSet, LinkedList, List, MessageEvent, @@ -60,3 +64,12 @@ export { TreeSet, Vector, WorkerEventListener, WorkerEventTarget, WorkerOptions, ThreadWorkerPriority, buffer, process, taskpool, uri, url, util, worker, xml, JSON, lang, ArkTSUtils, collections, stream, Decimal, fastbuffer }; + +/* 1.2独有部分 */ +/*** if arkts 1.2 */ +import transfer from '@ohos.transfer'; +export { + ArrayList, Deque, HashMap, HashSet, LightWeightMap, LightWeightSet, LinkedList, List, + PlainArray, Queue, Stack, TreeMap, TreeSet, buffer, uri, url, util, JSON, stream, xml, transfer, collections, Decimal +}; +/*** endif */ \ No newline at end of file -- Gitee From e39fc7ad7f3f4d315d529323fb10ec91d7aecae6 Mon Sep 17 00:00:00 2001 From: zhengshubin2233 Date: Mon, 18 Aug 2025 19:34:56 +0800 Subject: [PATCH 2/2] Kit Files Modification Signed-off-by: zhengshubin2233 --- kits/@kit.ArkTS.d.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kits/@kit.ArkTS.d.ts b/kits/@kit.ArkTS.d.ts index 3f75bbbd2a..ac8c470ef3 100644 --- a/kits/@kit.ArkTS.d.ts +++ b/kits/@kit.ArkTS.d.ts @@ -19,32 +19,31 @@ */ /* 共用部分*/ -/*** if arkts 1.1&1.2 */ +/*** if arkts 1.1&1.2 */ import buffer from '@ohos.buffer'; import uri from '@ohos.uri'; import url from '@ohos.url'; import ArrayList from '@ohos.util.ArrayList'; import util from '@ohos.util'; import Deque from '@ohos.util.Deque'; -import LightWeightMap from '@ohos.util.LightWeightMap'; -import Queue from '@ohos.util.Queue'; -import JSON from '@ohos.util.json'; -import stream from '@ohos.util.stream'; import HashMap from '@ohos.util.HashMap'; import HashSet from '@ohos.util.HashSet'; +import LightWeightMap from '@ohos.util.LightWeightMap'; import LightWeightSet from '@ohos.util.LightWeightSet'; import LinkedList from '@ohos.util.LinkedList'; import List from '@ohos.util.List'; import PlainArray from '@ohos.util.PlainArray'; +import Queue from '@ohos.util.Queue'; import Stack from '@ohos.util.Stack'; import TreeMap from '@ohos.util.TreeMap'; import TreeSet from '@ohos.util.TreeSet'; import xml from '@ohos.xml'; import collections from '@arkts.collections'; +import stream from '@ohos.util.stream'; import Decimal from '@arkts.math.Decimal'; /*** endif */ -/* 1.1独有部分 */ +/* 1.1 独有部分 */ import convertxml from '@ohos.convertxml'; import process from '@ohos.process'; import taskpool from '@ohos.taskpool'; @@ -55,6 +54,7 @@ import worker, { MessageEvent, MessageEvents, PostMessageOptions, ThreadWorkerGlobalScope, WorkerEventListener, WorkerEventTarget, WorkerOptions, ThreadWorkerPriority } from '@ohos.worker'; +import JSON from '@ohos.util.json'; import lang from '@arkts.lang'; import ArkTSUtils from '@arkts.utils'; export { @@ -65,11 +65,11 @@ export { uri, url, util, worker, xml, JSON, lang, ArkTSUtils, collections, stream, Decimal, fastbuffer }; -/* 1.2独有部分 */ +/* 1.2 独有部分 */ /*** if arkts 1.2 */ import transfer from '@ohos.transfer'; export { ArrayList, Deque, HashMap, HashSet, LightWeightMap, LightWeightSet, LinkedList, List, - PlainArray, Queue, Stack, TreeMap, TreeSet, buffer, uri, url, util, JSON, stream, xml, transfer, collections, Decimal + PlainArray, Queue, Stack, TreeMap, TreeSet, buffer, uri, url, util, stream, xml, transfer, collections, Decimal }; /*** endif */ \ No newline at end of file -- Gitee