Showing
5 changed files
with
89 additions
and
89 deletions
| @@ -24,16 +24,16 @@ export class AudioSuspensionModel { | @@ -24,16 +24,16 @@ export class AudioSuspensionModel { | ||
| 24 | */ | 24 | */ |
| 25 | private initPlayerController() { | 25 | private initPlayerController() { |
| 26 | if(this.playerController === undefined) { | 26 | if(this.playerController === undefined) { |
| 27 | - Logger.info(TAG, 'playerController undefined') | 27 | + // Logger.info(TAG, 'playerController undefined') |
| 28 | AppStorage.setOrCreate('playerController', new WDPlayerController({loop: false})); | 28 | AppStorage.setOrCreate('playerController', new WDPlayerController({loop: false})); |
| 29 | this.playerController = AppStorage.link<WDPlayerController>('playerController') | 29 | this.playerController = AppStorage.link<WDPlayerController>('playerController') |
| 30 | - Logger.info(TAG, 'playerController create success') | 30 | + // Logger.info(TAG, 'playerController create success') |
| 31 | this.playerController.get().onStatusChange = (status: number) => { | 31 | this.playerController.get().onStatusChange = (status: number) => { |
| 32 | - console.info(TAG, 'this.currentStatus Model', status) | 32 | + // console.info(TAG, 'this.currentStatus Model', status) |
| 33 | EmitterUtils.sendEvent(EmitterEventId.AUDIO_CHANGE_STATUS, status) | 33 | EmitterUtils.sendEvent(EmitterEventId.AUDIO_CHANGE_STATUS, status) |
| 34 | } | 34 | } |
| 35 | } else { | 35 | } else { |
| 36 | - Logger.info(TAG, 'playerController already exit') | 36 | + // Logger.info(TAG, 'playerController already exit') |
| 37 | } | 37 | } |
| 38 | } | 38 | } |
| 39 | /** | 39 | /** |
| @@ -52,7 +52,7 @@ export class AudioSuspensionModel { | @@ -52,7 +52,7 @@ export class AudioSuspensionModel { | ||
| 52 | 52 | ||
| 53 | if (this.url === url) { | 53 | if (this.url === url) { |
| 54 | this.isMinimize = AppStorage.link<boolean>('isMinimize') | 54 | this.isMinimize = AppStorage.link<boolean>('isMinimize') |
| 55 | - console.log(TAG, 'this.isMinimize', this.isMinimize?.get()) | 55 | + // console.log(TAG, 'this.isMinimize', this.isMinimize?.get()) |
| 56 | if (this.isMinimize?.get()) { | 56 | if (this.isMinimize?.get()) { |
| 57 | EmitterUtils.sendEvent(EmitterEventId.AUDIO_WINDOW_EXPAND, 1) | 57 | EmitterUtils.sendEvent(EmitterEventId.AUDIO_WINDOW_EXPAND, 1) |
| 58 | AppStorage.setOrCreate('isMinimize', false); | 58 | AppStorage.setOrCreate('isMinimize', false); |
| @@ -78,19 +78,19 @@ export class AudioSuspensionModel { | @@ -78,19 +78,19 @@ export class AudioSuspensionModel { | ||
| 78 | this.floatWindowClass.get().isShowing((err: BusinessError, data) => { | 78 | this.floatWindowClass.get().isShowing((err: BusinessError, data) => { |
| 79 | const errCode: number = err.code; | 79 | const errCode: number = err.code; |
| 80 | if (errCode) { | 80 | if (errCode) { |
| 81 | - console.error(TAG, 'Failed window is showing Cause:' + JSON.stringify(err)); | 81 | + // console.error(TAG, 'Failed window is showing Cause:' + JSON.stringify(err)); |
| 82 | return; | 82 | return; |
| 83 | } | 83 | } |
| 84 | - console.info(TAG, 'window is showing: ' + JSON.stringify(data)); | 84 | + // console.info(TAG, 'window is showing: ' + JSON.stringify(data)); |
| 85 | if(data === false) { | 85 | if(data === false) { |
| 86 | // 显示当前窗口,使用callback异步回调。 | 86 | // 显示当前窗口,使用callback异步回调。 |
| 87 | this.floatWindowClass.get().showWindow((err: BusinessError) => { | 87 | this.floatWindowClass.get().showWindow((err: BusinessError) => { |
| 88 | let errCode: number = err.code; | 88 | let errCode: number = err.code; |
| 89 | if (errCode) { | 89 | if (errCode) { |
| 90 | - console.error(TAG, 'floatWindowClass Failed to show the window. Cause: ' + JSON.stringify(err)); | 90 | + // console.error(TAG, 'floatWindowClass Failed to show the window. Cause: ' + JSON.stringify(err)); |
| 91 | return; | 91 | return; |
| 92 | } | 92 | } |
| 93 | - console.info(TAG, 'floatWindowClass Succeeded in showing the window.'); | 93 | + // console.info(TAG, 'floatWindowClass Succeeded in showing the window.'); |
| 94 | }); | 94 | }); |
| 95 | } | 95 | } |
| 96 | }); | 96 | }); |
| @@ -101,10 +101,10 @@ export class AudioSuspensionModel { | @@ -101,10 +101,10 @@ export class AudioSuspensionModel { | ||
| 101 | this.floatWindowClass.get().resize(width, height, (err: BusinessError) => { | 101 | this.floatWindowClass.get().resize(width, height, (err: BusinessError) => { |
| 102 | let errCode: number = err.code; | 102 | let errCode: number = err.code; |
| 103 | if (errCode) { | 103 | if (errCode) { |
| 104 | - console.error(TAG, 'floatWindowClass Failed to change the window size. Cause:' + JSON.stringify(err)); | 104 | + // console.error(TAG, 'floatWindowClass Failed to change the window size. Cause:' + JSON.stringify(err)); |
| 105 | return; | 105 | return; |
| 106 | } | 106 | } |
| 107 | - console.info(TAG, 'floatWindowClass Succeeded in changing the window size.'); | 107 | + // console.info(TAG, 'floatWindowClass Succeeded in changing the window size.'); |
| 108 | }); | 108 | }); |
| 109 | } | 109 | } |
| 110 | 110 | ||
| @@ -113,11 +113,11 @@ export class AudioSuspensionModel { | @@ -113,11 +113,11 @@ export class AudioSuspensionModel { | ||
| 113 | this.floatWindowClass.get().minimize((err: BusinessError) => { | 113 | this.floatWindowClass.get().minimize((err: BusinessError) => { |
| 114 | const errCode: number = err.code; | 114 | const errCode: number = err.code; |
| 115 | if (errCode) { | 115 | if (errCode) { |
| 116 | - console.error(TAG, 'Failed to minimize the window. Cause: ' + JSON.stringify(err)); | 116 | + // console.error(TAG, 'Failed to minimize the window. Cause: ' + JSON.stringify(err)); |
| 117 | return; | 117 | return; |
| 118 | } | 118 | } |
| 119 | AppStorage.setOrCreate('isMinimize', true); | 119 | AppStorage.setOrCreate('isMinimize', true); |
| 120 | - console.info(TAG, 'Succeeded in minimizing the window.'); | 120 | + // console.info(TAG, 'Succeeded in minimizing the window.'); |
| 121 | }); | 121 | }); |
| 122 | } | 122 | } |
| 123 | 123 |
| @@ -64,7 +64,7 @@ export struct DetailVideoListPage { | @@ -64,7 +64,7 @@ export struct DetailVideoListPage { | ||
| 64 | await this.getContentDetail(this.contentId, this.relId, this.relType) | 64 | await this.getContentDetail(this.contentId, this.relId, this.relType) |
| 65 | } | 65 | } |
| 66 | await this.queryVideoList() | 66 | await this.queryVideoList() |
| 67 | - console.log(TAG, 'aboutToAppear', JSON.stringify(action.params)) | 67 | + // console.log(TAG, 'aboutToAppear', JSON.stringify(action.params)) |
| 68 | 68 | ||
| 69 | } else { | 69 | } else { |
| 70 | // 无网络 | 70 | // 无网络 |
| @@ -77,13 +77,13 @@ export struct DetailVideoListPage { | @@ -77,13 +77,13 @@ export struct DetailVideoListPage { | ||
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | aboutToDisappear(): void { | 79 | aboutToDisappear(): void { |
| 80 | - console.log(TAG, 'aboutToDisappear') | 80 | + // console.log(TAG, 'aboutToDisappear') |
| 81 | this.closeFullScreen() | 81 | this.closeFullScreen() |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | // page show/hide只能在外层组件触发 | 84 | // page show/hide只能在外层组件触发 |
| 85 | onPageShow(): void { | 85 | onPageShow(): void { |
| 86 | - console.log(TAG, 'onPageShow') | 86 | + // console.log(TAG, 'onPageShow') |
| 87 | this.pageShow = Math.random() | 87 | this.pageShow = Math.random() |
| 88 | this.switchVideoStatus = true | 88 | this.switchVideoStatus = true |
| 89 | this.openFullScreen() | 89 | this.openFullScreen() |
| @@ -94,10 +94,10 @@ export struct DetailVideoListPage { | @@ -94,10 +94,10 @@ export struct DetailVideoListPage { | ||
| 94 | this.AudioSuspension.floatWindowClass.get().isShowing((err: BusinessError, data) => { | 94 | this.AudioSuspension.floatWindowClass.get().isShowing((err: BusinessError, data) => { |
| 95 | const errCode: number = err.code; | 95 | const errCode: number = err.code; |
| 96 | if (errCode) { | 96 | if (errCode) { |
| 97 | - console.error(TAG, 'Failed window is showing Cause:' + JSON.stringify(err)); | 97 | + // console.error(TAG, 'Failed window is showing Cause:' + JSON.stringify(err)); |
| 98 | return; | 98 | return; |
| 99 | } | 99 | } |
| 100 | - console.info(TAG, 'window is showing: ' + JSON.stringify(data)); | 100 | + // console.info(TAG, 'window is showing: ' + JSON.stringify(data)); |
| 101 | if(data) { | 101 | if(data) { |
| 102 | this.isShowAudioCom = true | 102 | this.isShowAudioCom = true |
| 103 | this.AudioSuspension.playerController.get()?.pause(); | 103 | this.AudioSuspension.playerController.get()?.pause(); |
| @@ -107,7 +107,7 @@ export struct DetailVideoListPage { | @@ -107,7 +107,7 @@ export struct DetailVideoListPage { | ||
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | onPageHide(): void { | 109 | onPageHide(): void { |
| 110 | - console.log(TAG, 'onPageHide') | 110 | + // console.log(TAG, 'onPageHide') |
| 111 | this.switchVideoStatus = false | 111 | this.switchVideoStatus = false |
| 112 | this.closeFullScreen() | 112 | this.closeFullScreen() |
| 113 | 113 | ||
| @@ -116,7 +116,7 @@ export struct DetailVideoListPage { | @@ -116,7 +116,7 @@ export struct DetailVideoListPage { | ||
| 116 | duration = Math.floor((this.pageHideTime - this.pageShowTime)/1000) | 116 | duration = Math.floor((this.pageHideTime - this.pageShowTime)/1000) |
| 117 | TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Customer_Personal,TrackConstants.PageName.Customer_Personal,duration) | 117 | TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Customer_Personal,TrackConstants.PageName.Customer_Personal,duration) |
| 118 | 118 | ||
| 119 | - console.info(TAG, 'this.isShowAudioCom: ' + this.isShowAudioCom); | 119 | + // console.info(TAG, 'this.isShowAudioCom: ' + this.isShowAudioCom); |
| 120 | if (this.isShowAudioCom) { | 120 | if (this.isShowAudioCom) { |
| 121 | this.AudioSuspension.showWindow() | 121 | this.AudioSuspension.showWindow() |
| 122 | this.isShowAudioCom = false | 122 | this.isShowAudioCom = false |
| @@ -170,7 +170,7 @@ export struct DetailVideoListPage { | @@ -170,7 +170,7 @@ export struct DetailVideoListPage { | ||
| 170 | relId: relId, | 170 | relId: relId, |
| 171 | relType: relType | 171 | relType: relType |
| 172 | }).then(async (resDTO: ResponseDTO<ContentDetailDTO[]>) => { | 172 | }).then(async (resDTO: ResponseDTO<ContentDetailDTO[]>) => { |
| 173 | - console.log(TAG, 'getContentDetail:', JSON.stringify(resDTO.data)) | 173 | + // console.log(TAG, 'getContentDetail:', JSON.stringify(resDTO.data)) |
| 174 | this.isOffLine = resDTO.data == null ? true : false | 174 | this.isOffLine = resDTO.data == null ? true : false |
| 175 | if (resDTO.data) { | 175 | if (resDTO.data) { |
| 176 | const params: contentListParams = { | 176 | const params: contentListParams = { |
| @@ -184,7 +184,7 @@ export struct DetailVideoListPage { | @@ -184,7 +184,7 @@ export struct DetailVideoListPage { | ||
| 184 | if (res.data) { | 184 | if (res.data) { |
| 185 | this.interactDataList = this.interactDataList.concat(res.data) | 185 | this.interactDataList = this.interactDataList.concat(res.data) |
| 186 | } | 186 | } |
| 187 | - console.log('获取互动点赞等数据===', JSON.stringify(res)) | 187 | + // console.log('获取互动点赞等数据===', JSON.stringify(res)) |
| 188 | }) | 188 | }) |
| 189 | this.data.push(resDTO.data[0]) | 189 | this.data.push(resDTO.data[0]) |
| 190 | } | 190 | } |
| @@ -202,7 +202,7 @@ export struct DetailVideoListPage { | @@ -202,7 +202,7 @@ export struct DetailVideoListPage { | ||
| 202 | if (res.data) { | 202 | if (res.data) { |
| 203 | await this.getContentInteract(res.data) | 203 | await this.getContentInteract(res.data) |
| 204 | this.data = this.data.concat(res.data) | 204 | this.data = this.data.concat(res.data) |
| 205 | - console.log('视频列表===', JSON.stringify(res.data)) | 205 | + // console.log('视频列表===', JSON.stringify(res.data)) |
| 206 | } | 206 | } |
| 207 | }) | 207 | }) |
| 208 | } | 208 | } |
| @@ -226,7 +226,7 @@ export struct DetailVideoListPage { | @@ -226,7 +226,7 @@ export struct DetailVideoListPage { | ||
| 226 | if (res.data) { | 226 | if (res.data) { |
| 227 | this.interactDataList = this.interactDataList.concat(res.data) | 227 | this.interactDataList = this.interactDataList.concat(res.data) |
| 228 | } | 228 | } |
| 229 | - console.log('获取互动点赞等数据===', JSON.stringify(res)) | 229 | + // console.log('获取互动点赞等数据===', JSON.stringify(res)) |
| 230 | }) | 230 | }) |
| 231 | } | 231 | } |
| 232 | } | 232 | } |
| @@ -66,43 +66,43 @@ export default class EntryAbility extends UIAbility { | @@ -66,43 +66,43 @@ export default class EntryAbility extends UIAbility { | ||
| 66 | //../../../../../../features/wdLogin/src/main/ets/pages/launchPage/LaunchPage | 66 | //../../../../../../features/wdLogin/src/main/ets/pages/launchPage/LaunchPage |
| 67 | windowStage.loadContent('pages/launchPage/LaunchPage', (err, data) => { | 67 | windowStage.loadContent('pages/launchPage/LaunchPage', (err, data) => { |
| 68 | if (err.code) { | 68 | if (err.code) { |
| 69 | - Logger.error(TAG, 'Failed to load the content. Cause: ' + JSON.stringify(err) ?? ''); | 69 | + // Logger.error(TAG, 'Failed to load the content. Cause: ' + JSON.stringify(err) ?? ''); |
| 70 | return; | 70 | return; |
| 71 | } | 71 | } |
| 72 | - Logger.info(TAG, 'Succeeded in loading the content. Data: ' + JSON.stringify(data) ?? ''); | 72 | + // Logger.info(TAG, 'Succeeded in loading the content. Data: ' + JSON.stringify(data) ?? ''); |
| 73 | }); | 73 | }); |
| 74 | // 1.创建悬浮窗 | 74 | // 1.创建悬浮窗 |
| 75 | windowStage.createSubWindow('subWindow', (err: BusinessError, data) => { | 75 | windowStage.createSubWindow('subWindow', (err: BusinessError, data) => { |
| 76 | let errCode: number = err.code; | 76 | let errCode: number = err.code; |
| 77 | if (errCode) { | 77 | if (errCode) { |
| 78 | - Logger.error('floatWindowClass Failed to create the subwindow. Cause: ' + JSON.stringify(err)); | 78 | + // Logger.error('floatWindowClass Failed to create the subwindow. Cause: ' + JSON.stringify(err)); |
| 79 | return; | 79 | return; |
| 80 | } | 80 | } |
| 81 | - Logger.info('floatWindowClass Succeeded in creating the subwindow. Data: ' + JSON.stringify(data)); | 81 | + // Logger.info('floatWindowClass Succeeded in creating the subwindow. Data: ' + JSON.stringify(data)); |
| 82 | floatWindowClass = data; | 82 | floatWindowClass = data; |
| 83 | AppStorage.setOrCreate('floatWindowClass', floatWindowClass); | 83 | AppStorage.setOrCreate('floatWindowClass', floatWindowClass); |
| 84 | // 2.悬浮窗窗口创建成功后,设置悬浮窗的位置、大小及相关属性等。 | 84 | // 2.悬浮窗窗口创建成功后,设置悬浮窗的位置、大小及相关属性等。 |
| 85 | floatWindowClass.moveWindowTo(initMoveX, initMoveY, (err: BusinessError) => { | 85 | floatWindowClass.moveWindowTo(initMoveX, initMoveY, (err: BusinessError) => { |
| 86 | let errCode: number = err.code; | 86 | let errCode: number = err.code; |
| 87 | if (errCode) { | 87 | if (errCode) { |
| 88 | - Logger.error('floatWindowClass Failed to move the window. Cause:' + JSON.stringify(err)); | 88 | + // Logger.error('floatWindowClass Failed to move the window. Cause:' + JSON.stringify(err)); |
| 89 | return; | 89 | return; |
| 90 | } | 90 | } |
| 91 | - Logger.info('floatWindowClass Succeeded in moving the window.'); | 91 | + // Logger.info('floatWindowClass Succeeded in moving the window.'); |
| 92 | }); | 92 | }); |
| 93 | // 3.为悬浮窗加载对应的目标页面。 | 93 | // 3.为悬浮窗加载对应的目标页面。 |
| 94 | floatWindowClass.setUIContent("pages/view/AudioComponent", (err: BusinessError) => { | 94 | floatWindowClass.setUIContent("pages/view/AudioComponent", (err: BusinessError) => { |
| 95 | let errCode: number = err.code; | 95 | let errCode: number = err.code; |
| 96 | if (errCode) { | 96 | if (errCode) { |
| 97 | - Logger.error('floatWindowClass Failed to load the content. Cause:' + JSON.stringify(err)); | 97 | + // Logger.error('floatWindowClass Failed to load the content. Cause:' + JSON.stringify(err)); |
| 98 | return; | 98 | return; |
| 99 | } | 99 | } |
| 100 | - Logger.info('floatWindowClass Succeeded in loading the content.'); | 100 | + // Logger.info('floatWindowClass Succeeded in loading the content.'); |
| 101 | let color: string = 'rgba(0,0,0,0)'; | 101 | let color: string = 'rgba(0,0,0,0)'; |
| 102 | try { | 102 | try { |
| 103 | (floatWindowClass as window.Window).setWindowBackgroundColor(color); | 103 | (floatWindowClass as window.Window).setWindowBackgroundColor(color); |
| 104 | } catch (exception) { | 104 | } catch (exception) { |
| 105 | - Logger.error('Failed to set the background color. Cause: ' + JSON.stringify(exception)); | 105 | + // Logger.error('Failed to set the background color. Cause: ' + JSON.stringify(exception)); |
| 106 | } | 106 | } |
| 107 | ; | 107 | ; |
| 108 | }); | 108 | }); |
| @@ -110,14 +110,14 @@ export default class EntryAbility extends UIAbility { | @@ -110,14 +110,14 @@ export default class EntryAbility extends UIAbility { | ||
| 110 | floatWindowClass.setWindowFocusable(false, (err: BusinessError) => { | 110 | floatWindowClass.setWindowFocusable(false, (err: BusinessError) => { |
| 111 | const errCode: number = err.code; | 111 | const errCode: number = err.code; |
| 112 | if (errCode) { | 112 | if (errCode) { |
| 113 | - console.error(`Failed to set the window to be focusable. Cause code: ${err.code}, message: ${err.message}`); | 113 | + // console.error(`Failed to set the window to be focusable. Cause code: ${err.code}, message: ${err.message}`); |
| 114 | return; | 114 | return; |
| 115 | } | 115 | } |
| 116 | - console.info('Succeeded in setting the window to be focusable.'); | 116 | + // console.info('Succeeded in setting the window to be focusable.'); |
| 117 | }); | 117 | }); |
| 118 | 118 | ||
| 119 | floatWindowClass.on('touchOutside', () => { | 119 | floatWindowClass.on('touchOutside', () => { |
| 120 | - console.info('touchOutside'); | 120 | + // console.info('touchOutside'); |
| 121 | EmitterUtils.sendEvent(EmitterEventId.AUDIO_WINDOW_TYPE, 3) | 121 | EmitterUtils.sendEvent(EmitterEventId.AUDIO_WINDOW_TYPE, 3) |
| 122 | }); | 122 | }); |
| 123 | 123 | ||
| @@ -142,20 +142,20 @@ export default class EntryAbility extends UIAbility { | @@ -142,20 +142,20 @@ export default class EntryAbility extends UIAbility { | ||
| 142 | // 普通phone以PORTRAIT/竖屏显示模式启动 | 142 | // 普通phone以PORTRAIT/竖屏显示模式启动 |
| 143 | // 折叠屏和tablet是以AUTO_ROTATION_RESTRICTED/受开关控制的自动旋转模式启动 | 143 | // 折叠屏和tablet是以AUTO_ROTATION_RESTRICTED/受开关控制的自动旋转模式启动 |
| 144 | WindowModel.shared.setPreferredOrientation(window.Orientation.PORTRAIT) | 144 | WindowModel.shared.setPreferredOrientation(window.Orientation.PORTRAIT) |
| 145 | - .then(() => { | ||
| 146 | - Logger.info(TAG, 'setPreferredOrientation Succeeded'); | ||
| 147 | - }) | ||
| 148 | - .catch((err: Error) => { | ||
| 149 | - Logger.info(TAG, | ||
| 150 | - `setPreferredOrientation catch, error error.name : ${err.name}, error.message:${err.message}`); | ||
| 151 | - }) | ||
| 152 | - } else if (DeviceUtil.is2in1()) { | ||
| 153 | - // 2in1(PC)设备不支持旋转(无横竖屏模式),会以默认窗口(非全屏)显示模式启动Logger.info(TAG,`start at 2in1 window device ) | ||
| 154 | - Logger.info(TAG, 'start at 2in1 window device') | ||
| 155 | - } else { | ||
| 156 | - // 轻量级智能穿戴/lite wearable device | ||
| 157 | - Logger.info(TAG, 'start at other type device') | 145 | + // .then(() => { |
| 146 | + // Logger.info(TAG, 'setPreferredOrientation Succeeded'); | ||
| 147 | + // }) | ||
| 148 | + // .catch((err: Error) => { | ||
| 149 | + // Logger.info(TAG, `setPreferredOrientation catch, error error.name : ${err.name}, error.message:${err.message}`); | ||
| 150 | + // }) | ||
| 158 | } | 151 | } |
| 152 | + // else if (DeviceUtil.is2in1()) { | ||
| 153 | + // // 2in1(PC)设备不支持旋转(无横竖屏模式),会以默认窗口(非全屏)显示模式启动Logger.info(TAG,`start at 2in1 window device ) | ||
| 154 | + // Logger.info(TAG, 'start at 2in1 window device') | ||
| 155 | + // } else { | ||
| 156 | + // // 轻量级智能穿戴/lite wearable device | ||
| 157 | + // Logger.info(TAG, 'start at other type device') | ||
| 158 | + // } | ||
| 159 | 159 | ||
| 160 | } | 160 | } |
| 161 | 161 | ||
| @@ -163,29 +163,29 @@ export default class EntryAbility extends UIAbility { | @@ -163,29 +163,29 @@ export default class EntryAbility extends UIAbility { | ||
| 163 | (floatWindowClass as window.Window).destroyWindow((err: BusinessError) => { | 163 | (floatWindowClass as window.Window).destroyWindow((err: BusinessError) => { |
| 164 | let errCode: number = err.code; | 164 | let errCode: number = err.code; |
| 165 | if (errCode) { | 165 | if (errCode) { |
| 166 | - Logger.error('floatWindowClass Failed to destroy the window. Cause: ' + JSON.stringify(err)); | 166 | + // Logger.error('floatWindowClass Failed to destroy the window. Cause: ' + JSON.stringify(err)); |
| 167 | return; | 167 | return; |
| 168 | } | 168 | } |
| 169 | - Logger.info('floatWindowClass Succeeded in destroying the window.'); | 169 | + // Logger.info('floatWindowClass Succeeded in destroying the window.'); |
| 170 | }); | 170 | }); |
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | onWindowStageDestroy(): void { | 173 | onWindowStageDestroy(): void { |
| 174 | // Main window is destroyed, release UI related resources | 174 | // Main window is destroyed, release UI related resources |
| 175 | this.destroyFloatWindow() | 175 | this.destroyFloatWindow() |
| 176 | - Logger.info(TAG, 'Ability onWindowStageDestroy'); | 176 | + // Logger.info(TAG, 'Ability onWindowStageDestroy'); |
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | onForeground(): void { | 179 | onForeground(): void { |
| 180 | // Ability has brought to foreground | 180 | // Ability has brought to foreground |
| 181 | - Logger.info(TAG, 'Ability onForeground'); | 181 | + // Logger.info(TAG, 'Ability onForeground'); |
| 182 | 182 | ||
| 183 | EmitterUtils.sendEmptyEvent(EmitterEventId.APP_ENTER_FOREGROUD) | 183 | EmitterUtils.sendEmptyEvent(EmitterEventId.APP_ENTER_FOREGROUD) |
| 184 | } | 184 | } |
| 185 | 185 | ||
| 186 | onBackground(): void { | 186 | onBackground(): void { |
| 187 | // Ability has back to background | 187 | // Ability has back to background |
| 188 | - Logger.info(TAG, 'Ability onBackground'); | 188 | + // Logger.info(TAG, 'Ability onBackground'); |
| 189 | 189 | ||
| 190 | EmitterUtils.sendEmptyEvent(EmitterEventId.APP_ENTER_BACKGROUD) | 190 | EmitterUtils.sendEmptyEvent(EmitterEventId.APP_ENTER_BACKGROUD) |
| 191 | } | 191 | } |
| @@ -50,10 +50,10 @@ struct Index { | @@ -50,10 +50,10 @@ struct Index { | ||
| 50 | EmitterUtils.receiveEvent(EmitterEventId.AUDIO_CHANGE_STATUS, (val: number | string | undefined) => { | 50 | EmitterUtils.receiveEvent(EmitterEventId.AUDIO_CHANGE_STATUS, (val: number | string | undefined) => { |
| 51 | // val 2 pause | 51 | // val 2 pause |
| 52 | if(val === PlayerConstants.STATUS_PAUSE || val === PlayerConstants.STATUS_COMPLETION) { | 52 | if(val === PlayerConstants.STATUS_PAUSE || val === PlayerConstants.STATUS_COMPLETION) { |
| 53 | - console.log(TAG,'AUDIO_CHANGE_STATUS this.currentStatus 2 ', val) | 53 | + // console.log(TAG,'AUDIO_CHANGE_STATUS this.currentStatus 2 ', val) |
| 54 | lottie.pause(this.name) | 54 | lottie.pause(this.name) |
| 55 | } else if(val === PlayerConstants.STATUS_START) { | 55 | } else if(val === PlayerConstants.STATUS_START) { |
| 56 | - console.log(TAG,'AUDIO_CHANGE_STATUS this.currentStatus 1 ', val) | 56 | + // console.log(TAG,'AUDIO_CHANGE_STATUS this.currentStatus 1 ', val) |
| 57 | lottie.play(this.name) | 57 | lottie.play(this.name) |
| 58 | } | 58 | } |
| 59 | this.currentStatus = val | 59 | this.currentStatus = val |
| @@ -80,7 +80,7 @@ struct Index { | @@ -80,7 +80,7 @@ struct Index { | ||
| 80 | 80 | ||
| 81 | moveWindow() { | 81 | moveWindow() { |
| 82 | if (this.subWindow == null) { | 82 | if (this.subWindow == null) { |
| 83 | - console.info('Faild in destroying the window.'); | 83 | + // console.info('Faild in destroying the window.'); |
| 84 | } else { | 84 | } else { |
| 85 | this.subWindow.moveWindowTo(this.windowPosition.x, this.windowPosition.y); | 85 | this.subWindow.moveWindowTo(this.windowPosition.x, this.windowPosition.y); |
| 86 | } | 86 | } |
| @@ -88,7 +88,7 @@ struct Index { | @@ -88,7 +88,7 @@ struct Index { | ||
| 88 | 88 | ||
| 89 | onPageHide() { | 89 | onPageHide() { |
| 90 | // this.status = PlayerConstants.STATUS_PAUSE; | 90 | // this.status = PlayerConstants.STATUS_PAUSE; |
| 91 | - console.info('onPageHide'); | 91 | + // console.info('onPageHide'); |
| 92 | // this.AudioSuspension.playerController.get()?.pause(); | 92 | // this.AudioSuspension.playerController.get()?.pause(); |
| 93 | } | 93 | } |
| 94 | 94 | ||
| @@ -110,15 +110,15 @@ struct Index { | @@ -110,15 +110,15 @@ struct Index { | ||
| 110 | .fontFamily('PingFang SC-Medium') | 110 | .fontFamily('PingFang SC-Medium') |
| 111 | .fontWeight(500) | 111 | .fontWeight(500) |
| 112 | .alignSelf(ItemAlign.Start) | 112 | .alignSelf(ItemAlign.Start) |
| 113 | - .onStart(() => { | ||
| 114 | - console.info('Marquee animation complete onStart') | ||
| 115 | - }) | ||
| 116 | - .onBounce(() => { | ||
| 117 | - console.info('Marquee animation complete onBounce') | ||
| 118 | - }) | ||
| 119 | - .onFinish(() => { | ||
| 120 | - console.info('Marquee animation complete onFinish') | ||
| 121 | - }) | 113 | + // .onStart(() => { |
| 114 | + // console.info('Marquee animation complete onStart') | ||
| 115 | + // }) | ||
| 116 | + // .onBounce(() => { | ||
| 117 | + // console.info('Marquee animation complete onBounce') | ||
| 118 | + // }) | ||
| 119 | + // .onFinish(() => { | ||
| 120 | + // console.info('Marquee animation complete onFinish') | ||
| 121 | + // }) | ||
| 122 | 122 | ||
| 123 | Row() { | 123 | Row() { |
| 124 | Text(this.currentTime) | 124 | Text(this.currentTime) |
| @@ -209,9 +209,9 @@ struct Index { | @@ -209,9 +209,9 @@ struct Index { | ||
| 209 | }), | 209 | }), |
| 210 | PanGesture(this.panOption) | 210 | PanGesture(this.panOption) |
| 211 | //手势识别成功回调。 | 211 | //手势识别成功回调。 |
| 212 | - .onActionStart((event: GestureEvent) => { | ||
| 213 | - console.info('Pan start'); | ||
| 214 | - }) | 212 | + // .onActionStart((event: GestureEvent) => { |
| 213 | + // console.info('Pan start'); | ||
| 214 | + // }) | ||
| 215 | // 手势移动过程中回调。发生拖拽时,获取到触摸点的位置,并将位置信息传递给windowPosition | 215 | // 手势移动过程中回调。发生拖拽时,获取到触摸点的位置,并将位置信息传递给windowPosition |
| 216 | .onActionUpdate((event: GestureEvent) => { | 216 | .onActionUpdate((event: GestureEvent) => { |
| 217 | // this.windowPosition.x += event.offsetX; | 217 | // this.windowPosition.x += event.offsetX; |
| @@ -219,9 +219,9 @@ struct Index { | @@ -219,9 +219,9 @@ struct Index { | ||
| 219 | this.windowPosition.y = Math.min(Math.max(newY, this.topSafeHeight), this.bottomSafeHeight); | 219 | this.windowPosition.y = Math.min(Math.max(newY, this.topSafeHeight), this.bottomSafeHeight); |
| 220 | }) | 220 | }) |
| 221 | //手势识别成功,手指抬起后触发回调。 | 221 | //手势识别成功,手指抬起后触发回调。 |
| 222 | - .onActionEnd(() => { | ||
| 223 | - console.info('Pan end'); | ||
| 224 | - }) | 222 | + // .onActionEnd(() => { |
| 223 | + // console.info('Pan end'); | ||
| 224 | + // }) | ||
| 225 | ) | 225 | ) |
| 226 | ) | 226 | ) |
| 227 | .borderRadius(4) | 227 | .borderRadius(4) |
| @@ -61,11 +61,11 @@ export struct BottomNavigationComponent { | @@ -61,11 +61,11 @@ export struct BottomNavigationComponent { | ||
| 61 | 61 | ||
| 62 | 62 | ||
| 63 | async aboutToAppear() { | 63 | async aboutToAppear() { |
| 64 | - Logger.info(TAG, `aboutToAppear currentNavIndex: ${this.currentNavIndex}`); | 64 | + // Logger.info(TAG, `aboutToAppear currentNavIndex: ${this.currentNavIndex}`); |
| 65 | this.getBottomData() | 65 | this.getBottomData() |
| 66 | 66 | ||
| 67 | EmitterUtils.receiveEvent(EmitterEventId.JUMP_HOME_CHANNEL, (str?: string) => { | 67 | EmitterUtils.receiveEvent(EmitterEventId.JUMP_HOME_CHANNEL, (str?: string) => { |
| 68 | - Logger.debug(TAG, 'receiveEvent JUMP_HOME_CHANNEL: ' + str) | 68 | + // Logger.debug(TAG, 'receiveEvent JUMP_HOME_CHANNEL: ' + str) |
| 69 | if (str) { | 69 | if (str) { |
| 70 | // 跳转指定频道场景,传参底导id、频道id | 70 | // 跳转指定频道场景,传参底导id、频道id |
| 71 | let assignChannel = JSON.parse(str) as AssignChannelParam | 71 | let assignChannel = JSON.parse(str) as AssignChannelParam |
| @@ -75,7 +75,7 @@ export struct BottomNavigationComponent { | @@ -75,7 +75,7 @@ export struct BottomNavigationComponent { | ||
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | aboutToDisappear() { | 77 | aboutToDisappear() { |
| 78 | - Logger.info(TAG, `aboutToDisappear, this.currentNavIndex: ${this.currentNavIndex}`); | 78 | + // Logger.info(TAG, `aboutToDisappear, this.currentNavIndex: ${this.currentNavIndex}`); |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | build() { | 81 | build() { |
| @@ -153,8 +153,8 @@ export struct BottomNavigationComponent { | @@ -153,8 +153,8 @@ export struct BottomNavigationComponent { | ||
| 153 | this.handleAudio(navItem) | 153 | this.handleAudio(navItem) |
| 154 | }) | 154 | }) |
| 155 | .onClick(() => { | 155 | .onClick(() => { |
| 156 | - Logger.info(TAG, `onChange, index: ${index}`); | ||
| 157 | - Logger.info(TAG, `onChange, navItem: ${JSON.stringify(navItem)}`); | 156 | + // Logger.info(TAG, `onChange, index: ${index}`); |
| 157 | + // Logger.info(TAG, `onChange, navItem: ${JSON.stringify(navItem)}`); | ||
| 158 | // 底部bar埋点 | 158 | // 底部bar埋点 |
| 159 | const params: ParamType = { | 159 | const params: ParamType = { |
| 160 | "pageName": navItem.pageName, | 160 | "pageName": navItem.pageName, |
| @@ -267,10 +267,10 @@ export struct BottomNavigationComponent { | @@ -267,10 +267,10 @@ export struct BottomNavigationComponent { | ||
| 267 | this.AudioSuspension.floatWindowClass.get().isShowing((err: BusinessError, data) => { | 267 | this.AudioSuspension.floatWindowClass.get().isShowing((err: BusinessError, data) => { |
| 268 | const errCode: number = err.code; | 268 | const errCode: number = err.code; |
| 269 | if (errCode) { | 269 | if (errCode) { |
| 270 | - console.error(TAG, 'Failed window is showing Cause:' + JSON.stringify(err)); | 270 | + // console.error(TAG, 'Failed window is showing Cause:' + JSON.stringify(err)); |
| 271 | return; | 271 | return; |
| 272 | } | 272 | } |
| 273 | - console.info(TAG, 'window is showing: ' + JSON.stringify(data)); | 273 | + // console.info(TAG, 'window is showing: ' + JSON.stringify(data)); |
| 274 | if(data) { | 274 | if(data) { |
| 275 | this.isShowAudioCom = true | 275 | this.isShowAudioCom = true |
| 276 | this.AudioSuspension.playerController.get()?.pause(); | 276 | this.AudioSuspension.playerController.get()?.pause(); |
| @@ -278,7 +278,7 @@ export struct BottomNavigationComponent { | @@ -278,7 +278,7 @@ export struct BottomNavigationComponent { | ||
| 278 | } | 278 | } |
| 279 | }); | 279 | }); |
| 280 | } else { | 280 | } else { |
| 281 | - console.info(TAG, 'this.isShowAudioCom: ' + this.isShowAudioCom); | 281 | + // console.info(TAG, 'this.isShowAudioCom: ' + this.isShowAudioCom); |
| 282 | if (this.isShowAudioCom) { | 282 | if (this.isShowAudioCom) { |
| 283 | this.AudioSuspension.showWindow() | 283 | this.AudioSuspension.showWindow() |
| 284 | this.isShowAudioCom = false | 284 | this.isShowAudioCom = false |
| @@ -288,7 +288,7 @@ export struct BottomNavigationComponent { | @@ -288,7 +288,7 @@ export struct BottomNavigationComponent { | ||
| 288 | 288 | ||
| 289 | // 底导切换函数 | 289 | // 底导切换函数 |
| 290 | async onBottomNavigationIndexChange(navItem: BottomNavDTO, index: number) { | 290 | async onBottomNavigationIndexChange(navItem: BottomNavDTO, index: number) { |
| 291 | - Logger.info(TAG, `onBottomNavigationIndexChange to Index:${index},this.currentNavIndex: ${this.currentNavIndex}`); | 291 | + // Logger.info(TAG, `onBottomNavigationIndexChange to Index:${index},this.currentNavIndex: ${this.currentNavIndex}`); |
| 292 | 292 | ||
| 293 | if (navItem.name === '我的') { | 293 | if (navItem.name === '我的') { |
| 294 | this.barBackgroundColor = Color.White | 294 | this.barBackgroundColor = Color.White |
| @@ -309,7 +309,7 @@ export struct BottomNavigationComponent { | @@ -309,7 +309,7 @@ export struct BottomNavigationComponent { | ||
| 309 | 309 | ||
| 310 | 310 | ||
| 311 | onBottomNavigationDataUpdated() { | 311 | onBottomNavigationDataUpdated() { |
| 312 | - Logger.error('yyyy', 'onBottomNavigationDataUpdated ' + JSON.stringify(this.bottomNavList)) | 312 | + // Logger.error('yyyy', 'onBottomNavigationDataUpdated ' + JSON.stringify(this.bottomNavList)) |
| 313 | } | 313 | } |
| 314 | 314 | ||
| 315 | /** | 315 | /** |
| @@ -339,18 +339,18 @@ export struct BottomNavigationComponent { | @@ -339,18 +339,18 @@ export struct BottomNavigationComponent { | ||
| 339 | } | 339 | } |
| 340 | 340 | ||
| 341 | private async getBottomData() { | 341 | private async getBottomData() { |
| 342 | - Logger.debug(TAG, 'getBottomData') | 342 | + // Logger.debug(TAG, 'getBottomData') |
| 343 | // 1、缓存底导数据 | 343 | // 1、缓存底导数据 |
| 344 | let bottomCache = await ChannelViewModel.getBottomNavCacheData() | 344 | let bottomCache = await ChannelViewModel.getBottomNavCacheData() |
| 345 | if (bottomCache && bottomCache.bottomNavList != null) { | 345 | if (bottomCache && bottomCache.bottomNavList != null) { |
| 346 | - Logger.debug(TAG, 'getBottomData cache success') | 346 | + // Logger.debug(TAG, 'getBottomData cache success') |
| 347 | this.setData(bottomCache) | 347 | this.setData(bottomCache) |
| 348 | this.getBottomDetail() | 348 | this.getBottomDetail() |
| 349 | }else{ | 349 | }else{ |
| 350 | 350 | ||
| 351 | let bottomPreset = await ChannelViewModel.getBottomNavPresetData() | 351 | let bottomPreset = await ChannelViewModel.getBottomNavPresetData() |
| 352 | if (bottomPreset && bottomPreset.bottomNavList != null) { | 352 | if (bottomPreset && bottomPreset.bottomNavList != null) { |
| 353 | - Logger.debug(TAG, 'getBottomData Preset success') | 353 | + // Logger.debug(TAG, 'getBottomData Preset success') |
| 354 | this.setData(bottomPreset) | 354 | this.setData(bottomPreset) |
| 355 | this.getBottomDetail() | 355 | this.getBottomDetail() |
| 356 | } | 356 | } |
| @@ -359,7 +359,7 @@ export struct BottomNavigationComponent { | @@ -359,7 +359,7 @@ export struct BottomNavigationComponent { | ||
| 359 | // 3、接口底导数据 | 359 | // 3、接口底导数据 |
| 360 | let bottomNav = await ChannelViewModel.getBottomNavData() | 360 | let bottomNav = await ChannelViewModel.getBottomNavData() |
| 361 | if (bottomNav && bottomNav.bottomNavList != null) { | 361 | if (bottomNav && bottomNav.bottomNavList != null) { |
| 362 | - Logger.debug(TAG, 'getBottomNavData') | 362 | + // Logger.debug(TAG, 'getBottomNavData') |
| 363 | HomeChannelUtils.setBottomNavData(bottomNav) | 363 | HomeChannelUtils.setBottomNavData(bottomNav) |
| 364 | if (this.bottomNavList == null || this.bottomNavList.length <= 0) { | 364 | if (this.bottomNavList == null || this.bottomNavList.length <= 0) { |
| 365 | // 底导没展示,则用接口数据(接口数据回来,不去覆盖缓存数据,没有缓存才加载) | 365 | // 底导没展示,则用接口数据(接口数据回来,不去覆盖缓存数据,没有缓存才加载) |
| @@ -395,7 +395,7 @@ export struct BottomNavigationComponent { | @@ -395,7 +395,7 @@ export struct BottomNavigationComponent { | ||
| 395 | } | 395 | } |
| 396 | 396 | ||
| 397 | private setData(data: NavigationBodyDTO) { | 397 | private setData(data: NavigationBodyDTO) { |
| 398 | - Logger.debug(TAG, 'setData') | 398 | + // Logger.debug(TAG, 'setData') |
| 399 | if (data == null) { | 399 | if (data == null) { |
| 400 | return | 400 | return |
| 401 | } | 401 | } |
| @@ -421,7 +421,7 @@ export struct BottomNavigationComponent { | @@ -421,7 +421,7 @@ export struct BottomNavigationComponent { | ||
| 421 | list = data.bottomNavList | 421 | list = data.bottomNavList |
| 422 | } | 422 | } |
| 423 | if (list.length > 0) { | 423 | if (list.length > 0) { |
| 424 | - Logger.info(TAG, `setData, bottomNav.length: ${list.length}`); | 424 | + // Logger.info(TAG, `setData, bottomNav.length: ${list.length}`); |
| 425 | // 使用filter方法移除name为'服务'的项 | 425 | // 使用filter方法移除name为'服务'的项 |
| 426 | list = list.filter(item => item.name !== '服务'); | 426 | list = list.filter(item => item.name !== '服务'); |
| 427 | list.forEach(item => { | 427 | list.forEach(item => { |
-
Please register or login to post a comment