From 0d50c9881044e18b656c40c3cb3dc2178c42013d Mon Sep 17 00:00:00 2001 From: lilinfeng-z <3211270061@qq.com> Date: Mon, 5 Jul 2021 19:27:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=96=B0=E7=89=88IDE,?= =?UTF-8?q?=E4=BF=AE=E6=94=B9readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++---- activityrouter/build.gradle | 4 ++-- activityrouter/src/main/config.json | 5 ----- annotation/src/main/config.json | 5 ----- app_module/build.gradle | 4 ++-- app_module/src/main/config.json | 5 ----- build.gradle | 4 ++-- entry/build.gradle | 4 ++-- entry/src/main/config.json | 4 ---- entry/src/ohosTest/config.json | 5 ----- stub/src/main/config.json | 5 ----- 11 files changed, 12 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 4f0f918..6207e59 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,11 @@ - 功能：支持给Ability定义 URL，这样可以通过 URL 跳转到Ability，支持在浏览器以及 app 中跳入。 - 项目移植状态: 主功能完成 - 调用差异: 无 -- 开发版本：sdk5，DevEco Studio 2.1 Release +- 开发版本：sdk6，DevEco Studio 2.2 Beta1 - 基线版本：Releases v1.1.5 ## 项目演示 - + ## 安装教程 @@ -39,7 +39,7 @@ dependencies { …… } ``` -在sdk5，DevEco Studio 2.1 Release下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 +在sdk6，DevEco Studio 2.2 Beta1下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 ## 使用说明 1.在需要配置的Ability上添加注解 @@ -143,7 +143,7 @@ CodeCheck代码测试无异常 CloudTest代码测试无异常 -火绒安全病毒安全检测通过 +病毒安全检测通过 当前版本demo功能与原组件基本无差异 diff --git a/activityrouter/build.gradle b/activityrouter/build.gradle index f578722..13c83c2 100644 --- a/activityrouter/build.gradle +++ b/activityrouter/build.gradle @@ -4,9 +4,9 @@ sourceCompatibility = "1.8" targetCompatibility = "1.8" ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } } diff --git a/activityrouter/src/main/config.json b/activityrouter/src/main/config.json index 6d71d19..c1c08b9 100644 --- a/activityrouter/src/main/config.json +++ b/activityrouter/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1, "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" } }, "deviceConfig": {}, diff --git a/annotation/src/main/config.json b/annotation/src/main/config.json index 025ded6..01c5fa0 100644 --- a/annotation/src/main/config.json +++ b/annotation/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1, "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" } }, "deviceConfig": {}, diff --git a/app_module/build.gradle b/app_module/build.gradle index 7634627..29c265e 100644 --- a/app_module/build.gradle +++ b/app_module/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.huawei.ohos.library' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } } diff --git a/app_module/src/main/config.json b/app_module/src/main/config.json index e61cee2..768f000 100644 --- a/app_module/src/main/config.json +++ b/app_module/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" } }, "deviceConfig": {}, diff --git a/build.gradle b/build.gradle index 8cdd760..16a1634 100644 --- a/build.gradle +++ b/build.gradle @@ -25,10 +25,10 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.2' + classpath 'com.huawei.ohos:hap:2.4.5.0' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' - classpath 'com.huawei.ohos:decctest:1.0.0.6' + classpath 'com.huawei.ohos:decctest:1.2.4.1' } } diff --git a/entry/build.gradle b/entry/build.gradle index 47d07c5..9b064f8 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } compileOptions { annotationEnabled true diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 01d38a2..c57adba 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -5,10 +5,6 @@ "version": { "code": 1000000, "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 } }, "deviceConfig": {}, diff --git a/entry/src/ohosTest/config.json b/entry/src/ohosTest/config.json index fd1f06f..4b402bf 100644 --- a/entry/src/ohosTest/config.json +++ b/entry/src/ohosTest/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": {}, diff --git a/stub/src/main/config.json b/stub/src/main/config.json index 01f296a..431ee5e 100644 --- a/stub/src/main/config.json +++ b/stub/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1, "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Beta1" } }, "deviceConfig": {}, -- Gitee From 45ad487a4f77149fd9a14da19fb851edd41d057e Mon Sep 17 00:00:00 2001 From: lilinfeng-z <3211270061@qq.com> Date: Mon, 5 Jul 2021 19:36:06 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=96=B0=E7=89=88IDE,?= =?UTF-8?q?=E4=BF=AE=E6=94=B9readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 16a1634..d01a826 100644 --- a/build.gradle +++ b/build.gradle @@ -2,9 +2,9 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } } -- Gitee From f50847b840345e4f708aa18680635e22b4f1612d Mon Sep 17 00:00:00 2001 From: lilinfeng-z <3211270061@qq.com> Date: Mon, 5 Jul 2021 19:52:43 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9GIF=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6207e59..98d3ced 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ - 基线版本：Releases v1.1.5 ## 项目演示 - + ## 安装教程 -- Gitee From a20a431edffc8ccca6c34d945b062ea9b2e34797 Mon Sep 17 00:00:00 2001 From: lilinfeng-z <3211270061@qq.com> Date: Tue, 6 Jul 2021 11:14:00 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../github/mzule/abilityrouter/router/RouterAbility.java | 9 ++++----- .../github/mzule/abilityrouter/module/ModuleAbility.java | 9 ++++----- .../java/com/github/mzule/abilityrouter/MainAbility.java | 9 ++++----- .../com/github/mzule/abilityrouter/MyApplication.java | 9 ++++----- .../mzule/abilityrouter/slice/DumpExtrasAbility.java | 9 ++++----- .../mzule/abilityrouter/slice/ErrorStackAbility.java | 9 ++++----- .../github/mzule/abilityrouter/slice/HomeAbility.java | 9 ++++----- .../github/mzule/abilityrouter/slice/HostAbility.java | 9 ++++----- .../github/mzule/abilityrouter/slice/LaunchAbility.java | 9 ++++----- .../mzule/abilityrouter/slice/MainAbilitySlice.java | 9 ++++----- .../github/mzule/abilityrouter/slice/NonUIActions.java | 9 ++++----- .../mzule/abilityrouter/slice/NotFoundAbility.java | 9 ++++----- .../github/mzule/abilityrouter/slice/UserAbility.java | 9 ++++----- .../mzule/abilityrouter/slice/UserCollectionAbility.java | 9 ++++----- 14 files changed, 56 insertions(+), 70 deletions(-) diff --git a/activityrouter/src/main/java/com/github/mzule/abilityrouter/router/RouterAbility.java b/activityrouter/src/main/java/com/github/mzule/abilityrouter/router/RouterAbility.java index 01a1f3c..2a7cba6 100644 --- a/activityrouter/src/main/java/com/github/mzule/abilityrouter/router/RouterAbility.java +++ b/activityrouter/src/main/java/com/github/mzule/abilityrouter/router/RouterAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * 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 a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * 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. diff --git a/app_module/src/main/java/com/github/mzule/abilityrouter/module/ModuleAbility.java b/app_module/src/main/java/com/github/mzule/abilityrouter/module/ModuleAbility.java index 2396efc..c25ef83 100644 --- a/app_module/src/main/java/com/github/mzule/abilityrouter/module/ModuleAbility.java +++ b/app_module/src/main/java/com/github/mzule/abilityrouter/module/ModuleAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * 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 a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * 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. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/MainAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/MainAbility.java index 37bd24a..eaebe99 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/MainAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/MainAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * 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 a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * 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. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/MyApplication.java b/entry/src/main/java/com/github/mzule/abilityrouter/MyApplication.java index c0fa545..9c84e83 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/MyApplication.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/MyApplication.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * 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 a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * 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. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/DumpExtrasAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/DumpExtrasAbility.java index c492922..0a3b680 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/DumpExtrasAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/DumpExtrasAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * 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 a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * 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. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/ErrorStackAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/ErrorStackAbility.java index 21bd045..78bcc1b 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/ErrorStackAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/ErrorStackAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * 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 a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * 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. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/HomeAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/HomeAbility.java index e599b5f..5297e75 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/HomeAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/HomeAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * 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 a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * 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. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/HostAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/HostAbility.java index 7def4c8..5660ad9 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/HostAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/HostAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * 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 a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * 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. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/LaunchAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/LaunchAbility.java index 9421bc5..9847e25 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/LaunchAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/LaunchAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * 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 a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * 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. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/MainAbilitySlice.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/MainAbilitySlice.java index ff4181e..0c3f29d 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/MainAbilitySlice.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * 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 a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * 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. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/NonUIActions.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/NonUIActions.java index ac7a314..3942e36 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/NonUIActions.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/NonUIActions.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * 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 a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * 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. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/NotFoundAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/NotFoundAbility.java index 572e26a..c7af4fb 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/NotFoundAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/NotFoundAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * 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 a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * 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. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/UserAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/UserAbility.java index 7fb5967..cc5e772 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/UserAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/UserAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * 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 a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * 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. diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/slice/UserCollectionAbility.java b/entry/src/main/java/com/github/mzule/abilityrouter/slice/UserCollectionAbility.java index b74ee85..8829a33 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/slice/UserCollectionAbility.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/slice/UserCollectionAbility.java @@ -1,12 +1,11 @@ /* - * Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved. - *

