wangliang_wd

Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix |> 修复进入视频播放页面屏幕亮度变亮
@@ -49,7 +49,6 @@ export class WDPlayerController { @@ -49,7 +49,6 @@ export class WDPlayerController {
49 private windowHeight: number = px2vp(AppStorage.get<number>('windowHeight') || 0) 49 private windowHeight: number = px2vp(AppStorage.get<number>('windowHeight') || 0)
50 50
51 51
52 -  
53 constructor(obj?: obj) { 52 constructor(obj?: obj) {
54 Logger.error("初始化") 53 Logger.error("初始化")
55 this.initPromise = this.createAVPlayer(); 54 this.initPromise = this.createAVPlayer();
@@ -62,6 +61,11 @@ export class WDPlayerController { @@ -62,6 +61,11 @@ export class WDPlayerController {
62 * 创建 videoPlayer对象 61 * 创建 videoPlayer对象
63 */ 62 */
64 private createAVPlayer(): Promise<void> { 63 private createAVPlayer(): Promise<void> {
  64 +
  65 + // const windowClass = WindowModel.shared.getWindowClass();
  66 + // this.bright = windowClass.getWindowProperties().brightness;
  67 + // Logger.debug(TAG, ">>>>>>默认屏幕亮度:"+this.bright)
  68 +
65 return new Promise((resolve, reject) => { 69 return new Promise((resolve, reject) => {
66 Logger.debug(TAG, "开始创建") 70 Logger.debug(TAG, "开始创建")
67 media.createAVPlayer().then((avPlayer) => { 71 media.createAVPlayer().then((avPlayer) => {
@@ -127,7 +131,7 @@ export class WDPlayerController { @@ -127,7 +131,7 @@ export class WDPlayerController {
127 if(this.onLoaded) { 131 if(this.onLoaded) {
128 this.onLoaded(2) 132 this.onLoaded(2)
129 } 133 }
130 - this.setBright(); 134 + // this.setBright();
131 this.status = PlayerConstants.STATUS_START; 135 this.status = PlayerConstants.STATUS_START;
132 this.avPlayer!.videoScaleType = media.VideoScaleType.VIDEO_SCALE_TYPE_FIT 136 this.avPlayer!.videoScaleType = media.VideoScaleType.VIDEO_SCALE_TYPE_FIT
133 this.watchStatus(); 137 this.watchStatus();