From d50eb8c76470be66c827b5d886cd71bda297a04f Mon Sep 17 00:00:00 2001 From: JiangJun <2680104782@qq.com> Date: Mon, 17 May 2021 22:18:26 +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=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Enable_Left_And_Right_Refresh_Slice.java | 2 +- .../pulllistview/RefreshComponent.java | 16 ++-- .../base/layout/head_default_layout.xml | 6 +- .../ikvstockchart/InteractiveKLineLayout.java | 4 - .../ikvstockchart/AbstractRenderTest.java | 56 +++++++++++++ .../InteractiveKLineLayoutTest.java | 83 +++++++++++++++++++ 6 files changed, 153 insertions(+), 14 deletions(-) create mode 100644 ikvStockChart/src/test/java/com/wordplat/ikvstockchart/AbstractRenderTest.java create mode 100644 ikvStockChart/src/test/java/com/wordplat/ikvstockchart/InteractiveKLineLayoutTest.java diff --git a/entry/src/main/java/com/wordplat/quickstart/slice/Enable_Left_And_Right_Refresh_Slice.java b/entry/src/main/java/com/wordplat/quickstart/slice/Enable_Left_And_Right_Refresh_Slice.java index bdfcf5c..adc7985 100644 --- a/entry/src/main/java/com/wordplat/quickstart/slice/Enable_Left_And_Right_Refresh_Slice.java +++ b/entry/src/main/java/com/wordplat/quickstart/slice/Enable_Left_And_Right_Refresh_Slice.java @@ -226,7 +226,7 @@ public class Enable_Left_And_Right_Refresh_Slice extends BaseAbilitySlice { final KLineRender kLineRender = (KLineRender) kLineLayout.getKLineView().getRender(); if (contains(kLineRender.getKLineRect(), x, y)) { kLineRender.zoomIn(x, y); - kLineLayout.klineNotify(); + kLineLayout.getKLineView().notifyDataSetChanged(); } } }); diff --git a/entry/src/main/java/com/wordplat/quickstart/wight/PullLayout/pulllistview/RefreshComponent.java b/entry/src/main/java/com/wordplat/quickstart/wight/PullLayout/pulllistview/RefreshComponent.java index 774cede..d184bb2 100644 --- a/entry/src/main/java/com/wordplat/quickstart/wight/PullLayout/pulllistview/RefreshComponent.java +++ b/entry/src/main/java/com/wordplat/quickstart/wight/PullLayout/pulllistview/RefreshComponent.java @@ -166,18 +166,20 @@ public class RefreshComponent extends ComponentContainer implements Component.La * 1.头部正在下拉,并未完全显示, */ mTextTitle.setText("下拉"); + mTextTime.setVisibility(HIDE); headBaseComponent.onHeadVisible(); } else if (head.getBottom() > headBaseComponent.mPullRefreshHeight) { /** * 2.头部已经下拉并且超出自身高度 */ - mTextTitle.setText("刷新释放"); + mTextTitle.setText("加载中..."); startTime = preferences.getLong(DeviceRuntime.PULL_START, 0); + endTime = System.currentTimeMillis(); if (startTime != 0 && isPull) { - long cutTime = endTime - startTime; - mTextTime.setVisibility(HIDE); - mTextTime.setText("最后更新：" + cutStringTime(cutTime/1000) + "之前"); + long cutTime2 = endTime - startTime; + mTextTime.setVisibility(VISIBLE); + mTextTime.setText("最后更新：" + cutStringTime(cutTime2 / 1000) + "之前"); isPull = false; } headBaseComponent.onHeadOver(); @@ -197,13 +199,15 @@ public class RefreshComponent extends ComponentContainer implements Component.La /** * 没到可刷新的距离，减少阻尼 */ - mTextTitle.setText("下拉"); + mTextTitle.setText("释放刷新"); offsetY = (int) (mLastY / 2f); } else { /** * 达到可刷新的距离，加大阻尼 */ - mTextTitle.setText("刷新释放"); + mTextTitle.setText("释放刷新"); + long cutTime = endTime - startTime; + mTextTime.setText("最后更新：" + cutStringTime(cutTime / 1000) + "之前"); offsetY = (int) (mLastY / 3.2f); } startDownY = endUpY; diff --git a/entry/src/main/resources/base/layout/head_default_layout.xml b/entry/src/main/resources/base/layout/head_default_layout.xml index 740ed94..399bce6 100644 --- a/entry/src/main/resources/base/layout/head_default_layout.xml +++ b/entry/src/main/resources/base/layout/head_default_layout.xml @@ -19,10 +19,10 @@ ohos:id="$+id:img_head_default" ohos:height="30vp" ohos:width="30vp" - ohos:right_margin="10vp" - ohos:top_margin="15vp" ohos:align_parent_right="true" ohos:background_element="$media:rotate" + ohos:right_margin="10vp" + ohos:top_margin="15vp" /> @@ -36,7 +36,7 @@ ohos:height="match_content" ohos:width="match_content" ohos:text="下拉" - ohos:text_alignment="bottom" + ohos:text_alignment="center" ohos:text_size="16fp" ohos:top_margin="10vp"/> diff --git a/ikvStockChart/src/main/java/com/wordplat/ikvstockchart/InteractiveKLineLayout.java b/ikvStockChart/src/main/java/com/wordplat/ikvstockchart/InteractiveKLineLayout.java index 02978e9..6aa274a 100644 --- a/ikvStockChart/src/main/java/com/wordplat/ikvstockchart/InteractiveKLineLayout.java +++ b/ikvStockChart/src/main/java/com/wordplat/ikvstockchart/InteractiveKLineLayout.java @@ -101,10 +101,6 @@ public class InteractiveKLineLayout extends StackLayout implements Component.Cli initUI(context, attrs, defStyleAttr); } - public void klineNotify() { - kLineView.notifyDataSetChanged(); - } - private void initUI(Context context, AttrSet attrs, int defStyleAttr) { kLineView = new InteractiveKLineView(context, attrs); kLineRender = (KLineRender) kLineView.getRender(); diff --git a/ikvStockChart/src/test/java/com/wordplat/ikvstockchart/AbstractRenderTest.java b/ikvStockChart/src/test/java/com/wordplat/ikvstockchart/AbstractRenderTest.java new file mode 100644 index 0000000..e48473a --- /dev/null +++ b/ikvStockChart/src/test/java/com/wordplat/ikvstockchart/AbstractRenderTest.java @@ -0,0 +1,56 @@ +package com.wordplat.ikvstockchart; + +import com.wordplat.ikvstockchart.render.AbstractRender; +import ohos.agp.utils.RectFloat; +import org.junit.Test; + +import static org.mockito.Mockito.mock; + +public class AbstractRenderTest { + private AbstractRender render = mock(AbstractRender.class); + + @Test + public void canDragging() { + render.canDragging(12); + } + + @Test + public void canScroll() { + render.canScroll(12); + } + + @Test + public void getSizeColor() { + render.getSizeColor(); + } + + @Test + public void invertMapPoints() { + float[] floats = {1, 2, 3, 4}; + render.invertMapPoints(floats); + } + + @Test + public void onHighlight() { + render.onHighlight(12, 12); + } + + @Test + public void mapPoints() { + float[] floats = {1, 2, 3, 4}; + render.mapPoints(floats); + } + + + @Test + public void zoomIn() { + render.zoomIn(12, 12); + } + + @Test + public void zoomOut() { + render.zoomOut(12, 12); + } + + +} diff --git a/ikvStockChart/src/test/java/com/wordplat/ikvstockchart/InteractiveKLineLayoutTest.java b/ikvStockChart/src/test/java/com/wordplat/ikvstockchart/InteractiveKLineLayoutTest.java new file mode 100644 index 0000000..09d0bc0 --- /dev/null +++ b/ikvStockChart/src/test/java/com/wordplat/ikvstockchart/InteractiveKLineLayoutTest.java @@ -0,0 +1,83 @@ +package com.wordplat.ikvstockchart; + +import org.junit.Test; + +import static org.mockito.Mockito.mock; + +public class InteractiveKLineLayoutTest { + private InteractiveKLineLayout layout = mock(InteractiveKLineLayout.class); + + @Test + public void announceAccessibility() { + layout.announceAccessibility("text some"); + } + + @Test + public void arrange() { + layout.arrange(12, 12, 12, 12); + } + + @Test + public void bindCornerMark() { + layout.bindCornerMark(); + } + + @Test + public void callOnClick() { + layout.callOnClick(); + } + + @Test + public void clearFocus() { + layout.clearFocus(); + } + + @Test + public void enableCornerMark() { + layout.enableCornerMark(true); + } + + @Test + public void simulateClick() { + layout.simulateClick(); + } + + @Test + public void simulateDrag() { + layout.simulateDrag(); + } + + @Test + public void createAnimatorProperty() { + layout.createAnimatorProperty(); + } + + @Test + public void getKLineView() { + layout.getKLineView(); + } + + @Test + public void isShownBOLL() { + layout.isShownBOLL(); + } + + @Test + public void isShownKDJ() { + layout.isShownKDJ(); + } + + @Test + public void isShownMACD() { + layout.isShownMACD(); + } + + @Test + public void isShownRSI() { + layout.isShownRSI(); + } + + + + +} -- Gitee