|
@@ -1595,11 +1595,24 @@ export struct LocalMusic {
|
|
|
if (index <= 3) {
|
|
if (index <= 3) {
|
|
|
popupPosition = PopupPosition.BOTTOM
|
|
popupPosition = PopupPosition.BOTTOM
|
|
|
}
|
|
}
|
|
|
- let pup = XPopup.Builder()
|
|
|
|
|
|
|
+ let pup: XPopup;
|
|
|
|
|
+ if (this.isDarkMode) {
|
|
|
|
|
+ pup = XPopup.Builder()
|
|
|
.setPopupPosition(popupPosition)
|
|
.setPopupPosition(popupPosition)
|
|
|
- .atView(id)
|
|
|
|
|
- .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
- .show()
|
|
|
|
|
|
|
+ .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()
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1651,11 +1664,30 @@ 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.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()
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1998,11 +2030,29 @@ export struct LocalMusic {
|
|
|
XPopup.dismissTop();
|
|
XPopup.dismissTop();
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- let pup = XPopup.Builder()
|
|
|
|
|
- .setPopupPosition(PopupPosition.TOP)
|
|
|
|
|
- .atView(viewId)
|
|
|
|
|
- .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
- .show();
|
|
|
|
|
|
|
+ // let pup = XPopup.Builder()
|
|
|
|
|
+ // .setPopupPosition(PopupPosition.TOP)
|
|
|
|
|
+ // .atView(viewId)
|
|
|
|
|
+ // .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
+ // .show();
|
|
|
|
|
+ let pup: XPopup;
|
|
|
|
|
+ if (this.isDarkMode) {
|
|
|
|
|
+ pup = XPopup.Builder()
|
|
|
|
|
+ .setPopupPosition(PopupPosition.TOP)
|
|
|
|
|
+ .atView(viewId)
|
|
|
|
|
+ .setBackgroundColor(Color.Black)
|
|
|
|
|
+ .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
+ .show()
|
|
|
|
|
+
|
|
|
|
|
+ }else {
|
|
|
|
|
+ pup = XPopup.Builder()
|
|
|
|
|
+ .setPopupPosition(PopupPosition.TOP)
|
|
|
|
|
+ .atView(viewId)
|
|
|
|
|
+ .setBackgroundColor(Color.Black)
|
|
|
|
|
+ .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
+ .show()
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//加入收藏
|
|
//加入收藏
|
|
@@ -2099,11 +2149,30 @@ export struct LocalMusic {
|
|
|
XPopup.dismissTop();
|
|
XPopup.dismissTop();
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- let pup = XPopup.Builder()
|
|
|
|
|
- .setPopupPosition(PopupPosition.TOP)
|
|
|
|
|
- .atView(viewId)
|
|
|
|
|
- .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
- .show();
|
|
|
|
|
|
|
+ // let pup = XPopup.Builder()
|
|
|
|
|
+ // .setPopupPosition(PopupPosition.TOP)
|
|
|
|
|
+ // .atView(viewId)
|
|
|
|
|
+ // .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
+ // .show();
|
|
|
|
|
+ let pup: XPopup;
|
|
|
|
|
+ if (this.isDarkMode) {
|
|
|
|
|
+ pup = XPopup.Builder()
|
|
|
|
|
+ .setPopupPosition(PopupPosition.TOP)
|
|
|
|
|
+ .atView(viewId)
|
|
|
|
|
+ .setBackgroundColor(Color.Black)
|
|
|
|
|
+ .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
+ .show()
|
|
|
|
|
+
|
|
|
|
|
+ }else {
|
|
|
|
|
+ pup = XPopup.Builder()
|
|
|
|
|
+ .setPopupPosition(PopupPosition.TOP)
|
|
|
|
|
+ .atView(viewId)
|
|
|
|
|
+ .setBackgroundColor(Color.Black)
|
|
|
|
|
+ .asBubble(wrapBuilder(cutPopupBuilder), dataBean)
|
|
|
|
|
+ .show()
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Builder
|
|
@Builder
|
|
@@ -7996,10 +8065,11 @@ 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)
|
|
|
})
|
|
})
|
|
|
})
|
|
})
|
|
@@ -8008,7 +8078,7 @@ function cutPopupBuilder(dataBu: BubbleBean) {
|
|
|
.width(150)
|
|
.width(150)
|
|
|
.divider({
|
|
.divider({
|
|
|
strokeWidth: 1,
|
|
strokeWidth: 1,
|
|
|
- color: "#22FFFFFF"
|
|
|
|
|
|
|
+ color: $r('app.color.divider_color')
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
|
|
|