diff --git a/build-profile.json5 b/build-profile.json5 index c033ce4278fb0641d84107c3c134047ac487368e..123c59c4d98cb48436bf22fbd63b0baea21e0748 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -6,6 +6,7 @@ "name": "default", "signingConfig": "default", "compatibleSdkVersion": "5.0.0(12)", + "targetSdkVersion": "5.0.0(12)", "runtimeOS": "HarmonyOS", } ], diff --git a/entry/build-profile.json5 b/entry/build-profile.json5 index b695582d3680556f4cce2ec518f65720a9413ca3..3167e54d1ff3a0aaa0cdcf4319789de8e3f3c350 100644 --- a/entry/build-profile.json5 +++ b/entry/build-profile.json5 @@ -2,27 +2,9 @@ "apiType": "stageMode", "buildOption": { }, - "buildOptionSet": [ - { - "name": "release", - "arkOptions": { - "obfuscation": { - "ruleOptions": { - "enable": true, - "files": [ - "./obfuscation-rules.txt" - ] - } - } - } - }, - ], "targets": [ { "name": "default" - }, - { - "name": "ohosTest", } ] } \ No newline at end of file diff --git a/entry/src/main/ets/view/AVPlayerItem.ets b/entry/src/main/ets/view/AVPlayerItem.ets index 351883c3235e0dc2ffd18ea164134c4899a68fb8..41e618f5c6a012ea921ecde726b8d4cc2f6b4952 100644 --- a/entry/src/main/ets/view/AVPlayerItem.ets +++ b/entry/src/main/ets/view/AVPlayerItem.ets @@ -15,9 +15,11 @@ import { media } from '@kit.MediaKit'; import { common } from '@kit.AbilityKit'; +import { hilog } from '@kit.PerformanceAnalysisKit'; // Video name const VIDEO_NAME = 'videoTest.mp4'; +const TAG = 'AVPlayerItem'; @Observed export class AVPlayerItem { @@ -66,21 +68,25 @@ export class AVPlayerItem { }) } - async avPlayerPlay(uiContext:UIContext) { - this.avPlayer = await media.createAVPlayer(); - this.avPlayer.setSpeed(media.PlaybackSpeed.SPEED_FORWARD_1_00_X); - this.setAVPlayerCallback(this.avPlayer); - let context = uiContext.getHostContext() as common.UIAbilityContext; - let fileDescriptor = await context.resourceManager.getRawFd(VIDEO_NAME); - this.totalTime = fileDescriptor.length; - this.curTime = fileDescriptor.offset; - let avFileDescriptor: media.AVFileDescriptor = { - fd: fileDescriptor.fd, - offset: fileDescriptor.offset, - length: fileDescriptor.length - }; - this.isSeek = true; - this.avPlayer.fdSrc = avFileDescriptor; - this.avPlayer.prepare(); + async avPlayerPlay(uiContext: UIContext) { + try { + this.avPlayer = await media.createAVPlayer(); + this.avPlayer.setSpeed(media.PlaybackSpeed.SPEED_FORWARD_1_00_X); + this.setAVPlayerCallback(this.avPlayer); + let context = uiContext.getHostContext() as common.UIAbilityContext; + let fileDescriptor = await context.resourceManager.getRawFd(VIDEO_NAME); + this.totalTime = fileDescriptor.length; + this.curTime = fileDescriptor.offset; + let avFileDescriptor: media.AVFileDescriptor = { + fd: fileDescriptor.fd, + offset: fileDescriptor.offset, + length: fileDescriptor.length + }; + this.isSeek = true; + this.avPlayer.fdSrc = avFileDescriptor; + this.avPlayer.prepare(); + } catch (error) { + hilog.error(0x0000, TAG, `avPlayerPlay catch error, code: ${error.code}, message: ${error.message}`); + } } } \ No newline at end of file diff --git a/entry/src/main/ets/view/MultiGrid.ets b/entry/src/main/ets/view/MultiGrid.ets index ce6b3170fb9a82d46778d6b171961fc9769e0d8c..434f6d744646608b8fde311af4bdfe5d24522ca8 100644 --- a/entry/src/main/ets/view/MultiGrid.ets +++ b/entry/src/main/ets/view/MultiGrid.ets @@ -31,7 +31,7 @@ const IMAGE_ONE_WIDTH = '60%' @Component export struct MultiGrid { @Prop modifier: AttributeModifier | null = null; - private imageSource: (string | Resource)[] = []; + public imageSource: (string | Resource)[] = []; private col: number = 0; private row: number = 0; private imageSpacing: number = 3; diff --git a/entry/src/main/ets/view/SampleUnitAVPlayView.ets b/entry/src/main/ets/view/SampleUnitAVPlayView.ets index 19ed6bdd95b2adbecf1802a156e8526621834e7d..a3b98faf30d531c44f4be82003ab6811a2cddd24 100644 --- a/entry/src/main/ets/view/SampleUnitAVPlayView.ets +++ b/entry/src/main/ets/view/SampleUnitAVPlayView.ets @@ -13,9 +13,10 @@ * limitations under the License. */ +import { display } from '@kit.ArkUI'; +import { hilog } from '@kit.PerformanceAnalysisKit'; import { AVPlayerItem } from '../view/AVPlayerItem'; import { CONSTANT } from '../constant/Constant'; -import { display } from '@kit.ArkUI'; // XComponent width const X_COMPONENT_WIDTH: string = '100%'; @@ -27,6 +28,7 @@ const DELAY = 500; const DURATION = 29024; // Surface size const SURFACE_SIZE = 1500; +const TAG = 'SampleUnitAVPlayView'; @Component @@ -41,17 +43,20 @@ export default struct SampleUnitAVPlayView { currentSurfaceID: string = '' aboutToAppear(): void { - if (display.getFoldStatus() === display.FoldStatus.FOLD_STATUS_EXPANDED) { - this.sliderWidth = this.getUIContext().px2vp(SURFACE_SIZE); - } - - display.on('foldStatusChange', () => { - if (display.getFoldStatus() === display.FoldStatus.FOLD_STATUS_FOLDED) { - this.sliderWidth = X_COMPONENT_WIDTH; - } else { + try { + if (display.getFoldStatus() === display.FoldStatus.FOLD_STATUS_EXPANDED) { this.sliderWidth = this.getUIContext().px2vp(SURFACE_SIZE); } - }); + display.on('foldStatusChange', () => { + if (display.getFoldStatus() === display.FoldStatus.FOLD_STATUS_FOLDED) { + this.sliderWidth = X_COMPONENT_WIDTH; + } else { + this.sliderWidth = this.getUIContext().px2vp(SURFACE_SIZE); + } + }); + } catch (error) { + hilog.error(0x0000, TAG, `aboutToAppear catch error, code: ${error.code}, message: ${error.message}`); + } } build() { diff --git a/entry/src/main/ets/viewmodel/BasicDataSource.ets b/entry/src/main/ets/viewmodel/BasicDataSource.ets index dceef7a62eddc08da21791bbb4f54dedcf2cb92d..fba5661f836431b265690afd9f79435ee42b906d 100644 --- a/entry/src/main/ets/viewmodel/BasicDataSource.ets +++ b/entry/src/main/ets/viewmodel/BasicDataSource.ets @@ -51,10 +51,10 @@ class BasicDataSource implements IDataSource { new ButtonUnitItem($r('app.media.share'), 5, $r('app.media.like'), 18, $r('app.media.collect'), 53); let areaUnit: TitleUnitItem = new TitleUnitItem($r('app.media.avatar'), - uiContext.getHostContext()!.resourceManager.getStringSync($r('app.string.show_netname')), - uiContext.getHostContext()!.resourceManager.getStringSync($r('app.string.show_time')), + uiContext.getHostContext()!.resourceManager.getStringByNameSync('show_netname'), + uiContext.getHostContext()!.resourceManager.getStringByNameSync('show_time'), ); - let textContext = uiContext.getHostContext()!.resourceManager.getStringSync($r('app.string.show_text')); + let textContext = uiContext.getHostContext()!.resourceManager.getStringByNameSync('show_text'); let data: SampleUnitItem[] = [ new SampleUnitItem('video', areaUnit, textContext, buttonUnit, this.imageArray1, new VideoController(),