diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000000000000000000000000000000000000..3644375f0f8176c1290ff360b1985a1f40a7d0c4 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,5 @@ +## 0.0.1-SNAPSHOT +ohos 第一个版本 + * 实现了原库的大部分 api + * 由于openharmony不支持Window.ID_CONTENT所以需要传递当前的Component在其上面进行操作 + \ No newline at end of file diff --git a/FloatingViewLib/build.gradle b/FloatingViewLib/build.gradle index e3a89620b6b96a3628e61bc7f289d7372508a54e..7c78a2c330eb0dfd5d220e49bf1c140d638255cf 100644 --- a/FloatingViewLib/build.gradle +++ b/FloatingViewLib/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'com.huawei.ohos.library' ohos { - compileSdkVersion 5 + compileSdkVersion 4 defaultConfig { compatibleSdkVersion 5 } diff --git a/FloatingViewLib/src/main/config.json b/FloatingViewLib/src/main/config.json index fc27a9276af72569aba4c78a5df651fd8dba3476..70980bd27df630a794311593268dca0b2c6aa5b3 100644 --- a/FloatingViewLib/src/main/config.json +++ b/FloatingViewLib/src/main/config.json @@ -7,7 +7,7 @@ "name": "1.0" }, "apiVersion": { - "compatible": 5, + "compatible": 4, "target": 5, "releaseType": "Release" } diff --git a/FloatingViewLib/src/test/java/com/ufreedom/floatingview/ExampleTest.java b/FloatingViewLib/src/test/java/com/ufreedom/floatingview/ExampleTest.java index aa6cb4785dc1f5d372aa099f85d924cbef153da1..12f2cb57be4d02e4d30a8488de3584dad4c3896e 100644 --- a/FloatingViewLib/src/test/java/com/ufreedom/floatingview/ExampleTest.java +++ b/FloatingViewLib/src/test/java/com/ufreedom/floatingview/ExampleTest.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2021 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 an 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. + */ + package com.ufreedom.floatingview; import org.junit.Test; diff --git a/README.md b/README.md index a31373300e35a5ae032df6a68a7170eb4218e7d1..11feb4ab091399f95b01b86dc819fde93d912729 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ #### 调用差异说明 ```java - 由于openharmony无对应API Window.ID_ANDROID_CONTENT所以需要传递当前的顶层Component在其上面进行操作 + 由于openharmony无对应API Window.ID_CONTENT所以需要传递当前的顶层Component在其上面进行操作 所以在初始化Floating的时候需要传递当前的Component ``` #### 安装教程 diff --git a/changeLog.md b/changeLog.md deleted file mode 100644 index 4b5290ce1d4b7458f2718358f723929c223d9f29..0000000000000000000000000000000000000000 --- a/changeLog.md +++ /dev/null @@ -1,7 +0,0 @@ -# 基本功能：Component在别的Component上执行的漂浮动画 - -# 修改点： - 由于openharmony不支持Window.ID_ANDROID_CONTENT所以需要传递当前的Component在其上面进行操作 - -# 遗留问题（暂不支持的功能）： - 无 \ No newline at end of file diff --git a/entry/build.gradle b/entry/build.gradle index 3ac9abb4f0214a5b933cb5bb0a33bbc6eb0dab2f..c5cc2f4de3078042f5b31b942919df0cb1c5ae03 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -13,3 +13,6 @@ dependencies { ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100' implementation('com.gitee.chinasoft_ohos:FloatingView:0.0.1-SNAPSHOT') } +decc { + supportType = ['html','xml'] +} diff --git a/entry/src/ohosTest/java/com/ohoskun/xtablayout/ExampleOhosTest.java b/entry/src/ohosTest/java/com/ufreedom/demo/ExampleOhosTest.java similarity index 97% rename from entry/src/ohosTest/java/com/ohoskun/xtablayout/ExampleOhosTest.java rename to entry/src/ohosTest/java/com/ufreedom/demo/ExampleOhosTest.java index dcee51a3369bdb29c005008385ce0a3d3c23d3b0..daf7aaf693997c32155133830eac9eaf94345ee7 100644 --- a/entry/src/ohosTest/java/com/ohoskun/xtablayout/ExampleOhosTest.java +++ b/entry/src/ohosTest/java/com/ufreedom/demo/ExampleOhosTest.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.ohoskun.xtablayout; +package com.ufreedom.demo; import ohos.aafwk.ability.delegation.AbilityDelegatorRegistry; import org.junit.Test; diff --git a/entry/src/test/java/com/ufreedom/demo/ExampleTest.java b/entry/src/test/java/com/ufreedom/demo/ExampleTest.java index 1920e18739d52350b5798f38d552ee5eaf6cc39b..a6ba95b3b7e1e52d41ba7e5c4ee91f0a4c5eaff5 100644 --- a/entry/src/test/java/com/ufreedom/demo/ExampleTest.java +++ b/entry/src/test/java/com/ufreedom/demo/ExampleTest.java @@ -1,5 +1,19 @@ -package com.ufreedom.demo; +/* + * Copyright (C) 2021 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 an 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. + */ +package com.ufreedom.demo; import org.junit.Test; /**