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 76ed646aff6ed27418414d774892c35285b18ee2..34bb7cb0b5f5611a068b632191bf7166ae229513 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 @@ -46,6 +46,7 @@ import ohos.hiviewdfx.HiLogLabel; import ohos.multimodalinput.event.MmiPoint; import ohos.multimodalinput.event.TouchEvent; import org.greenrobot.eventbus.EventBus; + import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -214,7 +215,6 @@ public class MainAbilitySlice extends AbilitySlice { 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() { @@ -228,7 +228,7 @@ public class MainAbilitySlice extends AbilitySlice { 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; @@ -240,7 +240,7 @@ public class MainAbilitySlice extends AbilitySlice { isYellow = false; isDelete = true; listCircle.remove(listCircle.get(position)); - } else if (isYellow && !isDelete) { + } else if (!isDelete && isYellow) { isYellow = false; isDelete = true; listCircle.remove(listCircle.get(position)); @@ -249,15 +249,13 @@ public class MainAbilitySlice extends AbilitySlice { } } else if (listCircle.get(position).getId() == 6) { if (isYellow && isDelete) { - isYellow = true; isDelete = false; listCircle.remove(listCircle.get(position)); - } else if (isYellow && !isDelete) { + } else if (isYellow) { isYellow = false; isDelete = false; listCircle.remove(listCircle.get(position)); - } else if (!isYellow && isDelete) { - isYellow = false; + } else if (isDelete) { isDelete = false; isDouble = false; listCircle.remove(listCircle.get(position)); @@ -307,7 +305,6 @@ public class MainAbilitySlice extends AbilitySlice { 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() { @@ -323,7 +320,7 @@ public class MainAbilitySlice extends AbilitySlice { 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 && isDelete) { + } else if (!isYellow) { isDouble = true; isYellow = true; isDelete = true; @@ -336,7 +333,7 @@ public class MainAbilitySlice extends AbilitySlice { isDelete = true; listCircle.remove(listCircle.get(position)); mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 70, getDisplayHeightInPx(MainAbilitySlice.this) - 370); - } else if (isYellow && !isDelete) { + } else if (!isDelete && isYellow) { isYellow = false; isDelete = true; listCircle.remove(listCircle.get(position)); @@ -348,11 +345,11 @@ public class MainAbilitySlice extends AbilitySlice { isDelete = false; listCircle.remove(listCircle.get(position)); mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 70, getDisplayHeightInPx(MainAbilitySlice.this) - 370); - } else if (isYellow && !isDelete) { + } else if (isYellow) { isYellow = false; isDelete = false; listCircle.remove(listCircle.get(position)); - } else if (!isYellow && isDelete) { + } else if (isDelete) { isYellow = false; isDelete = false; isDouble = false; @@ -402,7 +399,6 @@ public class MainAbilitySlice extends AbilitySlice { top_dl_dialog_texttwo.setVisibility(Component.VISIBLE); dlDialog.setVisibility(Component.VISIBLE); if (isDialogShow) { - isDialogShow = true; tvClose.setClickedListener(new Component.ClickedListener() { @Override public void onClick(Component component) { @@ -421,7 +417,7 @@ public class MainAbilitySlice extends AbilitySlice { isYellow = true; isDelete = false; listCircle.add(position, new ListBeanCircle(5, ResourceTable.Media_six, "Replace action")); - } else if (!isYellow && isDelete) { + } else if (!isYellow) { isDouble = true; isYellow = true; isDelete = true; @@ -432,7 +428,7 @@ public class MainAbilitySlice extends AbilitySlice { isYellow = false; isDelete = true; listCircle.remove(listCircle.get(position)); - } else if (isYellow && !isDelete) { + } else if (isYellow) { isYellow = false; isDelete = true; listCircle.remove(listCircle.get(position)); @@ -443,11 +439,11 @@ public class MainAbilitySlice extends AbilitySlice { isYellow = true; isDelete = false; listCircle.remove(listCircle.get(position)); - } else if (isYellow && !isDelete) { + } else if (isYellow) { isYellow = false; isDelete = false; listCircle.remove(listCircle.get(position)); - } else if (!isYellow && isDelete) { + } else if (isDelete) { isYellow = false; isDelete = false; isDouble = false; @@ -524,7 +520,7 @@ public class MainAbilitySlice extends AbilitySlice { isYellow = false; isDelete = true; listCircle.remove(listCircle.get(position)); - } else if (isYellow && !isDelete) { + } else if (isYellow) { isYellow = false; isDelete = true; listCircle.remove(listCircle.get(position)); @@ -535,11 +531,11 @@ public class MainAbilitySlice extends AbilitySlice { isYellow = true; isDelete = false; listCircle.remove(listCircle.get(position)); - } else if (isYellow && !isDelete) { + } else if (isYellow) { isYellow = false; isDelete = false; listCircle.remove(listCircle.get(position)); - } else if (!isYellow && isDelete) { + } else if (isDelete) { isYellow = false; isDelete = false; isDouble = false; @@ -937,292 +933,292 @@ public class MainAbilitySlice extends AbilitySlice { .hasShadowBg(false) // 去掉半透明背景 .asCustom(new CustomAttachDialogFive(getContext(), new CustomAttachDialogFive.CustomAttachDialogListener() { - @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; - mListContainer.setVisibility(Component.HIDE); - } 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 (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 (isBank) { - topNumSize += 1; - if (isTowShow) { - listCircle = new ArrayList<>(); - isTowShow = false; - } - listCircle.add(new ListBeanCircle(topNumSize, ResourceTable.Media_nine, "")); - if (!isAddFloat) { - mListContainerCircleLeft.setVisibility(Component.HIDE); - mListContainerCircleTop.setVisibility(Component.HIDE); - mListContainerCircleRight.setVisibility(Component.HIDE); - mListContainerCircleBottom.setVisibility(Component.HIDE); - } else { - 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; - mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "top"); - mListContainerCircleTop.setItemProvider(mListItemProviderCircle); - mListContainerCircleTop.setOrientation(Component.VERTICAL); - } else if (pos == 1) { - mListContainerCircleLeft.setVisibility(Component.VISIBLE); - mListContainerCircleTop.setVisibility(Component.HIDE); - mListContainerCircleRight.setVisibility(Component.HIDE); - mListContainerCircleBottom.setVisibility(Component.HIDE); - isLeft = true; - isTop = false; - isRight = false; - isBottom = false; - mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "left"); - mListContainerCircleLeftTwo.setItemProvider(mListItemProviderCircle); - mListContainerCircleLeftTwo.setOrientation(Component.HORIZONTAL); - } 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; - mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "bottom"); - mListContainerCircleBottom.setItemProvider(mListItemProviderCircle); - mListContainerCircleBottom.setOrientation(Component.VERTICAL); - } 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; - mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "right"); - mListContainerCircleRight.setItemProvider(mListItemProviderCircle); - mListContainerCircleRight.setOrientation(Component.HORIZONTAL); + @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; + mListContainer.setVisibility(Component.HIDE); + } else { + isShow = true; + mListContainer.setVisibility(Component.VISIBLE); + // initData(); } - } - } else { - if (topNumSize == 6) { - topNumSize += 1; - } - topNumSize += 1; - if (isTop) { - listCircle.add(0, new ListBeanCircle(topNumSize, ResourceTable.Media_nine, "")); - } else if (isLeft) { - listCircle.add(0, new ListBeanCircle(topNumSize, ResourceTable.Media_nine, "")); - } else if (isBottom) { - listCircle.add(listCircle.size(), new ListBeanCircle(topNumSize, ResourceTable.Media_nine, "")); - } else if (isRight) { - listCircle.add(listCircle.size(), new ListBeanCircle(topNumSize, ResourceTable.Media_nine, "")); - } - if (listCircle != null) { - mListItemProviderCircle.notifyDataChanged(); - } - } - break; - //remove action - case ResourceTable.Id_dl_remove_action: - if (isBank) { - if (listCircle != null && listCircle.size() != 0) { - listCircle.remove(0); - } - if (pos == 0) { - mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "top"); - mListContainerCircleTop.setItemProvider(mListItemProviderCircle); - mListContainerCircleTop.setOrientation(Component.VERTICAL); - } else if (pos == 1) { - mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "left"); - mListContainerCircleLeftTwo.setItemProvider(mListItemProviderCircle); - mListContainerCircleLeftTwo.setOrientation(Component.HORIZONTAL); - } else if (pos == 2) { - mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "bottom"); - mListContainerCircleBottom.setItemProvider(mListItemProviderCircle); - mListContainerCircleBottom.setOrientation(Component.VERTICAL); - } else if (pos == 3) { - mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "right"); - mListContainerCircleRight.setItemProvider(mListItemProviderCircle); - mListContainerCircleRight.setOrientation(Component.HORIZONTAL); - } - } else { - topNumSize -= 1; - if (isTop) { - if (listCircle.size() != 0) { - if (listCircle.get(0).getId() == 6 && isDouble) { - isDouble = true; - isDelete = false; - } else if (listCircle.get(0).getId() == 6 && !isDouble) { - isDouble = false; - isDelete = false; - } else if (listCircle.get(0).getId() == 5) { - isDouble = false; - isDelete = false; - isYellow = false; - topNumSize = 8; - } else if (listCircle.get(0).getId() == 4) { - isDouble = true; - isDelete = true; - isYellow = true; - topNumSize = 8; - } else if (listCircle.get(0).getId() == 3) { - isDouble = true; - isDelete = true; - isYellow = true; - topNumSize = 8; - } else if (listCircle.get(0).getId() == 2) { - isDouble = true; - isDelete = true; - isYellow = true; - topNumSize = 8; - } else if (listCircle.get(0).getId() == 1) { - topNumSize = 8; + break; + //view reverse + case ResourceTable.Id_dl_reverse_animation: + break; + //add action + case ResourceTable.Id_dl_add_action: + + if (isBank) { + topNumSize += 1; + if (isTowShow) { + listCircle = new ArrayList<>(); + isTowShow = false; } - listCircle.remove(0); - } - } else if (isLeft) { - if (listCircle.size() != 0) { - if (listCircle.get(0).getId() == 6 && isDouble) { - isDouble = true; - isDelete = false; - } else if (listCircle.get(0).getId() == 6 && !isDouble) { - isDouble = false; - isDelete = false; - } else if (listCircle.get(0).getId() == 5) { - isDouble = false; - isDelete = false; - isYellow = false; - topNumSize = 8; - } else if (listCircle.get(0).getId() == 4) { - isDouble = true; - isDelete = true; - isYellow = true; - topNumSize = 8; - } else if (listCircle.get(0).getId() == 3) { - isDouble = true; - isDelete = true; - isYellow = true; - topNumSize = 8; - } else if (listCircle.get(0).getId() == 2) { - isDouble = true; - isDelete = true; - isYellow = true; - topNumSize = 8; - } else if (listCircle.get(0).getId() == 1) { - topNumSize = 8; + listCircle.add(new ListBeanCircle(topNumSize, ResourceTable.Media_nine, "")); + if (!isAddFloat) { + mListContainerCircleLeft.setVisibility(Component.HIDE); + mListContainerCircleTop.setVisibility(Component.HIDE); + mListContainerCircleRight.setVisibility(Component.HIDE); + mListContainerCircleBottom.setVisibility(Component.HIDE); + } else { + 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; + mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "top"); + mListContainerCircleTop.setItemProvider(mListItemProviderCircle); + mListContainerCircleTop.setOrientation(Component.VERTICAL); + } else if (pos == 1) { + mListContainerCircleLeft.setVisibility(Component.VISIBLE); + mListContainerCircleTop.setVisibility(Component.HIDE); + mListContainerCircleRight.setVisibility(Component.HIDE); + mListContainerCircleBottom.setVisibility(Component.HIDE); + isLeft = true; + isTop = false; + isRight = false; + isBottom = false; + 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); + } + } + } 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; + mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "bottom"); + mListContainerCircleBottom.setItemProvider(mListItemProviderCircle); + mListContainerCircleBottom.setOrientation(Component.VERTICAL); + } 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; + mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "right"); + mListContainerCircleRight.setItemProvider(mListItemProviderCircle); + mListContainerCircleRight.setOrientation(Component.HORIZONTAL); + } } - listCircle.remove(0); - if (listCircle.size() == 5) { - mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 200, getDisplayHeightInPx(MainAbilitySlice.this) - 370); - } else if (listCircle.size() == 6) { - mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 70, getDisplayHeightInPx(MainAbilitySlice.this) - 370); + } else { + if (topNumSize == 6) { + topNumSize += 1; } - } - } else if (isBottom) { - if (listCircle.size() != 0) { - if (listCircle.get(0).getId() == 6 && isDouble) { - isDouble = true; - isDelete = false; - } else if (listCircle.get(0).getId() == 6 && !isDouble) { - isDouble = false; - isDelete = false; - } else if (listCircle.get(0).getId() == 5) { - isDouble = false; - isDelete = false; - isYellow = false; - topNumSize = 8; - } else if (listCircle.get(0).getId() == 4) { - isDouble = true; - isDelete = true; - isYellow = true; - topNumSize = 8; - } else if (listCircle.get(0).getId() == 3) { - isDouble = true; - isDelete = true; - isYellow = true; - topNumSize = 8; - } else if (listCircle.get(0).getId() == 2) { - isDouble = true; - isDelete = true; - isYellow = true; - topNumSize = 8; - } else if (listCircle.get(0).getId() == 1) { - topNumSize = 8; + topNumSize += 1; + if (isTop) { + listCircle.add(0, new ListBeanCircle(topNumSize, ResourceTable.Media_nine, "")); + } else if (isLeft) { + listCircle.add(0, new ListBeanCircle(topNumSize, ResourceTable.Media_nine, "")); + } else if (isBottom) { + listCircle.add(listCircle.size(), new ListBeanCircle(topNumSize, ResourceTable.Media_nine, "")); + } else if (isRight) { + listCircle.add(listCircle.size(), new ListBeanCircle(topNumSize, ResourceTable.Media_nine, "")); + } + if (listCircle != null) { + mListItemProviderCircle.notifyDataChanged(); } - listCircle.remove(listCircle.size() - 1); } - } else if (isRight) { - if (listCircle.size() != 0) { - if (listCircle.get(0).getId() == 6 && isDouble) { - isDouble = true; - isDelete = false; - } else if (listCircle.get(0).getId() == 6 && !isDouble) { - isDouble = false; - isDelete = false; - } else if (listCircle.get(0).getId() == 5) { - isDouble = false; - isDelete = false; - isYellow = false; - topNumSize = 8; - } else if (listCircle.get(0).getId() == 4) { - isDouble = true; - isDelete = true; - isYellow = true; - topNumSize = 8; - } else if (listCircle.get(0).getId() == 3) { - isDouble = true; - isDelete = true; - isYellow = true; - topNumSize = 8; - } else if (listCircle.get(0).getId() == 2) { - isDouble = true; - isDelete = true; - isYellow = true; - topNumSize = 8; - } else if (listCircle.get(0).getId() == 1) { - topNumSize = 8; + break; + //remove action + case ResourceTable.Id_dl_remove_action: + if (isBank) { + if (listCircle != null && listCircle.size() != 0) { + listCircle.remove(0); + } + if (pos == 0) { + mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "top"); + mListContainerCircleTop.setItemProvider(mListItemProviderCircle); + mListContainerCircleTop.setOrientation(Component.VERTICAL); + } else if (pos == 1) { + mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "left"); + mListContainerCircleLeftTwo.setItemProvider(mListItemProviderCircle); + mListContainerCircleLeftTwo.setOrientation(Component.HORIZONTAL); + } else if (pos == 2) { + mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "bottom"); + mListContainerCircleBottom.setItemProvider(mListItemProviderCircle); + mListContainerCircleBottom.setOrientation(Component.VERTICAL); + } else if (pos == 3) { + mListItemProviderCircle = new ListItemProviderCircle(listCircle, MainAbilitySlice.this, "right"); + mListContainerCircleRight.setItemProvider(mListItemProviderCircle); + mListContainerCircleRight.setOrientation(Component.HORIZONTAL); + } + } else { + topNumSize -= 1; + if (isTop) { + if (listCircle.size() != 0) { + if (listCircle.get(0).getId() == 6 && isDouble) { + isDouble = true; + isDelete = false; + } else if (listCircle.get(0).getId() == 6 && !isDouble) { + isDouble = false; + isDelete = false; + } else if (listCircle.get(0).getId() == 5) { + isDouble = false; + isDelete = false; + isYellow = false; + topNumSize = 8; + } else if (listCircle.get(0).getId() == 4) { + isDouble = true; + isDelete = true; + isYellow = true; + topNumSize = 8; + } else if (listCircle.get(0).getId() == 3) { + isDouble = true; + isDelete = true; + isYellow = true; + topNumSize = 8; + } else if (listCircle.get(0).getId() == 2) { + isDouble = true; + isDelete = true; + isYellow = true; + topNumSize = 8; + } else if (listCircle.get(0).getId() == 1) { + topNumSize = 8; + } + listCircle.remove(0); + } + } else if (isLeft) { + if (listCircle.size() != 0) { + if (listCircle.get(0).getId() == 6 && isDouble) { + isDouble = true; + isDelete = false; + } else if (listCircle.get(0).getId() == 6 && !isDouble) { + isDouble = false; + isDelete = false; + } else if (listCircle.get(0).getId() == 5) { + isDouble = false; + isDelete = false; + isYellow = false; + topNumSize = 8; + } else if (listCircle.get(0).getId() == 4) { + isDouble = true; + isDelete = true; + isYellow = true; + topNumSize = 8; + } else if (listCircle.get(0).getId() == 3) { + isDouble = true; + isDelete = true; + isYellow = true; + topNumSize = 8; + } else if (listCircle.get(0).getId() == 2) { + isDouble = true; + isDelete = true; + isYellow = true; + topNumSize = 8; + } else if (listCircle.get(0).getId() == 1) { + topNumSize = 8; + } + listCircle.remove(0); + if (listCircle.size() == 5) { + mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 200, getDisplayHeightInPx(MainAbilitySlice.this) - 370); + } else if (listCircle.size() == 6) { + mDSOne.setContentPosition(getDisplayWidthInPx(MainAbilitySlice.this) - 70, getDisplayHeightInPx(MainAbilitySlice.this) - 370); + } + } + } else if (isBottom) { + if (listCircle.size() != 0) { + if (listCircle.get(0).getId() == 6 && isDouble) { + isDouble = true; + isDelete = false; + } else if (listCircle.get(0).getId() == 6 && !isDouble) { + isDouble = false; + isDelete = false; + } else if (listCircle.get(0).getId() == 5) { + isDouble = false; + isDelete = false; + isYellow = false; + topNumSize = 8; + } else if (listCircle.get(0).getId() == 4) { + isDouble = true; + isDelete = true; + isYellow = true; + topNumSize = 8; + } else if (listCircle.get(0).getId() == 3) { + isDouble = true; + isDelete = true; + isYellow = true; + topNumSize = 8; + } else if (listCircle.get(0).getId() == 2) { + isDouble = true; + isDelete = true; + isYellow = true; + topNumSize = 8; + } else if (listCircle.get(0).getId() == 1) { + topNumSize = 8; + } + listCircle.remove(listCircle.size() - 1); + } + } else if (isRight) { + if (listCircle.size() != 0) { + if (listCircle.get(0).getId() == 6 && isDouble) { + isDouble = true; + isDelete = false; + } else if (listCircle.get(0).getId() == 6 && !isDouble) { + isDouble = false; + isDelete = false; + } else if (listCircle.get(0).getId() == 5) { + isDouble = false; + isDelete = false; + isYellow = false; + topNumSize = 8; + } else if (listCircle.get(0).getId() == 4) { + isDouble = true; + isDelete = true; + isYellow = true; + topNumSize = 8; + } else if (listCircle.get(0).getId() == 3) { + isDouble = true; + isDelete = true; + isYellow = true; + topNumSize = 8; + } else if (listCircle.get(0).getId() == 2) { + isDouble = true; + isDelete = true; + isYellow = true; + topNumSize = 8; + } else if (listCircle.get(0).getId() == 1) { + topNumSize = 8; + } + listCircle.remove(listCircle.size() - 1); + } + } + if (listCircle != null) { + mListItemProviderCircle.notifyDataChanged(); } - listCircle.remove(listCircle.size() - 1); } - } - if (listCircle != null) { - mListItemProviderCircle.notifyDataChanged(); - } + break; } - break; - } - basePopupView.dismiss(); - } - })); + basePopupView.dismiss(); + } + })); basePopupView.show(); } }); @@ -1310,21 +1306,20 @@ public class MainAbilitySlice extends AbilitySlice { .hasShadowBg(false) .asCustom(new CustomAttachDialogFiveItem(component.getContext(), new CustomAttachDialogFiveItem.CustomAttachDialogListener() { - @Override - public void onClick(Component component) { - switch (component.getId()) { - //second open and close - case ResourceTable.Id_dl_main_fab_color_open: - showFiveItemOpen(component); - break; - - case ResourceTable.Id_dl_main_fab_color_close: - showFiveItemClose(component); - break; - } - basePopupViewFive.dismiss(); - } - })); + @Override + public void onClick(Component component) { + switch (component.getId()) { + //second open and close + case ResourceTable.Id_dl_main_fab_color_open: + showFiveItemOpen(component); + break; + case ResourceTable.Id_dl_main_fab_color_close: + showFiveItemClose(component); + break; + } + basePopupViewFive.dismiss(); + } + })); basePopupViewFive.show(); } @@ -1406,67 +1401,67 @@ public class MainAbilitySlice extends AbilitySlice { .hasShadowBg(false) .asCustom(new CustomAttachDialogFiveItemClose(getContext(), new CustomAttachDialogFiveItemClose.CustomFiveItemCloseListenner() { - @Override - public void onClick(Component component) { - switch (component.getId()) { - case ResourceTable.Id_tv_primary_close: - if (!isAddFloat) { - colorClose = 1; - shapeElement.setRgbColor(new RgbColor(66, 133, 244)); - mDSOne.setBackground(shapeElement); - } else { - colorClose = 1; - } - break; - case ResourceTable.Id_tv_orange_close: - if (!isAddFloat) { - colorClose = 2; - shapeElement.setRgbColor(new RgbColor(255, 109, 0)); - mDSOne.setBackground(shapeElement); - } else { - colorClose = 2; - } - break; - case ResourceTable.Id_tv_purple_close: - if (!isAddFloat) { - colorClose = 3; - shapeElement.setRgbColor(new RgbColor(170, 0, 255)); - mDSOne.setBackground(shapeElement); - } else { - colorClose = 3; - } - break; - case ResourceTable.Id_tv_while_close: - if (!isAddFloat) { - colorClose = 4; - shapeElement.setRgbColor(new RgbColor(255, 255, 255)); - shapeElement.setStroke(1, new RgbColor(204, 204, 204)); - mDSOne.setBackground(shapeElement); - } else { - colorClose = 4; - } - break; - case ResourceTable.Id_tv_none_close: - if (!isAddFloat) { - colorClose = 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); - } else { - colorClose = 5; + @Override + public void onClick(Component component) { + switch (component.getId()) { + case ResourceTable.Id_tv_primary_close: + if (!isAddFloat) { + colorClose = 1; + shapeElement.setRgbColor(new RgbColor(66, 133, 244)); + mDSOne.setBackground(shapeElement); + } else { + colorClose = 1; + } + break; + case ResourceTable.Id_tv_orange_close: + if (!isAddFloat) { + colorClose = 2; + shapeElement.setRgbColor(new RgbColor(255, 109, 0)); + mDSOne.setBackground(shapeElement); + } else { + colorClose = 2; + } + break; + case ResourceTable.Id_tv_purple_close: + if (!isAddFloat) { + colorClose = 3; + shapeElement.setRgbColor(new RgbColor(170, 0, 255)); + mDSOne.setBackground(shapeElement); + } else { + colorClose = 3; + } + break; + case ResourceTable.Id_tv_while_close: + if (!isAddFloat) { + colorClose = 4; + shapeElement.setRgbColor(new RgbColor(255, 255, 255)); + shapeElement.setStroke(1, new RgbColor(204, 204, 204)); + mDSOne.setBackground(shapeElement); + } else { + colorClose = 4; + } + break; + case ResourceTable.Id_tv_none_close: + if (!isAddFloat) { + colorClose = 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); + } else { + colorClose = 5; + } + break; } - break; - } - basePopupViewItemClose.dismiss(); - } - })); + basePopupViewItemClose.dismiss(); + } + })); basePopupViewItemClose.show(); } diff --git a/entry/src/main/resources/base/graphic/ic_add_action_white_24dp.xml b/entry/src/main/resources/base/graphic/ic_add_action_white_24dp.xml index 0113513b0a9eedf1e247ae5700dc83f7a0343543..43e14e44528c73d3e3163121bbb65eff3983e997 100644 --- a/entry/src/main/resources/base/graphic/ic_add_action_white_24dp.xml +++ b/entry/src/main/resources/base/graphic/ic_add_action_white_24dp.xml @@ -14,7 +14,7 @@ ~ limitations under the License. --> - - - - - - - - - - - - - + + + ohos:pathData="M15.5,21L14,8H16.23L15.1,3.46L16.84,3L18.09,8H22L20.5,21H15.5M5,11H10A3,3 0 0,1 13,14H2A3,3 0 0,1 5,11M13,18A3,3 0 0,1 10,21H5A3,3 0 0,1 2,18H13M3,15H8L9.5,16.5L11,15H12A1,1 0 0,1 13,16A1,1 0 0,1 12,17H3A1,1 0 0,1 2,16A1,1 0 0,1 3,15Z"/> diff --git a/entry/src/main/resources/base/graphic/ic_theme_white_24dp.xml b/entry/src/main/resources/base/graphic/ic_theme_white_24dp.xml index 3992d6e20f0b5fa1127e4b89709febe2e6af5245..7ec00a82480ad08c691bfad457d3ec011a2d757f 100644 --- a/entry/src/main/resources/base/graphic/ic_theme_white_24dp.xml +++ b/entry/src/main/resources/base/graphic/ic_theme_white_24dp.xml @@ -14,7 +14,7 @@ ~ limitations under the License. --> - - + + + ohos:pathData="M9,4A4,4 0 0,0 5,8A4,4 0 0,0 9,12A4,4 0 0,0 13,8A4,4 0 0,0 9,4M9,14C6.33,14 1,15.33 1,18V20H12.08C12.03,19.67 12,19.34 12,19C12,17.5 12.5,16 13.41,14.8C11.88,14.28 10.18,14 9,14M18,14C17.87,14 17.76,14.09 17.74,14.21L17.55,15.53C17.25,15.66 16.96,15.82 16.7,16L15.46,15.5C15.35,15.5 15.22,15.5 15.15,15.63L14.15,17.36C14.09,17.47 14.11,17.6 14.21,17.68L15.27,18.5C15.25,18.67 15.24,18.83 15.24,19C15.24,19.17 15.25,19.33 15.27,19.5L14.21,20.32C14.12,20.4 14.09,20.53 14.15,20.64L15.15,22.37C15.21,22.5 15.34,22.5 15.46,22.5L16.7,22C16.96,22.18 17.24,22.35 17.55,22.47L17.74,23.79C17.76,23.91 17.86,24 18,24H20C20.11,24 20.22,23.91 20.24,23.79L20.43,22.47C20.73,22.34 21,22.18 21.27,22L22.5,22.5C22.63,22.5 22.76,22.5 22.83,22.37L23.83,20.64C23.89,20.53 23.86,20.4 23.77,20.32L22.7,19.5C22.72,19.33 22.74,19.17 22.74,19C22.74,18.83 22.73,18.67 22.7,18.5L23.76,17.68C23.85,17.6 23.88,17.47 23.82,17.36L22.82,15.63C22.76,15.5 22.63,15.5 22.5,15.5L21.27,16C21,15.82 20.73,15.65 20.42,15.53L20.23,14.21C20.22,14.09 20.11,14 20,14M19,17.5A1.5,1.5 0 0,1 20.5,19A1.5,1.5 0 0,1 19,20.5C18.16,20.5 17.5,19.83 17.5,19A1.5,1.5 0 0,1 19,17.5Z"/>