diff --git a/.gitignore b/.gitignore index 37a4eb8b43d978ea05b2c6e3fb934f9b40dddd4d..23df9723eaaf2abd41f7254aa949d532ebc06c84 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ .externalNativeBuild /entry/.preview .cxx +/library/build.gradle +/upload.gradle \ No newline at end of file diff --git a/README.OPENSOURCE b/README.OPENSOURCE index 1934273ee729e57b5d65a70ce642ccdb3ad8d121..43ad41951328926cdce69e107266116b14b82703 100644 --- a/README.OPENSOURCE +++ b/README.OPENSOURCE @@ -1,8 +1,8 @@ [ { "Name": " Codeview ", - "License": "", - "License File": "", + "License": "无", + "License File": "无", "Version Number": " 2 ", "Upstream URL": " https://github.com/avraampiperidis/Codeview ", "Description": " Codeview is a ohos library tha lets you preview code in webview very easy and simple with highlighs and colors. With styles to chooses and language." diff --git a/README.md b/README.md index fe1c9adc01eb93185e42f0a934b04f868eb44241..b7471657d564b3b20e9c79164e84b4328859d74a 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ - 功能:代码块高亮显示。 - 项目移植状态:主功能完成 - 调用差异:无 -- 开发版本:sdk5,DevEco Studio2.1 Beta4 +- 开发版本:sdk5,DevEco Studio 2.1 Release - 基线版本:Release 2 #### 效果演示 @@ -30,7 +30,7 @@ dependencies { ...... } ``` -在sdk5,DevEco Studio2.1 beta4下项目可直接运行 如无法运行,删除项目.gradle,.idea,build,gradle,build.gradle文件, 并依据自己的版本创建新项目,将新项目的对应文件复制到根目录下 +在sdk5,DevEco Studio 2.1 Release下项目可直接运行 如无法运行,删除项目.gradle,.idea,build,gradle,build.gradle文件, 并依据自己的版本创建新项目,将新项目的对应文件复制到根目录下 #### 使用说明 diff --git a/entry/build.gradle b/entry/build.gradle index ac00f2410f21fac717328c5a63e3203bd242384b..c32d31fab81b3b3706abd9807774839bb7f5a827 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -18,11 +18,10 @@ ohos { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) - implementation project(path: ':library') testImplementation 'junit:junit:4.13' ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100' testImplementation 'org.mockito:mockito-core:2.23.0' - testImplementation 'com.google.truth:truth:0.39' + implementation project(":library") } decc { supportType = ['html', 'xml'] diff --git a/entry/src/main/java/com/protectsoft/webviewcodedemo/ShowAbility.java b/entry/src/main/java/com/protectsoft/webviewcodedemo/ShowAbility.java index c7a29fc7380a320abd3ca02c8d8b1ae4e92d3d74..3bea5d6ddbdbbd12a040c03bcc59d993d012932d 100644 --- a/entry/src/main/java/com/protectsoft/webviewcodedemo/ShowAbility.java +++ b/entry/src/main/java/com/protectsoft/webviewcodedemo/ShowAbility.java @@ -40,7 +40,7 @@ public class ShowAbility extends Ability { ResourceTable.Id_btn_ATELIER_FOREST_DARK,ResourceTable.Id_btn_DARKSTYLE, ResourceTable.Id_btn_DARKULA,ResourceTable.Id_btn_DOCCO,ResourceTable.Id_btn_FAR, ResourceTable.Id_btn_GITHUB,ResourceTable.Id_btn_GITHUBGIST, - ResourceTable.Id_btn_GOOGLECODE,ResourceTable.Id_btn_IDEA,ResourceTable.Id_btn_MAGULA, + ResourceTable.Id_btn_GGCODE,ResourceTable.Id_btn_IDEA,ResourceTable.Id_btn_MAGULA, ResourceTable.Id_btn_OBSIDIAN,ResourceTable.Id_btn_XCODE}; private final String[] styles = { Settings.WithStyle.DEFAULT,Settings.WithStyle.AGATE, @@ -49,7 +49,7 @@ public class ShowAbility extends Ability { Settings.WithStyle.ATELIER_LIGHT,Settings.WithStyle.ATELIER_FOREST_DARK,Settings.WithStyle.DARKSTYLE, Settings.WithStyle.DARKULA,Settings.WithStyle.DOCCO, Settings.WithStyle.FAR,Settings.WithStyle.GITHUB,Settings.WithStyle.GITHUBGIST, - Settings.WithStyle.GOOGLECODE,Settings.WithStyle.IDEA, + Settings.WithStyle.GGCODE,Settings.WithStyle.IDEA, Settings.WithStyle.MAGULA,Settings.WithStyle.OBSIDIAN,Settings.WithStyle.XCODE}; private final Button[] buttons = new Button[NUM_20]; private Text textStyle; diff --git a/entry/src/main/resources/base/layout/ability_show.xml b/entry/src/main/resources/base/layout/ability_show.xml index 1006b8c683395336640af755cd586b423219fae6..d33b2887d11d37a3b179d1da99f9ac93ca492572 100644 --- a/entry/src/main/resources/base/layout/ability_show.xml +++ b/entry/src/main/resources/base/layout/ability_show.xml @@ -258,13 +258,13 @@ ohos:orientation="horizontal">