From 57a3e1eb83c7fbed57dfe92615709fb67ffcc430 Mon Sep 17 00:00:00 2001
From: wu361 <WuTengLong123>
Date: Wed, 21 Apr 2021 10:56:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?md=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   1 +
 CHANGELOG.md                                  |  14 +++
 README.md                                     |  27 +++--
 build.gradle                                  |   3 +
 entry/build.gradle                            |   1 +
 lib/build.gradle                              |   9 ++
 lib/lib.iml                                   |   2 +-
 .../java/com/lid/lib/LabelButtonView.java     |   6 +-
 .../main/java/com/lid/lib/LabelImageView.java |   6 +-
 .../main/java/com/lid/lib/LabelTextView.java  |   6 +-
 .../java/com/lid/lib/LabelViewHelper.java     |  57 ++-------
 .../main/java/com/lid/lib/bean/LabelBean.java | 110 ------------------
 .../com/lid/lib/utils/TypedAttrUtils.java     |   6 +-
 13 files changed, 71 insertions(+), 177 deletions(-)
 create mode 100644 CHANGELOG.md
 delete mode 100644 lib/src/main/java/com/lid/lib/bean/LabelBean.java

diff --git a/.gitignore b/.gitignore
index 603b140..757b427 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /captures
 .externalNativeBuild
 .cxx
+upload.gradle
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..26cd0a7
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,14 @@
+## 0.0.2-SNAPSHOT
+* modification: Update copyright
+
+## 0.0.1-SNAPSHOT
+* refactor: For module library Android-to-OpenHarmony
+
+## v1.1.2
+* Merge pull request #18 from Jilberta/master, and added Label Text Styles usage to Demo.
+
+## v1.1.1
+* fix the rect of text offset
+
+## v1.1.0
+* rewrite new labelview
\ No newline at end of file
diff --git a/README.md b/README.md
index 88a1aa8..b1b02e6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# labelview-master
+# labelview
 
-**本项目是基于开源项目 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.2-SNAPSHOT
 
 #### 版权和许可信息
 Copyright 2014 linger1216
diff --git a/build.gradle b/build.gradle
index 0f37d1b..ff7362f 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 bc93c6d..80f0e86 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/lib/build.gradle b/lib/build.gradle
index 312bc1c..a87e334 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 ce16faa..06f75ae 100644
--- a/lib/lib.iml
+++ b/lib/lib.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":lib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="labelview-master" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":lib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.gitee.chinasoft_ohos" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="CheckStyle-IDEA-Module">
     <option name="configuration">
       <map />
