From 337e60b9ce8d1ab5bdda353b518a478dad9f6e17 Mon Sep 17 00:00:00 2001 From: 0000226003-fuchi Date: Tue, 25 May 2021 17:18:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=89=88=E6=9D=83=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8CReadMe=E6=96=87=E4=BB=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- circleprogress/build.gradle | 2 +- circleprogress/src/main/config.json | 4 +- .../circleprogress/DialProgress.java | 6 +-- .../circleprogress/RoundProgressView.java | 5 +-- .../circleprogress/WaveProgress.java | 5 +-- .../utils/AnimatorValueUpdateUtil.java | 5 +-- .../circleprogress/utils/Constant.java | 5 +-- .../circleprogress/utils/MiscUtil.java | 5 +-- .../circleprogress/utils/ViewUtils.java | 5 +-- entry/build.gradle | 21 +++++++++- entry/src/main/config.json | 7 ++-- .../java/com/littlejie/app/MainAbility.java | 5 +-- .../java/com/littlejie/app/MyApplication.java | 5 +-- .../littlejie/app/slice/MainAbilitySlice.java | 9 +---- entry/src/ohosTest/config.json | 3 +- readme.md | 38 +++++++++++++++++-- 16 files changed, 84 insertions(+), 46 deletions(-) diff --git a/circleprogress/build.gradle b/circleprogress/build.gradle index 312bc1c..45ad141 100644 --- a/circleprogress/build.gradle +++ b/circleprogress/build.gradle @@ -9,5 +9,5 @@ ohos { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' + testCompile 'junit:junit:4.13' } diff --git a/circleprogress/src/main/config.json b/circleprogress/src/main/config.json index 2a1558b..53ce3f0 100644 --- a/circleprogress/src/main/config.json +++ b/circleprogress/src/main/config.json @@ -3,8 +3,8 @@ "bundleName": "com.littlejie.app", "vendor": "littlejie", "version": { - "code": 1, - "name": "1.0" + "code": 1000000, + "name": "1.0.0" }, "apiVersion": { "compatible": 5, diff --git a/circleprogress/src/main/java/com/littlejie/circleprogress/DialProgress.java b/circleprogress/src/main/java/com/littlejie/circleprogress/DialProgress.java index 2a2cf9b..be923a1 100644 --- a/circleprogress/src/main/java/com/littlejie/circleprogress/DialProgress.java +++ b/circleprogress/src/main/java/com/littlejie/circleprogress/DialProgress.java @@ -1,11 +1,11 @@ /** - * Copyright (C) 2021 The Chinese Software International Co., Ltd. + * 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 an 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. diff --git a/circleprogress/src/main/java/com/littlejie/circleprogress/RoundProgressView.java b/circleprogress/src/main/java/com/littlejie/circleprogress/RoundProgressView.java index 5b2c5a5..f63621f 100644 --- a/circleprogress/src/main/java/com/littlejie/circleprogress/RoundProgressView.java +++ b/circleprogress/src/main/java/com/littlejie/circleprogress/RoundProgressView.java @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2021 The Chinese Software International Co., Ltd. +/** + * 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 an copy of the License at @@ -11,7 +11,6 @@ * 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.littlejie.circleprogress; diff --git a/circleprogress/src/main/java/com/littlejie/circleprogress/WaveProgress.java b/circleprogress/src/main/java/com/littlejie/circleprogress/WaveProgress.java index bd5ab1b..4d166fe 100644 --- a/circleprogress/src/main/java/com/littlejie/circleprogress/WaveProgress.java +++ b/circleprogress/src/main/java/com/littlejie/circleprogress/WaveProgress.java @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2021 The Chinese Software International Co., Ltd. +/** + * 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 an copy of the License at @@ -11,7 +11,6 @@ * 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.littlejie.circleprogress; diff --git a/circleprogress/src/main/java/com/littlejie/circleprogress/utils/AnimatorValueUpdateUtil.java b/circleprogress/src/main/java/com/littlejie/circleprogress/utils/AnimatorValueUpdateUtil.java index ee3c8c0..4da7f3a 100644 --- a/circleprogress/src/main/java/com/littlejie/circleprogress/utils/AnimatorValueUpdateUtil.java +++ b/circleprogress/src/main/java/com/littlejie/circleprogress/utils/AnimatorValueUpdateUtil.java @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2021 The Chinese Software International Co., Ltd. +/** + * 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 an copy of the License at @@ -11,7 +11,6 @@ * 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.littlejie.circleprogress.utils; diff --git a/circleprogress/src/main/java/com/littlejie/circleprogress/utils/Constant.java b/circleprogress/src/main/java/com/littlejie/circleprogress/utils/Constant.java index 5606bc8..a8c7bbc 100644 --- a/circleprogress/src/main/java/com/littlejie/circleprogress/utils/Constant.java +++ b/circleprogress/src/main/java/com/littlejie/circleprogress/utils/Constant.java @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2021 The Chinese Software International Co., Ltd. +/** + * 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 an copy of the License at @@ -11,7 +11,6 @@ * 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.littlejie.circleprogress.utils; diff --git a/circleprogress/src/main/java/com/littlejie/circleprogress/utils/MiscUtil.java b/circleprogress/src/main/java/com/littlejie/circleprogress/utils/MiscUtil.java index 1ac8ae4..e46ba06 100644 --- a/circleprogress/src/main/java/com/littlejie/circleprogress/utils/MiscUtil.java +++ b/circleprogress/src/main/java/com/littlejie/circleprogress/utils/MiscUtil.java @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2021 The Chinese Software International Co., Ltd. +/** + * 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 an copy of the License at @@ -11,7 +11,6 @@ * 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.littlejie.circleprogress.utils; diff --git a/circleprogress/src/main/java/com/littlejie/circleprogress/utils/ViewUtils.java b/circleprogress/src/main/java/com/littlejie/circleprogress/utils/ViewUtils.java index a3ebb80..67ce51b 100644 --- a/circleprogress/src/main/java/com/littlejie/circleprogress/utils/ViewUtils.java +++ b/circleprogress/src/main/java/com/littlejie/circleprogress/utils/ViewUtils.java @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2021 The Chinese Software International Co., Ltd. +/** + * 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 an copy of the License at @@ -11,7 +11,6 @@ * 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.littlejie.circleprogress.utils; diff --git a/entry/build.gradle b/entry/build.gradle index 6921cd8..aacce66 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,7 +1,26 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - + signingConfigs { + debug { + storeFile file('D:\\证书\\fcDebug.p12') + storePassword '0000001846633BB02AD72B430D1D9B20C032DB6C23FFE94A57A4E91E2032CE5F1CC4670087B3922C' + keyAlias = 'HMFC' + keyPassword '000000182688B1577B5560C361EA0995735D94580E243CB10692E1845F5F8CCBD9325DB3F391229A' + signAlg = 'SHA256withECDSA' + profile file('D:\\证书\\环形进度条Debug.p7b') + certpath file('D:\\证书\\HMFC_cetif.cer') + } + release { + storeFile file('D:\\证书\\fcDebug.p12') + storePassword '0000001846633BB02AD72B430D1D9B20C032DB6C23FFE94A57A4E91E2032CE5F1CC4670087B3922C' + keyAlias = 'HMFC' + keyPassword '000000182688B1577B5560C361EA0995735D94580E243CB10692E1845F5F8CCBD9325DB3F391229A' + signAlg = 'SHA256withECDSA' + profile file('D:\\证书\\环形进度条Debug.p7b') + certpath file('D:\\证书\\HMFC_cetif.cer') + } + } compileSdkVersion 5 defaultConfig { compatibleSdkVersion 5 diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 4e07e0f..805e078 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -3,12 +3,13 @@ "bundleName": "com.littlejie.app", "vendor": "littlejie", "version": { - "code": 1, - "name": "1.0" + "code": 1000000, + "name": "1.0.0" }, "apiVersion": { "compatible": 5, - "target": 5 + "target": 6, + "releaseType": "Release" } }, "deviceConfig": {}, diff --git a/entry/src/main/java/com/littlejie/app/MainAbility.java b/entry/src/main/java/com/littlejie/app/MainAbility.java index 8be328c..c7f7a59 100644 --- a/entry/src/main/java/com/littlejie/app/MainAbility.java +++ b/entry/src/main/java/com/littlejie/app/MainAbility.java @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2021 The Chinese Software International Co., Ltd. +/** + * 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 an copy of the License at @@ -11,7 +11,6 @@ * 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.littlejie.app; diff --git a/entry/src/main/java/com/littlejie/app/MyApplication.java b/entry/src/main/java/com/littlejie/app/MyApplication.java index a360207..ba2ef4a 100644 --- a/entry/src/main/java/com/littlejie/app/MyApplication.java +++ b/entry/src/main/java/com/littlejie/app/MyApplication.java @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2021 The Chinese Software International Co., Ltd. +/** + * 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 an copy of the License at @@ -11,7 +11,6 @@ * 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.littlejie.app; 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 03ee9ff..5449ceb 100644 --- a/entry/src/main/java/com/littlejie/app/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/littlejie/app/slice/MainAbilitySlice.java @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2021 The Chinese Software International Co., Ltd. +/** + * 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 an copy of the License at @@ -11,7 +11,6 @@ * 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.littlejie.app.slice; @@ -132,8 +131,4 @@ 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 index 2b65743..3c7ce97 100644 --- a/entry/src/ohosTest/config.json +++ b/entry/src/ohosTest/config.json @@ -8,7 +8,8 @@ }, "apiVersion": { "compatible": 5, - "target": 6 + "target": 6, + "releaseType": "Release" } }, "deviceConfig": {}, diff --git a/readme.md b/readme.md index ee7bc08..3f320c3 100644 --- a/readme.md +++ b/readme.md @@ -11,7 +11,6 @@ > * 调用差异：无 > * 开发版本：sdk5，DevEco Studio2.1 beta3 > * 基线版本：release 1.0.0 -> * 原项目Doc地址：https://github.com/MyLifeMyTravel/CircleProgress ## 效果演示 @@ -20,7 +19,7 @@ ## 安装教程 -在moudle级别下的build.gradle文件中添加依赖 +在项目根目录下的build.gradle文件中 ``` allprojects { repositories { @@ -33,7 +32,7 @@ allprojects { jcenter() } ``` -在entry模块中的build.gradle文件中添加 +在entry模块中的build.gradle文件中 ``` dependencies { implementation (`com.gitee.chinasoft_ohos:circleprogress:0.0.1-SNAPSHOT`) @@ -51,7 +50,6 @@ dependencies { ohos:width="150vp" ohos:center_in_parent="true" ohos:layout_alignment="horizontal_center" - ohos:progress="7000" app:bgArcColor="$color:progressBgColor" app:hint="走了" app:maxValue="10000" @@ -59,6 +57,15 @@ dependencies { app:value="3444" /> ``` +您可以选择在布局xml文件中设置以下属性， +``` +1.hint 进度条中心文字 +2.maxValue 进度条最大值 +3.unit 进度条中心第二行文字 +4.value 默认当前值 +``` + + 时速表使用此组件 ``` ``` +您可以选择在布局xml文件中设置以下属性， +``` +1.hint 进度条中心文字 +2.maxValue 进度条最大值 +3.unit 进度条中心第二行文字 +4.value 默认当前值 +5.dialWidth 分隔条宽度 +6.dialIntervalDegree 前景圆弧刻度数量 +7.arcWidth 圆弧宽度 +``` + 水波纹使用此组件 ``` ``` +您可以选择在布局xml文件中设置以下属性， +``` +1.value 默认值 +2.valueSize 默认值字体大小 +3.waveHeight 水波纹高度 +4.waveNum 水波数量 +5.darkWaveAnimTime 水波速度 +6.darkWaveColor 暗色水波颜色 +7.lightWaveColor 亮色水波颜色 +8.lightWaveDirect 亮色水波方向 +``` + ## 测试信息 ``` CodeCheck代码测试无异常 -- Gitee From 180416841bb14c7a616b471a93f996fcac79c193 Mon Sep 17 00:00:00 2001 From: 0000226003-fuchi Date: Tue, 25 May 2021 17:20:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?ReadMe=E6=96=87=E4=BB=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 3f320c3..df10973 100644 --- a/readme.md +++ b/readme.md @@ -134,6 +134,6 @@ CloudTest代码测试无异常 火绒安全病毒安全检测通过 当前版本demo功能与原组件基本无差异 - +``` ## 版本迭代 > * 0.0.1_SNAPSHOT -- Gitee From 1db4392640914606d51024cefd5f74aa3fb74984 Mon Sep 17 00:00:00 2001 From: 0000226003-fuchi Date: Tue, 25 May 2021 17:22:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ReadMe=E6=96=87=E4=BB=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index df10973..22da59f 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# CircleProgress +# CIRCLEPROGRESS ------ **本项目是基于开源项目CircleProgress进行openharmony的移植和开发的，可以通过项目标签以及github地址 （https://github.com/MyLifeMyTravel/CircleProgress） 追踪到原项目版本** -- Gitee