From 77eb9da2bff006367b0a30a75324c9d8088e7c40 Mon Sep 17 00:00:00 2001 From: lilinfeng-z <3211270061@qq.com> Date: Mon, 26 Jul 2021 15:57:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9codecheck=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kongzue/stacklabel/MainAbility.java | 5 +++++ .../java/com/kongzue/stacklabel/MyApplication.java | 5 +++++ .../kongzue/stacklabel/slice/MainAbilitySlice.java | 13 +++++++++---- .../com/kongzue/stacklabelview/StackLabel.java | 14 +++++++------- .../com/kongzue/stacklabelview/StackLayout.java | 12 ++++++------ .../interfaces/OnLabelClickListener.java | 9 ++++++++- 6 files changed, 40 insertions(+), 18 deletions(-) diff --git a/entry/src/main/java/com/kongzue/stacklabel/MainAbility.java b/entry/src/main/java/com/kongzue/stacklabel/MainAbility.java index a8d27f8..dbe837c 100644 --- a/entry/src/main/java/com/kongzue/stacklabel/MainAbility.java +++ b/entry/src/main/java/com/kongzue/stacklabel/MainAbility.java @@ -5,6 +5,11 @@ import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; +/** + * 主页面 + * + * @since 2021-07-20 + */ public class MainAbility extends Ability { @Override public void onStart(Intent intent) { diff --git a/entry/src/main/java/com/kongzue/stacklabel/MyApplication.java b/entry/src/main/java/com/kongzue/stacklabel/MyApplication.java index 69b2e23..3d98d61 100644 --- a/entry/src/main/java/com/kongzue/stacklabel/MyApplication.java +++ b/entry/src/main/java/com/kongzue/stacklabel/MyApplication.java @@ -16,6 +16,11 @@ package com.kongzue.stacklabel; import ohos.aafwk.ability.AbilityPackage; +/** + * MyApplication + * + * @since 2021-07-20 + */ public class MyApplication extends AbilityPackage { @Override public void onInitialize() { diff --git a/entry/src/main/java/com/kongzue/stacklabel/slice/MainAbilitySlice.java b/entry/src/main/java/com/kongzue/stacklabel/slice/MainAbilitySlice.java index cfce81d..ba99e42 100644 --- a/entry/src/main/java/com/kongzue/stacklabel/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/kongzue/stacklabel/slice/MainAbilitySlice.java @@ -29,6 +29,11 @@ import ohos.hiviewdfx.HiLogLabel; import java.util.ArrayList; import java.util.List; +/** + * MainAbilitySlice + * + * @since 2021-07-20 + */ public class MainAbilitySlice extends AbilitySlice { private static final HiLogLabel HILOGLABEL = new HiLogLabel(HiLog.LOG_APP, 0x222, "my_app"); private StackLabel stackLabelView; @@ -145,16 +150,16 @@ public class MainAbilitySlice extends AbilitySlice { shapeElement.setShape(ShapeElement.LINE); // 设置背景类型 shapeElement.setRgbColors(new RgbColor[]{RgbColor.fromArgbInt(Color.getIntColor("#D81B60")), RgbColor.fromArgbInt(Color.getIntColor("#D81B60"))}); // 设置颜色值 起始与结束时的颜色 shapeElement.setGradientOrientation(ShapeElement.Orientation.TOP_TO_BOTTOM); // 设置渐变方向 - shapeElement.setStroke(50, RgbColor.fromArgbInt(Color.rgb(255, 0, 0)));// 设置光标高度 - editMaxNum.setCursorElement(shapeElement);// 设置光标背景色 + shapeElement.setStroke(50, RgbColor.fromArgbInt(Color.rgb(255, 0, 0))); // 设置光标高度 + editMaxNum.setCursorElement(shapeElement); // 设置光标背景色 // 设置光标颜色 ShapeElement shapeElementadd = new ShapeElement(); shapeElementadd.setShape(ShapeElement.LINE); // 设置背景类型 shapeElementadd.setRgbColors(new RgbColor[]{RgbColor.fromArgbInt(Color.getIntColor("#D81B60")), RgbColor.fromArgbInt(Color.getIntColor("#D81B60"))}); // 设置颜色值 起始与结束时的颜色 shapeElementadd.setGradientOrientation(ShapeElement.Orientation.TOP_TO_BOTTOM); // 设置渐变方向 - shapeElementadd.setStroke(50, RgbColor.fromArgbInt(Color.rgb(255, 0, 0)));// 设置光标高度 - editAdd.setCursorElement(shapeElementadd);// 设置光标背景色 + shapeElementadd.setStroke(50, RgbColor.fromArgbInt(Color.rgb(255, 0, 0))); // 设置光标高度 + editAdd.setCursorElement(shapeElementadd); // 设置光标背景色 } private void initThumbElement() { diff --git a/stacklabelview/src/main/java/com/kongzue/stacklabelview/StackLabel.java b/stacklabelview/src/main/java/com/kongzue/stacklabelview/StackLabel.java index e1065b3..2e078ab 100644 --- a/stacklabelview/src/main/java/com/kongzue/stacklabelview/StackLabel.java +++ b/stacklabelview/src/main/java/com/kongzue/stacklabelview/StackLabel.java @@ -63,7 +63,7 @@ public class StackLabel extends ComponentContainer implements Component.Estimate * 初始化 * * @param context context - * @param attrs attrs + * @param attrs attrs */ public StackLabel(Context context, AttrSet attrs) { super(context, attrs); @@ -74,8 +74,8 @@ public class StackLabel extends ComponentContainer implements Component.Estimate /** * 初始化 * - * @param context context - * @param attrs attrs + * @param context context + * @param attrs attrs * @param defStyleAttr defStyleAttr */ public StackLabel(Context context, AttrSet attrs, int defStyleAttr) { @@ -149,7 +149,7 @@ public class StackLabel extends ComponentContainer implements Component.Estimate @Override public boolean onEstimateSize(int width, int i1) { widthSize = EstimateSpec.getSize(width); - setEstimatedSize(widthSize, newHeight);// 设置宽高 + setEstimatedSize(widthSize, newHeight); // 设置宽高 refreshViews(); return false; } @@ -165,8 +165,8 @@ public class StackLabel extends ComponentContainer implements Component.Estimate for (int i = 0; i < items.size(); i++) { Component item = items.get(i); - int mWidth = Component.EstimateSpec.getSizeWithMode(maxWidth, EstimateSpec.UNCONSTRAINT); // AT_MOST：先按照最大宽度计算，如果小于则按实际值，如果大于，按最大宽度 - int mHeight = Component.EstimateSpec.getSizeWithMode(0, EstimateSpec.UNCONSTRAINT); // UNSPECIFIED：不确定，根据实际情况计算 + int mWidth = Component.EstimateSpec.getSizeWithMode(maxWidth, EstimateSpec.UNCONSTRAINT); // AT_MOST：先按照最大宽度计算，如果小于则按实际值，如果大于，按最大宽度 + int mHeight = Component.EstimateSpec.getSizeWithMode(0, EstimateSpec.UNCONSTRAINT); // UNSPECIFIED：不确定，根据实际情况计算 item.estimateSize(mWidth, mHeight); int childWidth = item.getEstimatedWidth(); @@ -400,7 +400,7 @@ public class StackLabel extends ComponentContainer implements Component.Estimate return this; } - private List whichIsSelected; // 初始化已选择列表 + private List whichIsSelected; // 初始化已选择列表 public StackLabel setSelectMode(boolean selectMode, List whichIsSelected) { this.selectMode = selectMode; diff --git a/stacklabelview/src/main/java/com/kongzue/stacklabelview/StackLayout.java b/stacklabelview/src/main/java/com/kongzue/stacklabelview/StackLayout.java index b4f4655..e6e826f 100644 --- a/stacklabelview/src/main/java/com/kongzue/stacklabelview/StackLayout.java +++ b/stacklabelview/src/main/java/com/kongzue/stacklabelview/StackLayout.java @@ -22,7 +22,7 @@ import java.util.List; * @since 2019/4/15 01:13 */ public class StackLayout extends ComponentContainer implements Component.DrawTask, Component.EstimateSizeListener, ComponentContainer.ArrangeListener { - private static HiLogLabel hiLogLabel = new HiLogLabel(HiLog.LOG_APP,0x222,"my_app"); + private static HiLogLabel hiLogLabel = new HiLogLabel(HiLog.LOG_APP, 0x222, "my_app"); private Context context; private int itemMargin = 0; private int widthSize; @@ -63,7 +63,7 @@ public class StackLayout extends ComponentContainer implements Component.DrawTas } @Override - public boolean onArrange(int i, int i1, int i2, int i3) { + public boolean onArrange(int left, int top, int width, int height) { return false; } @@ -75,7 +75,7 @@ public class StackLayout extends ComponentContainer implements Component.DrawTas // 加载值 itemMargin = AttrUtils.getDimensionValueByAttr(attrs, "itemMargin", itemMargin); } catch (Exception e) { - HiLog.info(hiLogLabel,"error-->"+e.getMessage()); + HiLog.info(hiLogLabel, "error-->" + e.getMessage()); } setEstimateSizeListener(this); @@ -89,7 +89,7 @@ public class StackLayout extends ComponentContainer implements Component.DrawTas public boolean onEstimateSize(int width, int i1) { widthSize = EstimateSpec.getSize(width); - setEstimatedSize(widthSize, newHeight);// 设置宽高 + setEstimatedSize(widthSize, newHeight); // 设置宽高 refreshViews(); return false; } @@ -111,8 +111,8 @@ public class StackLayout extends ComponentContainer implements Component.DrawTas for (int i = 0; i < items.size(); i++) { Component item = items.get(i); - int mWidth = Component.EstimateSpec.getSizeWithMode(0, EstimateSpec.UNCONSTRAINT); // AT_MOST：先按照最大宽度计算，如果小于则按实际值，如果大于，按最大宽度 - int mHeight = Component.EstimateSpec.getSizeWithMode(0, EstimateSpec.UNCONSTRAINT); // UNSPECIFIED：不确定，根据实际情况计算 + int mWidth = Component.EstimateSpec.getSizeWithMode(0, EstimateSpec.UNCONSTRAINT); // AT_MOST：先按照最大宽度计算，如果小于则按实际值，如果大于，按最大宽度 + int mHeight = Component.EstimateSpec.getSizeWithMode(0, EstimateSpec.UNCONSTRAINT); // UNSPECIFIED：不确定，根据实际情况计算 item.estimateSize(mWidth, mHeight); int childWidth = item.getEstimatedWidth(); diff --git a/stacklabelview/src/main/java/com/kongzue/stacklabelview/interfaces/OnLabelClickListener.java b/stacklabelview/src/main/java/com/kongzue/stacklabelview/interfaces/OnLabelClickListener.java index 419478d..6974323 100644 --- a/stacklabelview/src/main/java/com/kongzue/stacklabelview/interfaces/OnLabelClickListener.java +++ b/stacklabelview/src/main/java/com/kongzue/stacklabelview/interfaces/OnLabelClickListener.java @@ -11,5 +11,12 @@ import ohos.agp.components.Component; * @since 2018/10/24 22:11 */ public interface OnLabelClickListener { - void onClick(int index, Component v, String s); + /** + * 点击事件 + * + * @param index index + * @param component component + * @param string string + */ + void onClick(int index, Component component, String string); } -- Gitee