From a2ef77cb472e4bf601d4b65cc0aecdb2dca0f15c Mon Sep 17 00:00:00 2001 From: xuechangfeng <963779172@qq.com> Date: Wed, 30 Jun 2021 09:14:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../speeddial/sample/slice/MainAbilitySlice.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/slice/MainAbilitySlice.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/slice/MainAbilitySlice.java index 34bb7cb..2a5d999 100644 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/slice/MainAbilitySlice.java @@ -509,7 +509,7 @@ public class MainAbilitySlice extends AbilitySlice { isYellow = true; isDelete = false; listCircle.add(position + 1, new ListBeanCircle(5, ResourceTable.Media_six, "Replace action")); - } else if (!isYellow && isDelete) { + } else if (!isYellow) { isDouble = true; isYellow = true; isDelete = true; @@ -994,13 +994,11 @@ public class MainAbilitySlice extends AbilitySlice { mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "left"); mListContainerCircleLeftTwo.setItemProvider(mListItemProviderCircle); mListContainerCircleLeftTwo.setOrientation(Component.HORIZONTAL); - if (listCircle != null) { - if (listCircle.size() == 5) { - mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 70, getDisplayHeightInPx( - MainAbilitySlice.this) - 370); - } else if (listCircle.size() == 6) { - mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this), getDisplayHeightInPx(MainAbilitySlice.this) - 370); - } + if (listCircle.size() == 5) { + mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 70, getDisplayHeightInPx( + MainAbilitySlice.this) - 370); + } else if (listCircle.size() == 6) { + mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this), getDisplayHeightInPx(MainAbilitySlice.this) - 370); } } else if (pos == 2) { mListContainerCircleLeft.setVisibility(Component.HIDE); -- Gitee From 21756aafa98abc49916cded95ad05a888f09ba62 Mon Sep 17 00:00:00 2001 From: xuechangfeng <963779172@qq.com> Date: Wed, 30 Jun 2021 10:13:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +- .../sample/adapter/ListItemProvider.java | 5 + .../adapter/ListItemProviderCircle.java | 5 + .../ohos/speeddial/sample/beans/ListBean.java | 21 +- .../sample/beans/ListBeanCircle.java | 15 + .../sample/custom/CustomAttachDialogFive.java | 20 + .../custom/CustomAttachDialogFiveItem.java | 20 + .../CustomAttachDialogFiveItemClose.java | 20 + .../CustomAttachDialogFiveItemOpen.java | 15 + .../sample/custom/CustomAttachDialogFour.java | 20 + .../sample/custom/CustomAttachPopup2.java | 5 +- .../sample/custom/FastClickUtil.java | 20 + .../speeddial/sample/custom/MessageEvent.java | 13 - .../ohos/speeddial/sample/custom/MyToast.java | 75 -- .../speeddial/sample/custom/ToastUtil.java | 66 -- .../sample/slice/MainAbilitySlice.java | 937 ++++++++++-------- .../sample/slice/TestMainAbilitySlice.java | 15 + .../sample/slice/UseCasesActivitySlice.java | 40 +- .../speeddial/library/ViewGroupUtils.java | 20 - 19 files changed, 735 insertions(+), 603 deletions(-) delete mode 100644 entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/MessageEvent.java delete mode 100644 entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/MyToast.java delete mode 100644 entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/ToastUtil.java delete mode 100644 library/src/main/java/com/leinardi/ohos/speeddial/library/ViewGroupUtils.java diff --git a/README.md b/README.md index 456d838..783265d 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ - 项目名称：FloatingActionButtonSpeedDial - 所属系列：openharmony的第三方组件适配移植 - 功能：ohos库提供了Material Design浮动动作按钮快速拨号的实现 -- 项目移植状态：目前openharmony没提供menu动画组件 -- 调用差异：无 -- 开发版本：sdk6，DevEco Studio Studio 2.2 Beta1 +- 项目移植状态：主功能完成 +- 调用差异：鸿蒙暂不支持ListContainer动画展开效果 +- 开发版本：sdk6，DevEco Studio 2.2 Beta1 - 基线版本：Release v1.1 #### 效果演示 diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/adapter/ListItemProvider.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/adapter/ListItemProvider.java index 4e61128..77661e5 100644 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/adapter/ListItemProvider.java +++ b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/adapter/ListItemProvider.java @@ -24,6 +24,11 @@ import ohos.hiviewdfx.HiLogLabel; import java.util.List; +/** + * ListItemProvider + * + * @since 2021-06-29 + */ public class ListItemProvider extends BaseItemProvider { private List list; private AbilitySlice slice; diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/adapter/ListItemProviderCircle.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/adapter/ListItemProviderCircle.java index 097f14a..7c12b94 100644 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/adapter/ListItemProviderCircle.java +++ b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/adapter/ListItemProviderCircle.java @@ -30,6 +30,11 @@ import ohos.hiviewdfx.HiLogLabel; import java.io.IOException; import java.util.List; +/** + * ListItemProviderCircle + * + * @since 2021-06-29 + */ public class ListItemProviderCircle extends BaseItemProvider { private List list; private AbilitySlice slice; diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/beans/ListBean.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/beans/ListBean.java index ee00d49..ba95e63 100644 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/beans/ListBean.java +++ b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/beans/ListBean.java @@ -1,9 +1,28 @@ +/** + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.leinardi.ohos.speeddial.sample.beans; +/** + * ListBean + * + * @since 2021-06-29 + */ public class ListBean { private String text; - public ListBean(String text) { this.text = text; } diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/beans/ListBeanCircle.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/beans/ListBeanCircle.java index 5595022..e2e92b0 100644 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/beans/ListBeanCircle.java +++ b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/beans/ListBeanCircle.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.leinardi.ohos.speeddial.sample.beans; public class ListBeanCircle { diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFive.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFive.java index 66780fd..a147b20 100644 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFive.java +++ b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFive.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.leinardi.ohos.speeddial.sample.custom; import com.leinardi.ohos.speeddial.sample.ResourceTable; @@ -7,6 +22,11 @@ import ohos.agp.components.DependentLayout; import ohos.agp.components.DirectionalLayout; import ohos.app.Context; +/** + * CustomAttachDialogFive + * + * @since 2021-06-29 + */ public class CustomAttachDialogFive extends AttachPopupView implements Component.ClickedListener { private CustomAttachDialogListener customAttachDialogListener; public Context context; diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFiveItem.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFiveItem.java index 113af35..f33709e 100644 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFiveItem.java +++ b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFiveItem.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.leinardi.ohos.speeddial.sample.custom; import com.leinardi.ohos.speeddial.sample.ResourceTable; @@ -7,6 +22,11 @@ import ohos.agp.components.DependentLayout; import ohos.agp.components.Text; import ohos.app.Context; +/** + * CustomAttachDialogFiveItem + * + * @since 2021-06-29 + */ public class CustomAttachDialogFiveItem extends AttachPopupView implements Component.ClickedListener { public Context context; public CustomAttachDialogListener customAttachDialogListener; diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFiveItemClose.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFiveItemClose.java index 3488e1f..4d958f7 100644 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFiveItemClose.java +++ b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFiveItemClose.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.leinardi.ohos.speeddial.sample.custom; import com.leinardi.ohos.speeddial.sample.ResourceTable; @@ -6,6 +21,11 @@ import ohos.agp.components.Component; import ohos.agp.components.Text; import ohos.app.Context; +/** + * CustomAttachDialogFiveItemClose + * + * @since 2021-06-29 + */ public class CustomAttachDialogFiveItemClose extends AttachPopupView implements Component.ClickedListener { private Context context; private CustomFiveItemCloseListenner customFiveItemCloseListenner; diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFiveItemOpen.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFiveItemOpen.java index 8e1f50a..7ef2bfb 100644 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFiveItemOpen.java +++ b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFiveItemOpen.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.leinardi.ohos.speeddial.sample.custom; import com.leinardi.ohos.speeddial.sample.ResourceTable; diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFour.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFour.java index fb55156..9d887fe 100644 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFour.java +++ b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachDialogFour.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.leinardi.ohos.speeddial.sample.custom; import com.leinardi.ohos.speeddial.sample.ResourceTable; @@ -6,6 +21,11 @@ import ohos.agp.components.Component; import ohos.agp.components.Text; import ohos.app.Context; +/** + * CustomAttachDialogFour + * + * @since 2021-06-29 + */ public class CustomAttachDialogFour extends AttachPopupView implements Component.ClickedListener { private Context context; private LeaveMyDialogListener leaveMyDialogListener; diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachPopup2.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachPopup2.java index cfe0f80..3b7a77c 100644 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachPopup2.java +++ b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/CustomAttachPopup2.java @@ -8,8 +8,9 @@ import ohos.agp.components.Text; import ohos.app.Context; /** - * Description: 自定义背景的Attach弹窗 - * Create by lxj, at 2019/3/13 + * CustomAttachPopup2 + * + * @since 2021-06-29 */ public class CustomAttachPopup2 extends AttachPopupView { public CustomAttachPopup2(Context context) { diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/FastClickUtil.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/FastClickUtil.java index 2b9bffe..bcf8cc4 100644 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/FastClickUtil.java +++ b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/FastClickUtil.java @@ -1,5 +1,25 @@ +/** + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.leinardi.ohos.speeddial.sample.custom; +/** + * FastClickUtil + * + * @since 2021-06-29 + */ public class FastClickUtil { /** * 两次点击按钮之间的点击间隔不能少于1000毫秒 diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/MessageEvent.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/MessageEvent.java deleted file mode 100644 index fcbb1e5..0000000 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/MessageEvent.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.leinardi.ohos.speeddial.sample.custom; - -public class MessageEvent { - public final String message; - - public static MessageEvent getInstance(String message) { - return new MessageEvent(message); - } - - public MessageEvent(String message) { - this.message = message; - } -} diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/MyToast.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/MyToast.java deleted file mode 100644 index a60602f..0000000 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/MyToast.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.leinardi.ohos.speeddial.sample.custom; - -import com.leinardi.ohos.speeddial.sample.ResourceTable; -import ohos.agp.colors.RgbColor; -import ohos.agp.components.Component; -import ohos.agp.components.DirectionalLayout; -import ohos.agp.components.LayoutScatter; -import ohos.agp.components.Text; -import ohos.agp.components.element.ShapeElement; -import ohos.agp.utils.Color; -import ohos.agp.window.dialog.ToastDialog; -import ohos.agp.window.service.DisplayAttributes; -import ohos.agp.window.service.DisplayManager; -import ohos.app.Context; - -/** - * author xuechangfeng - * Version 1.0 - * ModifiedBy - * date 2021-05-18 14:46 - * description 自定义Toast - */ -public class MyToast { - public static final int LENGTH_LONG = 4000; - private ToastDialog toastDialog; - private int offsetX, offsetY; - - public MyToast(int offsetX, int offsetY) { - this.offsetX = offsetX; - this.offsetY = offsetY; - } - - public void createToast(Context mContext, String content, int duration, String bgColor) { - Component itemView = LayoutScatter.getInstance(mContext) - .parse(ResourceTable.Layout_text, null, false); - Text text = (Text) itemView.findComponentById(ResourceTable.Id_title); - text.setText(content); - text.setTextColor(new Color(Color.getIntColor("#000000"))); - text.setPadding(vp2px(mContext, 15), vp2px(mContext, 8), - vp2px(mContext, 15), vp2px(mContext, 8)); - text.setBackground(buildDrawableByColorRadius(Color.getIntColor(bgColor), vp2px(mContext, 5))); - text.setMarginBottom(20); - if (toastDialog != null) { - toastDialog.cancel(); - toastDialog = null; - } - toastDialog = new ToastDialog(mContext); - toastDialog.setComponent(itemView); - toastDialog.setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT); - toastDialog.setTransparent(true); - toastDialog.setDuration(duration); - toastDialog.setOffset(offsetX, offsetY); - toastDialog.show(); - } - - /** - * @return toast是否正在展示 - */ - public boolean toastIsShowing() { - return toastDialog.isShowing(); - } - - private ohos.agp.components.element.Element buildDrawableByColorRadius(int color, float radius) { - ShapeElement drawable = new ShapeElement(); - drawable.setShape(0); - drawable.setRgbColor(RgbColor.fromArgbInt(color)); - drawable.setCornerRadius(radius); - return drawable; - } - - private static int vp2px(Context context, float vp) { - DisplayAttributes attributes = DisplayManager.getInstance().getDefaultDisplay(context).get().getAttributes(); - return (int) (attributes.densityPixels * vp); - } -} diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/ToastUtil.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/ToastUtil.java deleted file mode 100644 index 341e3e6..0000000 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/custom/ToastUtil.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.leinardi.ohos.speeddial.sample.custom; - -import ohos.agp.colors.RgbColor; -import ohos.agp.components.ComponentContainer; -import ohos.agp.components.DirectionalLayout; -import ohos.agp.components.Text; -import ohos.agp.components.element.ShapeElement; -import ohos.agp.utils.LayoutAlignment; -import ohos.agp.utils.TextAlignment; -import ohos.agp.window.dialog.ToastDialog; -import ohos.app.Context; - -/** - * 吐司工具类 - */ -public class ToastUtil { - /** - * 显示一个吐司 - * - * @param abilityContext 上下文 - * @param str str - */ - public static void showToast(Context abilityContext, String str) { - Text text = new Text(abilityContext); - text.setWidth(ComponentContainer.LayoutConfig.MATCH_PARENT); - text.setHeight(ComponentContainer.LayoutConfig.MATCH_CONTENT); - text.setTextSize(48); - text.setText(str); - text.setMultipleLine(true); - text.setTextAlignment(TextAlignment.CENTER); - DirectionalLayout directionalLayout = new DirectionalLayout(abilityContext); - directionalLayout.setBackground(createDrawable(0xF0F0F0F0, 50)); - DirectionalLayout.LayoutConfig layoutConfig = new DirectionalLayout.LayoutConfig - (DirectionalLayout.LayoutConfig.MATCH_PARENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT); - layoutConfig.setMarginBottom(100); - directionalLayout.setLayoutConfig(layoutConfig); - directionalLayout.setPadding(20, 30, 20, 30); - directionalLayout.addComponent(text); - ToastDialog toastDialog = new ToastDialog(abilityContext); - toastDialog.setContentCustomComponent(directionalLayout).setDuration(2000).setAutoClosable(true) - .setAlignment(LayoutAlignment.BOTTOM).setTransparent(true).show(); - } - - private static ShapeElement createDrawable(int color, float radius) { - ShapeElement drawable = new ShapeElement(); - drawable.setShape(ShapeElement.RECTANGLE); - drawable.setRgbColor(new RgbColor(color)); - drawable.setCornerRadius(radius); - return drawable; - } -} diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/slice/MainAbilitySlice.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/slice/MainAbilitySlice.java index 2a5d999..cc8905e 100644 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/slice/MainAbilitySlice.java @@ -189,85 +189,20 @@ public class MainAbilitySlice extends AbilitySlice { } if (listCircle.get(position).getId() == 1) { initOneHide(); - DirectionalLayout toastLayout = (DirectionalLayout) - LayoutScatter.getInstance(component.getContext()) - .parse(ResourceTable.Layout_layout_toast_dia_four, null, false); - new ToastDialog(getContext()) - .setContentCustomComponent(toastLayout) - .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, - DirectionalLayout.LayoutConfig.MATCH_CONTENT) - .setAlignment(LayoutAlignment.BOTTOM) - .show(); + initOneBottom(component); } else if (listCircle.get(position).getId() == 2) { initOneHide(); - DirectionalLayout toastLayout = (DirectionalLayout) - LayoutScatter.getInstance(component.getContext()) - .parse(ResourceTable.Layout_layout_toast_dia_three, null, false); - new ToastDialog(getContext()) - .setContentCustomComponent(toastLayout) - .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, - DirectionalLayout.LayoutConfig.MATCH_CONTENT) - .setAlignment(LayoutAlignment.BOTTOM) - .show(); + initTwoBottom(component); } else if (listCircle.get(position).getId() == 3) { - dlDialogText.setText("Lorem ipsum dolor sit amet, consectetur"); - top_dl_dialog_texttwo.setText("adipiscing elit, sed do eiusmod tempor inci......"); - top_dl_dialog_texttwo.setVisibility(Component.VISIBLE); - dlDialog.setVisibility(Component.VISIBLE); - if (isDialogShow) { - component.getContext().getUITaskDispatcher().delayDispatch(new Runnable() { - @Override - public void run() { - dlDialog.setVisibility(Component.HIDE); - } - }, 2000); - } + initThreeBottom(component); } else if (listCircle.get(position).getId() == 4) { - if (!isYellow && !isDelete) { - isYellow = true; - isDelete = false; - listCircle.add(position + 1, new ListBeanCircle(5, - ResourceTable.Media_six, "Replace action")); - } else if (!isYellow) { - isDouble = true; - isYellow = true; - isDelete = true; - listCircle.add(position + 1, new ListBeanCircle(5, - ResourceTable.Media_six, "Replace action")); - } + initFourBottom(position); } else if (listCircle.get(position).getId() == 5) { - if (isYellow && isDelete) { - isYellow = false; - isDelete = true; - listCircle.remove(listCircle.get(position)); - } else if (!isDelete && isYellow) { - isYellow = false; - isDelete = true; - listCircle.remove(listCircle.get(position)); - listCircle.add(position, new ListBeanCircle(6, - ResourceTable.Media_seven, "Remove action")); - } + initFiveBottom(position); } else if (listCircle.get(position).getId() == 6) { - if (isYellow && isDelete) { - isDelete = false; - listCircle.remove(listCircle.get(position)); - } else if (isYellow) { - isYellow = false; - isDelete = false; - listCircle.remove(listCircle.get(position)); - } else if (isDelete) { - isDelete = false; - isDouble = false; - listCircle.remove(listCircle.get(position)); - } + initSixBottom(position); } else if (listCircle.get(position).getId() == 7) { - DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()).parse(ResourceTable.Layout_layout_toast_eight, null, false); - new ToastDialog(getContext()) - .setContentCustomComponent(toastLayout) - .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, - DirectionalLayout.LayoutConfig.MATCH_CONTENT) - .setAlignment(LayoutAlignment.BOTTOM) - .show(); + initSenverBottom(component); } mListItemProviderCircle.notifyDataChanged(); } @@ -281,89 +216,20 @@ public class MainAbilitySlice extends AbilitySlice { } if (listCircle.get(position).getId() == 1) { initOneHide(); - DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) - .parse(ResourceTable.Layout_layout_toast_dia_four, null, false); - new ToastDialog(getContext()) - .setContentCustomComponent(toastLayout) - .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) - .setAlignment(LayoutAlignment.BOTTOM) - .show(); + initOneLeft(component); } else if (listCircle.get(position).getId() == 2) { initOneHide(); - DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) - .parse(ResourceTable.Layout_layout_toast_dia_three, null, false); - new ToastDialog(getContext()) - .setContentCustomComponent(toastLayout) - .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) - .setAlignment(LayoutAlignment.BOTTOM) - .show(); + initTwoLeft(component); } else if (listCircle.get(position).getId() == 3) { - mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 260, getDisplayHeightInPx(MainAbilitySlice.this) - 370); - mListContainerCircleLeft.setContentPosition(20, getDisplayHeightInPx(MainAbilitySlice.this) - 360); - dlDialogText.setText("Lorem ipsum dolor sit amet, consectetur"); - top_dl_dialog_texttwo.setText("adipiscing elit, sed do eiusmod tempor inci......"); - top_dl_dialog_texttwo.setVisibility(Component.VISIBLE); - dlDialog.setVisibility(Component.VISIBLE); - if (isDialogShow) { - component.getContext().getUITaskDispatcher().delayDispatch(new Runnable() { - @Override - public void run() { - dlDialog.setVisibility(Component.HIDE); - mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 260, getDisplayHeightInPx(MainAbilitySlice.this) - 270); - mListContainerCircleLeft.setContentPosition(20, getDisplayHeightInPx(MainAbilitySlice.this) - 260); - } - }, 2000); - } + initThreeLeft(component); } else if (listCircle.get(position).getId() == 4) { - if (!isYellow && !isDelete) { - isYellow = true; - isDelete = false; - listCircle.add(position, new ListBeanCircle(5, ResourceTable.Media_six, "Replace action")); - mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 70, getDisplayHeightInPx(MainAbilitySlice.this) - 370); - } else if (!isYellow) { - isDouble = true; - isYellow = true; - isDelete = true; - listCircle.add(position, new ListBeanCircle(5, ResourceTable.Media_six, "Replace action")); - mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this), getDisplayHeightInPx(MainAbilitySlice.this) - 370); - } + initFourLeft(position); } else if (listCircle.get(position).getId() == 5) { - if (isYellow && isDelete) { - isYellow = false; - isDelete = true; - listCircle.remove(listCircle.get(position)); - mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 70, getDisplayHeightInPx(MainAbilitySlice.this) - 370); - } else if (!isDelete && isYellow) { - isYellow = false; - isDelete = true; - listCircle.remove(listCircle.get(position)); - listCircle.add(position, new ListBeanCircle(6, ResourceTable.Media_seven, "Remove action")); - } + initFiveLeft(position); } else if (listCircle.get(position).getId() == 6) { - if (isYellow && isDelete) { - isYellow = true; - isDelete = false; - listCircle.remove(listCircle.get(position)); - mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 70, getDisplayHeightInPx(MainAbilitySlice.this) - 370); - } else if (isYellow) { - isYellow = false; - isDelete = false; - listCircle.remove(listCircle.get(position)); - } else if (isDelete) { - isYellow = false; - isDelete = false; - isDouble = false; - listCircle.remove(listCircle.get(position)); - mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 200, getDisplayHeightInPx(MainAbilitySlice.this) - 370); - } + initSixLeft(position); } else if (listCircle.get(position).getId() == 7) { - DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) - .parse(ResourceTable.Layout_layout_toast_eight, null, false); - new ToastDialog(getContext()) - .setContentCustomComponent(toastLayout) - .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) - .setAlignment(LayoutAlignment.BOTTOM) - .show(); + initSeverLeft(component); } mListItemProviderCircle.notifyDataChanged(); } @@ -377,86 +243,20 @@ public class MainAbilitySlice extends AbilitySlice { } if (listCircle.get(position).getId() == 1) { initOneHide(); - DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) - .parse(ResourceTable.Layout_layout_toast_dia_four, null, false); - new ToastDialog(getContext()) - .setContentCustomComponent(toastLayout) - .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) - .setAlignment(LayoutAlignment.BOTTOM) - .show(); + initOneTop(component); } else if (listCircle.get(position).getId() == 2) { initOneHide(); - DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) - .parse(ResourceTable.Layout_layout_toast_dia_three, null, false); - new ToastDialog(getContext()) - .setContentCustomComponent(toastLayout) - .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) - .setAlignment(LayoutAlignment.BOTTOM) - .show(); + initTwoTop(component); } else if (listCircle.get(position).getId() == 3) { - dlDialogText.setText("Lorem ipsum dolor sit amet, consectetur"); - top_dl_dialog_texttwo.setText("adipiscing elit, sed do eiusmod tempor inci......"); - top_dl_dialog_texttwo.setVisibility(Component.VISIBLE); - dlDialog.setVisibility(Component.VISIBLE); - if (isDialogShow) { - tvClose.setClickedListener(new Component.ClickedListener() { - @Override - public void onClick(Component component) { - dlDialog.setVisibility(Component.HIDE); - } - }); - component.getContext().getUITaskDispatcher().delayDispatch(new Runnable() { - @Override - public void run() { - dlDialog.setVisibility(Component.HIDE); - } - }, 2000); - } + initThreeTop(component); } else if (listCircle.get(position).getId() == 4) { - if (!isYellow && !isDelete) { - isYellow = true; - isDelete = false; - listCircle.add(position, new ListBeanCircle(5, ResourceTable.Media_six, "Replace action")); - } else if (!isYellow) { - isDouble = true; - isYellow = true; - isDelete = true; - listCircle.add(position, new ListBeanCircle(5, ResourceTable.Media_six, "Replace action")); - } + initFourTop(position); } else if (listCircle.get(position).getId() == 5) { - if (isYellow && isDelete) { - isYellow = false; - isDelete = true; - listCircle.remove(listCircle.get(position)); - } else if (isYellow) { - isYellow = false; - isDelete = true; - listCircle.remove(listCircle.get(position)); - listCircle.add(position, new ListBeanCircle(6, ResourceTable.Media_seven, "Remove action")); - } + initFiveTop(position); } else if (listCircle.get(position).getId() == 6) { - if (isYellow && isDelete) { - isYellow = true; - isDelete = false; - listCircle.remove(listCircle.get(position)); - } else if (isYellow) { - isYellow = false; - isDelete = false; - listCircle.remove(listCircle.get(position)); - } else if (isDelete) { - isYellow = false; - isDelete = false; - isDouble = false; - listCircle.remove(listCircle.get(position)); - } + initSixTop(position); } else if (listCircle.get(position).getId() == 7) { - DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) - .parse(ResourceTable.Layout_layout_toast_eight, null, false); - new ToastDialog(getContext()) - .setContentCustomComponent(toastLayout) - .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) - .setAlignment(LayoutAlignment.BOTTOM) - .show(); + initSevenTop(component); } mListItemProviderCircle.notifyDataChanged(); } @@ -470,85 +270,20 @@ public class MainAbilitySlice extends AbilitySlice { } if (listCircle.get(position).getId() == 1) { initOneHide(); - DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) - .parse(ResourceTable.Layout_layout_toast_dia_four, null, false); - new ToastDialog(getContext()) - .setContentCustomComponent(toastLayout) - .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) - .setAlignment(LayoutAlignment.BOTTOM) - .show(); + initOneRight(component); } else if (listCircle.get(position).getId() == 2) { initOneHide(); - DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) - .parse(ResourceTable.Layout_layout_toast_dia_three, null, false); - new ToastDialog(getContext()) - .setContentCustomComponent(toastLayout) - .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) - .setAlignment(LayoutAlignment.BOTTOM) - .show(); + initTwoRight(component); } else if (listCircle.get(position).getId() == 3) { - mDSOne.setContentPosition(40, getDisplayHeightInPx(MainAbilitySlice.this) - 365); - mListContainerCircleRight.setContentPosition(220, getDisplayHeightInPx(MainAbilitySlice.this) - 365); - dlDialogText.setText("Lorem ipsum dolor sit amet, consectetur"); - top_dl_dialog_texttwo.setText("adipiscing elit, sed do eiusmod tempor inci......"); - top_dl_dialog_texttwo.setVisibility(Component.VISIBLE); - dlDialog.setVisibility(Component.VISIBLE); - if (isDialogShow) { - isDialogShow = true; - component.getContext().getUITaskDispatcher().delayDispatch(new Runnable() { - @Override - public void run() { - dlDialog.setVisibility(Component.HIDE); - mDSOne.setContentPosition(40, getDisplayHeightInPx(MainAbilitySlice.this) - 265); - mListContainerCircleRight.setContentPosition(220, getDisplayHeightInPx(MainAbilitySlice.this) - 265); - } - }, 2000); - } + initThreeRight(component); } else if (listCircle.get(position).getId() == 4) { - if (!isYellow && !isDelete) { - isYellow = true; - isDelete = false; - listCircle.add(position + 1, new ListBeanCircle(5, ResourceTable.Media_six, "Replace action")); - } else if (!isYellow) { - isDouble = true; - isYellow = true; - isDelete = true; - listCircle.add(position + 1, new ListBeanCircle(5, ResourceTable.Media_six, "Replace action")); - } + initFourRight(position); } else if (listCircle.get(position).getId() == 5) { - if (isYellow && isDelete) { - isYellow = false; - isDelete = true; - listCircle.remove(listCircle.get(position)); - } else if (isYellow) { - isYellow = false; - isDelete = true; - listCircle.remove(listCircle.get(position)); - listCircle.add(position, new ListBeanCircle(6, ResourceTable.Media_seven, "Remove action")); - } + initFiveRight(position); } else if (listCircle.get(position).getId() == 6) { - if (isYellow && isDelete) { - isYellow = true; - isDelete = false; - listCircle.remove(listCircle.get(position)); - } else if (isYellow) { - isYellow = false; - isDelete = false; - listCircle.remove(listCircle.get(position)); - } else if (isDelete) { - isYellow = false; - isDelete = false; - isDouble = false; - listCircle.remove(listCircle.get(position)); - } + initSixRight(position); } else if (listCircle.get(position).getId() == 7) { - DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) - .parse(ResourceTable.Layout_layout_toast_eight, null, false); - new ToastDialog(getContext()) - .setContentCustomComponent(toastLayout) - .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) - .setAlignment(LayoutAlignment.BOTTOM) - .show(); + initSevenRight(component); } mListItemProviderCircle.notifyDataChanged(); } @@ -630,113 +365,16 @@ public class MainAbilitySlice extends AbilitySlice { animatorPropertyAddPen.rotate(180).setDuration(300); animatorPropertyAddPen.start(); } - - if (colorIsShow == 0) { - shapeElement.setRgbColor(new RgbColor(221, 0, 0)); - mDSOne.setBackground(shapeElement); - } else if (colorIsShow == 1) { - shapeElement.setRgbColor(new RgbColor(66, 133, 244)); - mDSOne.setBackground(shapeElement); - } else if (colorIsShow == 2) { - shapeElement.setRgbColor(new RgbColor(255, 109, 0)); - mDSOne.setBackground(shapeElement); - } else if (colorIsShow == 3) { - shapeElement.setRgbColor(new RgbColor(170, 0, 255)); - mDSOne.setBackground(shapeElement); - } else if (colorIsShow == 4) { - shapeElement.setRgbColor(new RgbColor(255, 255, 255)); - shapeElement.setStroke(1, new RgbColor(204, 204, 204)); - mDSOne.setBackground(shapeElement); - } else if (colorIsShow == 5) { - PixelMapElement pixelMapElement = null; - try { - pixelMapElement = new PixelMapElement(mDSOne.getResourceManager() - .getResource(ResourceTable.Media_yy)); - } catch (IOException e) { - e.printStackTrace(); - } catch (NotExistException e) { - e.printStackTrace(); - } - mDSOne.setBackground(pixelMapElement); - } + initAddPen(); if (pos == 0) { - mListContainerCircleLeft.setVisibility(Component.HIDE); - mListContainerCircleTop.setVisibility(Component.VISIBLE); - mListContainerCircleRight.setVisibility(Component.HIDE); - mListContainerCircleBottom.setVisibility(Component.HIDE); - isLeft = false; - isTop = true; - isRight = false; - isBottom = false; - if (isBank) { - } else { - listCircle = getDataCircle(); - } - mListItemProviderCircle = new ListItemProviderCircle(listCircle, - MainAbilitySlice.this, "top"); - mListContainerCircleTop.setItemProvider(mListItemProviderCircle); - mListContainerCircleTop.setOrientation(Component.VERTICAL); - mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 260, getDisplayHeightInPx(MainAbilitySlice.this) - 350); + initIsTop(); } else if (pos == 1) { - mListContainerCircleLeft.setVisibility(Component.VISIBLE); - mListContainerCircleLeftTwo.setVisibility(Component.VISIBLE); - mListContainerCircleTop.setVisibility(Component.HIDE); - mListContainerCircleRight.setVisibility(Component.HIDE); - mListContainerCircleBottom.setVisibility(Component.HIDE); - isLeft = true; - isTop = false; - isRight = false; - isBottom = false; - if (isBank) { - mListItemProviderCircle = new ListItemProviderCircle(listCircle, - MainAbilitySlice.this, "left"); - mListContainerCircleLeftTwo.setItemProvider(mListItemProviderCircle); - mListContainerCircleLeftTwo.setOrientation(Component.HORIZONTAL); - } else { - listCircle = getDataCircleLeft(); - mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "left"); - mListContainerCircleLeft.setItemProvider(mListItemProviderCircle); - mListContainerCircleLeft.setOrientation(Component.HORIZONTAL); - } - mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 200, - getDisplayHeightInPx(MainAbilitySlice.this) - 370); + initIsLeft(); } else if (pos == 2) { - mListContainerCircleLeft.setVisibility(Component.HIDE); - mListContainerCircleTop.setVisibility(Component.HIDE); - mListContainerCircleRight.setVisibility(Component.HIDE); - mListContainerCircleBottom.setVisibility(Component.VISIBLE); - isLeft = false; - isTop = false; - isRight = false; - isBottom = true; - if (isBank) { - } else { - listCircle = getDataCircleBottom(); - } - mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "bottom"); - mListContainerCircleBottom.setItemProvider(mListItemProviderCircle); - mListContainerCircleBottom.setOrientation(Component.VERTICAL); - mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - vp2px(context, 90), getDisplayHeightInPx(MainAbilitySlice.this) - vp2px(context, 600)); + initIsBottom(); } else if (pos == 3) { - mListContainerCircleLeft.setVisibility(Component.HIDE); - mListContainerCircleTop.setVisibility(Component.HIDE); - mListContainerCircleRight.setVisibility(Component.VISIBLE); - mListContainerCircleBottom.setVisibility(Component.HIDE); - isLeft = false; - isTop = false; - isRight = true; - isBottom = false; - if (isBank) { - } else { - listCircle = getDataCircleLeft(); - } - mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "right"); - mListContainerCircleRight.setItemProvider(mListItemProviderCircle); - mDSOne.setContentPosition(40, getDisplayHeightInPx(MainAbilitySlice.this) - 270); - mListContainerCircleRight.setContentPosition(220, getDisplayHeightInPx(MainAbilitySlice.this) - 260); - mListContainerCircleRight.setOrientation(Component.HORIZONTAL); - Collections.reverse(listCircle); + initIsRight(); } mMainImageBg.setVisibility(Component.VISIBLE); } else { @@ -936,11 +574,9 @@ public class MainAbilitySlice extends AbilitySlice { @Override public void onClick(Component component) { switch (component.getId()) { - //first main fab case ResourceTable.Id_dl_main_fab: showFive(component); break; - //toggle list case ResourceTable.Id_dl_toggle_list: if (isShow) { isShow = false; @@ -948,15 +584,11 @@ public class MainAbilitySlice extends AbilitySlice { } else { isShow = true; mListContainer.setVisibility(Component.VISIBLE); - // initData(); } break; - //view reverse case ResourceTable.Id_dl_reverse_animation: break; - //add action case ResourceTable.Id_dl_add_action: - if (isBank) { topNumSize += 1; if (isTowShow) { @@ -1222,6 +854,505 @@ public class MainAbilitySlice extends AbilitySlice { }); } + private void initIsTop() { + mListContainerCircleLeft.setVisibility(Component.HIDE); + mListContainerCircleTop.setVisibility(Component.VISIBLE); + mListContainerCircleRight.setVisibility(Component.HIDE); + mListContainerCircleBottom.setVisibility(Component.HIDE); + isLeft = false; + isTop = true; + isRight = false; + isBottom = false; + if (isBank) { + } else { + listCircle = getDataCircle(); + } + mListItemProviderCircle = new ListItemProviderCircle(listCircle, + MainAbilitySlice.this, "top"); + mListContainerCircleTop.setItemProvider(mListItemProviderCircle); + mListContainerCircleTop.setOrientation(Component.VERTICAL); + mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 260, getDisplayHeightInPx(MainAbilitySlice.this) - 350); + + } + + private void initIsLeft() { + mListContainerCircleLeft.setVisibility(Component.VISIBLE); + mListContainerCircleLeftTwo.setVisibility(Component.VISIBLE); + mListContainerCircleTop.setVisibility(Component.HIDE); + mListContainerCircleRight.setVisibility(Component.HIDE); + mListContainerCircleBottom.setVisibility(Component.HIDE); + isLeft = true; + isTop = false; + isRight = false; + isBottom = false; + if (isBank) { + mListItemProviderCircle = new ListItemProviderCircle(listCircle, + MainAbilitySlice.this, "left"); + mListContainerCircleLeftTwo.setItemProvider(mListItemProviderCircle); + mListContainerCircleLeftTwo.setOrientation(Component.HORIZONTAL); + } else { + listCircle = getDataCircleLeft(); + mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "left"); + mListContainerCircleLeft.setItemProvider(mListItemProviderCircle); + mListContainerCircleLeft.setOrientation(Component.HORIZONTAL); + } + mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 200, + getDisplayHeightInPx(MainAbilitySlice.this) - 370); + } + + private void initIsBottom() { + mListContainerCircleLeft.setVisibility(Component.HIDE); + mListContainerCircleTop.setVisibility(Component.HIDE); + mListContainerCircleRight.setVisibility(Component.HIDE); + mListContainerCircleBottom.setVisibility(Component.VISIBLE); + isLeft = false; + isTop = false; + isRight = false; + isBottom = true; + if (isBank) { + } else { + listCircle = getDataCircleBottom(); + } + mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "bottom"); + mListContainerCircleBottom.setItemProvider(mListItemProviderCircle); + mListContainerCircleBottom.setOrientation(Component.VERTICAL); + mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - vp2px(context, 90), getDisplayHeightInPx(MainAbilitySlice.this) - vp2px(context, 600)); + } + + private void initIsRight() { + mListContainerCircleLeft.setVisibility(Component.HIDE); + mListContainerCircleTop.setVisibility(Component.HIDE); + mListContainerCircleRight.setVisibility(Component.VISIBLE); + mListContainerCircleBottom.setVisibility(Component.HIDE); + isLeft = false; + isTop = false; + isRight = true; + isBottom = false; + if (isBank) { + } else { + listCircle = getDataCircleLeft(); + } + mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "right"); + mListContainerCircleRight.setItemProvider(mListItemProviderCircle); + mDSOne.setContentPosition(40, getDisplayHeightInPx(MainAbilitySlice.this) - 270); + mListContainerCircleRight.setContentPosition(220, getDisplayHeightInPx(MainAbilitySlice.this) - 260); + mListContainerCircleRight.setOrientation(Component.HORIZONTAL); + Collections.reverse(listCircle); + } + + private void initAddPen() { + if (colorIsShow == 0) { + shapeElement.setRgbColor(new RgbColor(221, 0, 0)); + mDSOne.setBackground(shapeElement); + } else if (colorIsShow == 1) { + shapeElement.setRgbColor(new RgbColor(66, 133, 244)); + mDSOne.setBackground(shapeElement); + } else if (colorIsShow == 2) { + shapeElement.setRgbColor(new RgbColor(255, 109, 0)); + mDSOne.setBackground(shapeElement); + } else if (colorIsShow == 3) { + shapeElement.setRgbColor(new RgbColor(170, 0, 255)); + mDSOne.setBackground(shapeElement); + } else if (colorIsShow == 4) { + shapeElement.setRgbColor(new RgbColor(255, 255, 255)); + shapeElement.setStroke(1, new RgbColor(204, 204, 204)); + mDSOne.setBackground(shapeElement); + } else if (colorIsShow == 5) { + PixelMapElement pixelMapElement = null; + try { + pixelMapElement = new PixelMapElement(mDSOne.getResourceManager() + .getResource(ResourceTable.Media_yy)); + } catch (IOException e) { + e.printStackTrace(); + } catch (NotExistException e) { + e.printStackTrace(); + } + mDSOne.setBackground(pixelMapElement); + } + } + + private void initOneRight(Component component) { + DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) + .parse(ResourceTable.Layout_layout_toast_dia_four, null, false); + new ToastDialog(getContext()) + .setContentCustomComponent(toastLayout) + .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) + .setAlignment(LayoutAlignment.BOTTOM) + .show(); + } + + private void initTwoRight(Component component) { + DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) + .parse(ResourceTable.Layout_layout_toast_dia_three, null, false); + new ToastDialog(getContext()) + .setContentCustomComponent(toastLayout) + .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) + .setAlignment(LayoutAlignment.BOTTOM) + .show(); + } + + private void initThreeRight(Component component) { + mDSOne.setContentPosition(40, getDisplayHeightInPx(MainAbilitySlice.this) - 365); + mListContainerCircleRight.setContentPosition(220, getDisplayHeightInPx(MainAbilitySlice.this) - 365); + dlDialogText.setText("Lorem ipsum dolor sit amet, consectetur"); + top_dl_dialog_texttwo.setText("adipiscing elit, sed do eiusmod tempor inci......"); + top_dl_dialog_texttwo.setVisibility(Component.VISIBLE); + dlDialog.setVisibility(Component.VISIBLE); + if (isDialogShow) { + isDialogShow = true; + component.getContext().getUITaskDispatcher().delayDispatch(new Runnable() { + @Override + public void run() { + dlDialog.setVisibility(Component.HIDE); + mDSOne.setContentPosition(40, getDisplayHeightInPx(MainAbilitySlice.this) - 265); + mListContainerCircleRight.setContentPosition(220, getDisplayHeightInPx(MainAbilitySlice.this) - 265); + } + }, 2000); + } + } + + private void initFourRight(int position) { + if (!isYellow && !isDelete) { + isYellow = true; + isDelete = false; + listCircle.add(position + 1, new ListBeanCircle(5, ResourceTable.Media_six, "Replace action")); + } else if (!isYellow) { + isDouble = true; + isYellow = true; + isDelete = true; + listCircle.add(position + 1, new ListBeanCircle(5, ResourceTable.Media_six, "Replace action")); + } + } + + private void initFiveRight(int position) { + if (isYellow && isDelete) { + isYellow = false; + isDelete = true; + listCircle.remove(listCircle.get(position)); + } else if (isYellow) { + isYellow = false; + isDelete = true; + listCircle.remove(listCircle.get(position)); + listCircle.add(position, new ListBeanCircle(6, ResourceTable.Media_seven, "Remove action")); + } + } + + private void initSixRight(int position) { + if (isYellow && isDelete) { + isYellow = true; + isDelete = false; + listCircle.remove(listCircle.get(position)); + } else if (isYellow) { + isYellow = false; + isDelete = false; + listCircle.remove(listCircle.get(position)); + } else if (isDelete) { + isYellow = false; + isDelete = false; + isDouble = false; + listCircle.remove(listCircle.get(position)); + } + } + + private void initSevenRight(Component component) { + DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) + .parse(ResourceTable.Layout_layout_toast_eight, null, false); + new ToastDialog(getContext()) + .setContentCustomComponent(toastLayout) + .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) + .setAlignment(LayoutAlignment.BOTTOM) + .show(); + } + + private void initOneTop(Component component) { + DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) + .parse(ResourceTable.Layout_layout_toast_dia_four, null, false); + new ToastDialog(getContext()) + .setContentCustomComponent(toastLayout) + .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) + .setAlignment(LayoutAlignment.BOTTOM) + .show(); + } + + private void initTwoTop(Component component) { + DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) + .parse(ResourceTable.Layout_layout_toast_dia_three, null, false); + new ToastDialog(getContext()) + .setContentCustomComponent(toastLayout) + .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) + .setAlignment(LayoutAlignment.BOTTOM) + .show(); + } + + private void initThreeTop(Component component) { + dlDialogText.setText("Lorem ipsum dolor sit amet, consectetur"); + top_dl_dialog_texttwo.setText("adipiscing elit, sed do eiusmod tempor inci......"); + top_dl_dialog_texttwo.setVisibility(Component.VISIBLE); + dlDialog.setVisibility(Component.VISIBLE); + if (isDialogShow) { + tvClose.setClickedListener(new Component.ClickedListener() { + @Override + public void onClick(Component component) { + dlDialog.setVisibility(Component.HIDE); + } + }); + component.getContext().getUITaskDispatcher().delayDispatch(new Runnable() { + @Override + public void run() { + dlDialog.setVisibility(Component.HIDE); + } + }, 2000); + } + } + + private void initFourTop(int position) { + if (!isYellow && !isDelete) { + isYellow = true; + isDelete = false; + listCircle.add(position, new ListBeanCircle(5, ResourceTable.Media_six, "Replace action")); + } else if (!isYellow) { + isDouble = true; + isYellow = true; + isDelete = true; + listCircle.add(position, new ListBeanCircle(5, ResourceTable.Media_six, "Replace action")); + } + } + + private void initFiveTop(int position) { + if (isYellow && isDelete) { + isYellow = false; + isDelete = true; + listCircle.remove(listCircle.get(position)); + } else if (isYellow) { + isYellow = false; + isDelete = true; + listCircle.remove(listCircle.get(position)); + listCircle.add(position, new ListBeanCircle(6, ResourceTable.Media_seven, "Remove action")); + } + } + + private void initSixTop(int position) { + if (isYellow && isDelete) { + isYellow = true; + isDelete = false; + listCircle.remove(listCircle.get(position)); + } else if (isYellow) { + isYellow = false; + isDelete = false; + listCircle.remove(listCircle.get(position)); + } else if (isDelete) { + isYellow = false; + isDelete = false; + isDouble = false; + listCircle.remove(listCircle.get(position)); + } + } + + private void initSevenTop(Component component) { + DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) + .parse(ResourceTable.Layout_layout_toast_eight, null, false); + new ToastDialog(getContext()) + .setContentCustomComponent(toastLayout) + .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) + .setAlignment(LayoutAlignment.BOTTOM) + .show(); + } + + private void initOneLeft(Component component) { + DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) + .parse(ResourceTable.Layout_layout_toast_dia_four, null, false); + new ToastDialog(getContext()) + .setContentCustomComponent(toastLayout) + .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) + .setAlignment(LayoutAlignment.BOTTOM) + .show(); + } + + private void initTwoLeft(Component component) { + DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) + .parse(ResourceTable.Layout_layout_toast_dia_three, null, false); + new ToastDialog(getContext()) + .setContentCustomComponent(toastLayout) + .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) + .setAlignment(LayoutAlignment.BOTTOM) + .show(); + } + + private void initThreeLeft(Component component) { + mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 260, getDisplayHeightInPx(MainAbilitySlice.this) - 370); + mListContainerCircleLeft.setContentPosition(20, getDisplayHeightInPx(MainAbilitySlice.this) - 360); + dlDialogText.setText("Lorem ipsum dolor sit amet, consectetur"); + top_dl_dialog_texttwo.setText("adipiscing elit, sed do eiusmod tempor inci......"); + top_dl_dialog_texttwo.setVisibility(Component.VISIBLE); + dlDialog.setVisibility(Component.VISIBLE); + if (isDialogShow) { + component.getContext().getUITaskDispatcher().delayDispatch(new Runnable() { + @Override + public void run() { + dlDialog.setVisibility(Component.HIDE); + mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 260, getDisplayHeightInPx(MainAbilitySlice.this) - 270); + mListContainerCircleLeft.setContentPosition(20, getDisplayHeightInPx(MainAbilitySlice.this) - 260); + } + }, 2000); + } + } + + private void initFourLeft(int position) { + if (!isYellow && !isDelete) { + isYellow = true; + isDelete = false; + listCircle.add(position, new ListBeanCircle(5, ResourceTable.Media_six, "Replace action")); + mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 70, getDisplayHeightInPx(MainAbilitySlice.this) - 370); + } else if (!isYellow) { + isDouble = true; + isYellow = true; + isDelete = true; + listCircle.add(position, new ListBeanCircle(5, ResourceTable.Media_six, "Replace action")); + mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this), getDisplayHeightInPx(MainAbilitySlice.this) - 370); + } + } + + private void initFiveLeft(int position) { + if (isYellow && isDelete) { + isYellow = true; + isDelete = false; + listCircle.remove(listCircle.get(position)); + mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 70, getDisplayHeightInPx(MainAbilitySlice.this) - 370); + } else if (isYellow) { + isYellow = false; + isDelete = false; + listCircle.remove(listCircle.get(position)); + } else if (isDelete) { + isYellow = false; + isDelete = false; + isDouble = false; + listCircle.remove(listCircle.get(position)); + mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 200, getDisplayHeightInPx(MainAbilitySlice.this) - 370); + } + } + + private void initSixLeft(int position) { + if (isYellow && isDelete) { + isYellow = true; + isDelete = false; + listCircle.remove(listCircle.get(position)); + mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 70, getDisplayHeightInPx(MainAbilitySlice.this) - 370); + } else if (isYellow) { + isYellow = false; + isDelete = false; + listCircle.remove(listCircle.get(position)); + } else if (isDelete) { + isYellow = false; + isDelete = false; + isDouble = false; + listCircle.remove(listCircle.get(position)); + mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 200, getDisplayHeightInPx(MainAbilitySlice.this) - 370); + } + } + + private void initSeverLeft(Component component) { + DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()) + .parse(ResourceTable.Layout_layout_toast_eight, null, false); + new ToastDialog(getContext()) + .setContentCustomComponent(toastLayout) + .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, DirectionalLayout.LayoutConfig.MATCH_CONTENT) + .setAlignment(LayoutAlignment.BOTTOM) + .show(); + } + + private void initOneBottom(Component component) { + DirectionalLayout toastLayout = (DirectionalLayout) + LayoutScatter.getInstance(component.getContext()) + .parse(ResourceTable.Layout_layout_toast_dia_four, null, false); + new ToastDialog(getContext()) + .setContentCustomComponent(toastLayout) + .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, + DirectionalLayout.LayoutConfig.MATCH_CONTENT) + .setAlignment(LayoutAlignment.BOTTOM) + .show(); + } + + private void initTwoBottom(Component component) { + DirectionalLayout toastLayout = (DirectionalLayout) + LayoutScatter.getInstance(component.getContext()) + .parse(ResourceTable.Layout_layout_toast_dia_three, null, false); + new ToastDialog(getContext()) + .setContentCustomComponent(toastLayout) + .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, + DirectionalLayout.LayoutConfig.MATCH_CONTENT) + .setAlignment(LayoutAlignment.BOTTOM) + .show(); + } + + private void initThreeBottom(Component component) { + dlDialogText.setText("Lorem ipsum dolor sit amet, consectetur"); + top_dl_dialog_texttwo.setText("adipiscing elit, sed do eiusmod tempor inci......"); + top_dl_dialog_texttwo.setVisibility(Component.VISIBLE); + dlDialog.setVisibility(Component.VISIBLE); + if (isDialogShow) { + component.getContext().getUITaskDispatcher().delayDispatch(new Runnable() { + @Override + public void run() { + dlDialog.setVisibility(Component.HIDE); + } + }, 2000); + } + } + + private void initFourBottom(int position) { + if (!isYellow && !isDelete) { + isYellow = true; + isDelete = false; + listCircle.add(position + 1, new ListBeanCircle(5, + ResourceTable.Media_six, "Replace action")); + } else if (!isYellow) { + isDouble = true; + isYellow = true; + isDelete = true; + listCircle.add(position + 1, new ListBeanCircle(5, + ResourceTable.Media_six, "Replace action")); + } + } + + private void initFiveBottom(int position) { + if (isYellow && isDelete) { + isYellow = false; + isDelete = true; + listCircle.remove(listCircle.get(position)); + } else if (!isDelete && isYellow) { + isYellow = false; + isDelete = true; + listCircle.remove(listCircle.get(position)); + listCircle.add(position, new ListBeanCircle(6, + ResourceTable.Media_seven, "Remove action")); + } + } + + private void initSixBottom(int position) { + if (isYellow && isDelete) { + isDelete = false; + listCircle.remove(listCircle.get(position)); + } else if (isYellow) { + isYellow = false; + isDelete = false; + listCircle.remove(listCircle.get(position)); + } else if (isDelete) { + isDelete = false; + isDouble = false; + listCircle.remove(listCircle.get(position)); + } + } + + private void initSenverBottom(Component component) { + DirectionalLayout toastLayout = (DirectionalLayout) LayoutScatter.getInstance(component.getContext()).parse(ResourceTable.Layout_layout_toast_eight, null, false); + new ToastDialog(getContext()) + .setContentCustomComponent(toastLayout) + .setSize(DirectionalLayout.LayoutConfig.MATCH_CONTENT, + DirectionalLayout.LayoutConfig.MATCH_CONTENT) + .setAlignment(LayoutAlignment.BOTTOM) + .show(); + } + private int vp2px(Context context, float vp) { DisplayAttributes attributes = DisplayManager.getInstance().getDefaultDisplay(context).get().getAttributes(); return (int) (attributes.densityPixels * vp); @@ -1466,7 +1597,7 @@ public class MainAbilitySlice extends AbilitySlice { /** * 获取屏幕宽度 * - * @return 屏幕宽度 + * @return getDisplayWidthInPx */ public static int getDisplayWidthInPx(Context context) { Display display = DisplayManager.getInstance().getDefaultDisplay(context).get(); @@ -1476,7 +1607,7 @@ public class MainAbilitySlice extends AbilitySlice { /** * 获取屏幕高度，不包含状态栏的高度 * - * @return 屏幕高度，不包含状态栏的高度 + * @return getDisplayHeightInPx */ public static int getDisplayHeightInPx(Context context) { Display display = DisplayManager.getInstance().getDefaultDisplay(context).get(); diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/slice/TestMainAbilitySlice.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/slice/TestMainAbilitySlice.java index df82f24..ca56a59 100644 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/slice/TestMainAbilitySlice.java +++ b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/slice/TestMainAbilitySlice.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.leinardi.ohos.speeddial.sample.slice; import com.leinardi.ohos.speeddial.sample.ResourceTable; diff --git a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/slice/UseCasesActivitySlice.java b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/slice/UseCasesActivitySlice.java index 4f79020..966868d 100644 --- a/entry/src/main/java/com/leinardi/ohos/speeddial/sample/slice/UseCasesActivitySlice.java +++ b/entry/src/main/java/com/leinardi/ohos/speeddial/sample/slice/UseCasesActivitySlice.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.leinardi.ohos.speeddial.sample.slice; import com.leinardi.ohos.speeddial.sample.ResourceTable; @@ -15,6 +30,11 @@ import ohos.agp.window.service.DisplayManager; import ohos.agp.window.service.WindowManager; import ohos.app.Context; +/** + * UseCasesActivitySlice + * + * @since 2021-06-29 + */ public class UseCasesActivitySlice extends AbilitySlice { private Image mImageAdd; private DependentLayout mDSThree; @@ -118,26 +138,6 @@ public class UseCasesActivitySlice extends AbilitySlice { mDSThreeText.setVisibility(Component.VERTICAL); } - /** - * 获取屏幕宽度 - * - * @return 屏幕宽度 - */ - public static int getDisplayWidthInPx(Context context) { - Display display = DisplayManager.getInstance().getDefaultDisplay(context).get(); - return display.getAttributes().width; - } - - /** - * 获取屏幕高度，不包含状态栏的高度 - * - * @return 屏幕高度，不包含状态栏的高度 - */ - public static int getDisplayHeightInPx(Context context) { - Display display = DisplayManager.getInstance().getDefaultDisplay(context).get(); - return display.getAttributes().height; - } - @Override protected void onStop() { super.onStop(); diff --git a/library/src/main/java/com/leinardi/ohos/speeddial/library/ViewGroupUtils.java b/library/src/main/java/com/leinardi/ohos/speeddial/library/ViewGroupUtils.java deleted file mode 100644 index 7ae1d15..0000000 --- a/library/src/main/java/com/leinardi/ohos/speeddial/library/ViewGroupUtils.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2019 Roberto Leinardi. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.leinardi.ohos.speeddial.library; - -class ViewGroupUtils { -} -- Gitee