From 781e156e63b5f852d53b1b7542ed271981b69bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=A7=8B?= <1273378004@qq.com> Date: Mon, 19 Jul 2021 10:01:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?style:=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mingle/widget/ShapeLoadingDialog.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingDialog.java b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingDialog.java index feca8ea..f0a124d 100644 --- a/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingDialog.java +++ b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingDialog.java @@ -20,8 +20,6 @@ public class ShapeLoadingDialog extends CommonDialog implements BaseDialog.Dialo private ShapeLoadingDialog(Builder builder) { super(builder.mContext); mBuilder = builder; - siteRemovable(mBuilder.mCancelable); - setSwipeToDismiss(mBuilder.mCancelable); setDialogListener(this); setSize(ComponentContainer.LayoutConfig.MATCH_CONTENT, ComponentContainer.LayoutConfig.MATCH_CONTENT); setAlignment(LayoutAlignment.CENTER); @@ -71,6 +69,7 @@ public class ShapeLoadingDialog extends CommonDialog implements BaseDialog.Dialo /** * 获取此Loading弹窗的构造器 + * * @return Loading弹窗构造器 */ public Builder getBuilder() { @@ -98,6 +97,7 @@ public class ShapeLoadingDialog extends CommonDialog implements BaseDialog.Dialo /** * 设置loading控件延迟显示的时间 + * * @param delay loading控件延迟显示的时间 * @return loading弹窗构造器自身 */ @@ -108,6 +108,7 @@ public class ShapeLoadingDialog extends CommonDialog implements BaseDialog.Dialo /** * 设置loading控件的文本 + * * @param loadText loading控件的文本 * @return loading弹窗构造器自身 */ @@ -118,6 +119,7 @@ public class ShapeLoadingDialog extends CommonDialog implements BaseDialog.Dialo /** * 设置loading控件的文本资源id + * * @param resId loading控件的文本资源id * @return loading弹窗构造器自身 */ @@ -128,6 +130,7 @@ public class ShapeLoadingDialog extends CommonDialog implements BaseDialog.Dialo /** * 设置点击返回键时是否删除loading弹框 + * * @param cancelable 是否删除loading弹框 * @return loading弹窗构造器自身 */ @@ -139,6 +142,7 @@ public class ShapeLoadingDialog extends CommonDialog implements BaseDialog.Dialo /** * 设置点击弹窗外部时是否删除loading弹框 + * * @param canceledOnTouchOutside 是否删除loading弹框 * @return loading弹窗构造器自身 */ @@ -149,6 +153,7 @@ public class ShapeLoadingDialog extends CommonDialog implements BaseDialog.Dialo /** * 创建loading弹框 + * * @return loading弹框 */ public ShapeLoadingDialog build() { @@ -157,6 +162,7 @@ public class ShapeLoadingDialog extends CommonDialog implements BaseDialog.Dialo /** * 创建并显示loading弹框 + * * @return loading弹框 */ public ShapeLoadingDialog show() { -- Gitee From 9540b6bea77794ca955d351f798534f3e789d808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=A7=8B?= <1273378004@qq.com> Date: Mon, 19 Jul 2021 10:02:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=EF=BC=9A=E8=A7=A3=E5=86=B3entry?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=9C=A8=E6=A8=A1=E6=8B=9F=E5=99=A8=E4=B8=8A?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=88=E5=88=A0?= =?UTF-8?q?=E9=99=A4Beta1=E5=92=8Cvisable=3Dfalse=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- entry/src/main/config.json | 4 +--- shapeloading/src/main/config.json | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index ef3f577..0367685 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.2.5' + classpath 'com.huawei.ohos:hap:2.4.2.7' classpath 'com.huawei.ohos:decctest:1.0.0.6' } } diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 02e7e6f..8d8a20b 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -8,8 +8,7 @@ }, "apiVersion": { "compatible": 5, - "target": 5, - "releaseType": "Beta1" + "target": 5 } }, "deviceConfig": {}, @@ -41,7 +40,6 @@ "icon": "$media:icon", "label": "$string:app_name", "type": "page", - "visible": false, "launchType": "standard" } ] diff --git a/shapeloading/src/main/config.json b/shapeloading/src/main/config.json index c89fe34..dc971b0 100644 --- a/shapeloading/src/main/config.json +++ b/shapeloading/src/main/config.json @@ -8,8 +8,7 @@ }, "apiVersion": { "compatible": 5, - "target": 5, - "releaseType": "Beta1" + "target": 5 } }, "deviceConfig": {}, -- Gitee From 7361876dde3d96a4f67007a7803d26a6842a8d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=A7=8B?= <1273378004@qq.com> Date: Mon, 19 Jul 2021 10:34:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?docs=EF=BC=9Amaven=E5=92=8Chapm=E5=8F=91?= =?UTF-8?q?=E5=B8=831.0.2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- changelog.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 874b287..7c3cef4 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ allprojects{ mavenCentral() } } -implementation 'io.openharmony.tpc.thirdlib:ohos-shapeLoadingView:1.0.1' +implementation 'io.openharmony.tpc.thirdlib:ohos-shapeLoadingView:1.0.2' ``` ## 用法 diff --git a/changelog.md b/changelog.md index 7145881..f096a56 100644 --- a/changelog.md +++ b/changelog.md @@ -1,9 +1,13 @@ +## 1.0.2 +删除一些无用代码 + ## 1.0.1 修改readme图片路径为绝对路径 ## 1.0.0 已支持部分： 1.仿新版58加载动画的控件 + 2.仿新版58加载动画的Dialog 未支持部分： -- Gitee