From 6c1ed89667e8cac1f89bf359087eec3c1cb2a3b1 Mon Sep 17 00:00:00 2001 From: xingfei Date: Wed, 28 Jul 2021 09:50:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E4=B8=AD?= =?UTF-8?q?=E7=9A=84android=E5=AD=97=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.OPENSOURCE | 2 +- entry/src/main/config.json | 8 ++++---- .../rxdiffutil/CustStateChangedListener.java | 2 +- .../rxdiffutil/CustomTableLayout.java | 6 +++--- .../rxdiffutil/DiffResult.java | 4 ++-- .../rxdiffutil/MainAbility.java | 4 ++-- .../rxdiffutil/MyApplication.java | 2 +- .../rxdiffutil/Thing.java | 2 +- .../rxdiffutil/ThingRepository.java | 2 +- .../rxdiffutil/adapter/BaseProvider.java | 2 +- .../rxdiffutil/slice/MainAbilitySlice.java | 8 ++++---- entry/src/main/resources/base/layout/ability_main.xml | 2 +- .../rxdiffutil/ExampleOhosTest.java | 4 ++-- .../rxdiffutil/RxDiffUtilTest.java | 2 +- .../rxdiffutil/ExampleTest.java | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) rename entry/src/main/java/cafe/adriel/{androidaudioconverter => ohosaudioconverter}/rxdiffutil/CustStateChangedListener.java (95%) rename entry/src/main/java/cafe/adriel/{androidaudioconverter => ohosaudioconverter}/rxdiffutil/CustomTableLayout.java (97%) rename entry/src/main/java/cafe/adriel/{androidaudioconverter => ohosaudioconverter}/rxdiffutil/DiffResult.java (90%) rename entry/src/main/java/cafe/adriel/{androidaudioconverter => ohosaudioconverter}/rxdiffutil/MainAbility.java (87%) rename entry/src/main/java/cafe/adriel/{androidaudioconverter => ohosaudioconverter}/rxdiffutil/MyApplication.java (93%) rename entry/src/main/java/cafe/adriel/{androidaudioconverter => ohosaudioconverter}/rxdiffutil/Thing.java (98%) rename entry/src/main/java/cafe/adriel/{androidaudioconverter => ohosaudioconverter}/rxdiffutil/ThingRepository.java (98%) rename entry/src/main/java/cafe/adriel/{androidaudioconverter => ohosaudioconverter}/rxdiffutil/adapter/BaseProvider.java (95%) rename entry/src/main/java/cafe/adriel/{androidaudioconverter => ohosaudioconverter}/rxdiffutil/slice/MainAbilitySlice.java (95%) rename entry/src/ohosTest/java/cafe/adriel/{androidaudioconverter => ohosaudioconverter}/rxdiffutil/ExampleOhosTest.java (72%) rename entry/src/ohosTest/java/cafe/adriel/{androidaudioconverter => ohosaudioconverter}/rxdiffutil/RxDiffUtilTest.java (88%) rename entry/src/test/java/cafe/adriel/{androidaudioconverter => ohosaudioconverter}/rxdiffutil/ExampleTest.java (64%) diff --git a/README.OPENSOURCE b/README.OPENSOURCE index 98163f8..4017411 100644 --- a/README.OPENSOURCE +++ b/README.OPENSOURCE @@ -12,7 +12,7 @@ "Upstream URL": "https://github.com/v2rc/RxDiffUtil", - "Description": "围绕Android DiffUtil库的 RecyclerView窗口小部件的Rx包装器,它处理线程并使用来响应对适配器的并发更改" + "Description": "围绕 DiffUtil库的 RecyclerView窗口小部件的Rx包装器,它处理线程并使用来响应对适配器的并发更改" } diff --git a/entry/src/main/config.json b/entry/src/main/config.json index b4aedcb..7039cc5 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -1,6 +1,6 @@ { "app": { - "bundleName": "cafe.adriel.androidaudioconverter.rxdiffutil", + "bundleName": "cafe.adriel.ohosaudioconverter.rxdiffutil", "vendor": "adriel", "version": { "code": 1000000, @@ -9,9 +9,9 @@ }, "deviceConfig": {}, "module": { - "package": "cafe.adriel.androidaudioconverter.rxdiffutil", + "package": "cafe.adriel.ohosaudioconverter.rxdiffutil", "name": ".MyApplication", - "mainAbility": "cafe.adriel.androidaudioconverter.rxdiffutil.MainAbility", + "mainAbility": "cafe.adriel.ohosaudioconverter.rxdiffutil.MainAbility", "deviceType": [ "phone", "tablet" @@ -35,7 +35,7 @@ } ], "orientation": "unspecified", - "name": "cafe.adriel.androidaudioconverter.rxdiffutil.MainAbility", + "name": "cafe.adriel.ohosaudioconverter.rxdiffutil.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:entry_MainAbility", diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/CustStateChangedListener.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/CustStateChangedListener.java similarity index 95% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/CustStateChangedListener.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/CustStateChangedListener.java index f463fa3..1a18e6b 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/CustStateChangedListener.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/CustStateChangedListener.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; import ohos.agp.animation.Animator; diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/CustomTableLayout.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/CustomTableLayout.java similarity index 97% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/CustomTableLayout.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/CustomTableLayout.java index b3a3990..fed465e 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/CustomTableLayout.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/CustomTableLayout.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; -import cafe.adriel.androidaudioconverter.rxdiffutil.adapter.BaseProvider; +import cafe.adriel.ohosaudioconverter.rxdiffutil.adapter.BaseProvider; import ohos.agp.animation.Animator; import ohos.agp.animation.AnimatorProperty; import ohos.agp.components.*; @@ -27,7 +27,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static cafe.adriel.androidaudioconverter.rxdiffutil.ThingRepository.*; +import static cafe.adriel.ohosaudioconverter.rxdiffutil.ThingRepository.*; /** * CustomTableLayout. diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/DiffResult.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/DiffResult.java similarity index 90% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/DiffResult.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/DiffResult.java index 781bdab..7a15721 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/DiffResult.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/DiffResult.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; -import cafe.adriel.androidaudioconverter.rxdiffutil.adapter.BaseProvider; +import cafe.adriel.ohosaudioconverter.rxdiffutil.adapter.BaseProvider; /** * DiffResult. diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/MainAbility.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/MainAbility.java similarity index 87% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/MainAbility.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/MainAbility.java index 6de0b4e..3d68a6b 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/MainAbility.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/MainAbility.java @@ -13,9 +13,9 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; -import cafe.adriel.androidaudioconverter.rxdiffutil.slice.MainAbilitySlice; +import cafe.adriel.ohosaudioconverter.rxdiffutil.slice.MainAbilitySlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/MyApplication.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/MyApplication.java similarity index 93% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/MyApplication.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/MyApplication.java index 59081e1..bee8180 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/MyApplication.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/MyApplication.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; import ohos.aafwk.ability.AbilityPackage; diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/Thing.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/Thing.java similarity index 98% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/Thing.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/Thing.java index 4870e18..0a25087 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/Thing.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/Thing.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; import ohos.utils.Parcel; import ohos.utils.Sequenceable; diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/ThingRepository.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ThingRepository.java similarity index 98% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/ThingRepository.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ThingRepository.java index 61f064d..938d5b1 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/ThingRepository.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ThingRepository.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.schedulers.Schedulers; diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/adapter/BaseProvider.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/adapter/BaseProvider.java similarity index 95% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/adapter/BaseProvider.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/adapter/BaseProvider.java index 74f1352..116ad02 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/adapter/BaseProvider.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/adapter/BaseProvider.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil.adapter; +package cafe.adriel.ohosaudioconverter.rxdiffutil.adapter; import ohos.agp.components.Component; import ohos.agp.components.ComponentContainer; diff --git a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/slice/MainAbilitySlice.java b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/slice/MainAbilitySlice.java similarity index 95% rename from entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/slice/MainAbilitySlice.java rename to entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/slice/MainAbilitySlice.java index 46fba16..7cb6858 100644 --- a/entry/src/main/java/cafe/adriel/androidaudioconverter/rxdiffutil/slice/MainAbilitySlice.java +++ b/entry/src/main/java/cafe/adriel/ohosaudioconverter/rxdiffutil/slice/MainAbilitySlice.java @@ -13,10 +13,10 @@ * limitations under the License. */ -package cafe.adriel.androidaudioconverter.rxdiffutil.slice; +package cafe.adriel.ohosaudioconverter.rxdiffutil.slice; -import cafe.adriel.androidaudioconverter.rxdiffutil.*; -import cafe.adriel.androidaudioconverter.rxdiffutil.adapter.BaseProvider; +import cafe.adriel.ohosaudioconverter.rxdiffutil.*; +import cafe.adriel.ohosaudioconverter.rxdiffutil.adapter.BaseProvider; import io.reactivex.rxjava3.disposables.Disposable; import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import static cafe.adriel.androidaudioconverter.rxdiffutil.DiffResult.calculateDiff; +import static cafe.adriel.ohosaudioconverter.rxdiffutil.DiffResult.calculateDiff; import static io.reactivex.rxjava3.openharmony.schedulers.OpenHarmonySchedulers.mainThread; import static io.reactivex.rxjava3.schedulers.Schedulers.computation; diff --git a/entry/src/main/resources/base/layout/ability_main.xml b/entry/src/main/resources/base/layout/ability_main.xml index cffdd84..4e45e06 100644 --- a/entry/src/main/resources/base/layout/ability_main.xml +++ b/entry/src/main/resources/base/layout/ability_main.xml @@ -7,7 +7,7 @@ ohos:orientation="vertical"> - + diff --git a/entry/src/ohosTest/java/cafe/adriel/androidaudioconverter/rxdiffutil/ExampleOhosTest.java b/entry/src/ohosTest/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ExampleOhosTest.java similarity index 72% rename from entry/src/ohosTest/java/cafe/adriel/androidaudioconverter/rxdiffutil/ExampleOhosTest.java rename to entry/src/ohosTest/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ExampleOhosTest.java index 58f1dc5..ed5c8fe 100644 --- a/entry/src/ohosTest/java/cafe/adriel/androidaudioconverter/rxdiffutil/ExampleOhosTest.java +++ b/entry/src/ohosTest/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ExampleOhosTest.java @@ -1,4 +1,4 @@ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; import junit.framework.TestCase; import ohos.aafwk.ability.delegation.AbilityDelegatorRegistry; @@ -11,6 +11,6 @@ public class ExampleOhosTest extends TestCase { @Test public void testBundleName() { final String actualBundleName = AbilityDelegatorRegistry.getArguments().getTestBundleName(); - Assert.assertEquals("cafe.adriel.androidaudioconverter.rxdiffutil", actualBundleName); + Assert.assertEquals("cafe.adriel.ohosaudioconverter.rxdiffutil", actualBundleName); } } \ No newline at end of file diff --git a/entry/src/ohosTest/java/cafe/adriel/androidaudioconverter/rxdiffutil/RxDiffUtilTest.java b/entry/src/ohosTest/java/cafe/adriel/ohosaudioconverter/rxdiffutil/RxDiffUtilTest.java similarity index 88% rename from entry/src/ohosTest/java/cafe/adriel/androidaudioconverter/rxdiffutil/RxDiffUtilTest.java rename to entry/src/ohosTest/java/cafe/adriel/ohosaudioconverter/rxdiffutil/RxDiffUtilTest.java index 1ff5b03..734f3c9 100644 --- a/entry/src/ohosTest/java/cafe/adriel/androidaudioconverter/rxdiffutil/RxDiffUtilTest.java +++ b/entry/src/ohosTest/java/cafe/adriel/ohosaudioconverter/rxdiffutil/RxDiffUtilTest.java @@ -1,4 +1,4 @@ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; import junit.framework.TestCase; import org.junit.Test; diff --git a/entry/src/test/java/cafe/adriel/androidaudioconverter/rxdiffutil/ExampleTest.java b/entry/src/test/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ExampleTest.java similarity index 64% rename from entry/src/test/java/cafe/adriel/androidaudioconverter/rxdiffutil/ExampleTest.java rename to entry/src/test/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ExampleTest.java index f33beef..7c371ba 100644 --- a/entry/src/test/java/cafe/adriel/androidaudioconverter/rxdiffutil/ExampleTest.java +++ b/entry/src/test/java/cafe/adriel/ohosaudioconverter/rxdiffutil/ExampleTest.java @@ -1,4 +1,4 @@ -package cafe.adriel.androidaudioconverter.rxdiffutil; +package cafe.adriel.ohosaudioconverter.rxdiffutil; import org.junit.Test; -- Gitee