+ * 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 a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

+ * + * 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. -- Gitee From 6836794959093d01f12b0b3cf4721d7b14dbca52 Mon Sep 17 00:00:00 2001 From: lilinfeng-z <3211270061@qq.com> Date: Tue, 6 Jul 2021 14:58:22 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9findbugs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../github/mzule/abilityrouter/router/ExtraTypes.java | 9 +++++++++ .../com/github/mzule/abilityrouter/MyApplication.java | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/activityrouter/src/main/java/com/github/mzule/abilityrouter/router/ExtraTypes.java b/activityrouter/src/main/java/com/github/mzule/abilityrouter/router/ExtraTypes.java index 09f6bcf..b281d13 100644 --- a/activityrouter/src/main/java/com/github/mzule/abilityrouter/router/ExtraTypes.java +++ b/activityrouter/src/main/java/com/github/mzule/abilityrouter/router/ExtraTypes.java @@ -52,6 +52,7 @@ public class ExtraTypes { private Map transfer; public String[] getIntExtra() { + String[] intExtra = this.intExtra; return intExtra; } @@ -60,6 +61,7 @@ public class ExtraTypes { } public String[] getLongExtra() { + String[] longExtra = this.longExtra; return longExtra; } @@ -68,6 +70,7 @@ public class ExtraTypes { } public String[] getBooleanExtra() { + String[] booleanExtra = this.booleanExtra; return booleanExtra; } @@ -76,6 +79,7 @@ public class ExtraTypes { } public String[] getShortExtra() { + String[] shortExtra = this.shortExtra; return shortExtra; } @@ -84,6 +88,7 @@ public class ExtraTypes { } public String[] getFloatExtra() { + String[] floatExtra = this.floatExtra; return floatExtra; } @@ -92,6 +97,7 @@ public class ExtraTypes { } public String[] getDoubleExtra() { + String[] doubleExtra = this.doubleExtra; return doubleExtra; } @@ -100,6 +106,7 @@ public class ExtraTypes { } public String[] getByteExtra() { + String[] byteExtra = this.byteExtra; return byteExtra; } @@ -108,6 +115,7 @@ public class ExtraTypes { } public String[] getCharExtra() { + String[] charExtra = this.charExtra; return charExtra; } @@ -116,6 +124,7 @@ public class ExtraTypes { } public Map getTransfer() { + Map transfer = this.transfer; return transfer; } diff --git a/entry/src/main/java/com/github/mzule/abilityrouter/MyApplication.java b/entry/src/main/java/com/github/mzule/abilityrouter/MyApplication.java index 9c84e83..e3c6c8b 100644 --- a/entry/src/main/java/com/github/mzule/abilityrouter/MyApplication.java +++ b/entry/src/main/java/com/github/mzule/abilityrouter/MyApplication.java @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.github.mzule.abilityrouter; import com.github.mzule.abilityrouter.annotation.Modules; @@ -33,8 +34,8 @@ import ohos.utils.net.Uri; **/ @Modules({"app", "sdk"}) public class MyApplication extends AbilityPackage implements RouterCallbackProvider { - private final int beforopenmark = 11; - private final int notFound = 2; + private static final int beforopenmark = 11; + private static final int notFound = 2; @Override public void onInitialize() { super.onInitialize(); -- Gitee