|
@@ -6066,6 +6066,9 @@ export struct LocalMusic {
|
|
|
|
|
|
|
|
//是不是1920x720的hicar的屏幕分辨率
|
|
//是不是1920x720的hicar的屏幕分辨率
|
|
|
isHiCarKuanBianPing(){
|
|
isHiCarKuanBianPing(){
|
|
|
|
|
+ if(!this.isHiCar()){
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
const hiCarAspectRatios: HiCarAspectRatio[] = [
|
|
const hiCarAspectRatios: HiCarAspectRatio[] = [
|
|
|
{ ratio: 1920 / 720, name: "1920x720" },
|
|
{ ratio: 1920 / 720, name: "1920x720" },
|
|
|
];
|
|
];
|
|
@@ -6078,7 +6081,7 @@ export struct LocalMusic {
|
|
|
LogUtil.info('twocold isHiCarKuanBianPing Math.abs(currentRatio - hiCarRatio.ratio)= ' + Math.abs(currentRatio - hiCarRatio.ratio))
|
|
LogUtil.info('twocold isHiCarKuanBianPing Math.abs(currentRatio - hiCarRatio.ratio)= ' + Math.abs(currentRatio - hiCarRatio.ratio))
|
|
|
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 this.isHiCar();
|
|
|
|
|
|
|
+ return true;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -6088,7 +6091,9 @@ export struct LocalMusic {
|
|
|
|
|
|
|
|
//是不是hicar的屏幕分辨率
|
|
//是不是hicar的屏幕分辨率
|
|
|
isHiCarSmall() {
|
|
isHiCarSmall() {
|
|
|
-
|
|
|
|
|
|
|
+ if(!this.isHiCar()){
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
if(this.windowWidth>1800&&this.windowHeight>=1200)//大屏幕可以Grid
|
|
if(this.windowWidth>1800&&this.windowHeight>=1200)//大屏幕可以Grid
|
|
|
return false
|
|
return false
|
|
|
|
|
|
|
@@ -6106,7 +6111,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 this.isHiCar();
|
|
|
|
|
|
|
+ return true;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|