diff --git a/README.md b/README.md index b7471657d564b3b20e9c79164e84b4328859d74a..67e7e90c0d77ea89074ea3106ecbf81f74e92840 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ - 功能：代码块高亮显示。 - 项目移植状态：主功能完成 - 调用差异：无 -- 开发版本：sdk5，DevEco Studio 2.1 Release +- 开发版本：sdk6，DevEco Studio 2.2 Beta1 - 基线版本：Release 2 #### 效果演示 @@ -30,7 +30,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文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 #### 使用说明 @@ -120,7 +120,7 @@ CodeCheck代码测试无异常 CloudTest代码测试无异常 -火绒安全病毒安全检测通过 +病毒安全检测通过 当前版本demo功能与原组件基本无差异 diff --git a/build.gradle b/build.gradle index 3c52aa1178cc9d802a490b6029d1298d9f3e0e1a..8e7d5ed27de5b0b788c4895978e0eea2ba71e12b 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 } @@ -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 c32d31fab81b3b3706abd9807774839bb7f5a827..d3e5d96c6cc3a04eb64eb26e72f0770bc58e6ca9 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 } diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 9fe69b2fedf678eaa1de9a0edde2cc1fd6e2e034..18b0121a972c5e67119667a74302d1e9cb737312 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": {}, @@ -22,7 +17,8 @@ "distro": { "deliveryWithInstall": true, "moduleName": "entry", - "moduleType": "entry" + "moduleType": "entry", + "installationFree":true }, "abilities": [ { diff --git a/entry/src/main/java/com/protectsoft/webviewcodedemo/Constants.java b/entry/src/main/java/com/protectsoft/webviewcodedemo/Constants.java index 1d406e5ab57352dc88cb8591f8a9ebf92b728762..d6e9f57c61e86317bf59aa43fe5a7f360bd3b839 100644 --- a/entry/src/main/java/com/protectsoft/webviewcodedemo/Constants.java +++ b/entry/src/main/java/com/protectsoft/webviewcodedemo/Constants.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/protectsoft/webviewcodedemo/MainAbility.java b/entry/src/main/java/com/protectsoft/webviewcodedemo/MainAbility.java index d6c2411ba632b0c0bf29c651e7fc853e91d62c4c..3a8e310302953c12d1cffdc6e2b131b1022c39da 100644 --- a/entry/src/main/java/com/protectsoft/webviewcodedemo/MainAbility.java +++ b/entry/src/main/java/com/protectsoft/webviewcodedemo/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/protectsoft/webviewcodedemo/MyApplication.java b/entry/src/main/java/com/protectsoft/webviewcodedemo/MyApplication.java index d6152a85eeb0d16fcd09eb9aed38a58990bf820e..2ebdf24a1935173516b459b075ab72ec08b724ca 100644 --- a/entry/src/main/java/com/protectsoft/webviewcodedemo/MyApplication.java +++ b/entry/src/main/java/com/protectsoft/webviewcodedemo/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/protectsoft/webviewcodedemo/ShowAbility.java b/entry/src/main/java/com/protectsoft/webviewcodedemo/ShowAbility.java index 3bea5d6ddbdbbd12a040c03bcc59d993d012932d..181a13b492b5b7ee1516b4aa86ebfe182149884d 100644 --- a/entry/src/main/java/com/protectsoft/webviewcodedemo/ShowAbility.java +++ b/entry/src/main/java/com/protectsoft/webviewcodedemo/ShowAbility.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/library/build.gradle b/library/build.gradle index d65602bcf7e6b70787f237462419949e8f8162c5..7a7c5fafed3a16f250b3f8d4f06c386e4110f5b0 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.huawei.ohos.library' + ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 } @@ -12,7 +13,7 @@ ohos { } } } - + } dependencies { diff --git a/library/src/main/config.json b/library/src/main/config.json index 69cff0527c18dbb4d9d9672364639bb5b2af58e8..4af5031e93ada68fca56ac23ad7835e87cf5d34d 100644 --- a/library/src/main/config.json +++ b/library/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": { diff --git a/library/src/main/java/com/protectsoft/webviewcode/Codeview.java b/library/src/main/java/com/protectsoft/webviewcode/Codeview.java index fb2a8f200459a152c834f28bbac9b4d0c0a3e2ef..4fb65b81ed6880bd706f820a510f87674bc789e8 100644 --- a/library/src/main/java/com/protectsoft/webviewcode/Codeview.java +++ b/library/src/main/java/com/protectsoft/webviewcode/Codeview.java @@ -29,14 +29,13 @@ public class Codeview { */ private static final int NUM_4 = 4; private static volatile Codeview singleton = null; - private static String[] htmlWrapper; - private static List contents; + private static String[] htmlWrapper = new String[]{"","","","",""};; + private static List contents = new ArrayList<>();; private final Context mContext; private boolean isTextWrap = false; - private String style; - private String language; + private String style = DEFAULT_STYLE; + private String language = DEFAULT_LANG;; private Object mWebview; - /** * Codeview * @@ -44,10 +43,6 @@ public class Codeview { */ public Codeview(Context context) { mContext = context; - htmlWrapper = new String[]{"","","","",""}; - contents = new ArrayList<>(); - language = DEFAULT_LANG; - style = DEFAULT_STYLE; } /** diff --git a/library/src/main/java/com/protectsoft/webviewcode/Settings.java b/library/src/main/java/com/protectsoft/webviewcode/Settings.java index 7d225fecc9a9925be1a62b8daffceff6e06a8b88..00a6d3a811d1dd9e24bc8d55ab5551a075e65102 100644 --- a/library/src/main/java/com/protectsoft/webviewcode/Settings.java +++ b/library/src/main/java/com/protectsoft/webviewcode/Settings.java @@ -15,7 +15,7 @@ public final class Settings { * * @since 2021-04-30 */ - public final class Lang { + public static final class Lang { /** * JAVA */ @@ -55,7 +55,7 @@ public final class Settings { * * @since 2021-04-30 */ - public final class WithStyle { + public static final class WithStyle { /** * DEFAULT */ @@ -143,7 +143,7 @@ public final class Settings { * * @since 2021-04-30 */ - public final class MimeType { + public static final class MimeType { /** * TEXT_HTML */ @@ -159,7 +159,7 @@ public final class Settings { * * @since 2021-04-30 */ - public final class Charset { + public static final class Charset { /** * UTF_8 */ @@ -171,7 +171,7 @@ public final class Settings { * * @since 2021-04-30 */ - public final class TextWrap { + public static final class TextWrap { /** * PRE_WRAP */