diff --git a/app/src/main/java/com/example/rwidgethelper/MainAbility.java b/app/src/main/java/com/example/rwidgethelper/MainAbility.java index 90de4a7605de319301375013cd8509c049cd35b1..0279e84c18c768ae01410cd534633c53999f4e00 100644 --- a/app/src/main/java/com/example/rwidgethelper/MainAbility.java +++ b/app/src/main/java/com/example/rwidgethelper/MainAbility.java @@ -1,6 +1,5 @@ package com.example.rwidgethelper; - import com.example.rwidgethelper.slice.MainAbilitySlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/app/src/main/java/com/example/rwidgethelper/Pagelider/RTextVersion.java b/app/src/main/java/com/example/rwidgethelper/Pagelider/RTextVersion.java index 41efdb2b6125485ffd1d6ecd4915c7a1ebbf41ed..f58e46734c8922674ff6c0638da57e0b5695785c 100644 --- a/app/src/main/java/com/example/rwidgethelper/Pagelider/RTextVersion.java +++ b/app/src/main/java/com/example/rwidgethelper/Pagelider/RTextVersion.java @@ -9,6 +9,11 @@ public class RTextVersion implements ComponentOwner { private AbilityContext mContext; private Component root; + /** + * 构造 + * + * @param mContext 上下文 + */ public RTextVersion(AbilityContext mContext) { init(mContext); } diff --git a/app/src/main/java/com/example/rwidgethelper/component/RCommonAbility.java b/app/src/main/java/com/example/rwidgethelper/component/RCommonAbility.java index 17e5f0061300c3b3f6650344028c655e203a4327..717564067e598bd92d9dcdffea0d3f599c7336d9 100644 --- a/app/src/main/java/com/example/rwidgethelper/component/RCommonAbility.java +++ b/app/src/main/java/com/example/rwidgethelper/component/RCommonAbility.java @@ -16,7 +16,6 @@ public class RCommonAbility extends Ability { componentById.setClickedListener(new Component.ClickedListener() { @Override public void onClick(Component component) { - } }); } diff --git a/app/src/main/java/com/example/rwidgethelper/component/RTextFieldAbility.java b/app/src/main/java/com/example/rwidgethelper/component/RTextFieldAbility.java index 1d6ff380e49d5895d718fa39d7e64a013361c66d..28dfdad1b4398f041f322ab8143a31b5588ba2c1 100644 --- a/app/src/main/java/com/example/rwidgethelper/component/RTextFieldAbility.java +++ b/app/src/main/java/com/example/rwidgethelper/component/RTextFieldAbility.java @@ -83,5 +83,4 @@ public class RTextFieldAbility extends Ability { Matcher matcher = compile.matcher(s); return matcher.replaceAll("").trim(); } - } diff --git a/app/src/main/java/com/example/rwidgethelper/component/RipperAbility.java b/app/src/main/java/com/example/rwidgethelper/component/RipperAbility.java index 7a09bb1bc1dbbe2ca0651b61711dd4974b27126c..f9c95fd57eb8a42397e4cb794bdb50d1113f0458 100644 --- a/app/src/main/java/com/example/rwidgethelper/component/RipperAbility.java +++ b/app/src/main/java/com/example/rwidgethelper/component/RipperAbility.java @@ -30,9 +30,8 @@ public class RipperAbility extends Ability implements AbsButton.CheckedStateChan }); } - @Override - public void onCheckedChanged(AbsButton absButton, boolean b) { - absButton.setClickable(!b); + public void onCheckedChanged(AbsButton absButton, boolean isClickable) { + absButton.setClickable(!isClickable); } } diff --git a/app/src/main/java/com/example/rwidgethelper/component/RtextAbility.java b/app/src/main/java/com/example/rwidgethelper/component/RtextAbility.java index 5f474a3753713324d261cf3c2a85319ec75e602f..1649154772389d3e818be05aad21f80d79e67cf7 100644 --- a/app/src/main/java/com/example/rwidgethelper/component/RtextAbility.java +++ b/app/src/main/java/com/example/rwidgethelper/component/RtextAbility.java @@ -5,7 +5,6 @@ import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; public class RtextAbility extends Ability { - @Override public void onStart(Intent intent) { super.onStart(intent); diff --git a/app/src/main/java/com/example/rwidgethelper/slice/MainAbilitySlice.java b/app/src/main/java/com/example/rwidgethelper/slice/MainAbilitySlice.java index 91f4208815322d8a509a1f187517ac1f313fe089..0ea7a2a7e074c9b9079332d096d47867b00e60f0 100644 --- a/app/src/main/java/com/example/rwidgethelper/slice/MainAbilitySlice.java +++ b/app/src/main/java/com/example/rwidgethelper/slice/MainAbilitySlice.java @@ -9,6 +9,7 @@ import ohos.agp.components.Component; public class MainAbilitySlice extends AbilitySlice implements Component.ClickedListener { private boolean btnFlag; + @Override protected void onStart(Intent intent) { super.onStart(intent); diff --git a/app/src/main/java/com/example/rwidgethelper/slice/RtextAbilitySlice.java b/app/src/main/java/com/example/rwidgethelper/slice/RtextAbilitySlice.java index 95fa785c7f95887ed81a7681f5122d89db38c454..753b0a83e9a121302a6a7185bd48b95891bc31f3 100644 --- a/app/src/main/java/com/example/rwidgethelper/slice/RtextAbilitySlice.java +++ b/app/src/main/java/com/example/rwidgethelper/slice/RtextAbilitySlice.java @@ -19,6 +19,7 @@ import java.util.Optional; public class RtextAbilitySlice extends AbilitySlice { private List pageList = new ArrayList<>(); + @Override public void onStart(Intent intent) { super.onStart(intent); @@ -44,6 +45,12 @@ public class RtextAbilitySlice extends AbilitySlice { private List components; private Context context; + /** + * 构造 + * + * @param components component + * @param context 上下文 + */ public PageProvider(List components, Context context) { this.components = components; this.context = context; diff --git a/library/src/main/java/com/ruffian/library/widget/clip/ClipHelper.java b/library/src/main/java/com/ruffian/library/widget/clip/ClipHelper.java index f1a77ff4a298cf94d8cf941ab62d37ba01297974..293c22243f021a78df60d262c03d82da50054322 100644 --- a/library/src/main/java/com/ruffian/library/widget/clip/ClipHelper.java +++ b/library/src/main/java/com/ruffian/library/widget/clip/ClipHelper.java @@ -23,6 +23,9 @@ public class ClipHelper implements IClip { private Component mComponent; private boolean isClipLayout; + /** + * 构造 + */ public ClipHelper() { clipPaint.setAntiAlias(true); clipPaint.setColor(Color.BLUE); diff --git a/library/src/main/java/com/ruffian/library/widget/clip/IClip.java b/library/src/main/java/com/ruffian/library/widget/clip/IClip.java index a04d1d84fab21533bce2dcb9cfa2057d1deaaabd..40e595abac0a3ee28f9669d021be75af32eaf87c 100644 --- a/library/src/main/java/com/ruffian/library/widget/clip/IClip.java +++ b/library/src/main/java/com/ruffian/library/widget/clip/IClip.java @@ -8,8 +8,20 @@ import ohos.agp.render.Canvas; * @author ZhongDaFeng */ public interface IClip { - + /** + * 图 + * + * @param canvas 绘画 + */ public void dispatchDraw(Canvas canvas); + /** + * 布局 + * + * @param left 左边 + * @param top 上边 + * @param right 右边 + * @param bottom 下边 + */ public void onLayout(int left, int top, int right, int bottom); } diff --git a/library/src/main/java/com/ruffian/library/widget/component/RStackLayout.java b/library/src/main/java/com/ruffian/library/widget/component/RStackLayout.java index 4d1e3b7f313227b89c58a4e0f53d14b74f0e0ced..1a891d6f1a3a198fe7ed6feffe04b532f40a9e6a 100644 --- a/library/src/main/java/com/ruffian/library/widget/component/RStackLayout.java +++ b/library/src/main/java/com/ruffian/library/widget/component/RStackLayout.java @@ -14,14 +14,32 @@ import ohos.app.Context; public class RStackLayout extends StackLayout implements RHelper { private RBaseHelper mHelper; + /** + * 构造 + * + * @param context 上下文 + */ public RStackLayout(Context context) { this(context, null); } + /** + * 构造 + * + * @param context 上下文 + * @param attrSet 属性集 + */ public RStackLayout(Context context, AttrSet attrSet) { this(context, attrSet, ""); } + /** + * 构造 + * + * @param context 上下文 + * @param attrSet 属性集 + * @param styleName name + */ public RStackLayout(Context context, AttrSet attrSet, String styleName) { super(context, attrSet, styleName); mHelper = new RBaseHelper(context, this, attrSet); diff --git a/library/src/main/java/com/ruffian/library/widget/helper/RCheckHelper.java b/library/src/main/java/com/ruffian/library/widget/helper/RCheckHelper.java index a03fb8d47a5471776c532eb8086d058de8e7fd31..9f17e97de1882623fbc9ee6912f8c49db3396061 100644 --- a/library/src/main/java/com/ruffian/library/widget/helper/RCheckHelper.java +++ b/library/src/main/java/com/ruffian/library/widget/helper/RCheckHelper.java @@ -18,7 +18,6 @@ import ohos.multimodalinput.event.TouchEvent; * * @author ZhongDaFeng */ - public class RCheckHelper extends RTextHelper implements Component.TouchEventListener, Component.DrawTask { // Text private Color mTextColorChecked; @@ -48,10 +47,13 @@ public class RCheckHelper extends RTextHelper implements Component.TouchEventLis states = new int[6][]; } - /* + /** * 提交 * - * */ + * @param context 上下文 + * @param component component + * @param attrs 属性集 + */ public RCheckHelper(Context context, Component component, AttrSet attrs) { super(context, (Text) component, attrs); mComponent.addDrawTask(this::onDraw); @@ -341,7 +343,6 @@ public class RCheckHelper extends RTextHelper implements Component.TouchEventLis } mComponent.invalidate(); - // paint.setColor(text_ripple_color); } }); if (mComponent.getWidth() > mComponent.getHeight()) { diff --git a/library/src/main/java/com/ruffian/library/widget/helper/RImageHelper.java b/library/src/main/java/com/ruffian/library/widget/helper/RImageHelper.java index bf42ea6298c5217af76b82f0235fe5881164740d..fe8c31e124d0da2fe138f42cceb600c18d7323a1 100644 --- a/library/src/main/java/com/ruffian/library/widget/helper/RImageHelper.java +++ b/library/src/main/java/com/ruffian/library/widget/helper/RImageHelper.java @@ -72,6 +72,13 @@ public class RImageHelper { private PixelMapShader mBitmapShader; + /** + * 构造 + * + * @param context 上下文 + * @param image 图 + * @param attrs 属性集 + */ public RImageHelper(Context context, Image image, AttrSet attrs) { mComponent = image; initAttributeSet(context, attrs); @@ -411,6 +418,12 @@ public class RImageHelper { return mIconNormal; } + /** + * 构造 + * + * @param icon 背景 + * @return 图 + */ public RImageHelper setIconPressed(Element icon) { this.mIconPressed = icon; setIcon(); @@ -421,6 +434,12 @@ public class RImageHelper { return mIconPressed; } + /** + * 构造 + * + * @param icon 背景 + * @return 图 + */ public RImageHelper setIconUnable(Element icon) { this.mIconUnable = icon; setIcon(); @@ -431,6 +450,12 @@ public class RImageHelper { return mIconUnable; } + /** + * 背景 + * + * @param icon 图 + * @return 选中的 + */ public RImageHelper setIconSelected(Element icon) { this.mIconSelected = icon; setIcon(); @@ -456,6 +481,12 @@ public class RImageHelper { return mBorderWidth; } + /** + * 构造 + * + * @param borderWidth 边框宽度 + * @return 宽度 + */ public RImageHelper setBorderWidth(int borderWidth) { this.mBorderWidth = borderWidth; invalidate(); @@ -466,6 +497,12 @@ public class RImageHelper { return mBorderColor; } + /** + * 构造 + * + * @param borderColor 边框颜色 + * @return 颜色 + */ public RImageHelper setBorderColor(Color borderColor) { this.mBorderColor = borderColor; invalidate(); @@ -481,6 +518,12 @@ public class RImageHelper { return mCorner; } + /** + * 边框颜色 + * + * @param corner float类型 + * @return RImageHelper + */ public RImageHelper setCorner(float corner) { this.mCorner = corner; init(); @@ -492,6 +535,12 @@ public class RImageHelper { return mCornerTopLeft; } + /** + * 构造 + * + * @param cornerTopLeft 左上 + * @return 图 + */ public RImageHelper setCornerTopLeft(float cornerTopLeft) { this.mCorner = -1; this.mCornerTopLeft = cornerTopLeft; @@ -504,6 +553,12 @@ public class RImageHelper { return mCornerTopRight; } + /** + * 构造 + * + * @param cornerTopRight 右上 + * @return 图 + */ public RImageHelper setCornerTopRight(float cornerTopRight) { this.mCorner = -1; this.mCornerTopRight = cornerTopRight; @@ -516,6 +571,12 @@ public class RImageHelper { return mCornerBottomLeft; } + /** + * 构造 + * + * @param cornerBottomLeft 左下 + * @return 图值 + */ public RImageHelper setCornerBottomLeft(float cornerBottomLeft) { this.mCorner = -1; this.mCornerBottomLeft = cornerBottomLeft; @@ -528,6 +589,12 @@ public class RImageHelper { return mCornerBottomRight; } + /** + * 构造 + * + * @param cornerBottomRight 右下 + * @return 图值 + */ public RImageHelper setCornerBottomRight(float cornerBottomRight) { this.mCorner = -1; this.mCornerBottomRight = cornerBottomRight; @@ -536,6 +603,15 @@ public class RImageHelper { return this; } + /** + * 构造 + * + * @param topLeft 左上 + * @param topRight 右上 + * @param bottomRight 右下 + * @param bottomLeft 左下 + * @return 综合位置 + */ public RImageHelper setCorner(float topLeft, float topRight, float bottomRight, float bottomLeft) { this.mCorner = -1; this.mCornerTopLeft = topLeft; diff --git a/library/src/main/java/com/ruffian/library/widget/helper/RTextHelper.java b/library/src/main/java/com/ruffian/library/widget/helper/RTextHelper.java index a0a36d9a334dba75b2ef506d93fdb05efd400ba7..1b512292d0770773666693139fe703869ba2aff0 100644 --- a/library/src/main/java/com/ruffian/library/widget/helper/RTextHelper.java +++ b/library/src/main/java/com/ruffian/library/widget/helper/RTextHelper.java @@ -867,12 +867,22 @@ public class RTextHelper extends RBaseHelper implements ITextFeature, Text setIcon(); } + /** + * 设置图 + * + * @param icon 背景 + */ @SuppressWarnings("unchecked") protected void setIconTop(Element icon) { this.mIconTop = icon; setIcon(); } + /** + * 设置背景 + * + * @param icon 图 + */ @SuppressWarnings("unchecked") protected void setIconBottom(Element icon) { this.mIconBottom = icon;