From e4dc1b401fe7f87bc8842d6d5c389d4fd2b61f7f Mon Sep 17 00:00:00 2001 From: yihuiyang Date: Fri, 10 Jan 2025 11:23:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=88=E6=9D=83=E5=A4=B4=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yihuiyang --- LICENSE - KHZG | 12 ++++++++++++ OAT.xml | 6 ++++++ example/ohos/entry/build-profile.json5 | 15 --------------- example/ohos/entry/hvigorfile.ts | 15 --------------- .../src/ohosTest/ets/test/Ability.test.ets | 15 --------------- .../entry/src/ohosTest/ets/test/List.test.ets | 15 --------------- .../ohosTest/ets/testability/TestAbility.ets | 15 --------------- .../ohosTest/ets/testability/pages/Index.ets | 15 --------------- .../ets/testrunner/OpenHarmonyTestRunner.ts | 15 --------------- example/ohos/entry/src/ohosTest/module.json5 | 15 --------------- example/ohos/hvigorfile.ts | 15 --------------- lib/src/ohos.dart | 15 --------------- ohos/build-profile.json5 | 17 +---------------- ohos/hvigorfile.ts | 15 --------------- ohos/index.ets | 15 --------------- ohos/oh-package.json5 | 14 -------------- .../components/plugin/AudioSessionPlugin.ets | 15 --------------- .../ets/components/plugin/OhosAudioManager.ets | 15 --------------- ohos/src/main/module.json5 | 17 +---------------- ohos/src/test/List.test.ets | 17 +---------------- ohos/src/test/LocalUnit.test.ets | 17 +---------------- 21 files changed, 22 insertions(+), 288 deletions(-) create mode 100644 LICENSE - KHZG diff --git a/LICENSE - KHZG b/LICENSE - KHZG new file mode 100644 index 0000000..d134ef8 --- /dev/null +++ b/LICENSE - KHZG @@ -0,0 +1,12 @@ +Copyright (c) 2025 Hunan OpenValley Digital Industry Development 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. \ No newline at end of file diff --git a/OAT.xml b/OAT.xml index adc3468..0de8167 100644 --- a/OAT.xml +++ b/OAT.xml @@ -109,6 +109,12 @@ + + + + + + diff --git a/example/ohos/entry/build-profile.json5 b/example/ohos/entry/build-profile.json5 index 633d360..20c7504 100644 --- a/example/ohos/entry/build-profile.json5 +++ b/example/ohos/entry/build-profile.json5 @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - { "apiType": 'stageMode', "buildOption": { diff --git a/example/ohos/entry/hvigorfile.ts b/example/ohos/entry/hvigorfile.ts index 894fc15..80e4ec5 100644 --- a/example/ohos/entry/hvigorfile.ts +++ b/example/ohos/entry/hvigorfile.ts @@ -1,17 +1,2 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. export { hapTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets b/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets index 25d4c71..8abf7f2 100644 --- a/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development 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 hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/example/ohos/entry/src/ohosTest/ets/test/List.test.ets b/example/ohos/entry/src/ohosTest/ets/test/List.test.ets index f414003..d766fe2 100644 --- a/example/ohos/entry/src/ohosTest/ets/test/List.test.ets +++ b/example/ohos/entry/src/ohosTest/ets/test/List.test.ets @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development 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 abilityTest from './Ability.test' export default function testsuite() { diff --git a/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets b/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets index 4ca645e..e3f6e91 100644 --- a/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development 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 UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; import hilog from '@ohos.hilog'; diff --git a/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index cef0447..1663665 100644 --- a/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development 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 hilog from '@ohos.hilog'; @Entry diff --git a/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 1def08f..92a16d8 100644 --- a/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development 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 hilog from '@ohos.hilog'; import TestRunner from '@ohos.application.testRunner'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/example/ohos/entry/src/ohosTest/module.json5 b/example/ohos/entry/src/ohosTest/module.json5 index fab77ce..87631d3 100644 --- a/example/ohos/entry/src/ohosTest/module.json5 +++ b/example/ohos/entry/src/ohosTest/module.json5 @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development 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. -*/ - { "module": { "name": "entry_test", diff --git a/example/ohos/hvigorfile.ts b/example/ohos/hvigorfile.ts index 8f2d2aa..0a7e3d8 100644 --- a/example/ohos/hvigorfile.ts +++ b/example/ohos/hvigorfile.ts @@ -1,18 +1,3 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development 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 { appTasks } from '@ohos/hvigor-ohos-plugin'; export default { diff --git a/lib/src/ohos.dart b/lib/src/ohos.dart index db19d79..f2844bd 100644 --- a/lib/src/ohos.dart +++ b/lib/src/ohos.dart @@ -1,18 +1,3 @@ -// -// Copyright (c) 2024 Hunan OpenValley Digital Industry Development 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 'dart:async'; import 'package:audio_session/src/util.dart'; diff --git a/ohos/build-profile.json5 b/ohos/build-profile.json5 index b5cf541..611694c 100644 --- a/ohos/build-profile.json5 +++ b/ohos/build-profile.json5 @@ -1,19 +1,4 @@ -/** - * Copyright (c) 2024 Hunan OpenValley Digital Industry Development Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -{ + { "apiType": "stageMode", "buildOption": { }, diff --git a/ohos/hvigorfile.ts b/ohos/hvigorfile.ts index 5cdfdb9..47e6e1f 100644 --- a/ohos/hvigorfile.ts +++ b/ohos/hvigorfile.ts @@ -1,17 +1,2 @@ -/** - * Copyright (c) 2024 Hunan OpenValley Digital Industry Development Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. export { harTasks } from '@ohos/hvigor-ohos-plugin'; \ No newline at end of file diff --git a/ohos/index.ets b/ohos/index.ets index 50548b8..3cfde83 100644 --- a/ohos/index.ets +++ b/ohos/index.ets @@ -1,17 +1,2 @@ -/* -* Copyright (c) 2023 Hunan OpenValley Digital Industry Development 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 AudioSessionPlugin from './src/main/ets/components/plugin/AudioSessionPlugin'; export default AudioSessionPlugin; diff --git a/ohos/oh-package.json5 b/ohos/oh-package.json5 index bf7909c..6ba0c9e 100644 --- a/ohos/oh-package.json5 +++ b/ohos/oh-package.json5 @@ -1,17 +1,3 @@ -/** - * Copyright (c) 2024 Hunan OpenValley Digital Industry Development 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. - */ { "name": "audio_session", "version": "1.0.0", diff --git a/ohos/src/main/ets/components/plugin/AudioSessionPlugin.ets b/ohos/src/main/ets/components/plugin/AudioSessionPlugin.ets index 0ff7dfe..8999730 100644 --- a/ohos/src/main/ets/components/plugin/AudioSessionPlugin.ets +++ b/ohos/src/main/ets/components/plugin/AudioSessionPlugin.ets @@ -1,18 +1,3 @@ -/** - * Copyright (c) 2024 Hunan OpenValley Digital Industry Development 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 { FlutterPlugin, FlutterPluginBinding } from '@ohos/flutter_ohos/src/main/ets/embedding/engine/plugins/FlutterPlugin'; import MethodChannel, { MethodCallHandler, MethodResult } from '@ohos/flutter_ohos/src/main/ets/plugin/common/MethodChannel'; import MethodCall from '@ohos/flutter_ohos/src/main/ets/plugin/common/MethodCall'; diff --git a/ohos/src/main/ets/components/plugin/OhosAudioManager.ets b/ohos/src/main/ets/components/plugin/OhosAudioManager.ets index bb37fdd..d924dad 100644 --- a/ohos/src/main/ets/components/plugin/OhosAudioManager.ets +++ b/ohos/src/main/ets/components/plugin/OhosAudioManager.ets @@ -1,18 +1,3 @@ -/** - * Copyright (c) 2024 Hunan OpenValley Digital Industry Development 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 { Any, BinaryMessenger, Log, MethodCall } from '@ohos/flutter_ohos'; import MethodChannel, { MethodCallHandler, MethodResult } from '@ohos/flutter_ohos/src/main/ets/plugin/common/MethodChannel'; import { Context } from '@kit.AbilityKit'; diff --git a/ohos/src/main/module.json5 b/ohos/src/main/module.json5 index 33f159f..3ddbb21 100644 --- a/ohos/src/main/module.json5 +++ b/ohos/src/main/module.json5 @@ -1,19 +1,4 @@ -/** - * Copyright (c) 2024 Hunan OpenValley Digital Industry Development 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. - */ - -{ + { "module": { "name": "audio_session", "type": "har", diff --git a/ohos/src/test/List.test.ets b/ohos/src/test/List.test.ets index 93d49a3..0b63a6e 100644 --- a/ohos/src/test/List.test.ets +++ b/ohos/src/test/List.test.ets @@ -1,19 +1,4 @@ -/** - * Copyright (c) 2024 Hunan OpenValley Digital Industry Development 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 localUnitTest from './LocalUnit.test'; + import localUnitTest from './LocalUnit.test'; export default function testsuite() { localUnitTest() diff --git a/ohos/src/test/LocalUnit.test.ets b/ohos/src/test/LocalUnit.test.ets index 3059cb4..3c0ece6 100644 --- a/ohos/src/test/LocalUnit.test.ets +++ b/ohos/src/test/LocalUnit.test.ets @@ -1,19 +1,4 @@ -/** - * Copyright (c) 2024 Hunan OpenValley Digital Industry Development 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 { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; + import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; export default function localUnitTest() { } \ No newline at end of file -- Gitee From 526743c314ee9686beb66c38eccd6b5494908103 Mon Sep 17 00:00:00 2001 From: yihuiyang Date: Mon, 13 Jan 2025 14:26:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=88=E6=9D=83=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E5=92=8C=E4=B9=8B=E5=89=8D=E4=B8=80=E7=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yihuiyang --- LICENSE - KHZG | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 LICENSE - KHZG diff --git a/LICENSE - KHZG b/LICENSE - KHZG deleted file mode 100644 index d134ef8..0000000 --- a/LICENSE - KHZG +++ /dev/null @@ -1,12 +0,0 @@ -Copyright (c) 2025 Hunan OpenValley Digital Industry Development 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. \ No newline at end of file -- Gitee