From e2519d02210d469bfa0aaeb3d78f145a838f7cde Mon Sep 17 00:00:00 2001 From: ZYF949 <446962864@qq.com> Date: Mon, 17 May 2021 20:04:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E3=80=91=EF=BC=9A=E4=BF=AE=E6=94=B9readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../ikvstockchart/render/AbstractRender.java | 59 +++++++++++-------- 2 files changed, 37 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 9fc3d58..08faf62 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ allprojects { ```gradle dependencies { - implementation('com.gitee.chinasoft_ohos:timetable-view:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:ikvStockChart:0.0.1-SNAPSHOT') ...... } ``` diff --git a/ikvStockChart/src/main/java/com/wordplat/ikvstockchart/render/AbstractRender.java b/ikvStockChart/src/main/java/com/wordplat/ikvstockchart/render/AbstractRender.java index 29d1dc3..3a4f09d 100644 --- a/ikvStockChart/src/main/java/com/wordplat/ikvstockchart/render/AbstractRender.java +++ b/ikvStockChart/src/main/java/com/wordplat/ikvstockchart/render/AbstractRender.java @@ -20,7 +20,6 @@ package com.wordplat.ikvstockchart.render; import com.wordplat.ikvstockchart.entry.EntrySet; import com.wordplat.ikvstockchart.entry.SizeColor; - import ohos.agp.render.Canvas; import ohos.agp.utils.Matrix; import ohos.agp.utils.RectFloat; @@ -36,14 +35,11 @@ import ohos.hiviewdfx.HiLogLabel; */ public abstract class AbstractRender { - static final HiLogLabel LOG_LABEL = new HiLogLabel(HiLog.LOG_APP, 0x00201, "AbstractRender"); private static final String TAG = "AbstractRender"; private static final boolean DEBUG = false; public static final int MSCALE_X = 0; - public static final int MSKEW_X = 1; - public static final int MTRANS_X = 2; public static final int MSKEW_Y = 3; public static final int MSCALE_Y = 4; @@ -93,7 +89,7 @@ public abstract class AbstractRender { /** * 存储缩放和平移信息 */ - private final float[] touchValues = new float[9]; // + private final float[] touchValues = new float[9]; // /** * 当前显示区域内的 Y 轴范围 */ @@ -129,6 +125,8 @@ public abstract class AbstractRender { /** * 根据给出的 view 坐标信息，进行视图上的一些设置 + * + * @param viewRect viewRect */ public abstract void onViewRect(RectFloat viewRect); @@ -162,6 +160,8 @@ public abstract class AbstractRender { /** * 设置 entry 数据 + * + * @param entrySet */ public void setEntrySet(EntrySet entrySet) { this.entrySet = entrySet; @@ -169,6 +169,8 @@ public abstract class AbstractRender { /** * 获取颜色尺寸配置 + * + * @return getSizeColor */ public SizeColor getSizeColor() { return sizeColor; @@ -176,6 +178,8 @@ public abstract class AbstractRender { /** * 设置颜色尺寸配置 + * + * @param sizeColor setSizeColor */ public void setSizeColor(SizeColor sizeColor) { this.sizeColor = sizeColor; @@ -183,6 +187,8 @@ public abstract class AbstractRender { /** * 获取整个的视图区域大小 + * + * @return getViewRect */ public RectFloat getViewRect() { return viewRect; @@ -190,6 +196,8 @@ public abstract class AbstractRender { /** * 设置整个的视图区域大小 + * + * @param viewRect viewRect */ public void setViewRect(RectFloat viewRect) { if (this.viewRect.getHeight() > 0 && !this.viewRect.equals(viewRect)) { @@ -204,6 +212,8 @@ public abstract class AbstractRender { /** * 获取 Y 轴极值缩放因子 + * + * @return float */ public float getExtremumYScale() { return extremumYScale; @@ -211,6 +221,8 @@ public abstract class AbstractRender { /** * 设置 Y 轴极值缩放因子 + * + * @param extremumYScale extremumYScale */ public void setExtremumYScale(float extremumYScale) { this.extremumYScale = extremumYScale; @@ -246,21 +258,34 @@ public abstract class AbstractRender { highlightPoint[1] = -1; } + /** + * isHighlight + * + * @return boolean + */ public boolean isHighlight() { return highlight; } + /** + * getHighlightPoint + * + * @return float + */ public float[] getHighlightPoint() { return highlightPoint; } /** * 是否可以滚动 + * + * @param dx dx + * @return boolean */ public boolean canScroll(float dx) { final float offset = touchValues[MTRANS_X] - dx; - if (offset < -maxScrollOffset && touchValues[MTRANS_X] <= -maxScrollOffset) { + if (-maxScrollOffset > offset && touchValues[MTRANS_X] <= -maxScrollOffset) { return false; } if (offset > minScrollOffset && touchValues[MTRANS_X] >= minScrollOffset) { @@ -280,6 +305,8 @@ public abstract class AbstractRender { /** * 获取超出边界滚动的距离 + * + * @return float */ public float getOverScrollOffset() { return overScrollOffset; @@ -354,7 +381,7 @@ public abstract class AbstractRender { /** * 更新当前滚动量，当滚动到边界时将不能再滚动 * - * @param dx 变化量 + * @param dx */ public void scroll(float dx) { matrixTouch.getData(); @@ -411,12 +438,7 @@ public abstract class AbstractRender { matrixTouch.setMatrix(new Matrix(touchValues)); - if (DEBUG) { - HiLog.info(LOG_LABEL, "##d zoom: touchValues[Matrix.MSCALE_X] = " + touchValues[MSCALE_X] - + ", touchValues[Matrix.MTRANS_X] = " + touchValues[MTRANS_X] - + ", visibleCount = " + visibleCount - + ", minVisibleIndex = " + minVisibleIndex); - } + } /** @@ -557,13 +579,6 @@ public abstract class AbstractRender { } computeScrollRange(width, scaleX); - if (DEBUG) { - HiLog.info(LOG_LABEL, "##d postMatrixTouch: currentOffset = " + touchValues[MTRANS_X] - + ", maxScrollOffset = " + maxScrollOffset - + ", lastMaxScrollOffset = " + lastMaxScrollOffset - + ", overScrollOffset = " + overScrollOffset); - } - /** * 数据不满一屏，不需要滚动定位 */ @@ -588,9 +603,7 @@ public abstract class AbstractRender { */ touchValues[MTRANS_X] = touchValues[MTRANS_X] / lastMaxScrollOffset * maxScrollOffset; - if (DEBUG) { - HiLog.info(LOG_LABEL, "##d postMatrixTouch: transX = " + touchValues[MTRANS_X] + ", viewRectChange = " + viewRectChange); - } + matrixTouch.postTranslate(touchValues[MTRANS_X], 0); -- Gitee