|
@@ -203,6 +203,7 @@ export struct LocalMusic {
|
|
|
@StorageProp('topRectHeight') topRectHeight: number = px2vp(AppUtil.getStatusBarHeight());
|
|
@StorageProp('topRectHeight') topRectHeight: number = px2vp(AppUtil.getStatusBarHeight());
|
|
|
@StorageProp('windowWidth') windowWidth: number = 0;
|
|
@StorageProp('windowWidth') windowWidth: number = 0;
|
|
|
@StorageProp('windowHeight') windowHeight: number = 0;
|
|
@StorageProp('windowHeight') windowHeight: number = 0;
|
|
|
|
|
+ @StorageProp('windowHeight') isHiCarStatus: boolean = false;
|
|
|
private listArea: Area = {
|
|
private listArea: Area = {
|
|
|
width: 0,
|
|
width: 0,
|
|
|
height: 0,
|
|
height: 0,
|
|
@@ -602,6 +603,13 @@ export struct LocalMusic {
|
|
|
this.longPressSpeed = PreferencesUtil.getNumberSync(SettingPage.LONG_PRESS_SPEED, 3)
|
|
this.longPressSpeed = PreferencesUtil.getNumberSync(SettingPage.LONG_PRESS_SPEED, 3)
|
|
|
this.isPlayListBgGrass = PreferencesUtil.getBooleanSync(SettingPage.IS_PLAYLIST_BG_GRASS, true)
|
|
this.isPlayListBgGrass = PreferencesUtil.getBooleanSync(SettingPage.IS_PLAYLIST_BG_GRASS, true)
|
|
|
this.isShowHeader = PreferencesUtil.getBooleanSync(SettingPage.IS_SHOW_HEADER, true)
|
|
this.isShowHeader = PreferencesUtil.getBooleanSync(SettingPage.IS_SHOW_HEADER, true)
|
|
|
|
|
+
|
|
|
|
|
+ //如果是hicar连接状态,这些都是false
|
|
|
|
|
+ if(this.isHiCarStatus){
|
|
|
|
|
+ this.isShowTitleBar = false//不显示导航栏
|
|
|
|
|
+ this.isShowHeader = false//二级菜单不显示头部
|
|
|
|
|
+ this.isGridMusic= false//用list不用网格
|
|
|
|
|
+ }
|
|
|
if (this.isSavePlayMode) {
|
|
if (this.isSavePlayMode) {
|
|
|
this.playType = PreferencesUtil.getNumberSync('musicPlayType', 0)
|
|
this.playType = PreferencesUtil.getNumberSync('musicPlayType', 0)
|
|
|
}
|
|
}
|
|
@@ -4331,7 +4339,7 @@ export struct LocalMusic {
|
|
|
|
|
|
|
|
Column() {
|
|
Column() {
|
|
|
Text(this.currentSong?.name)
|
|
Text(this.currentSong?.name)
|
|
|
- .fontSize(13)
|
|
|
|
|
|
|
+ .fontSize(16)
|
|
|
.textOverflow({ overflow: TextOverflow.MARQUEE })//超长滚动
|
|
.textOverflow({ overflow: TextOverflow.MARQUEE })//超长滚动
|
|
|
.maxLines(1)
|
|
.maxLines(1)
|
|
|
.fontColor($r('app.color.text_color'))
|
|
.fontColor($r('app.color.text_color'))
|
|
@@ -4339,7 +4347,7 @@ export struct LocalMusic {
|
|
|
Row() {
|
|
Row() {
|
|
|
Text(this.currentSong?.artist)
|
|
Text(this.currentSong?.artist)
|
|
|
.margin({ top: 2 })
|
|
.margin({ top: 2 })
|
|
|
- .fontSize(11)
|
|
|
|
|
|
|
+ .fontSize(13)
|
|
|
.fontColor($r('app.color.text_color'))
|
|
.fontColor($r('app.color.text_color'))
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -4363,8 +4371,8 @@ export struct LocalMusic {
|
|
|
|
|
|
|
|
Row() {
|
|
Row() {
|
|
|
Image($r('app.media.hm_previous'))
|
|
Image($r('app.media.hm_previous'))
|
|
|
- .height(24)
|
|
|
|
|
- .width(24)
|
|
|
|
|
|
|
+ .height(28)
|
|
|
|
|
+ .width(28)
|
|
|
.clickEffect({ level: ClickEffectLevel.MIDDLE, scale: 0.5 })
|
|
.clickEffect({ level: ClickEffectLevel.MIDDLE, scale: 0.5 })
|
|
|
.margin({ left: 8, right: 16 })
|
|
.margin({ left: 8, right: 16 })
|
|
|
.fillColor(this.themeColor)
|
|
.fillColor(this.themeColor)
|
|
@@ -4390,8 +4398,8 @@ export struct LocalMusic {
|
|
|
.height(36)
|
|
.height(36)
|
|
|
.aspectRatio(CommonConstants.ASPECT_RATIO)
|
|
.aspectRatio(CommonConstants.ASPECT_RATIO)
|
|
|
Image(this.CONTROL_PlayStatus === PlayStatus.PLAY ? $r('app.media.hm_pause') : $r('app.media.hm_play2'))
|
|
Image(this.CONTROL_PlayStatus === PlayStatus.PLAY ? $r('app.media.hm_pause') : $r('app.media.hm_play2'))
|
|
|
- .height(32)
|
|
|
|
|
- .width(32)
|
|
|
|
|
|
|
+ .height(38)
|
|
|
|
|
+ .width(38)
|
|
|
.displayPriority(3)
|
|
.displayPriority(3)
|
|
|
.clickEffect({ level: ClickEffectLevel.MIDDLE, scale: 0.5 })
|
|
.clickEffect({ level: ClickEffectLevel.MIDDLE, scale: 0.5 })
|
|
|
.fillColor(this.themeColor)
|
|
.fillColor(this.themeColor)
|
|
@@ -4406,8 +4414,8 @@ export struct LocalMusic {
|
|
|
|
|
|
|
|
|
|
|
|
|
Image($r('app.media.hm_next'))
|
|
Image($r('app.media.hm_next'))
|
|
|
- .height(24)
|
|
|
|
|
- .width(24)
|
|
|
|
|
|
|
+ .height(28)
|
|
|
|
|
+ .width(28)
|
|
|
.margin({
|
|
.margin({
|
|
|
right: 16,
|
|
right: 16,
|
|
|
left: 16
|
|
left: 16
|
|
@@ -4425,8 +4433,8 @@ export struct LocalMusic {
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
Image($r('app.media.hm_playlist'))
|
|
Image($r('app.media.hm_playlist'))
|
|
|
- .height(24)
|
|
|
|
|
- .width(24)
|
|
|
|
|
|
|
+ .height(28)
|
|
|
|
|
+ .width(28)
|
|
|
.displayPriority(1)
|
|
.displayPriority(1)
|
|
|
.clickEffect({ level: ClickEffectLevel.MIDDLE, scale: 0.5 })
|
|
.clickEffect({ level: ClickEffectLevel.MIDDLE, scale: 0.5 })
|
|
|
.fillColor(this.themeColor)
|
|
.fillColor(this.themeColor)
|
|
@@ -5602,7 +5610,7 @@ export struct LocalMusic {
|
|
|
@State barBottomOpacity: number = 1
|
|
@State barBottomOpacity: number = 1
|
|
|
private hideDone: boolean = false;
|
|
private hideDone: boolean = false;
|
|
|
@State currentYOffset: number = 0;
|
|
@State currentYOffset: number = 0;
|
|
|
- @State bottomBarHeight: number = 55;
|
|
|
|
|
|
|
+ @State bottomBarHeight: number = 60;
|
|
|
private isHiding: boolean = false;
|
|
private isHiding: boolean = false;
|
|
|
|
|
|
|
|
//是否是Pura X外屏,或者小屏幕
|
|
//是否是Pura X外屏,或者小屏幕
|
|
@@ -5663,6 +5671,7 @@ export struct LocalMusic {
|
|
|
|
|
|
|
|
//是不是hicar的屏幕分辨率
|
|
//是不是hicar的屏幕分辨率
|
|
|
isHiCar() {
|
|
isHiCar() {
|
|
|
|
|
+
|
|
|
const hiCarAspectRatios: HiCarAspectRatio[] = [
|
|
const hiCarAspectRatios: HiCarAspectRatio[] = [
|
|
|
{ ratio: 800 / 480, name: "800x480" },
|
|
{ ratio: 800 / 480, name: "800x480" },
|
|
|
{ ratio: 762 / 752, name: "762x752" },
|
|
{ ratio: 762 / 752, name: "762x752" },
|