diff --git a/MediaService/Index.ets b/MediaService/Index.ets index d755f017971b61f486d601aa66a67da9bf9d2af7..13a5dfb4b8748ce3f65cca387a572223d8d40114 100644 --- a/MediaService/Index.ets +++ b/MediaService/Index.ets @@ -8,4 +8,4 @@ export { AVSessionController } from './src/main/ets/utils/AVSessionController' export { MusicPlayMode, AudioPlayerState, - playModeSwitchList as PlayModeSwitchList } from './src/main/ets/songdatacontroller/PlayerData' + playModeSwitchList as PlayModeSwitchList } from './src/main/ets/songdatacontroller/PlayerData' \ No newline at end of file diff --git a/MediaService/src/main/ets/songdatacontroller/PlayerData.ets b/MediaService/src/main/ets/songdatacontroller/PlayerData.ets index a90dde25826888c91069143690b9d476bf44bb74..bec3561a83ced6cb865e6e2b992058c478b87c1a 100644 --- a/MediaService/src/main/ets/songdatacontroller/PlayerData.ets +++ b/MediaService/src/main/ets/songdatacontroller/PlayerData.ets @@ -51,6 +51,4 @@ export const SILENT_ID = 'silentId'; export class Options { public offset?: number; public length?: number; -} - - +} \ No newline at end of file diff --git a/MediaService/src/main/ets/songdatacontroller/SongData.ets b/MediaService/src/main/ets/songdatacontroller/SongData.ets index 7ae81b589e75e23b0398e94b7e4b05de18c96915..68fa10e988711b0b8a57c311f3d6ed2e6360591c 100644 --- a/MediaService/src/main/ets/songdatacontroller/SongData.ets +++ b/MediaService/src/main/ets/songdatacontroller/SongData.ets @@ -21,44 +21,36 @@ export class SongItem { * Primary key ID. */ public id: number = 0; - /** * Music name. */ public title: string = ''; - /** * Music author name. */ public singer: string = ''; - /** * Music logo information. */ public mark: Resource = $r('app.string.page_show'); - /** * Music avatar information. */ public label: Resource = $r('app.string.page_show'); - /** * Music file path information. */ public src: string = ''; - /** * Index of the current music list. */ public index: number = 0; - /** * Lyric file path information. */ public lyric: string = ''; - /** * Is the background dark. */ public isDarkBackground: boolean = false; -} +} \ No newline at end of file diff --git a/MediaService/src/main/ets/songdatacontroller/SongItemBuilder.ets b/MediaService/src/main/ets/songdatacontroller/SongItemBuilder.ets index 3d5e781f2db4462b8dbab504e50a29f24d06e041..f7d9405f8db505cf30752bc6b148c74efa92192b 100644 --- a/MediaService/src/main/ets/songdatacontroller/SongItemBuilder.ets +++ b/MediaService/src/main/ets/songdatacontroller/SongItemBuilder.ets @@ -14,10 +14,12 @@ */ import { common } from '@kit.AbilityKit'; -import { resourceManager } from '@kit.LocalizationKit'; import { BusinessError } from '@kit.BasicServicesKit'; -import { SongItem } from './SongData'; +import { resourceManager } from '@kit.LocalizationKit'; import { Logger } from '../utils/Logger'; +import { SongItem } from './SongData'; + +const TAG: string = '[SongItemBuilder]'; export default class SongItemBuilder { private context: common.UIAbilityContext | undefined = AppStorage.get('context'); @@ -31,24 +33,28 @@ export default class SongItemBuilder { } let rawFileDescriptor = await this.context.resourceManager.getRawFd(songItem.src) .catch((error: BusinessError) => { - Logger.error(`resourceManager error code ${error.code} message ${error.message}`); + Logger.error(TAG, `resourceManager error code ${error.code} message ${error.message}`); }) if (rawFileDescriptor) { this.rawFileDescriptor = rawFileDescriptor; } - Logger.info('MediaAssetBuilder build rawFileDescriptor'); + Logger.info(TAG, 'MediaAssetBuilder build rawFileDescriptor'); return this.songItem; } public getRawFileDescriptor(): resourceManager.RawFileDescriptor | undefined { - Logger.info(`get rawFileDescriptor succeed.`); + Logger.info(TAG, `getRawFileDescriptor succeed.`); return this.rawFileDescriptor; } public async release(): Promise { - if (this.context && this.context !== null && this.songItem !== null) { - this.context.resourceManager.closeRawFd(this.songItem.src); + try { + if (this.context && this.context !== null && this.songItem !== null) { + this.context.resourceManager.closeRawFd(this.songItem.src); + } + this.songItem = null; + }catch (error){ + Logger.error(TAG, `Failed to release. Code:${error.code}, message:${error.message}`); } - this.songItem = null; } } \ No newline at end of file diff --git a/MediaService/src/main/ets/utils/AVSessionController.ets b/MediaService/src/main/ets/utils/AVSessionController.ets index 59cfebc91112026f1d241be13c4e1d06ebf8e92a..4a31fec727431ac3530fa1368db8e22e5e52260f 100644 --- a/MediaService/src/main/ets/utils/AVSessionController.ets +++ b/MediaService/src/main/ets/utils/AVSessionController.ets @@ -17,14 +17,14 @@ import { common, wantAgent } from '@kit.AbilityKit'; import { avSession } from '@kit.AVSessionKit'; import { BusinessError } from '@kit.BasicServicesKit'; import { resourceManager } from '@kit.LocalizationKit'; +import { MusicPlayMode } from '../songdatacontroller/PlayerData'; import { SongItem } from '../songdatacontroller/SongData'; +import { AudioRendererController } from './AudioRendererController'; import { Logger } from './Logger'; import { MediaTools } from './MediaTools'; -import { AudioRendererController } from './AudioRendererController'; -import { MusicPlayMode } from '../songdatacontroller/PlayerData'; import { PreferencesUtil } from './PreferencesUtil'; -const TAG = 'AVSessionController'; +const TAG: string = '[AVSessionController]'; export class AVSessionController { private context: common.UIAbilityContext | undefined = undefined; @@ -143,7 +143,7 @@ export class AVSessionController { } } } catch (error) { - Logger.error(TAG, `SetAVMetadata try: code: ${(error as BusinessError).code}`); + Logger.error(TAG, `SetAVMetadata try: code: ${error.code}, message: ${error.message}`); } } @@ -172,7 +172,6 @@ export class AVSessionController { this.audioRendererController.start(); } } - private pauseCall: () => void = () => { Logger.info(TAG, `on pause , do pause task`); if (!this.audioRendererController) { @@ -181,7 +180,6 @@ export class AVSessionController { } this.audioRendererController.pause(); } - private playNextCall: () => void = () => { Logger.info(TAG, `on playNext , do playNext task`); if (!this.audioRendererController) { @@ -190,7 +188,6 @@ export class AVSessionController { } this.audioRendererController.playNext(); } - private playPreviousCall: () => void = () => { Logger.info(TAG, `on playPrevious , do playPrevious task`); if (!this.audioRendererController) { @@ -199,7 +196,6 @@ export class AVSessionController { } this.audioRendererController.playPrevious(); } - private seekCall: (curMs: number) => void = (curMs: number) => { Logger.info(TAG, `on seek , do seek task`); if (!this.audioRendererController) { @@ -208,7 +204,6 @@ export class AVSessionController { } this.audioRendererController.seek(curMs); } - private setLoopModeCall: (loopMode: avSession.LoopMode) => void = (loopMode: avSession.LoopMode) => { Logger.info(TAG, `on loopMode , do loopMode task`); if (!this.audioRendererController) { @@ -231,7 +226,6 @@ export class AVSessionController { this.setPlayModeToAVSession(); this.setPlayModeToControlArea(); } - private toggleFavoriteCall: (assetId: string) => void = (assetId: string) => { Logger.info(TAG, `on toggleFavorite , do toggleFavorite task`); this.updateFavoriteState(assetId); diff --git a/MediaService/src/main/ets/utils/AudioRendererController.ets b/MediaService/src/main/ets/utils/AudioRendererController.ets index 7c1497aa08154cbbd4b979c5a53961fa95834732..5511455f6f0322586932f4d314900995ad126a62 100644 --- a/MediaService/src/main/ets/utils/AudioRendererController.ets +++ b/MediaService/src/main/ets/utils/AudioRendererController.ets @@ -14,20 +14,20 @@ */ import { common } from '@kit.AbilityKit'; -import { BusinessError } from '@kit.BasicServicesKit'; -import { resourceManager } from '@kit.LocalizationKit'; import { audio } from '@kit.AudioKit'; +import { BusinessError } from '@kit.BasicServicesKit'; import { fileIo } from '@kit.CoreFileKit'; -import { AVSessionController } from './AVSessionController'; -import SongItemBuilder from '../songdatacontroller/SongItemBuilder'; +import { resourceManager } from '@kit.LocalizationKit'; import { MusicPlayMode, SECOND_BUFFER_WALK, Options, SILENT_ID } from '../songdatacontroller/PlayerData'; import { SongItem } from '../songdatacontroller/SongData'; +import SongItemBuilder from '../songdatacontroller/SongItemBuilder'; +import { AVSessionController } from './AVSessionController'; import { BackgroundUtil } from './BackgroundUtil'; -import { MediaTools } from './MediaTools'; import { Logger } from './Logger'; +import { MediaTools } from './MediaTools'; import { PreferencesUtil } from './PreferencesUtil'; -const TAG = 'AudioRendererController'; +const TAG: string = '[AudioRendererController]'; export class AudioRendererController { public audioRenderer?: audio.AudioRenderer; @@ -115,35 +115,39 @@ export class AudioRendererController { let bufferWalk = 0; let options: Options | undefined = undefined; this.audioRenderer.on('writeData', (buffer) => { - if (!this.songRawFileDescriptor) { - return; - } - options = { - offset: this.currentOffset, - length: buffer.byteLength - }; - fileIo.readSync(this.songRawFileDescriptor.fd, buffer, options); - this.currentOffset += buffer.byteLength; - this.bufferRead = this.currentOffset - this.initOffset; - bufferWalk += buffer.byteLength; - Logger.info(TAG, - `songRawFileDescriptor get successed` + 'bufferRead is ' + this.bufferRead + '///' + 'bufferNeedRead is ' + - this.bufferNeedRead); - if (this.bufferRead <= this.bufferNeedRead) { - if (bufferWalk >= secondBufferWalk) { // 1s seek - let curMs = MediaTools.getMsFromByteLength(this.bufferRead); - this.seek(curMs); + try { + if (!this.songRawFileDescriptor) { + return; + } + options = { + offset: this.currentOffset, + length: buffer.byteLength + }; + fileIo.readSync(this.songRawFileDescriptor.fd, buffer, options); + this.currentOffset += buffer.byteLength; + this.bufferRead = this.currentOffset - this.initOffset; + bufferWalk += buffer.byteLength; + Logger.info(TAG, + `songRawFileDescriptor get successed` + 'bufferRead is ' + this.bufferRead + '///' + 'bufferNeedRead is ' + + this.bufferNeedRead); + if (this.bufferRead <= this.bufferNeedRead) { + if (bufferWalk >= secondBufferWalk) { // 1s seek + let curMs = MediaTools.getMsFromByteLength(this.bufferRead); + this.seek(curMs); + bufferWalk = 0; + } + } else { bufferWalk = 0; + let curMs = MediaTools.getMsFromByteLength(this.songRawFileDescriptor.length); + Logger.info(TAG, 'setWriteDataCallback CurMs succeed.'); + this.seek(curMs); + this.playNext(); } - } else { - bufferWalk = 0; - let curMs = MediaTools.getMsFromByteLength(this.songRawFileDescriptor.length); - Logger.info(TAG, 'setWriteDataCallback CurMs succeed.'); - this.seek(curMs); - this.playNext(); + Logger.info(TAG, 'writeData is calling. '); + } catch (error) { + Logger.error(TAG, `writeData failed. code: ${error.code}, message: ${error.message}`); } - Logger.info(TAG, 'writeData is calling. '); - }) + }); } private setInterruptCallback() { @@ -232,14 +236,14 @@ export class AudioRendererController { audioSessionManager.deactivateAudioSession().then(() => { Logger.info(TAG, 'deactivateAudioSession SUCCESS'); }).catch((err: BusinessError) => { - Logger.error(TAG, `ERROR: ${err}`); + Logger.error(TAG, `ERROR. code: ${err.code}, message: ${err.message}`); }); } else { // AudioSession needs to be activated first, and then unmute. audioSessionManager.activateAudioSession(strategy).then(() => { Logger.info(TAG, 'activateAudioSession SUCCESS'); }).catch((err: BusinessError) => { - Logger.error(TAG, `ERROR: ${err}`); + Logger.error(TAG, `ERROR. code: ${err.code}, message: ${err.message}`); }); if (formIds.includes(SILENT_ID)) { await PreferencesUtil.getInstance().removeFormId(this.context, SILENT_ID); diff --git a/MediaService/src/main/ets/utils/BackgroundUtil.ets b/MediaService/src/main/ets/utils/BackgroundUtil.ets index c11808a60d43a9c088b9bf639311a3b28e1c5d52..1d36cca8e50bef6025bdcb567a73d2899097706d 100644 --- a/MediaService/src/main/ets/utils/BackgroundUtil.ets +++ b/MediaService/src/main/ets/utils/BackgroundUtil.ets @@ -18,7 +18,7 @@ import { backgroundTaskManager } from '@kit.BackgroundTasksKit'; import { BusinessError } from '@kit.BasicServicesKit'; import { Logger } from './Logger'; -const TAG = 'BackgroundUtil'; +const TAG: string = '[BackgroundUtil]'; export class BackgroundUtil { /** @@ -28,7 +28,7 @@ export class BackgroundUtil { */ public static startContinuousTask(context?: common.UIAbilityContext): void { if (!context) { - Logger.error(TAG, 'startContinuousTask failed', `context undefined`); + Logger.error(TAG, 'startContinuousTask failed. context undefined'); return; } let wantAgentInfo: wantAgent.WantAgentInfo = { @@ -49,10 +49,10 @@ export class BackgroundUtil { backgroundTaskManager.BackgroundMode.AUDIO_PLAYBACK, wantAgentObj).then(() => { Logger.info('this audioRenderer: ', 'startBackgroundRunning succeeded'); }).catch((error: BusinessError) => { - Logger.error('this audioRenderer: ', `startBackgroundRunning failed Cause: code ${error.code}`); + Logger.error(TAG, `startBackgroundRunning failed. code: ${error.code}, message: ${error.message}`); }); - } catch (error) { - Logger.error(TAG, `startBackgroundRunning failed.message ${(error as BusinessError).message}`); + } catch (err) { + Logger.error(TAG, `startBackgroundRunning failed. code: ${err.code}, message: ${err.message}`); } }); } @@ -65,12 +65,12 @@ export class BackgroundUtil { public static stopContinuousTask(context: common.UIAbilityContext): void { try { backgroundTaskManager.stopBackgroundRunning(context).then(() => { - Logger.info('this audioRenderer: ', 'stopBackgroundRunning succeeded'); + Logger.info(TAG, 'stopBackgroundRunning succeeded'); }).catch((error: BusinessError) => { - Logger.error('this audioRenderer: ', `stopBackgroundRunning failed Cause: code ${error.code}`); + Logger.error(TAG, `stopBackgroundRunning failed. code: ${error.code}, message: ${error.message}`); }); - } catch (error) { - Logger.error(TAG, `stopBackgroundRunning failed. message ${(error as BusinessError).message}`); + } catch (err) { + Logger.error(TAG, `stopBackgroundRunning failed. code: ${err.code}, message: ${err.message}`); } } } \ No newline at end of file diff --git a/MediaService/src/main/ets/utils/MediaTools.ets b/MediaService/src/main/ets/utils/MediaTools.ets index d330dbbebf87a80b3d60e538bdfa9ae25c0c3524..f2d82f87079c43b6b1d2b7dc990b8625fb2dd345 100644 --- a/MediaService/src/main/ets/utils/MediaTools.ets +++ b/MediaService/src/main/ets/utils/MediaTools.ets @@ -13,10 +13,10 @@ * limitations under the License. */ -import { image } from '@kit.ImageKit'; import { common } from '@kit.AbilityKit'; -import { resourceManager } from '@kit.LocalizationKit'; import { util } from '@kit.ArkTS'; +import { image } from '@kit.ImageKit'; +import { resourceManager } from '@kit.LocalizationKit'; import { SECOND_BUFFER_WALK } from '../songdatacontroller/PlayerData'; export class MediaTools { @@ -24,13 +24,10 @@ export class MediaTools { name: resourceManager.Resource): Promise { let resourceMgr = context.resourceManager; let fileData: Uint8Array = await resourceMgr.getMediaContent(name); - const imageSource = image.createImageSource(fileData.buffer as ArrayBuffer); const createPixelMap: image.PixelMap = await imageSource.createPixelMap(); - await imageSource.release(); - //await createPixelMap.release(); + await imageSource?.release(); return createPixelMap; - //return await image.createImageSource(fileData.buffer as ArrayBuffer).createPixelMap(); } /** diff --git a/MediaService/src/main/ets/utils/PreferencesUtil.ets b/MediaService/src/main/ets/utils/PreferencesUtil.ets index 7571eeafa75e0e0f86af6de634dc27ac7139d6c5..46535be1404438b6c8652569278999033827d964 100644 --- a/MediaService/src/main/ets/utils/PreferencesUtil.ets +++ b/MediaService/src/main/ets/utils/PreferencesUtil.ets @@ -17,9 +17,9 @@ import { preferences } from '@kit.ArkData'; import { BusinessError } from '@kit.BasicServicesKit'; import { Logger } from './Logger'; -const TAG = 'PreferencesUtil'; -const MY_STORE = 'myStore'; -const FORM_ID = 'formIds'; +const TAG: string = '[PreferencesUtil]'; +const MY_STORE: string = 'myStore'; +const FORM_ID: string = 'formIds'; export class PreferencesUtil { private static preferencesUtil: PreferencesUtil; @@ -65,7 +65,7 @@ export class PreferencesUtil { resolve(true); }) } catch (error) { - Logger.error(TAG, `Failed to put data. message:${(error as BusinessError).message}`); + Logger.error(TAG, `Failed to put data. Code:${error.code}, message:${error.message}`); } }); } @@ -102,7 +102,7 @@ export class PreferencesUtil { }) }); } catch (error) { - Logger.error(TAG, `WANG Failed to get value of 'formIds'.message:${(error as BusinessError).message}`); + Logger.error(TAG, `WANG Failed to get value of 'formIds'. Code:${error.code}, message:${error.message}`);111111 } return new Promise((resolve, reject) => { Logger.info(TAG, JSON.stringify(resolve) + JSON.stringify(reject)) @@ -133,7 +133,7 @@ export class PreferencesUtil { this.preferencesFlush(preferences); } } catch (error) { - Logger.error(TAG, `Failed to check the key 'formIds'. message:${(error as BusinessError).message}`); + Logger.error(TAG, `Failed to check the key 'formIds'. Code:${error.code}, message:${error.message}`); } } @@ -156,8 +156,7 @@ export class PreferencesUtil { this.preferencesFlush(preferences); } } catch (error) { - Logger.error(TAG, `WANG Failed to get preferences. Code:${(error as BusinessError).code}, - message:${(error as BusinessError).message}`); + Logger.error(TAG, `WANG Failed to get preferences. Code:${error.code}, message:${error.message}`); } } } \ No newline at end of file diff --git a/entry/src/main/ets/common/constants/BreakpointConstants.ets b/entry/src/main/ets/common/constants/BreakpointConstants.ets index 9a18ba843659d0bc67f8c2e35e6354c40a2c1532..5c24cc2be71cb78b664eb48aee8a72eb2da5b034 100644 --- a/entry/src/main/ets/common/constants/BreakpointConstants.ets +++ b/entry/src/main/ets/common/constants/BreakpointConstants.ets @@ -21,82 +21,66 @@ export class BreakpointConstants { * Breakpoints that represent small device types. */ public static readonly BREAKPOINT_SM: string = 'sm'; - /** * Breakpoints that represent middle device types. */ public static readonly BREAKPOINT_MD: string = 'md'; - /** * Breakpoints that represent large device types. */ public static readonly BREAKPOINT_LG: string = 'lg'; - /** * The break point value. */ public static readonly BREAKPOINT_VALUE_NUMBER: Array = [320, 600, 840]; - /** * The number of columns for SM device. */ public static readonly COLUMN_SM: number = 4; - /** * The number of columns for MD device. */ public static readonly COLUMN_MD: number = 8; - /** * The number of columns for LG device. */ public static readonly COLUMN_LG: number = 12; - /** * The number of columns for LG device. */ public static readonly COLUMN_LYRIC_LG: number = 7; - /** * The number of gutter X for device. */ public static readonly GUTTER_MUSIC_X: number = 24; - /** * The number of span for SM device. */ public static readonly SPAN_SM: number = 4; - /** * The number of span for MD device. */ public static readonly SPAN_MD: number = 6; - /** * The number of span for LG device. */ public static readonly SPAN_LYRIC_LG: number = 5; - /** * The number of offset for MD device. */ public static readonly OFFSET_MD: number = 1; - /** * Current breakpoints that to query the device types. */ public static readonly CURRENT_BREAKPOINT: string = 'currentBreakpoint'; - /** * Range of the small device width. */ public static readonly RANGE_SM: string = '(320vp<=width<600vp)'; - /** * Range of the middle device width. */ public static readonly RANGE_MD: string = '(600vp<=width<840vp)'; - /** * Range of the large device width. */ diff --git a/entry/src/main/ets/common/constants/ContentConstants.ets b/entry/src/main/ets/common/constants/ContentConstants.ets index 3cb24ffdc60814ac1fbb038607aab4eee2f252c8..63a878a5ee615f846f2f3401013615f163f385f0 100644 --- a/entry/src/main/ets/common/constants/ContentConstants.ets +++ b/entry/src/main/ets/common/constants/ContentConstants.ets @@ -21,12 +21,10 @@ export class ContentConstants { * The max lines of play all area is 1. */ public static readonly PLAY_ALL_MAX_LINES: number = 1; - /** * Value of lanes is 2. */ public static readonly COL_TWO: number = 2; - /** * Value of lanes is 1. */ diff --git a/entry/src/main/ets/common/constants/PlayerConstants.ets b/entry/src/main/ets/common/constants/PlayerConstants.ets index acca5275ee8cf2f0b97817b7d7ad48417dc91876..8c22e0e4920bb610709a0501a42b676b7fb68082 100644 --- a/entry/src/main/ets/common/constants/PlayerConstants.ets +++ b/entry/src/main/ets/common/constants/PlayerConstants.ets @@ -17,42 +17,34 @@ * Constants for player area. */ export class PlayerConstants { - /** * The value of font weight. */ public static readonly FONT_WEIGHT_700: number = 700; - /** * The value of font weight. */ public static readonly FONT_WEIGHT_500: number = 500; - /** * The value of font family. */ public static readonly FONT_FAMILY_BLACK: string = 'HarmonyHeiTi'; - /** * The value of font family. */ public static readonly FONT_FAMILY_BOLD: string = 'HarmonyHeiTi-Bold'; - /** * The value of font family. */ public static readonly FONT_FAMILY_MEDIUM: string = 'HarmonyHeiTi-Medium'; - /** * The value of encoding. */ public static readonly ENCODING: string = 'utf-8'; - /** * The value of back ground image width and height. */ public static readonly BACK_IMAGE: string = '120%'; - /** * Set the image blur level. */ diff --git a/entry/src/main/ets/common/constants/StyleConstants.ets b/entry/src/main/ets/common/constants/StyleConstants.ets index 75bccb3315cce848048115df00f85c8256d2e0ab..841f61fb4b84c2328b52cb3c1a5dd16660c444b7 100644 --- a/entry/src/main/ets/common/constants/StyleConstants.ets +++ b/entry/src/main/ets/common/constants/StyleConstants.ets @@ -21,7 +21,6 @@ export class StyleConstants { * Component width percentage: 100%. */ public static readonly FULL_WIDTH: string = '100%'; - /** * Component height percentage: 100%. */ diff --git a/entry/src/main/ets/common/utils/ColorConversion.ets b/entry/src/main/ets/common/utils/ColorConversion.ets index 37b4667d3d196cbfa4954e20d0065c45c38c7e0c..c81f2f7ce99402896ee791b357de537f76c8ff15 100644 --- a/entry/src/main/ets/common/utils/ColorConversion.ets +++ b/entry/src/main/ets/common/utils/ColorConversion.ets @@ -15,7 +15,7 @@ import { window } from '@kit.ArkUI'; import { Logger } from '@ohos/MediaService'; -const TAG = 'ColorConversion' +const TAG: string = '[ColorConversion]' /** * Color conversion processing class. @@ -120,5 +120,4 @@ export class ColorConversion { Logger.info(TAG, 'setWindowSystemBarProperties success '); }) } -} - +} \ No newline at end of file diff --git a/entry/src/main/ets/components/ControlAreaComponent.ets b/entry/src/main/ets/components/ControlAreaComponent.ets index f00f56055aad9f342d0112c75f825021b3904326..08384ab8acd4a7366836afebbbd253dbedc1426b 100644 --- a/entry/src/main/ets/components/ControlAreaComponent.ets +++ b/entry/src/main/ets/components/ControlAreaComponent.ets @@ -22,15 +22,15 @@ import { SongItem, PlayModeSwitchList as playModeSwitchList } from '@ohos/MediaService'; -import { StyleConstants } from '../common/constants/StyleConstants'; import { BreakpointConstants } from '../common/constants/BreakpointConstants'; +import { ContentConstants } from '../common/constants/ContentConstants'; import { PlayerConstants } from '../common/constants/PlayerConstants'; +import { ResourceConversion } from '../common/utils/ResourceConversion'; +import { StyleConstants } from '../common/constants/StyleConstants'; import { BreakpointType } from '../common/utils/BreakpointSystem' import { SongDataSource } from '../datasource/SongDataSource'; -import { ContentConstants } from '../common/constants/ContentConstants'; -import { ResourceConversion } from '../common/utils/ResourceConversion'; -const TAG = 'ControlAreaComponent' +const TAG: string = '[ControlAreaComponent]' @Component export struct ControlAreaComponent { diff --git a/entry/src/main/ets/components/LyricsComponent.ets b/entry/src/main/ets/components/LyricsComponent.ets index f4fc9f0676de3b8d87e09f6c408eed13ebdec162..4c1233a9508b57133c55501207d92c1dcb378d73 100644 --- a/entry/src/main/ets/components/LyricsComponent.ets +++ b/entry/src/main/ets/components/LyricsComponent.ets @@ -15,17 +15,19 @@ import { common } from '@kit.AbilityKit'; import { util } from '@kit.ArkTS'; -import { SongItem } from '@ohos/MediaService'; -import { BreakpointType } from '../common/utils/BreakpointSystem' -import { StyleConstants } from '../common/constants/StyleConstants'; +import { BusinessError } from '@kit.BasicServicesKit'; +import { Logger, SongItem } from '@ohos/MediaService'; import { BreakpointConstants } from '../common/constants/BreakpointConstants'; +import { PlayerConstants } from '../common/constants/PlayerConstants'; +import { StyleConstants } from '../common/constants/StyleConstants'; +import { BreakpointType } from '../common/utils/BreakpointSystem' import { LrcEntry } from '../lyric/LrcEntry'; import { parseKrcLyric, parseLrcLyric } from '../lyric/LrcUtils'; import LrcView from '../lyric/LrcView'; -import { LyricScrollEffect, LyricTopPosition } from '../lyric/LyricConst'; +import { LyricFile, LyricScrollEffect, LyricTopPosition } from '../lyric/LyricConst'; import { ControlAreaComponent } from './ControlAreaComponent'; -import { LyricFile } from '../lyric/LyricConst'; -import { PlayerConstants } from '../common/constants/PlayerConstants'; + +const TAG: string = '[LyricsComponent]'; @Component export struct LyricsComponent { @@ -59,6 +61,9 @@ export struct LyricsComponent { this.mLrcEntryList = parseLrcLyric(stringData); } }) + .catch((error: BusinessError) => { + Logger.error(TAG, `stopBackgroundRunning failed. code: ${error.code}, message: ${error.message}`); + }); } build() { diff --git a/entry/src/main/ets/components/MusicInfoComponent.ets b/entry/src/main/ets/components/MusicInfoComponent.ets index 4707f92a5b8b0923dcb6d1083f73d4f27bc9e9ea..f63dc270fee3d32d126419164ff3737b6bd9ebdc 100644 --- a/entry/src/main/ets/components/MusicInfoComponent.ets +++ b/entry/src/main/ets/components/MusicInfoComponent.ets @@ -14,9 +14,9 @@ */ import { SongItem } from '@ohos/MediaService'; -import { StyleConstants } from '../common/constants/StyleConstants'; import { BreakpointConstants } from '../common/constants/BreakpointConstants'; import { PlayerConstants } from '../common/constants/PlayerConstants'; +import { StyleConstants } from '../common/constants/StyleConstants'; import { ControlAreaComponent } from './ControlAreaComponent'; @Preview diff --git a/entry/src/main/ets/components/PlayerInfoComponent.ets b/entry/src/main/ets/components/PlayerInfoComponent.ets index 7e93a5e825a5d1a76630bb85893c8d466d5299e0..d9ca7f46866c2ae2bb2a8889ce02ab0abc283754 100644 --- a/entry/src/main/ets/components/PlayerInfoComponent.ets +++ b/entry/src/main/ets/components/PlayerInfoComponent.ets @@ -13,20 +13,22 @@ * limitations under the License. */ -import { BusinessError } from '@kit.BasicServicesKit'; -import { effectKit } from '@kit.ArkGraphics2D'; -import { image } from '@kit.ImageKit'; import { common } from '@kit.AbilityKit'; +import { effectKit } from '@kit.ArkGraphics2D'; import { display } from '@kit.ArkUI'; +import { BusinessError } from '@kit.BasicServicesKit'; +import { image } from '@kit.ImageKit'; import { Logger, SongItem } from '@ohos/MediaService'; +import { BreakpointConstants } from '../common/constants/BreakpointConstants'; import { PlayerConstants } from '../common/constants/PlayerConstants'; -import { ColorConversion } from '../common/utils/ColorConversion'; import { StyleConstants } from '../common/constants/StyleConstants'; -import { BreakpointConstants } from '../common/constants/BreakpointConstants'; +import { ColorConversion } from '../common/utils/ColorConversion'; +import { ControlAreaComponent } from './ControlAreaComponent'; import { LyricsComponent } from './LyricsComponent'; -import { TopAreaComponent } from './TopAreaComponent'; import { MusicInfoComponent } from './MusicInfoComponent'; -import { ControlAreaComponent } from './ControlAreaComponent'; +import { TopAreaComponent } from './TopAreaComponent'; + +const TAG: string = '[PlayerInfoComponent]'; @Component export struct PlayerInfoComponent { @@ -66,8 +68,9 @@ export struct PlayerInfoComponent { } display.on('foldDisplayModeChange', this.callback); } - } catch (exception) { - Logger.error('Failed to register callback. Code: ' + JSON.stringify(exception)); + } catch (err) { + Logger.error(TAG, + `Failed to register callback. Code:${(err as BusinessError).code}, message:${(err as BusinessError).message}`); } } @@ -76,8 +79,9 @@ export struct PlayerInfoComponent { if (canIUse('SystemCapability.Window.SessionManager')) { display.off('foldDisplayModeChange', this.callback); } - } catch (error) { - Logger.error('FoldDisplayModeChange catch err:', JSON.stringify(error) ?? ''); + } catch (err) { + Logger.error(TAG, + `FoldDisplayModeChange catch err. Code:${(err as BusinessError).code}, message:${(err as BusinessError).message}`); } } @@ -259,7 +263,7 @@ export struct PlayerInfoComponent { const createPixelMap: image.PixelMap = await imageSource.createPixelMap(); effectKit.createColorPicker(createPixelMap, (error, colorPicker) => { if (error) { - Logger.error('Failed to create color picker.'); + Logger.error(TAG, 'Failed to create color picker.'); } else { let color = colorPicker.getLargestProportionColor(); let colorArr = ColorConversion.dealColor(color.red, color.green, color.blue); @@ -277,7 +281,7 @@ export struct PlayerInfoComponent { await createPixelMap.release(); }) .catch((error: BusinessError) => { - Logger.error(`${error.code} + ${error.message}`); + Logger.error(TAG, `getImageColor failed. Code:${error.code}, message:${error.message}`); }) } } \ No newline at end of file diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index 8aa12d68d75b111d4b424e38ad6beef5ceaa5460..1ccf8245cea82feb7e3b6a204c7698a7b32766d8 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -14,28 +14,32 @@ */ import { Configuration, ConfigurationConstant, UIAbility } from '@kit.AbilityKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import { display, window } from '@kit.ArkUI'; +import { BusinessError } from '@kit.BasicServicesKit'; +import { hilog } from '@kit.PerformanceAnalysisKit'; import { BreakpointConstants } from '../common/constants/BreakpointConstants'; +const TAG: string = '[EntryAbility]'; + export default class EntryAbility extends UIAbility { private windowObj?: window.Window; onCreate() { AppStorage.setOrCreate('context', this.context) - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate'); + hilog.info(0x0000, TAG, '%{public}s', 'Ability onCreate'); AppStorage.setOrCreate('systemColorMode', this.context.config.colorMode); this.context.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_NOT_SET); } onDestroy() { - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onDestroy'); + hilog.info(0x0000, TAG, '%{public}s', 'Ability onDestroy'); } onConfigurationUpdate(newConfig: Configuration): void { let newColorMode: ConfigurationConstant.ColorMode = newConfig.colorMode || ConfigurationConstant.ColorMode.COLOR_MODE_DARK; - let currentColorMode = AppStorage.get('systemColorMode'); + let currentColorMode: ConfigurationConstant.ColorMode | undefined = + AppStorage.get('systemColorMode'); if (newColorMode !== currentColorMode) { AppStorage.setOrCreate('systemColorMode', newColorMode); } @@ -44,8 +48,7 @@ export default class EntryAbility extends UIAbility { onWindowStageCreate(windowStage: window.WindowStage) { // Main window is created, set main page for this ability - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate'); - + hilog.info(0x0000, TAG, '%{public}s', 'Ability onWindowStageCreate'); windowStage.getMainWindow().then((data: window.Window) => { this.windowObj = data; AppStorage.setOrCreate('window', data); @@ -60,14 +63,17 @@ export default class EntryAbility extends UIAbility { this.windowObj.on('windowSizeChange', (windowSize: window.Size) => { this.updateBreakpoint(windowSize.width); }) - }) - - windowStage.loadContent('pages/Root', (err) => { + }).catch((error: BusinessError) => { + hilog.error(0x0000, TAG, '%{public}s', + `Failed to get main window. code: ${error.code}, message: ${error.message}`); + }); + windowStage.loadContent('pages/Root', (err: BusinessError) => { if (err.code) { - hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? ''); + hilog.error(0x0000, TAG, '%{public}s', + `Failed to load the content. code: ${err.code}, message: ${err.message}`); return; } - hilog.info(0x0000, 'testTag', 'Succeeded in loading the content.'); + hilog.info(0x0000, TAG, '%{public}s', 'Succeeded in loading the content.'); }); } @@ -83,23 +89,23 @@ export default class EntryAbility extends UIAbility { curBp = BreakpointConstants.BREAKPOINT_LG; } AppStorage.setOrCreate('currentBreakpoint', curBp); - } catch (error) { - hilog.error(0X0000, 'testTag', 'updateBreakpoint catch err:', JSON.stringify(error) ?? ''); + } catch (err) { + hilog.error(0X0000, TAG, '%{public}s', `updateBreakpoint catch err. code: ${err.code}, message: ${err.message}`); } } onWindowStageDestroy() { // Main window is destroyed, release UI related resources - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageDestroy'); + hilog.info(0x0000, TAG, '%{public}s', 'Ability onWindowStageDestroy'); } onForeground() { // Ability has brought to foreground - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onForeground'); + hilog.info(0x0000, TAG, '%{public}s', 'Ability onForeground'); } onBackground() { // Ability has back to background - hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onBackground'); + hilog.info(0x0000, TAG, '%{public}s', 'Ability onBackground'); } -} +} \ No newline at end of file diff --git a/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets b/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets index 6b744d7eaa66e51e79fc4e0896e251292ee767c5..5c743a2db5c25b5955021742da064ad33e0eb5d9 100644 --- a/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets +++ b/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets @@ -16,12 +16,14 @@ import { hilog } from '@kit.PerformanceAnalysisKit'; import { BackupExtensionAbility, BundleVersion } from '@kit.CoreFileKit'; +const TAG: string = '[EntryBackupAbility]'; + export default class EntryBackupAbility extends BackupExtensionAbility { async onBackup() { - hilog.info(0x0000, 'testTag', 'onBackup ok'); + hilog.info(0x0000, TAG, '%{public}s', 'onBackup ok'); } async onRestore(bundleVersion: BundleVersion) { - hilog.info(0x0000, 'testTag', 'onRestore ok %{public}s', JSON.stringify(bundleVersion)); + hilog.info(0x0000, TAG, '%{public}s', 'onRestore ok %{public}s', JSON.stringify(bundleVersion)); } } \ No newline at end of file diff --git a/entry/src/main/ets/lyric/LrcUtils.ets b/entry/src/main/ets/lyric/LrcUtils.ets index 489444910ee444363e4492cde6d36f8869e4c03e..b69cd663fb28d5d47273e7d43a75627f24f0d086 100644 --- a/entry/src/main/ets/lyric/LrcUtils.ets +++ b/entry/src/main/ets/lyric/LrcUtils.ets @@ -16,6 +16,8 @@ import { Logger } from '@ohos/MediaService'; import { LrcEntry, Word } from './LrcEntry'; +const TAG: string = '[LrcUtils]'; + /** * LRC format lyrics. */ @@ -74,7 +76,7 @@ export function parseLrcLyric(text: string): Array { } } } else { - Logger.error('Failed to parse the lyrics.'); + Logger.error(TAG, 'Failed to parse the lyrics.'); } return lrc; } diff --git a/entry/src/main/ets/lyric/LrcView.ets b/entry/src/main/ets/lyric/LrcView.ets index 8724e2e596e1af81b03af47e427f153fec4e6ee4..9326b1eeb5db57bca7d220e4ba3453da69ae88cf 100644 --- a/entry/src/main/ets/lyric/LrcView.ets +++ b/entry/src/main/ets/lyric/LrcView.ets @@ -19,6 +19,8 @@ import { LrcEntry } from './LrcEntry'; import { angleToRadian } from './LrcUtils'; import { Rectangle, LyricTopPosition, LyricScrollEffect } from './LyricConst'; +const TAG: string = '[LrcView]'; + /** * Default number of rows. */ @@ -472,7 +474,7 @@ export default struct shiLrcView { } else if (this.lyricMilliSecondsTime >= lyric.lineStartTime + lyric.lineDuration) { progress = GRADIENT_PROGRESS_MAX; } else { - Logger.error('This should not be happening.'); + Logger.error(TAG, 'This should not be happening.'); } } @@ -524,7 +526,7 @@ export default struct shiLrcView { starX = this.lrcX + textMetrics.width / 2 - this.context.measureText(lyric.words[lyric.words.length - 1].text).width / 2; } else { - Logger.error('This should not be happening.'); + Logger.error(TAG, 'This should not be happening.'); } let starY = this.lrcY - textMetrics.height; this.drawStars(starX, starY, this.mDividerHeight / 2, this.mDividerHeight / 4, 0); diff --git a/entry/src/main/ets/pages/PlayerPage.ets b/entry/src/main/ets/pages/PlayerPage.ets index 380313fbb9f16edc8325cf480d58458f5ac2c10b..6051c891c75e48e859347ad1f6661c0500537c64 100644 --- a/entry/src/main/ets/pages/PlayerPage.ets +++ b/entry/src/main/ets/pages/PlayerPage.ets @@ -14,9 +14,9 @@ */ import { AudioRendererController } from '@ohos/MediaService'; +import { songList } from '../datasource/SongListData'; import { BreakpointSystem } from '../common/utils/BreakpointSystem'; import { PlayerInfoComponent } from '../components/PlayerInfoComponent'; -import { songList } from '../datasource/SongListData'; @Builder export function PlayerPageBuilder() {