diff --git a/README.md b/README.md index 85f4a3eff7923fb2a58730302492072d42aa11e1..f309ba86ccbd4d01f0245af6d5b2b7bae07524cd 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 d3c9f1fef7ce4e18162867c20c11bfc65e1a8d28..8c592a611e3fcbe90cf76d82e59ca599eaa8ce2b 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 2b23a857051050a033db405463b5bca172d3f2d5..b4b40f397d0eb4e30607c9db2f354f8c50460ce2 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 7908177b77501a2c1ce95c0b994e7e230f975a2c..e0c8455175c47c34b696817e73959fde61a10e62 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" } }, diff --git a/entry/src/main/java/com/github/phoenix/MainAbility.java b/entry/src/main/java/com/github/phoenix/MainAbility.java index 7a090cbfc20c74ee9ced0da8a2ae47dc314130e2..7940b5b1a311afbd2b880b4ace640be1e5edfdb8 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 5498bfb0cf55d55c83e3f350f94016ca02873df3..a7eb2cda02992570178b8915391aad2440f87edb 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 5bf3f7acb575450e2f1afe57664c66e56b81b251..ef4a493f240e07e3c15173abbe2bf6696efacb61 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 3d8ac717ae4c9429a856933311c218da1775edf5..3d90b83e4c4dd2a13e4f190e7bdf6704efb4673b 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 dfaa8ba0c56894c57458dd039ea80d4f236e047e..60467fd603771960cb2572af4c343630d8d17c02 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");