From f68eb215f5cacfba8a6fbd9d22a8438ad69eb74e Mon Sep 17 00:00:00 2001 From: 0000226003-fuchi Date: Fri, 21 May 2021 14:56:25 +0800 Subject: [PATCH 1/9] =?UTF-8?q?Readme=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/readme.md b/readme.md index 768888b..877d704 100644 --- a/readme.md +++ b/readme.md @@ -97,11 +97,5 @@ dependencies { app:waveNum="1" /> ``` -## 测试信息 -CodeCheck代码测试无异常 -CloudTest代码测试无异常 -火绒安全病毒安全检测通过 -当前版本demo功能与原组件基本无差异 -测试员：李向涛 ## 版本迭代 > * 0.0.1_SNAPSHOT -- Gitee From 0e2aff3b96c8f4b3c5e17a7645f4679a72ffae9a Mon Sep 17 00:00:00 2001 From: 0000226003-fuchi Date: Fri, 21 May 2021 14:59:35 +0800 Subject: [PATCH 2/9] =?UTF-8?q?Readme=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/readme.md b/readme.md index 877d704..8b94e1d 100644 --- a/readme.md +++ b/readme.md @@ -97,5 +97,10 @@ dependencies { app:waveNum="1" /> ``` +## 测试信息 +CodeCheck代码测试无异常 +CloudTest代码测试无异常 +火绒安全病毒安全检测通过 +当前版本demo功能与原组件基本无差异 ## 版本迭代 > * 0.0.1_SNAPSHOT -- Gitee From 280c68f54a91e19bcb33e063240c4068d0e9e544 Mon Sep 17 00:00:00 2001 From: 0000226003-fuchi Date: Fri, 21 May 2021 15:00:23 +0800 Subject: [PATCH 3/9] =?UTF-8?q?Readme=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/readme.md b/readme.md index 8b94e1d..3aff3a5 100644 --- a/readme.md +++ b/readme.md @@ -99,8 +99,12 @@ dependencies { ``` ## 测试信息 CodeCheck代码测试无异常 + CloudTest代码测试无异常 + 火绒安全病毒安全检测通过 + 当前版本demo功能与原组件基本无差异 + ## 版本迭代 > * 0.0.1_SNAPSHOT -- Gitee From cdefedeae439740fda58da3453c5e40a9d59fbc1 Mon Sep 17 00:00:00 2001 From: 0000226003-fuchi Date: Tue, 25 May 2021 09:57:33 +0800 Subject: [PATCH 4/9] =?UTF-8?q?Readme=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.OPENSOURCE | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 README.OPENSOURCE diff --git a/README.OPENSOURCE b/README.OPENSOURCE new file mode 100644 index 0000000..d0d788a --- /dev/null +++ b/README.OPENSOURCE @@ -0,0 +1,19 @@ +[ + + { + + "Name": "CircleProgress", + + "License": "", + + "License File": "", + + "Version Number": "v1.0", + + "Upstream URL": "https://github.com/MyLifeMyTravel/CircleProgress", + + "Description": "自定义圆形进度条，包括传统传统的圆形(CircleProgress)、刻度(DialProgress)、水波纹(WaveProgress)效果的三种圆形进度条" + + } + +] \ No newline at end of file -- Gitee From c04bfa5fecca355740eeb14a9e2f3d424f45b8b4 Mon Sep 17 00:00:00 2001 From: 0000226003-fuchi Date: Tue, 25 May 2021 10:19:51 +0800 Subject: [PATCH 5/9] changelog --- chandeLog.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 chandeLog.md diff --git a/chandeLog.md b/chandeLog.md new file mode 100644 index 0000000..81eb5b2 --- /dev/null +++ b/chandeLog.md @@ -0,0 +1,2 @@ +0.0.1-SNAPSHOT +ohos 第一个版本，完整实现了原库的全部 api \ No newline at end of file -- Gitee From 0a82532487371a45b2db5c500b0c2a17b38e7202 Mon Sep 17 00:00:00 2001 From: 0000226003-fuchi Date: Tue, 25 May 2021 11:14:41 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/test/java/com/littlejie/app/ExampleTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/entry/src/test/java/com/littlejie/app/ExampleTest.java b/entry/src/test/java/com/littlejie/app/ExampleTest.java index 2865fdb..2a2f393 100644 --- a/entry/src/test/java/com/littlejie/app/ExampleTest.java +++ b/entry/src/test/java/com/littlejie/app/ExampleTest.java @@ -1,9 +1,14 @@ package com.littlejie.app; +import ohos.aafwk.ability.delegation.AbilityDelegatorRegistry; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class ExampleTest { @Test public void onStart() { + final String actualBundleName = AbilityDelegatorRegistry.getArguments().getTestBundleName(); + assertEquals("com.littlejie.app", actualBundleName); } } -- Gitee From 40a7c058d36009951939cd92ebd8d5a0c17b75fd Mon Sep 17 00:00:00 2001 From: 0000226003-fuchi Date: Tue, 25 May 2021 16:00:33 +0800 Subject: [PATCH 7/9] =?UTF-8?q?ReadMe=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/readme.md b/readme.md index 3aff3a5..a02399e 100644 --- a/readme.md +++ b/readme.md @@ -12,7 +12,6 @@ > * 开发版本：sdk5，DevEco Studio2.1 beta3 > * 项目作者和维护人：符驰 > * 基线版本：release 1.0.0 -> * 联系方式：fuchi064@chinasoftinc.com > * 原项目Doc地址：https://github.com/MyLifeMyTravel/CircleProgress ## 效果演示 -- Gitee From 35f30cfd4c61d17464e3dc62d8cd10c2fb95cc92 Mon Sep 17 00:00:00 2001 From: 0000226003-fuchi Date: Tue, 25 May 2021 16:02:22 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/.gitignore | 13 ------ entry/build.gradle | 18 ++++++++- entry/proguard-rules.pro | 1 + .../littlejie/app/slice/MainAbilitySlice.java | 4 ++ entry/src/ohosTest/config.json | 40 +++++++++++++++++++ .../com/littlejie/app/ExampleOhosTest.java | 14 +++++++ .../java/com/littlejie/app/ExampleTest.java | 5 --- gradle.properties | 10 +++++ 8 files changed, 85 insertions(+), 20 deletions(-) create mode 100644 entry/proguard-rules.pro create mode 100644 entry/src/ohosTest/config.json create mode 100644 entry/src/ohosTest/java/com/littlejie/app/ExampleOhosTest.java create mode 100644 gradle.properties diff --git a/entry/.gitignore b/entry/.gitignore index 603b140..796b96d 100644 --- a/entry/.gitignore +++ b/entry/.gitignore @@ -1,14 +1 @@ -*.iml -.gradle -/local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -.DS_Store /build -/captures -.externalNativeBuild -.cxx diff --git a/entry/build.gradle b/entry/build.gradle index d782e49..6921cd8 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,14 +1,28 @@ apply plugin: 'com.huawei.ohos.hap' +apply plugin: 'com.huawei.ohos.decctest' ohos { + compileSdkVersion 5 defaultConfig { compatibleSdkVersion 5 } - + buildTypes { + release { + proguardOpt { + proguardEnabled false + rulesFiles 'proguard-rules.pro' + } + } + } + } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) - testCompile 'junit:junit:4.12' + testImplementation 'junit:junit:4.13' compile project(path: ':circleprogress') + ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100' +} +decc { + supportType = ['html','xml'] } diff --git a/entry/proguard-rules.pro b/entry/proguard-rules.pro new file mode 100644 index 0000000..f7666e4 --- /dev/null +++ b/entry/proguard-rules.pro @@ -0,0 +1 @@ +# config module specific ProGuard rules here. \ No newline at end of file diff --git a/entry/src/main/java/com/littlejie/app/slice/MainAbilitySlice.java b/entry/src/main/java/com/littlejie/app/slice/MainAbilitySlice.java index e08996d..03ee9ff 100644 --- a/entry/src/main/java/com/littlejie/app/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/littlejie/app/slice/MainAbilitySlice.java @@ -132,4 +132,8 @@ public class MainAbilitySlice extends AbilitySlice implements Component.ClickedL waveProgress.setValue(0); } } + + public void showTest(){ + System.out.println("test"); + } } diff --git a/entry/src/ohosTest/config.json b/entry/src/ohosTest/config.json new file mode 100644 index 0000000..2b65743 --- /dev/null +++ b/entry/src/ohosTest/config.json @@ -0,0 +1,40 @@ +{ + "app": { + "bundleName": "com.littlejie.app", + "vendor": "littlejie", + "version": { + "code": 1000000, + "name": "1.0.0" + }, + "apiVersion": { + "compatible": 5, + "target": 6 + } + }, + "deviceConfig": {}, + "module": { + "package": "com.littlejie.app", + "name": "testModule", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry_test", + "moduleType": "feature", + "installationFree": true + }, + "abilities": [ + { + "name": "decc.testkit.runner.EntryAbility", + "description": "Test Entry Ability", + "icon": "$media:icon", + "label": "HM_CircleProgress", + "launchType": "standard", + "orientation": "landscape", + "visible": true, + "type": "page" + } + ] + } +} \ No newline at end of file diff --git a/entry/src/ohosTest/java/com/littlejie/app/ExampleOhosTest.java b/entry/src/ohosTest/java/com/littlejie/app/ExampleOhosTest.java new file mode 100644 index 0000000..4875eef --- /dev/null +++ b/entry/src/ohosTest/java/com/littlejie/app/ExampleOhosTest.java @@ -0,0 +1,14 @@ +package com.littlejie.app; + +import ohos.aafwk.ability.delegation.AbilityDelegatorRegistry; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class ExampleOhosTest { + @Test + public void testBundleName() { + final String actualBundleName = AbilityDelegatorRegistry.getArguments().getTestBundleName(); + assertEquals("com.littlejie.app", actualBundleName); + } +} \ No newline at end of file diff --git a/entry/src/test/java/com/littlejie/app/ExampleTest.java b/entry/src/test/java/com/littlejie/app/ExampleTest.java index 2a2f393..2865fdb 100644 --- a/entry/src/test/java/com/littlejie/app/ExampleTest.java +++ b/entry/src/test/java/com/littlejie/app/ExampleTest.java @@ -1,14 +1,9 @@ package com.littlejie.app; -import ohos.aafwk.ability.delegation.AbilityDelegatorRegistry; import org.junit.Test; -import static org.junit.Assert.assertEquals; - public class ExampleTest { @Test public void onStart() { - final String actualBundleName = AbilityDelegatorRegistry.getArguments().getTestBundleName(); - assertEquals("com.littlejie.app", actualBundleName); } } diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..0daf183 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,10 @@ +# Project-wide Gradle settings. +# IDE (e.g. DevEco Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# If the Chinese output is garbled, please configure the following parameter. +# org.gradle.jvmargs=-Dfile.encoding=GBK -- Gitee From d0b8ec1f9c71bcfc4431cfcd8ab1b156cfaec148 Mon Sep 17 00:00:00 2001 From: 0000226003-fuchi Date: Tue, 25 May 2021 16:03:18 +0800 Subject: [PATCH 9/9] =?UTF-8?q?readme=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/readme.md b/readme.md index a02399e..1f454d1 100644 --- a/readme.md +++ b/readme.md @@ -10,7 +10,6 @@ > * 项目移植状态：已完成 > * 调用差异：无 > * 开发版本：sdk5，DevEco Studio2.1 beta3 -> * 项目作者和维护人：符驰 > * 基线版本：release 1.0.0 > * 原项目Doc地址：https://github.com/MyLifeMyTravel/CircleProgress -- Gitee