From 93ae98cf5a830be5a88a78188d609bb92ce79f23 Mon Sep 17 00:00:00 2001 From: "229144497@qq.com" Date: Mon, 28 Jun 2021 17:19:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0CopyRight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/github/phoenix/MainAbility.java | 14 ++++++++++++++ .../java/com/github/phoenix/MyApplication.java | 14 ++++++++++++++ .../src/main/java/com/github/phoenix/MyToast.java | 14 ++++++++++++++ .../com/github/phoenix/slice/MainAbilitySlice.java | 14 ++++++++++++++ .../com/github/phoenix/widget/TypedAttrUtils.java | 1 - 5 files changed, 56 insertions(+), 1 deletion(-) diff --git a/entry/src/main/java/com/github/phoenix/MainAbility.java b/entry/src/main/java/com/github/phoenix/MainAbility.java index 7a090cb..7940b5b 100644 --- a/entry/src/main/java/com/github/phoenix/MainAbility.java +++ b/entry/src/main/java/com/github/phoenix/MainAbility.java @@ -1,3 +1,17 @@ +/* + * 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 + * + * 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.github.phoenix; import com.github.phoenix.slice.MainAbilitySlice; diff --git a/entry/src/main/java/com/github/phoenix/MyApplication.java b/entry/src/main/java/com/github/phoenix/MyApplication.java index 5498bfb..a7eb2cd 100644 --- a/entry/src/main/java/com/github/phoenix/MyApplication.java +++ b/entry/src/main/java/com/github/phoenix/MyApplication.java @@ -1,3 +1,17 @@ +/* + * 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 + * + * 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.github.phoenix; import ohos.aafwk.ability.AbilityPackage; diff --git a/entry/src/main/java/com/github/phoenix/MyToast.java b/entry/src/main/java/com/github/phoenix/MyToast.java index 5bf3f7a..ef4a493 100644 --- a/entry/src/main/java/com/github/phoenix/MyToast.java +++ b/entry/src/main/java/com/github/phoenix/MyToast.java @@ -1,3 +1,17 @@ +/* + * 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 + * + * 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.github.phoenix; import ohos.agp.colors.RgbColor; diff --git a/entry/src/main/java/com/github/phoenix/slice/MainAbilitySlice.java b/entry/src/main/java/com/github/phoenix/slice/MainAbilitySlice.java index 3d8ac71..3d90b83 100644 --- a/entry/src/main/java/com/github/phoenix/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/github/phoenix/slice/MainAbilitySlice.java @@ -1,3 +1,17 @@ +/* + * 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 + * + * 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.github.phoenix.slice; import com.github.phoenix.MyToast; diff --git a/entry/src/main/java/com/github/phoenix/widget/TypedAttrUtils.java b/entry/src/main/java/com/github/phoenix/widget/TypedAttrUtils.java index dfaa8ba..60467fd 100644 --- a/entry/src/main/java/com/github/phoenix/widget/TypedAttrUtils.java +++ b/entry/src/main/java/com/github/phoenix/widget/TypedAttrUtils.java @@ -1,4 +1,3 @@ - /* * Copyright (C) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); -- Gitee From 881061c7e8cf4ea2f8017117a0f2a5c090ed0bea Mon Sep 17 00:00:00 2001 From: "229144497@qq.com" Date: Tue, 29 Jun 2021 09:30:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=96=B0=E7=89=88IDE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- build.gradle | 8 ++++---- entry/build.gradle | 4 ++-- entry/src/main/config.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 85f4a3e..f309ba8 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ - 功能：仿京东，支付宝密码键盘和密码输入框 - 项目移植状态：主功能完成 - 调用差异：无 -- 开发版本：sdk5，DevEco Studio 2.1 Release +- 开发版本：sdk6，DevEco Studio2.2 Bate1 - 基线版本：master分支 #### 效果演示 @@ -18,7 +18,7 @@ 本项目为纯Demo工程 -在sdk5，DevEco Studio2.1 Release下项目可直接运行 +在sdk5，DevEco Studio2.2 Bate1下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件 diff --git a/build.gradle b/build.gradle index d3c9f1f..8c592a6 100644 --- a/build.gradle +++ b/build.gradle @@ -2,9 +2,9 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 5 + compatibleSdkVersion 6 } } @@ -19,8 +19,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.2' - classpath 'com.huawei.ohos:decctest:1.0.0.7' + classpath 'com.huawei.ohos:hap:2.4.5.0' + classpath 'com.huawei.ohos:decctest:1.2.4.1' } } diff --git a/entry/build.gradle b/entry/build.gradle index 2b23a85..b4b40f3 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 5 + compatibleSdkVersion 6 } buildTypes { release { diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 7908177..e0c8455 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -7,8 +7,8 @@ "name": "1.0.0" }, "apiVersion": { - "compatible": 5, - "target": 5, + "compatible": 6, + "target": 6, "releaseType": "Release" } }, -- Gitee