From 49bcbf75d71f825ba31859b65b289ff6689d2b40 Mon Sep 17 00:00:00 2001 From: cuizhaofei Date: Fri, 18 Jun 2021 16:21:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?.gitignore=E6=96=87=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 47 +++++++---------------------------------------- 1 file changed, 7 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index 04f02a6..42b4248 100644 --- a/.gitignore +++ b/.gitignore @@ -1,42 +1,9 @@ -# Built application files -*.apk -*.ap_ - -# Files for the Dalvik VM -*.dex - -# Java class files -*.class - -# Generated files -bin/ -gen/ - -# Gradle files -.gradle/ -build/ - -# Local configuration file (sdk path, etc) -local.properties - -# Proguard folder generated by Eclipse -proguard/ - -# Android Studio -.idea -.gradle -build/ *.iml - -# Windows thumbnail db -Thumbs.db - -# OSX files +.gradle +.idea/* .DS_Store - -# Eclipse project files -.classpath -.project - -# Don't ignore sample.apk -!sample.apk \ No newline at end of file +/build +/captures +.externalNativeBuild +/entry/.preview +.cxx -- Gitee From 3314ab050af51ae9dcbf765c5a74ca9d86fff0e7 Mon Sep 17 00:00:00 2001 From: cuizhaofei Date: Wed, 30 Jun 2021 14:34:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=82=E9=85=8DSDK6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 11 +++++++---- README.md | 12 ++++++------ build.gradle | 8 ++++---- entry/build.gradle | 6 +++--- entry/src/main/config.json | 5 ----- entry/src/ohosTest/config.json | 5 ----- library/build.gradle | 4 ++-- library/src/main/config.json | 5 ----- 8 files changed, 22 insertions(+), 34 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c846c5b..e3d3e6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -0.0.1-SNAPSHOT --------------- - -ohos 第一个版本，完整实现了原库的全部 api \ No newline at end of file +## 0.0.2-SNAPSHOT +ohos 第2个版本 + * 更新sdk6 + +## 0.0.1-SNAPSHOT +ohos 第1个版本 + * 实现了原库的全部api \ No newline at end of file diff --git a/README.md b/README.md index 0b977f4..d8682ae 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # VNTNumberPickerPreference #### 项目介绍 -- 项目名称：VNTNumberPickerPreference数字选择器 +- 项目名称：VNTNumberPickerPreference - 所属系列：openharmony的第三方组件适配移植 - 功能：实现VNTNumberPickerPreference数字选择器值自动保存 - 项目移植状态：主功能完成 - 调用差异：无 +- 开发版本：sdk6，DevEco Studio2.2 Beta1 - 基线版本: Release v1.0.0 -- 开发版本：sdk5，DevEco Studio2.1 Release #### 效果演示 @@ -27,12 +27,12 @@ ``` dependencies { - implementation('com.gitee.chinasoft_ohos:vntNumber_PickerPre:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:vntNumber_PickerPre:0.0.2-SNAPSHOT') ...... } ``` -在sdk5，DevEco Studio2.1 Release下项目可直接运行 +在sdk6，DevEco Studio2.2 Beta1下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 @@ -86,13 +86,13 @@ CodeCheck代码测试无异常 CloudTest代码测试无异常 -火绒安全病毒安全检测通过 +病毒安全检测通过 当前版本demo功能与原组件基本无差异 #### 版本迭代 -- 0.0.1-SNAPSHOT +- 0.0.2-SNAPSHOT #### 版权和许可信息 ``` diff --git a/build.gradle b/build.gradle index 78d567d..85f19b1 100644 --- a/build.gradle +++ b/build.gradle @@ -2,9 +2,9 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + 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 72af0ff..17c72fd 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 4 + compatibleSdkVersion 5 } buildTypes { release { @@ -21,7 +21,7 @@ dependencies { testImplementation 'junit:junit:4.13' ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100' implementation 'io.openharmony.tpc.thirdlib:XPopup:1.0.3' - implementation('com.gitee.chinasoft_ohos:vntNumber_PickerPre:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:vntNumber_PickerPre:0.0.2-SNAPSHOT') implementation 'io.openharmony.tpc.thirdlib:RippleEffect:1.0.1' } decc { diff --git a/entry/src/main/config.json b/entry/src/main/config.json index b185c0b..ec5dfd1 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": 4, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": {}, diff --git a/entry/src/ohosTest/config.json b/entry/src/ohosTest/config.json index 4e93dc2..78010e1 100644 --- a/entry/src/ohosTest/config.json +++ b/entry/src/ohosTest/config.json @@ -5,11 +5,6 @@ "version": { "code": 1000000, "name": "1.0.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": {}, diff --git a/library/build.gradle b/library/build.gradle index da7649f..f4483c3 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.huawei.ohos.library' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } buildTypes { release { diff --git a/library/src/main/config.json b/library/src/main/config.json index 51fcd41..d9f1443 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": 4, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": { -- Gitee