diff --git a/packages/share_plus/share_plus/ohos/src/main/ets/dev/fluttercommunity/plus/share/Share.ets b/packages/share_plus/share_plus/ohos/src/main/ets/dev/fluttercommunity/plus/share/Share.ets index e49e1eaee2b8e4fc97e893a54eee4f57c5311726..c1ec828a5633173f44319bd35f62d8ee1773b1f3 100644 --- a/packages/share_plus/share_plus/ohos/src/main/ets/dev/fluttercommunity/plus/share/Share.ets +++ b/packages/share_plus/share_plus/ohos/src/main/ets/dev/fluttercommunity/plus/share/Share.ets @@ -15,7 +15,6 @@ import Log from '@ohos/flutter_ohos/src/main/ets/util/Log'; import common from '@ohos.app.ability.common'; -import UIAbility from '@ohos.app.ability.UIAbility'; import List from '@ohos.util.List'; import fs from '@ohos.file.fs'; import { fileUri } from '@kit.CoreFileKit'; @@ -26,17 +25,12 @@ import uniformTypeDescriptor from '@ohos.data.uniformTypeDescriptor'; const TAG = 'Share'; export default class Share { - public context: common.Context | null = null; - public ability?: UIAbility | null = null; + public context?: common.UIAbilityContext | null = null; - constructor(context: common.Context, ability?: UIAbility) { + public setAbility(context: common.UIAbilityContext | null): void { this.context = context; } - public setAbility(ability: UIAbility | null): void { - this.ability = ability; - } - public async share(text: string, subject: string | null, withResult: boolean, result: MethodResult): Promise { Log.i(TAG, "share"); let record: systemShare.SharedRecord = { @@ -101,7 +95,7 @@ export default class Share { result.success(''); }); } - controller.show(this.ability?.context, { + controller.show(this.context, { previewMode: systemShare.SharePreviewMode.DETAIL, selectionMode: systemShare.SelectionMode.BATCH }); diff --git a/packages/share_plus/share_plus/ohos/src/main/ets/dev/fluttercommunity/plus/share/SharePlusOhosPlugin.ets b/packages/share_plus/share_plus/ohos/src/main/ets/dev/fluttercommunity/plus/share/SharePlusOhosPlugin.ets index 1d598fc436705682e41f423ae39a13b2b9896360..ab869485593da544a6ef4b55b5c4dd7f1c3b298d 100644 --- a/packages/share_plus/share_plus/ohos/src/main/ets/dev/fluttercommunity/plus/share/SharePlusOhosPlugin.ets +++ b/packages/share_plus/share_plus/ohos/src/main/ets/dev/fluttercommunity/plus/share/SharePlusOhosPlugin.ets @@ -40,7 +40,7 @@ export default class SharePlusOhosPlugin implements FlutterPlugin, AbilityAware onAttachedToAbility(binding: AbilityPluginBinding) { Log.i(TAG, "onAttachedToAbility"); - this.share?.setAbility(binding.getAbility()); + this.share!.setAbility(binding.getAbilityContext()); } onDetachedFromAbility() { @@ -51,7 +51,7 @@ export default class SharePlusOhosPlugin implements FlutterPlugin, AbilityAware onAttachedToEngine(binding: FlutterPluginBinding): void { Log.i(TAG, "onAttachedToEngine"); this.methodChannel = new MethodChannel(binding.getBinaryMessenger(), CHANNEL_NAME); - this.share = new Share(binding.getApplicationContext()); + this.share = new Share(); this.methodChannelHandlerImpl = new MethodChannelHandlerImpl(this.share); this.methodChannel.setMethodCallHandler(this.methodChannelHandlerImpl); }