diff --git a/lib/src/main/java/com/lid/lib/LabelButtonView.java b/lib/src/main/java/com/lid/lib/LabelButtonView.java
index 25ec0da..062f53e 100644
--- a/lib/src/main/java/com/lid/lib/LabelButtonView.java
+++ b/lib/src/main/java/com/lid/lib/LabelButtonView.java
@@ -34,7 +34,7 @@ public class LabelButtonView extends Button implements Component.DrawTask {
      * @param attrs
      */
     public LabelButtonView(Context context, AttrSet attrs) {
-        this(context, attrs, 0);
+        this(context, attrs, "");
     }
 
     /**
@@ -44,8 +44,8 @@ public class LabelButtonView extends Button implements Component.DrawTask {
      * @param attrs
      * @param defStyleAttr
      */
-    public LabelButtonView(Context context, AttrSet attrs, int defStyleAttr) {
-        super(context, attrs, String.valueOf(defStyleAttr));
+    public LabelButtonView(Context context, AttrSet attrs, String defStyleAttr) {
+        super(context, attrs, defStyleAttr);
         utils = new LabelViewHelper(context, attrs, defStyleAttr);
         addDrawTask(this);
     }
diff --git a/lib/src/main/java/com/lid/lib/LabelImageView.java b/lib/src/main/java/com/lid/lib/LabelImageView.java
index 7363a36..50ca3f3 100644
--- a/lib/src/main/java/com/lid/lib/LabelImageView.java
+++ b/lib/src/main/java/com/lid/lib/LabelImageView.java
@@ -35,7 +35,7 @@ public class LabelImageView extends Image implements Component.DrawTask {
      * @param attrs
      */
     public LabelImageView(Context context, AttrSet attrs) {
-        this(context, attrs, 0);
+        this(context, attrs, "");
         HiLog.info(LABEL, "LabelImageView");
     }
 
@@ -46,8 +46,8 @@ public class LabelImageView extends Image implements Component.DrawTask {
      * @param attrs
      * @param defStyleAttr
      */
-    public LabelImageView(Context context, AttrSet attrs, int defStyleAttr) {
-        super(context, attrs, String.valueOf(defStyleAttr));
+    public LabelImageView(Context context, AttrSet attrs, String defStyleAttr) {
+        super(context, attrs, defStyleAttr);
         utils = new LabelViewHelper(context, attrs, defStyleAttr);
         addDrawTask(this);
     }
diff --git a/lib/src/main/java/com/lid/lib/LabelTextView.java b/lib/src/main/java/com/lid/lib/LabelTextView.java
index d9d505a..50ce942 100644
--- a/lib/src/main/java/com/lid/lib/LabelTextView.java
+++ b/lib/src/main/java/com/lid/lib/LabelTextView.java
@@ -31,7 +31,7 @@ public class LabelTextView extends Text implements Component.DrawTask {
      * @param attrs
      */
     public LabelTextView(Context context, AttrSet attrs) {
-        this(context, attrs, 0);
+        this(context, attrs, "");
     }
 
     /**
@@ -41,8 +41,8 @@ public class LabelTextView extends Text implements Component.DrawTask {
      * @param attrs
      * @param defStyleAttr
      */
-    public LabelTextView(Context context, AttrSet attrs, int defStyleAttr) {
-        super(context, attrs, String.valueOf(defStyleAttr));
+    public LabelTextView(Context context, AttrSet attrs, String defStyleAttr) {
+        super(context, attrs, defStyleAttr);
         utils = new LabelViewHelper(context, attrs, defStyleAttr);
         addDrawTask(this);
     }
diff --git a/lib/src/main/java/com/lid/lib/LabelViewHelper.java b/lib/src/main/java/com/lid/lib/LabelViewHelper.java
index e5a6413..a5b02ef 100644
--- a/lib/src/main/java/com/lid/lib/LabelViewHelper.java
+++ b/lib/src/main/java/com/lid/lib/LabelViewHelper.java
@@ -2,7 +2,6 @@ package com.lid.lib;
 
 import static ohos.agp.components.AttrHelper.getDensity;
 
-import com.lid.lib.bean.LabelBean;
 import com.lid.lib.utils.TypedAttrUtils;
 
 import ohos.agp.components.AttrHelper;
@@ -80,14 +79,23 @@ public class LabelViewHelper {
      * @param attrs
      * @param defStyleAttr
      */
-    public LabelViewHelper(Context context, AttrSet attrs, int defStyleAttr) {
+    public LabelViewHelper(Context context, AttrSet attrs, String defStyleAttr) {
         this.context = context;
         fontList = new ArrayList<Font>();
 
         fontList.add(Font.DEFAULT_BOLD);
         fontList.add(Font.DEFAULT);
         fontList.add(Font.MONOSPACE);
-        getValue(attrs);
+
+        mDistance = TypedAttrUtils.getDimensionPixelSize(attrs, "label_distance", DEFAULT_DISTANCE);
+        mHeight = TypedAttrUtils.getDimensionPixelSize(attrs, "label_height", DEFAULT_HEIGHT);
+        mText = TypedAttrUtils.getString(attrs, "label_text", "HD");
+        mBackgroundColor = TypedAttrUtils.getColor(attrs, "label_backgroundColor", Color.BLACK);
+        mTextColor = TypedAttrUtils.getColor(attrs, "label_color", Color.WHITE);
+        mTextSize = TypedAttrUtils.getDimensionPixelSize(attrs, "label_textSize", DEFAULT_TEXT_SIZE);
+        mTextStyle = TypedAttrUtils.getDimensionPixelSize(attrs, "label_textStyle", 1);
+        mOrientation = TypedAttrUtils.getDimensionPixelSize(attrs, "label_orientation", 1);
+
         rectPaint = new Paint();
         rectPaint.setDither(true);
         rectPaint.setAntiAlias(true);
@@ -114,49 +122,6 @@ public class LabelViewHelper {
         textBound = new Rect();
     }
 
-    /**
-     * 获取自定义属性值
-     *
-     * @param attrs
-     */
-    public void getValue(AttrSet attrs) {
-        ArrayList<LabelBean> labelBeanList = new ArrayList<>();
-        LabelBean labelBean = new LabelBean();
-
-        for (int i = 0; i <= INT_5; i++) {
-            mDistance = TypedAttrUtils.getDimensionPixelSize(attrs, "label_distance", DEFAULT_DISTANCE);
-            mHeight = TypedAttrUtils.getDimensionPixelSize(attrs, "label_height", DEFAULT_HEIGHT);
-            mText = TypedAttrUtils.getString(attrs, "label_text", "HD");
-            mBackgroundColor = TypedAttrUtils.getColor(attrs, "label_backgroundColor", Color.BLACK);
-            mTextColor = TypedAttrUtils.getColor(attrs, "label_color", Color.WHITE);
-            mTextSize = TypedAttrUtils.getDimensionPixelSize(attrs, "label_textSize", DEFAULT_TEXT_SIZE);
-            mTextStyle = TypedAttrUtils.getDimensionPixelSize(attrs, "label_textStyle", 1);
-            mOrientation = TypedAttrUtils.getDimensionPixelSize(attrs, "label_orientation", 1);
-
-            labelBean.setDistance(mDistance);
-            labelBean.setHeight(mHeight);
-            labelBean.setText(mText);
-            labelBean.setBackgroundColor(mBackgroundColor);
-            labelBean.setTextSize(mTextSize);
-            labelBean.setTextStyle(mTextStyle);
-            labelBean.setOrientation(mOrientation);
-            labelBean.setTextcolor(mTextColor);
-            labelBeanList.add(labelBean);
-        }
-
-        for (int i = 0; i <= INT_5; i++) {
-            LabelBean labelBean1 = labelBeanList.get(i);
-            mDistance = labelBean1.getDistance();
-            mHeight = labelBean1.getHeight();
-            mText = labelBean1.getText();
-            mBackgroundColor = labelBean1.getBackgroundColor();
-            mTextSize = labelBean1.getTextSize();
-            mTextStyle = labelBean1.getTextStyle();
-            mOrientation = labelBean1.getOrientation();
-            mTextColor = labelBean1.getTextcolor();
-        }
-    }
-
     /**
      * onDraw
      *
diff --git a/lib/src/main/java/com/lid/lib/bean/LabelBean.java b/lib/src/main/java/com/lid/lib/bean/LabelBean.java
deleted file mode 100644
index 581003e..0000000
--- a/lib/src/main/java/com/lid/lib/bean/LabelBean.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.lid.lib.bean;
-
-import ohos.agp.utils.Color;
-
-/**
- * LabelBean;
- *
- * @since 2021-04-13
- */
-public class LabelBean {
-    private int distance;
-    private int height;
-    private int strokeWidth;
-    private String text;
-    private Color backgroundColor;
-    private int strokeColor;
-    private int textSize;
-    private int textStyle;
-    private boolean isVisual;
-    private int orientation;
-    private Color textcolor;
-
-    public Color getTextcolor() {
-        return textcolor;
-    }
-
-    public void setTextcolor(Color textcolor) {
-        this.textcolor = textcolor;
-    }
-
-    public int getDistance() {
-        return distance;
-    }
-
-    public void setDistance(int distance) {
-        this.distance = distance;
-    }
-
-    public int getHeight() {
-        return height;
-    }
-
-    public void setHeight(int height) {
-        this.height = height;
-    }
-
-    public int getStrokeWidth() {
-        return strokeWidth;
-    }
-
-    public void setStrokeWidth(int strokeWidth) {
-        this.strokeWidth = strokeWidth;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public Color getBackgroundColor() {
-        return backgroundColor;
-    }
-
-    public void setBackgroundColor(Color backgroundColor) {
-        this.backgroundColor = backgroundColor;
-    }
-
-    public int getStrokeColor() {
-        return strokeColor;
-    }
-
-    public void setStrokeColor(int strokeColor) {
-        this.strokeColor = strokeColor;
-    }
-
-    public int getTextSize() {
-        return textSize;
-    }
-
-    public void setTextSize(int textSize) {
-        this.textSize = textSize;
-    }
-
-    public int getTextStyle() {
-        return textStyle;
-    }
-
-    public void setTextStyle(int textStyle) {
-        this.textStyle = textStyle;
-    }
-
-    public boolean isVisual() {
-        return isVisual;
-    }
-
-    public void setVisual(boolean ismVisual) {
-        this.isVisual = ismVisual;
-    }
-
-    public int getOrientation() {
-        return orientation;
-    }
-
-    public void setOrientation(int orientation) {
-        this.orientation = orientation;
-    }
-}
diff --git a/lib/src/main/java/com/lid/lib/utils/TypedAttrUtils.java b/lib/src/main/java/com/lid/lib/utils/TypedAttrUtils.java
index fdcedf3..ffdf214 100644
--- a/lib/src/main/java/com/lid/lib/utils/TypedAttrUtils.java
+++ b/lib/src/main/java/com/lid/lib/utils/TypedAttrUtils.java
@@ -1,18 +1,16 @@
 /*
- * Copyright (C) 2016 Jared Rummler
- *
+ * 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 a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     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.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package com.lid.lib.utils;
-- 
Gitee


From 35a0282764478e37ad8214b07108b9e7023ce62b Mon Sep 17 00:00:00 2001
From: wu361 <WuTengLong123>
Date: Wed, 21 Apr 2021 11:17:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=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         | 4 ++++
 README.md          | 2 +-
 entry/build.gradle | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 757b427..0ec1c51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,8 @@
 /captures
 .externalNativeBuild
 .cxx
+gradle.properties
+gradlew
+gradlew.bat
+local.properties
 upload.gradle
\ No newline at end of file
diff --git a/README.md b/README.md
index b1b02e6..b33841e 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ allprojects {
 
  ```gradle
  dependencies {
-    implementation('com.gitee.chinasoft_ohos:labelview:0.0.1-SNAPSHOT')
+    implementation('com.gitee.chinasoft_ohos:labelview:0.0.2-SNAPSHOT')
     ......  
  }
  ```
diff --git a/entry/build.gradle b/entry/build.gradle
index 80f0e86..b8ea0ae 100644
--- a/entry/build.gradle
+++ b/entry/build.gradle
@@ -8,5 +8,5 @@ ohos {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.har'])
-    implementation('com.gitee.chinasoft_ohos:labelview:0.0.1-SNAPSHOT')
+    implementation project(path: ':lib')
 }
-- 
Gitee