diff --git a/README.md b/README.md index 874b287f4b84765c925e84c457c2d6e6141819c7..7c3cef4dee278ebbb73d9b2a4b434af7e04c83c0 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/build.gradle b/build.gradle index ef3f57778829a3a3db8f688a13cdf9f686af29cb..03676856250801186e64eb703c0326e29a2246d5 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/changelog.md b/changelog.md index 71458815fab45b46955315c0f6ff6324f63ace0c..f096a56c4d7443749c0ba7271d3107f3a4bffb4b 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 未支持部分: diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 02e7e6fa5ddebced0c5f1f8dc48f859ad2aaa058..8d8a20b643001e040b969ec7ae512e8e36422356 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 c89fe348ae34657f4e7886ec3a3329ab10e5ba4d..dc971b0f644ed0b36b8e28f957c45cb0dd57811f 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": {}, diff --git a/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingDialog.java b/shapeloading/src/main/java/com/mingle/widget/ShapeLoadingDialog.java index feca8eaff9fe5b693e5f95d8686a77ee6fd3f04a..f0a124dfddabc718ebc48ee96aeb85f866b5bb8a 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() {