|
@@ -942,14 +942,14 @@ export struct LocalMusic {
|
|
|
$r('app.media.refresh')]
|
|
$r('app.media.refresh')]
|
|
|
let pup: XPopup;
|
|
let pup: XPopup;
|
|
|
if (this.isDarkMode) {
|
|
if (this.isDarkMode) {
|
|
|
- pup = XPopup.Builder()
|
|
|
|
|
|
|
+ pup = XPopup.Builder()
|
|
|
.setPopupPosition(PopupPosition.BOTTOM)
|
|
.setPopupPosition(PopupPosition.BOTTOM)
|
|
|
.atView('pup_positon_music')
|
|
.atView('pup_positon_music')
|
|
|
.setBackgroundColor(Color.Black)
|
|
.setBackgroundColor(Color.Black)
|
|
|
.asBubble(wrapBuilder(customPopupBuilder), dataBean)
|
|
.asBubble(wrapBuilder(customPopupBuilder), dataBean)
|
|
|
.show()
|
|
.show()
|
|
|
}else {
|
|
}else {
|
|
|
- pup = XPopup.Builder()
|
|
|
|
|
|
|
+ pup = XPopup.Builder()
|
|
|
.setPopupPosition(PopupPosition.BOTTOM)
|
|
.setPopupPosition(PopupPosition.BOTTOM)
|
|
|
.atView('pup_positon_music')
|
|
.atView('pup_positon_music')
|
|
|
.setBackgroundColor(Color.White)
|
|
.setBackgroundColor(Color.White)
|
|
@@ -1595,24 +1595,11 @@ export struct LocalMusic {
|
|
|
if (index <= 3) {
|
|
if (index <= 3) {
|
|
|
popupPosition = PopupPosition.BOTTOM
|
|
popupPosition = PopupPosition.BOTTOM
|
|
|
}
|
|
}
|
|
|
- let pup: XPopup;
|
|
|
|
|
- if (this.isDarkMode) {
|
|
|
|
|
- pup = XPopup.Builder()
|
|
|
|
|
|
|
+ let pup = XPopup.Builder()
|
|
|
.setPopupPosition(popupPosition)
|
|
.setPopupPosition(popupPosition)
|
|
|
- .atView(id)
|
|
|
|
|
- .setBackgroundColor(Color.Black)
|
|
|
|
|
- .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
- .show()
|
|
|
|
|
-
|
|
|
|
|
- }else {
|
|
|
|
|
- pup = XPopup.Builder()
|
|
|
|
|
- .setPopupPosition(popupPosition)
|
|
|
|
|
- .atView(id)
|
|
|
|
|
- .setBackgroundColor(Color.White)
|
|
|
|
|
- .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
- .show()
|
|
|
|
|
-
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ .atView(id)
|
|
|
|
|
+ .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
+ .show()
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1664,30 +1651,11 @@ export struct LocalMusic {
|
|
|
if (index <= 3) {
|
|
if (index <= 3) {
|
|
|
popupPosition = PopupPosition.BOTTOM
|
|
popupPosition = PopupPosition.BOTTOM
|
|
|
}
|
|
}
|
|
|
- // let pup = XPopup.Builder()
|
|
|
|
|
- // .setPopupPosition(popupPosition)
|
|
|
|
|
- // .atView(id)
|
|
|
|
|
- // .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
- // .show()
|
|
|
|
|
-
|
|
|
|
|
- let pup: XPopup;
|
|
|
|
|
- if (this.isDarkMode) {
|
|
|
|
|
- pup = XPopup.Builder()
|
|
|
|
|
- .setPopupPosition(popupPosition)
|
|
|
|
|
- .atView(id)
|
|
|
|
|
- .setBackgroundColor(Color.Black)
|
|
|
|
|
- .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
- .show()
|
|
|
|
|
-
|
|
|
|
|
- }else {
|
|
|
|
|
- pup = XPopup.Builder()
|
|
|
|
|
- .setPopupPosition(popupPosition)
|
|
|
|
|
- .atView(id)
|
|
|
|
|
- .setBackgroundColor(Color.White)
|
|
|
|
|
- .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
- .show()
|
|
|
|
|
-
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ let pup = XPopup.Builder()
|
|
|
|
|
+ .setPopupPosition(popupPosition)
|
|
|
|
|
+ .atView(id)
|
|
|
|
|
+ .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
+ .show()
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -2035,23 +2003,21 @@ export struct LocalMusic {
|
|
|
// .atView(viewId)
|
|
// .atView(viewId)
|
|
|
// .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
// .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
// .show();
|
|
// .show();
|
|
|
- let pup: XPopup;
|
|
|
|
|
|
|
+ let pup:XPopup
|
|
|
if (this.isDarkMode) {
|
|
if (this.isDarkMode) {
|
|
|
pup = XPopup.Builder()
|
|
pup = XPopup.Builder()
|
|
|
.setPopupPosition(PopupPosition.TOP)
|
|
.setPopupPosition(PopupPosition.TOP)
|
|
|
.atView(viewId)
|
|
.atView(viewId)
|
|
|
.setBackgroundColor(Color.Black)
|
|
.setBackgroundColor(Color.Black)
|
|
|
.asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
.asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
- .show()
|
|
|
|
|
-
|
|
|
|
|
|
|
+ .show();
|
|
|
}else {
|
|
}else {
|
|
|
pup = XPopup.Builder()
|
|
pup = XPopup.Builder()
|
|
|
.setPopupPosition(PopupPosition.TOP)
|
|
.setPopupPosition(PopupPosition.TOP)
|
|
|
.atView(viewId)
|
|
.atView(viewId)
|
|
|
- .setBackgroundColor(Color.Black)
|
|
|
|
|
|
|
+ .setBackgroundColor(Color.White)
|
|
|
.asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
.asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
- .show()
|
|
|
|
|
-
|
|
|
|
|
|
|
+ .show();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -2149,28 +2115,21 @@ export struct LocalMusic {
|
|
|
XPopup.dismissTop();
|
|
XPopup.dismissTop();
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- // let pup = XPopup.Builder()
|
|
|
|
|
- // .setPopupPosition(PopupPosition.TOP)
|
|
|
|
|
- // .atView(viewId)
|
|
|
|
|
- // .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
- // .show();
|
|
|
|
|
- let pup: XPopup;
|
|
|
|
|
|
|
+ let pup:XPopup
|
|
|
if (this.isDarkMode) {
|
|
if (this.isDarkMode) {
|
|
|
pup = XPopup.Builder()
|
|
pup = XPopup.Builder()
|
|
|
.setPopupPosition(PopupPosition.TOP)
|
|
.setPopupPosition(PopupPosition.TOP)
|
|
|
.atView(viewId)
|
|
.atView(viewId)
|
|
|
.setBackgroundColor(Color.Black)
|
|
.setBackgroundColor(Color.Black)
|
|
|
.asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
.asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
- .show()
|
|
|
|
|
-
|
|
|
|
|
|
|
+ .show();
|
|
|
}else {
|
|
}else {
|
|
|
pup = XPopup.Builder()
|
|
pup = XPopup.Builder()
|
|
|
.setPopupPosition(PopupPosition.TOP)
|
|
.setPopupPosition(PopupPosition.TOP)
|
|
|
.atView(viewId)
|
|
.atView(viewId)
|
|
|
- .setBackgroundColor(Color.Black)
|
|
|
|
|
|
|
+ .setBackgroundColor(Color.White)
|
|
|
.asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
.asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
- .show()
|
|
|
|
|
-
|
|
|
|
|
|
|
+ .show();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -8065,11 +8024,10 @@ function cutPopupBuilder(dataBu: BubbleBean) {
|
|
|
})
|
|
})
|
|
|
.textAlign(TextAlign.Start).width("100%")// .fontColor(Color.Gray)
|
|
.textAlign(TextAlign.Start).width("100%")// .fontColor(Color.Gray)
|
|
|
.fontSize(15)
|
|
.fontSize(15)
|
|
|
- .fontColor($r('app.color.text_color'))
|
|
|
|
|
}
|
|
}
|
|
|
.margin({ top: 7, bottom: 7 })
|
|
.margin({ top: 7, bottom: 7 })
|
|
|
- }
|
|
|
|
|
- .onClick(() => {
|
|
|
|
|
|
|
+
|
|
|
|
|
+ }.onClick(() => {
|
|
|
dataBu.onItemClick?.(index)
|
|
dataBu.onItemClick?.(index)
|
|
|
})
|
|
})
|
|
|
})
|
|
})
|
|
@@ -8078,7 +8036,7 @@ function cutPopupBuilder(dataBu: BubbleBean) {
|
|
|
.width(150)
|
|
.width(150)
|
|
|
.divider({
|
|
.divider({
|
|
|
strokeWidth: 1,
|
|
strokeWidth: 1,
|
|
|
- color: $r('app.color.divider_color')
|
|
|
|
|
|
|
+ color: "#22FFFFFF"
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
|
|
|