diff --git a/.gitignore b/.gitignore index 603b14077394cd2294ac6922fe619669630ef3ab..757b427e2080e8334e77222974b098fd1e79fd51 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /captures .externalNativeBuild .cxx +upload.gradle \ No newline at end of file diff --git a/.idea/$PRODUCT_WORKSPACE_FILE$ b/.idea/$PRODUCT_WORKSPACE_FILE$ new file mode 100644 index 0000000000000000000000000000000000000000..3733e0d369c0331583e53353e77299dc56783aab --- /dev/null +++ b/.idea/$PRODUCT_WORKSPACE_FILE$ @@ -0,0 +1,19 @@ + + + + + + + 1.8 + + + + + + + + \ No newline at end of file diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml new file mode 100644 index 0000000000000000000000000000000000000000..6eefe0e18e7f9b22e04bd7ae191213bd65c48515 --- /dev/null +++ b/.idea/checkstyle-idea.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000000000000000000000000000000000000..ebcbc5e78e5d9a6b8412b2a6fea958c9fb704df4 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,90 @@ + + + + + +
+ + + + xmlns:ohos + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.huawei.com/res/ohos + + + +
+
+ + + + .*:height + + http://schemas.huawei.com/res/ohos + + + +
+
+ + + + .*:width + + http://schemas.huawei.com/res/ohos + + + +
+
+ + + + ohos:.* + + http://schemas.huawei.com/res/ohos + + + BY_NAME + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000000000000000000000000000000000000..61a9130cd9669c3843e6445dfe1fee2d493869bc --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000000000000000000000000000000000000..07718e26d7ec2fee9e3cf88d47ff08e14716f0f5 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000000000000000000000000000000000000..dc31bf4ca80f663480e9b93fd8eb75b471cdeb9a --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000000000000000000000000000000000000..f43837a9d879322d3f3c732d212a3e507d555196 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/previewer/phone/phoneSettingConfig_-1760090840.json b/.idea/previewer/phone/phoneSettingConfig_-1760090840.json new file mode 100644 index 0000000000000000000000000000000000000000..78eb57dc08fbe128df6330c0cca9865faa8e367d --- /dev/null +++ b/.idea/previewer/phone/phoneSettingConfig_-1760090840.json @@ -0,0 +1,25 @@ +{ + "setting": { + "1.0.1": { + "Language": { + "args": { + "Language": "zh-CN" + } + } + } + }, + "frontend": { + "1.0.0": { + "Resolution": { + "args": { + "Resolution": "360*750" + } + }, + "DeviceType": { + "args": { + "DeviceType": "phone" + } + } + } + } +} \ No newline at end of file diff --git a/.idea/previewer/previewConfig.json b/.idea/previewer/previewConfig.json new file mode 100644 index 0000000000000000000000000000000000000000..80354357f754b792ac2a9f6b7c36324396c5b703 --- /dev/null +++ b/.idea/previewer/previewConfig.json @@ -0,0 +1,7 @@ +{ + "1.0.0": { + "LastPreviewDevice": { + "E:\\labelview\\entry": [] + } + } +} \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000000000000000000000000000000000..45cf85c200ef6f73a8727ea65ecddb01a2c8130d --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 88a1aa87c0a260d908d16091dfe65d6f008d4586..1d3fd10edf26c404446b42a8dbfecdda937401a8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # labelview-master -**本项目是基于开源项目 labelview 进行openharmony化的移植和开发的，可以通过项目标签以及github地址（ https://github.com/linger1216/labelview ）追踪到原安卓项目版本** +**本项目是基于开源项目 labelview 进行openharmony的移植和开发的，可以通过项目标签以及github地址（ https://github.com/linger1216/labelview ）追踪到原安卓项目版本** #### 项目介绍 - 项目名称：labeView @@ -28,13 +28,26 @@ ![img](img/labelview.gif) #### 安装教程 -1、下载Labelview的har包Labelview.har（位于: https://gitee.com/chinasoft_ohos/labelview/releases ）。 +1.在项目根目录下的build.gradle文件中， -2、启动 DevEco Studio，将下载的har包，导入工程目录“entry->libs”下。 +```gradle +allprojects { + repositories { + maven { + url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' + } + } +} +``` -3、在moudle级别下的build.gradle文件中添加依赖，在dependences标签中增加对libs目录下har包的引用。 +2.在entry模块的build.gradle文件中， -dependencies { implementation fileTree(dir: 'libs', include: ['.jar', '.har']) …… } + ```gradle + dependencies { + implementation('com.gitee.chinasoft_ohos:labelview:0.0.1-SNAPSHOT') + ...... + } + ``` #### 使用说明 @@ -206,7 +219,7 @@ CloudTest代码测试无异常 #### 版本迭代 -- v0.0.1_alpha +- 0.0.1-SNAPSHOT #### 版权和许可信息 Copyright 2014 linger1216 diff --git a/build.gradle b/build.gradle index 0f37d1b371f1632aaf2af4a2814463596cc0ddf0..ff7362f67029f35dec778c6749a2269326af9339 100755 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,9 @@ allprojects { maven { url 'https://developer.huawei.com/repo/' } + maven { + url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' + } jcenter() } } diff --git a/entry/build.gradle b/entry/build.gradle index bc93c6df4d133fd5fadb1f904ff1321f4bec2f7c..80f0e86479b5e85d8354835afe77e40a53145c69 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -8,4 +8,5 @@ ohos { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) + implementation('com.gitee.chinasoft_ohos:labelview:0.0.1-SNAPSHOT') } diff --git a/entry/libs/labelview.har b/entry/libs/labelview.har new file mode 100644 index 0000000000000000000000000000000000000000..88e314ac76f71c15db36f20949ac5e6cbd52c8df Binary files /dev/null and b/entry/libs/labelview.har differ diff --git a/lib/build.gradle b/lib/build.gradle index 312bc1c336a2b750048a182991e5872344e45dbf..a87e33429ac373503f7d2483109d16f5f25a775e 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -1,4 +1,12 @@ apply plugin: 'com.huawei.ohos.library' +apply from: '../upload.gradle' + +rootProject.ext { + DEFAULT_GROUP_ID = 'com.gitee.chinasoft_ohos' //固定的groupId，服务商自行申请 + DEFAULT_ARTIFACT_ID = "labelview" //项目ID，填写项目名称。 + DEFAULT_VERSION = '0.0.1-SNAPSHOT' //版本号，发新版本时修改 +} + ohos { compileSdkVersion 5 defaultConfig { @@ -7,6 +15,7 @@ ohos { } + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' diff --git a/lib/lib.iml b/lib/lib.iml index ce16faa7ce602c929c073535ac97987aff322dba..000ba0ef406e7b8dffb671750f888a0e845c60e5 100644 --- a/lib/lib.iml +++ b/lib/lib.iml @@ -1,5 +1,5 @@ - +