diff --git a/OAT.xml b/OAT.xml index b2b92501e7542c97a761a55f6e1170b26d91d814..0266ae4e78008cffa34061a520ed61cb7fe61330 100644 --- a/OAT.xml +++ b/OAT.xml @@ -72,6 +72,7 @@ + diff --git a/flutter_music_player/ohos/build-profile.json5 b/flutter_music_player/ohos/build-profile.json5 index 238b2d5bbf8b3a0c28dae746eaf5220737a944fe..26733084878869ff8adf5e2c3bae5e8339978508 100644 --- a/flutter_music_player/ohos/build-profile.json5 +++ b/flutter_music_player/ohos/build-profile.json5 @@ -16,12 +16,13 @@ { "app": { "signingConfigs": [], - "compileSdkVersion": 10, - "compatibleSdkVersion": 10, "products": [ { "name": "default", "signingConfig": "default", + "compileSdkVersion": "4.0.0(10)", + "compatibleSdkVersion": "4.0.0(10)", + "runtimeOS": "HarmonyOS", } ] }, diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/icudtl.dat b/flutter_music_player/ohos/dependencies/hvigor-3.0.9-s.tgz similarity index 45% rename from flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/icudtl.dat rename to flutter_music_player/ohos/dependencies/hvigor-3.0.9-s.tgz index d1f10917ab52e3ebd251abd7f5377d7196b80d67..65b0d24f94d2aecc1099f8f8220beec695bfb779 100644 Binary files a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/icudtl.dat and b/flutter_music_player/ohos/dependencies/hvigor-3.0.9-s.tgz differ diff --git a/flutter_music_player/ohos/dependencies/hvigor-ohos-arkui-x-plugin-2.1.7-s.tgz b/flutter_music_player/ohos/dependencies/hvigor-ohos-arkui-x-plugin-2.1.7-s.tgz new file mode 100644 index 0000000000000000000000000000000000000000..233a449cbfef6be702d861744254dd89ce633fb7 Binary files /dev/null and b/flutter_music_player/ohos/dependencies/hvigor-ohos-arkui-x-plugin-2.1.7-s.tgz differ diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/isolate_snapshot_data b/flutter_music_player/ohos/dependencies/hvigor-ohos-plugin-3.0.9-s.tgz similarity index 36% rename from flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/isolate_snapshot_data rename to flutter_music_player/ohos/dependencies/hvigor-ohos-plugin-3.0.9-s.tgz index 0c27f9d5b95a1a20177e0069bda7f9126746ee14..e2e499e18dfcd05e1e275579d11697640eb80323 100644 Binary files a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/isolate_snapshot_data and b/flutter_music_player/ohos/dependencies/hvigor-ohos-plugin-3.0.9-s.tgz differ diff --git a/flutter_music_player/ohos/dependencies/rollup.tgz b/flutter_music_player/ohos/dependencies/rollup.tgz new file mode 100644 index 0000000000000000000000000000000000000000..b224a37a5f69fd22f58c7a28151742eafe7e6317 Binary files /dev/null and b/flutter_music_player/ohos/dependencies/rollup.tgz differ diff --git a/flutter_music_player/ohos/entry/.gitignore b/flutter_music_player/ohos/entry/.gitignore index 2795a1c5b1fe53659dd1b71d90ba0592eaf7e043..8cf932c613f93099584fe2c88a4fc572ff956c3e 100644 --- a/flutter_music_player/ohos/entry/.gitignore +++ b/flutter_music_player/ohos/entry/.gitignore @@ -4,4 +4,5 @@ /.preview /build /.cxx -/.test \ No newline at end of file +/.test +/src/main/resources/rawfile/flutter_assets \ No newline at end of file diff --git a/flutter_music_player/ohos/entry/build-profile.json5 b/flutter_music_player/ohos/entry/build-profile.json5 index f02a52e08c8fa1c3a33b9faa4592e9f695cd1c54..633d360fbc91a3186a23b66ab71b27e5618944cb 100644 --- a/flutter_music_player/ohos/entry/build-profile.json5 +++ b/flutter_music_player/ohos/entry/build-profile.json5 @@ -20,7 +20,7 @@ "targets": [ { "name": "default", - "runtimeOS": "OpenHarmony" + "runtimeOS": "HarmonyOS" }, { "name": "ohosTest", diff --git a/flutter_music_player/ohos/entry/src/main/ets/plugin/AVPlayerPlugin.ets b/flutter_music_player/ohos/entry/src/main/ets/plugin/AVPlayerPlugin.ets index d89d0831115d285d18c44fe0bb9c9e0f57efad30..7d92e19ee70dfb7d6080d9fa1b6414386241845f 100644 --- a/flutter_music_player/ohos/entry/src/main/ets/plugin/AVPlayerPlugin.ets +++ b/flutter_music_player/ohos/entry/src/main/ets/plugin/AVPlayerPlugin.ets @@ -29,9 +29,9 @@ import JSONMethodCodec from '@ohos/flutter_ohos/src/main/ets/plugin/common/JSONM const TAG = "FlutterAVPlayerPlugin" export default class AVPlayerPlugin implements FlutterPlugin, MethodCallHandler { - private mMethodChannel: MethodChannel; - private avPlayer: media.AVPlayer; - private binding: FlutterPluginBinding; + private mMethodChannel: MethodChannel | null = null; + private avPlayer: media.AVPlayer | null = null; + private binding: FlutterPluginBinding | null = null; getUniqueClassName(): string { return "AVPlayerPlugin" @@ -65,7 +65,7 @@ export default class AVPlayerPlugin implements FlutterPlugin, MethodCallHandler result.success(null); break; case "seek": - var value = call.argument("seekValue"); + let value: number = call.argument("seekValue"); this.seek(value); result.success(null); break; @@ -78,18 +78,18 @@ export default class AVPlayerPlugin implements FlutterPlugin, MethodCallHandler result.success(null); break; case "getCurrentTime": - result.success(this.avPlayer.currentTime); + result.success(this.avPlayer!.currentTime); break; case "getDuration": - result.success(this.avPlayer.duration); + result.success(this.avPlayer!.duration); break; case "prepare": - this.avPlayer.prepare().then(() => { + this.avPlayer!.prepare().then(() => { Log.d(TAG, 'AVPlayer prepare succeeded.'); result.success(null); - }, (err) => { - Log.d(TAG, `Invoke prepare failed, code is ${err.code}, message is ${err.message}`); - result.error("-1", err, err); + }, (err: Error) => { + Log.d(TAG, `Invoke prepare failed, code name is ${err.name}, message is ${err.message}`); + result.error("-1", err.message, err); }); break; } @@ -98,16 +98,16 @@ export default class AVPlayerPlugin implements FlutterPlugin, MethodCallHandler // 注册avplayer回调函数 setAVPlayerCallback() { // seek操作结果回调函数 - this.avPlayer.on('seekDone', (seekDoneTime) => { + this.avPlayer!.on('seekDone', (seekDoneTime) => { Log.d(TAG, `AVPlayer seek succeeded, seek time is ${seekDoneTime}`); }) // error回调监听函数,当avPlayer在操作过程中出现错误时调用reset接口触发重置流程 - this.avPlayer.on('error', (err) => { + this.avPlayer!.on('error', (err) => { Log.d(TAG, `Invoke avPlayer failed, code is ${err.code}, message is ${err.message}`); - this.avPlayer.reset(); // 调用reset重置资源，触发idle状态 + this.avPlayer!.reset(); // 调用reset重置资源，触发idle状态 }) // 状态机变化回调函数 - this.avPlayer.on('stateChange', async (state, reason) => { + this.avPlayer!.on('stateChange', async (state, reason) => { switch (state) { case 'idle': // 成功调用reset接口后触发该状态机上报 Log.d(TAG, 'AVPlayer state idle called.'); @@ -146,17 +146,17 @@ export default class AVPlayerPlugin implements FlutterPlugin, MethodCallHandler break; } }) - this.avPlayer.on('timeUpdate', (time: number) => { + this.avPlayer!.on('timeUpdate', (time: number) => { Log.d(TAG, 'timeUpdate success,and new time is :' + time) - this.mMethodChannel.invokeMethod('updateTime', { - time: time, duration: this.avPlayer.duration + this.mMethodChannel!.invokeMethod('updateTime', { + time: time, duration: this.avPlayer!.duration }) }) } private notifyStateChange(state: string) { Log.d(TAG, 'notifyStateChange state :' + state); - this.mMethodChannel.invokeMethod('notifyStateChange', { + this.mMethodChannel!.invokeMethod('notifyStateChange', { state: state }); } @@ -169,7 +169,7 @@ export default class AVPlayerPlugin implements FlutterPlugin, MethodCallHandler this.setAVPlayerCallback(); // 通过UIAbilityContext的resourceManager成员的getRawFd接口获取媒体资源播放地址 // 返回类型为{fd,offset,length},fd为HAP包fd地址，offset为媒体资源偏移量，length为播放长度 - let fileDescriptor = await this.binding.getApplicationContext().resourceManager.getRawFd(source); + let fileDescriptor = await this.binding!.getApplicationContext().resourceManager.getRawFd(source); // 为fdSrc赋值触发initialized状态机上报 this.avPlayer.fdSrc = fileDescriptor; } diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/AssetManifest.json b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/AssetManifest.json deleted file mode 100644 index 9eeb68acd74d429149ea5e83f7e41b6d6dc12666..0000000000000000000000000000000000000000 --- a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/AssetManifest.json +++ /dev/null @@ -1 +0,0 @@ -{"assets/images/album.png":["assets/images/album.png"],"assets/images/album2.png":["assets/images/album2.png"],"assets/images/bg_blurry.png":["assets/images/bg_blurry.png"],"assets/images/ic_hop.svg":["assets/images/ic_hop.svg"],"assets/images/ic_pause.svg":["assets/images/ic_pause.svg"],"assets/images/ic_play.svg":["assets/images/ic_play.svg"],"assets/images/ic_play_next.svg":["assets/images/ic_play_next.svg"],"assets/images/ic_play_previous.svg":["assets/images/ic_play_previous.svg"],"assets/images/ov_logo.png":["assets/images/ov_logo.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]} \ No newline at end of file diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/FontManifest.json b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/FontManifest.json deleted file mode 100644 index 464ab5882a2234c39b1a4dbad5feba0954478155..0000000000000000000000000000000000000000 --- a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/FontManifest.json +++ /dev/null @@ -1 +0,0 @@ -[{"family":"MaterialIcons","fonts":[{"asset":"fonts/MaterialIcons-Regular.otf"}]},{"family":"packages/cupertino_icons/CupertinoIcons","fonts":[{"asset":"packages/cupertino_icons/assets/CupertinoIcons.ttf"}]}] \ No newline at end of file diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/NOTICES.Z b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/NOTICES.Z deleted file mode 100644 index c35cd40058ce761524eadb92393019a5ed542aa0..0000000000000000000000000000000000000000 Binary files a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/NOTICES.Z and /dev/null differ diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/album.png b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/album.png deleted file mode 100644 index f11d87e33c69edfd3dc18ce52764a0325f7b3e39..0000000000000000000000000000000000000000 Binary files a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/album.png and /dev/null differ diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/album2.png b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/album2.png deleted file mode 100644 index 31e86725e0b367603dda942d1e2c744c2d0c5b78..0000000000000000000000000000000000000000 Binary files a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/album2.png and /dev/null differ diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/bg_blurry.png b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/bg_blurry.png deleted file mode 100644 index 4fcb62599bbab2b4992baa98f5d9d7e429fd7c4f..0000000000000000000000000000000000000000 Binary files a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/bg_blurry.png and /dev/null differ diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ic_hop.svg b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ic_hop.svg deleted file mode 100644 index a3c9baade44146810d8b91691934ab4b7bf98adf..0000000000000000000000000000000000000000 --- a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ic_hop.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - icon_hop - - - - - \ No newline at end of file diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ic_pause.svg b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ic_pause.svg deleted file mode 100644 index 8f71f032115891474fff08377d907503dffe0231..0000000000000000000000000000000000000000 --- a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ic_pause.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - icon_pause - - - - - - - - - \ No newline at end of file diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ic_play.svg b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ic_play.svg deleted file mode 100644 index f701fa61f2893958b798e1d32fae9b06ee6503d7..0000000000000000000000000000000000000000 --- a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ic_play.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - icon_play - - - - - - - - - \ No newline at end of file diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ic_play_next.svg b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ic_play_next.svg deleted file mode 100644 index 627e85cfa153f07a3c07e7aecccab76df2b96015..0000000000000000000000000000000000000000 --- a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ic_play_next.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - icon_play_next - - - - - - - - - \ No newline at end of file diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ic_play_previous.svg b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ic_play_previous.svg deleted file mode 100644 index c0a738f5cf0ede3ea70d0d69c097d8ab9215b25d..0000000000000000000000000000000000000000 --- a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ic_play_previous.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - icon_play_last - - - - - - - - - \ No newline at end of file diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ov_logo.png b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ov_logo.png deleted file mode 100644 index b16416840e992f7569082747d7483165c86a94b1..0000000000000000000000000000000000000000 Binary files a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/assets/images/ov_logo.png and /dev/null differ diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/fonts/MaterialIcons-Regular.otf b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/fonts/MaterialIcons-Regular.otf deleted file mode 100644 index 8c99266130a89547b4344f47e08aacad473b14e0..0000000000000000000000000000000000000000 Binary files a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/fonts/MaterialIcons-Regular.otf and /dev/null differ diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/kernel_blob.bin b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/kernel_blob.bin deleted file mode 100644 index 786f54c428afd5cc599c1e1b190b9905dcb11326..0000000000000000000000000000000000000000 Binary files a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/kernel_blob.bin and /dev/null differ diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf deleted file mode 100644 index 79ba7ea0836b93b3f178067bcd0a0945dbc26b3f..0000000000000000000000000000000000000000 Binary files a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf and /dev/null differ diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/shaders/ink_sparkle.frag b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/shaders/ink_sparkle.frag deleted file mode 100644 index 0bb5a14a220d223adde1e69eb1959332d6bd08c7..0000000000000000000000000000000000000000 Binary files a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/shaders/ink_sparkle.frag and /dev/null differ diff --git a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/vm_snapshot_data b/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/vm_snapshot_data deleted file mode 100644 index b5bd48ef5234cafddbb10134e1077fdfb85edf20..0000000000000000000000000000000000000000 Binary files a/flutter_music_player/ohos/entry/src/main/resources/rawfile/flutter_assets/vm_snapshot_data and /dev/null differ diff --git a/flutter_music_player/ohos/har/flutter_embedding.har.debug.10 b/flutter_music_player/ohos/har/flutter_embedding.har.debug.10 index d933e65a7b494783b81203aa912988a43a863e5b..6b41214e49ef628929399a7a70adc39a17374d35 100644 Binary files a/flutter_music_player/ohos/har/flutter_embedding.har.debug.10 and b/flutter_music_player/ohos/har/flutter_embedding.har.debug.10 differ diff --git a/flutter_music_player/ohos/har/flutter_embedding.har.release.10 b/flutter_music_player/ohos/har/flutter_embedding.har.release.10 index 158baa7bcb32cb235cb1bdc661d60553128f42ac..07bdf8f9b5ad61a27a4ddb0d89e2ef74c857b8b7 100644 Binary files a/flutter_music_player/ohos/har/flutter_embedding.har.release.10 and b/flutter_music_player/ohos/har/flutter_embedding.har.release.10 differ diff --git a/flutter_music_player/ohos/hvigor/hvigor-config.json5 b/flutter_music_player/ohos/hvigor/hvigor-config.json5 index 35ac4322aa0f429402b189a313ea879645ad33d1..0675e04dd09ab349dcc8cab2ff11f12187c6f26b 100644 --- a/flutter_music_player/ohos/hvigor/hvigor-config.json5 +++ b/flutter_music_player/ohos/hvigor/hvigor-config.json5 @@ -13,9 +13,10 @@ * limitations under the License. */ -{ - "hvigorVersion": "2.4.2", - "dependencies": { - "@ohos/hvigor-ohos-plugin": "2.4.2" - } -} +{ + "hvigorVersion": "file:../dependencies/hvigor-3.0.9-s.tgz", + "dependencies": { + "@ohos/hvigor-ohos-plugin": "file:../dependencies/hvigor-ohos-plugin-3.0.9-s.tgz", + "rollup": "file:../dependencies/rollup.tgz", + } +} \ No newline at end of file