From 2931476407fed1c5fe15bea383338700e77f353c Mon Sep 17 00:00:00 2001 From: lele <879860859@qq.com> Date: Mon, 21 Jun 2021 15:20:14 +0800 Subject: [PATCH 1/5] commit --- entry/build.gradle | 4 +- entry/src/main/config.json | 4 +- ...isable_Left_And_Right_Refresh_Ability.java | 2 + .../quickstart/base/BaseAbilitySlice.java | 1 - .../wordplat/quickstart/slice/MainSlice.java | 3 +- .../wordplat/quickstart/utils/SSLHelper.java | 6 +- .../xutils/cache/DiskCacheFile.java | 10 --- .../xutils/http/loader/FileLoader.java | 6 +- .../main/resources/base/graphic/border.xml | 2 +- .../main/resources/base/layout/item_text.xml | 2 +- .../main/resources/base/layout/slice_main.xml | 1 + entry/src/ohosTest/config.json | 2 +- .../quickstart/AbstractRenderTest.java | 47 +++++++++++ .../wordplat/quickstart/ExampleOhosTest.java | 3 +- .../InteractiveKLineLayoutTest.java | 81 +++++++++++++++++++ 15 files changed, 151 insertions(+), 23 deletions(-) create mode 100644 entry/src/ohosTest/java/com/wordplat/quickstart/AbstractRenderTest.java create mode 100644 entry/src/ohosTest/java/com/wordplat/quickstart/InteractiveKLineLayoutTest.java diff --git a/entry/build.gradle b/entry/build.gradle index 15971d4..ca92dc9 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - compileSdkVersion 5 defaultConfig { compatibleSdkVersion 5 @@ -24,7 +23,10 @@ dependencies { implementation 'io.reactivex:rxjava:1.1.9' implementation 'com.alibaba:fastjson:1.2.55' implementation project(path: ":ikvstockchart") + testImplementation 'org.mockito:mockito-core:2.23.0' + testImplementation 'com.google.truth:truth:0.39' } + decc { supportType = ['html', 'xml'] } diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 3d7ffe9..0e2cf29 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -3,8 +3,8 @@ "bundleName": "com.wordplat.quickstart", "vendor": "wordplat", "version": { - "code": 1, - "name": "1.0" + "code": 1000000, + "name": "1.0.0" }, "apiVersion": { "compatible": 5, diff --git a/entry/src/main/java/com/wordplat/quickstart/ability/Disable_Left_And_Right_Refresh_Ability.java b/entry/src/main/java/com/wordplat/quickstart/ability/Disable_Left_And_Right_Refresh_Ability.java index 9cbacf1..374da95 100644 --- a/entry/src/main/java/com/wordplat/quickstart/ability/Disable_Left_And_Right_Refresh_Ability.java +++ b/entry/src/main/java/com/wordplat/quickstart/ability/Disable_Left_And_Right_Refresh_Ability.java @@ -18,6 +18,7 @@ package com.wordplat.quickstart.ability; import com.wordplat.quickstart.slice.Disable_Left_And_Right_Refresh_Slice; import ohos.aafwk.content.Intent; +import ohos.agp.utils.Point; /** * Disable_Left_And_Right_Refresh_Ability @@ -29,5 +30,6 @@ public class Disable_Left_And_Right_Refresh_Ability extends Enable_Left_And_Righ public void onStart(Intent intent) { super.onStart(intent); super.setMainRoute(Disable_Left_And_Right_Refresh_Slice.class.getName()); + } } diff --git a/entry/src/main/java/com/wordplat/quickstart/base/BaseAbilitySlice.java b/entry/src/main/java/com/wordplat/quickstart/base/BaseAbilitySlice.java index 75ce7fe..204baae 100644 --- a/entry/src/main/java/com/wordplat/quickstart/base/BaseAbilitySlice.java +++ b/entry/src/main/java/com/wordplat/quickstart/base/BaseAbilitySlice.java @@ -44,6 +44,5 @@ public class BaseAbilitySlice extends AbilitySlice { */ protected void setStatusBarColor(int colorResId) { WindowManager.getInstance().getTopWindow().get().setStatusBarColor(Color.rgb(30,130,210)); - } } diff --git a/entry/src/main/java/com/wordplat/quickstart/slice/MainSlice.java b/entry/src/main/java/com/wordplat/quickstart/slice/MainSlice.java index b0e74bb..d9af982 100644 --- a/entry/src/main/java/com/wordplat/quickstart/slice/MainSlice.java +++ b/entry/src/main/java/com/wordplat/quickstart/slice/MainSlice.java @@ -17,6 +17,7 @@ package com.wordplat.quickstart.slice; import com.wordplat.quickstart.ResourceTable; +import com.wordplat.quickstart.ability.MainAbility; import com.wordplat.quickstart.adapter.TextAdapter; import com.wordplat.quickstart.base.BaseAbilitySlice; import com.wordplat.quickstart.utils.ToastViewDialog; @@ -97,7 +98,7 @@ public class MainSlice extends BaseAbilitySlice { exitTime = System.currentTimeMillis(); } else { this.exit(); - System.exit(0); + terminateAbility(); } } } diff --git a/entry/src/main/java/com/wordplat/quickstart/utils/SSLHelper.java b/entry/src/main/java/com/wordplat/quickstart/utils/SSLHelper.java index 03f7207..1883d20 100644 --- a/entry/src/main/java/com/wordplat/quickstart/utils/SSLHelper.java +++ b/entry/src/main/java/com/wordplat/quickstart/utils/SSLHelper.java @@ -2,16 +2,18 @@ package com.wordplat.quickstart.utils; import com.wordplat.quickstart.ResourceTable; + import ohos.app.Context; import ohos.hiviewdfx.HiLog; import ohos.hiviewdfx.HiLogLabel; +import java.io.InputStream; +import java.security.KeyStore; + import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManagerFactory; -import java.io.InputStream; -import java.security.KeyStore; /** *

SSLHelper

diff --git a/entry/src/main/java/com/wordplat/quickstart/xutils/cache/DiskCacheFile.java b/entry/src/main/java/com/wordplat/quickstart/xutils/cache/DiskCacheFile.java index c4637ba..ed8a820 100644 --- a/entry/src/main/java/com/wordplat/quickstart/xutils/cache/DiskCacheFile.java +++ b/entry/src/main/java/com/wordplat/quickstart/xutils/cache/DiskCacheFile.java @@ -53,14 +53,4 @@ public final class DiskCacheFile extends File implements Closeable { return cacheEntity; } - /** - * finalize - * - * @throws Throwable - */ - @Override - protected void finalize() throws Throwable { - super.finalize(); - this.close(); - } } diff --git a/entry/src/main/java/com/wordplat/quickstart/xutils/http/loader/FileLoader.java b/entry/src/main/java/com/wordplat/quickstart/xutils/http/loader/FileLoader.java index 6042a05..db911f9 100644 --- a/entry/src/main/java/com/wordplat/quickstart/xutils/http/loader/FileLoader.java +++ b/entry/src/main/java/com/wordplat/quickstart/xutils/http/loader/FileLoader.java @@ -133,8 +133,10 @@ public class FileLoader extends Loader { int len; while ((len = bis.read(tmp)) != -1) { if (!targetFile.getParentFile().exists()) { - targetFile.getParentFile().mkdirs(); - throw new IOException("parent be deleted!"); + boolean mkdirs = targetFile.getParentFile().mkdirs(); + if (!mkdirs) { + throw new IOException("parent be deleted!"); + } } bos.write(tmp, 0, len); diff --git a/entry/src/main/resources/base/graphic/border.xml b/entry/src/main/resources/base/graphic/border.xml index 83fff8a..bcef8d0 100644 --- a/entry/src/main/resources/base/graphic/border.xml +++ b/entry/src/main/resources/base/graphic/border.xml @@ -2,7 +2,7 @@ + radius="30"/> diff --git a/entry/src/main/resources/base/layout/item_text.xml b/entry/src/main/resources/base/layout/item_text.xml index 1370e40..688ed90 100644 --- a/entry/src/main/resources/base/layout/item_text.xml +++ b/entry/src/main/resources/base/layout/item_text.xml @@ -13,8 +13,8 @@ ohos:clickable="true" ohos:left_padding="10vp" ohos:text="hello" + ohos:background_element="#fafafa" ohos:text_alignment="vertical_center" - ohos:background_element="$graphic:background_shape" ohos:text_color="#282b34" ohos:text_size="15fp" ohos:weight="1"/> diff --git a/entry/src/main/resources/base/layout/slice_main.xml b/entry/src/main/resources/base/layout/slice_main.xml index 7cce1fd..14c3ca4 100644 --- a/entry/src/main/resources/base/layout/slice_main.xml +++ b/entry/src/main/resources/base/layout/slice_main.xml @@ -17,6 +17,7 @@ ohos:text_size="50"/> Date: Mon, 21 Jun 2021 15:25:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20entr?= =?UTF-8?q?y/src/ohosTest/java/com/wordplat/quickstart/AbstractRenderTest.?= =?UTF-8?q?java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quickstart/AbstractRenderTest.java | 47 ------------------- 1 file changed, 47 deletions(-) delete mode 100644 entry/src/ohosTest/java/com/wordplat/quickstart/AbstractRenderTest.java diff --git a/entry/src/ohosTest/java/com/wordplat/quickstart/AbstractRenderTest.java b/entry/src/ohosTest/java/com/wordplat/quickstart/AbstractRenderTest.java deleted file mode 100644 index 86f96e6..0000000 --- a/entry/src/ohosTest/java/com/wordplat/quickstart/AbstractRenderTest.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.wordplat.quickstart; - -import com.wordplat.ikvstockchart.render.AbstractRender; -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); - } - - -} -- Gitee From ae45b677629ab498787317149e3b3ff871796bd2 Mon Sep 17 00:00:00 2001 From: lele <879860859@qq.com> Date: Mon, 21 Jun 2021 15:25:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20entr?= =?UTF-8?q?y/src/ohosTest/java/com/wordplat/quickstart/InteractiveKLineLay?= =?UTF-8?q?outTest.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InteractiveKLineLayoutTest.java | 81 ------------------- 1 file changed, 81 deletions(-) delete mode 100644 entry/src/ohosTest/java/com/wordplat/quickstart/InteractiveKLineLayoutTest.java diff --git a/entry/src/ohosTest/java/com/wordplat/quickstart/InteractiveKLineLayoutTest.java b/entry/src/ohosTest/java/com/wordplat/quickstart/InteractiveKLineLayoutTest.java deleted file mode 100644 index 4d584ee..0000000 --- a/entry/src/ohosTest/java/com/wordplat/quickstart/InteractiveKLineLayoutTest.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.wordplat.quickstart; - -import com.wordplat.ikvstockchart.InteractiveKLineLayout; -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 From 956ddbd3837a732f1f54ab009c3ce81e1975e16f Mon Sep 17 00:00:00 2001 From: lele <879860859@qq.com> Date: Mon, 21 Jun 2021 15:28:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20ikvS?= =?UTF-8?q?tockChart/src/test/java/com/wordplat/ikvstockchart/AbstractRend?= =?UTF-8?q?erTest.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ikvstockchart/AbstractRenderTest.java | 56 ------------------- 1 file changed, 56 deletions(-) delete mode 100644 ikvStockChart/src/test/java/com/wordplat/ikvstockchart/AbstractRenderTest.java diff --git a/ikvStockChart/src/test/java/com/wordplat/ikvstockchart/AbstractRenderTest.java b/ikvStockChart/src/test/java/com/wordplat/ikvstockchart/AbstractRenderTest.java deleted file mode 100644 index e48473a..0000000 --- a/ikvStockChart/src/test/java/com/wordplat/ikvstockchart/AbstractRenderTest.java +++ /dev/null @@ -1,56 +0,0 @@ -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); - } - - -} -- Gitee From 70248b86ba7552d4f26ccceea2d58ab06d57fb48 Mon Sep 17 00:00:00 2001 From: lele <879860859@qq.com> Date: Mon, 21 Jun 2021 15:28:15 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20ikvS?= =?UTF-8?q?tockChart/src/test/java/com/wordplat/ikvstockchart/InteractiveK?= =?UTF-8?q?LineLayoutTest.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InteractiveKLineLayoutTest.java | 83 ------------------- 1 file changed, 83 deletions(-) delete mode 100644 ikvStockChart/src/test/java/com/wordplat/ikvstockchart/InteractiveKLineLayoutTest.java diff --git a/ikvStockChart/src/test/java/com/wordplat/ikvstockchart/InteractiveKLineLayoutTest.java b/ikvStockChart/src/test/java/com/wordplat/ikvstockchart/InteractiveKLineLayoutTest.java deleted file mode 100644 index 09d0bc0..0000000 --- a/ikvStockChart/src/test/java/com/wordplat/ikvstockchart/InteractiveKLineLayoutTest.java +++ /dev/null @@ -1,83 +0,0 @@ -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