|
|
@@ -105,7 +105,7 @@ class PQSelecteMusicView: UIView {
|
|
|
musicSearchBtn.setTitle("搜索", for: .normal)
|
|
|
musicSearchBtn.setImage(UIImage().BF_Image(named: "musicSearch"), for: .normal)
|
|
|
musicSearchBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#959595"), for: .normal)
|
|
|
- musicSearchBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: 14)
|
|
|
+ musicSearchBtn.titleLabel?.font = UIFont.systemFont(ofSize: 14)
|
|
|
|
|
|
return musicSearchBtn
|
|
|
}()
|
|
|
@@ -329,6 +329,7 @@ extension PQSelecteMusicView: UICollectionViewDelegate, UICollectionViewDataSour
|
|
|
|
|
|
func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
|
|
|
if collectionView == selectMusicCollection {
|
|
|
+
|
|
|
let itemData: Any = musicDatas[indexPath.item]
|
|
|
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: String(describing: PQSelectMusicCell.self), for: indexPath) as! PQSelectMusicCell
|
|
|
cell.bgmData = itemData as? PQVoiceModel
|
|
|
@@ -456,9 +457,11 @@ class PQSelectMusicTagsCell: UICollectionViewCell {
|
|
|
titleLab.text = "\(tagData?.tagName ?? "")"
|
|
|
if tagData?.isSelected ?? false {
|
|
|
titleLab.textColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
|
|
|
+ titleLab.font = UIFont.boldSystemFont(ofSize: 14)
|
|
|
|
|
|
} else {
|
|
|
titleLab.textColor = UIColor.hexColor(hexadecimal: "#959595")
|
|
|
+ titleLab.font = UIFont.systemFont(ofSize: 14)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -615,7 +618,7 @@ class PQSelectMusicCell: UICollectionViewCell {
|
|
|
|
|
|
confirmBtn.isHidden = !(bgmData?.voiceStatue == .isPause || bgmData?.voiceStatue == .isPlaying)
|
|
|
|
|
|
- if(bgmData?.voiceStatue == .isSelected){
|
|
|
+ if(bgmData?.voiceStatue == .isSelected || bgmData?.voiceStatue == .isPause || bgmData?.voiceStatue == .isPlaying){
|
|
|
musicNameLab.textColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
|
|
|
musicNameLab.font = UIFont.boldSystemFont(ofSize: 12)
|
|
|
}else{
|
jsonwang