|
@@ -674,6 +674,7 @@ export struct LocalMusic {
|
|
|
//如果是hicar连接状态,这些都是false
|
|
//如果是hicar连接状态,这些都是false
|
|
|
if(this.isHiCar()){
|
|
if(this.isHiCar()){
|
|
|
this.isShowTitleBar = false//不显示导航栏
|
|
this.isShowTitleBar = false//不显示导航栏
|
|
|
|
|
+ this.columns=4
|
|
|
if(!(this.windowWidth>1800&&this.windowHeight>=1200))//小屏幕不可以Grid
|
|
if(!(this.windowWidth>1800&&this.windowHeight>=1200))//小屏幕不可以Grid
|
|
|
{
|
|
{
|
|
|
this.isShowHeader = false//二级菜单不显示头部
|
|
this.isShowHeader = false//二级菜单不显示头部
|
|
@@ -1210,6 +1211,9 @@ export struct LocalMusic {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
getCurFileList(): Array<VideoItem> {
|
|
getCurFileList(): Array<VideoItem> {
|
|
|
|
|
+ if(this.isSearchMode){
|
|
|
|
|
+ return this.filteredList
|
|
|
|
|
+ }
|
|
|
let files: Array<VideoItem> = [];
|
|
let files: Array<VideoItem> = [];
|
|
|
if (ArrayUtil.isNotEmpty(this.videoLocalList)) {
|
|
if (ArrayUtil.isNotEmpty(this.videoLocalList)) {
|
|
|
for (let i = 0; i < this.videoLocalList.length; i++) {
|
|
for (let i = 0; i < this.videoLocalList.length; i++) {
|
|
@@ -3465,7 +3469,7 @@ export struct LocalMusic {
|
|
|
.cachedCount(6)
|
|
.cachedCount(6)
|
|
|
.margin(
|
|
.margin(
|
|
|
this.isHiCar()?{bottom:this.bottomBarHeight+90}:
|
|
this.isHiCar()?{bottom:this.bottomBarHeight+90}:
|
|
|
- {bottom:this.isShowCoverHeader()? 25:
|
|
|
|
|
|
|
+ {bottom:this.isShowCoverHeader()? this.topBarHeight+35:
|
|
|
this.isCoverOpacity()?this.topBarHeight+this.bottomBarHeight+78
|
|
this.isCoverOpacity()?this.topBarHeight+this.bottomBarHeight+78
|
|
|
:this.topBarHeight+this.bottomBarHeight+108})
|
|
:this.topBarHeight+this.bottomBarHeight+108})
|
|
|
.transition(TransitionEffect.move(TransitionEdge.BOTTOM)
|
|
.transition(TransitionEffect.move(TransitionEdge.BOTTOM)
|
|
@@ -7109,6 +7113,7 @@ export struct LocalMusic {
|
|
|
LogUtil.info('twocold isHiCarSmall isHiCarStatus= ' + this.isHiCarStatus);
|
|
LogUtil.info('twocold isHiCarSmall isHiCarStatus= ' + this.isHiCarStatus);
|
|
|
if (Math.abs(currentRatio - hiCarRatio.ratio) <= RATIO_TOLERANCE) {
|
|
if (Math.abs(currentRatio - hiCarRatio.ratio) <= RATIO_TOLERANCE) {
|
|
|
// LogUtil.info(`HiCar detected: ${hiCarRatio.name}, actual: ${this.windowWidth}x${this.windowHeight}`);
|
|
// LogUtil.info(`HiCar detected: ${hiCarRatio.name}, actual: ${this.windowWidth}x${this.windowHeight}`);
|
|
|
|
|
+ //宽扁平的尺寸设置列表展示
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -9473,8 +9478,8 @@ export struct LocalMusic {
|
|
|
|
|
|
|
|
Row() {
|
|
Row() {
|
|
|
this.pushLyricButton($r('app.media.cut_current'), 0, '本地歌词')
|
|
this.pushLyricButton($r('app.media.cut_current'), 0, '本地歌词')
|
|
|
- this.pushLyricButton($r('app.media.white_search'), 1, '获取歌词')
|
|
|
|
|
-
|
|
|
|
|
|
|
+ // this.pushLyricButton($r('app.media.white_search'), 1, '获取歌词')
|
|
|
|
|
+ this.pushLyricButton($r('app.media.white_search'), 1, '繁体转简体')
|
|
|
}
|
|
}
|
|
|
.justifyContent(FlexAlign.Center)
|
|
.justifyContent(FlexAlign.Center)
|
|
|
.margin({ top: 3, bottom: 10 })
|
|
.margin({ top: 3, bottom: 10 })
|