From 4411cd5bdc0f3b60219708bac705241d8d52bf23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rulong=20Chen=EF=BC=88=E9=99=88=E6=B1=9D=E9=BE=99=EF=BC=89?=
 <rulong.crl@alibaba-inc.com>
Date: Fri, 9 Aug 2024 17:21:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E6=93=8E=E6=8E=A5=E5=8F=A3=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitee.com/openharmony-sig/flutter_engine/pulls/374
---
 ohos/src/main/ets/MobileScannerPlugin.ets | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ohos/src/main/ets/MobileScannerPlugin.ets b/ohos/src/main/ets/MobileScannerPlugin.ets
index b124089..033f1e3 100644
--- a/ohos/src/main/ets/MobileScannerPlugin.ets
+++ b/ohos/src/main/ets/MobileScannerPlugin.ets
@@ -24,7 +24,7 @@ import MethodChannel, {
 import MethodCall from '@ohos/flutter_ohos/src/main/ets/plugin/common/MethodCall';
 import Log from '@ohos/flutter_ohos/src/main/ets/util/Log';
 import { AbilityAware, AbilityPluginBinding, ByteBuffer } from '@ohos/flutter_ohos/index';
-import { UIAbility } from '@kit.AbilityKit';
+import { common } from '@kit.AbilityKit';
 import { cameraPermission, checkPermissions, requestPermissions } from './CameraPermissions';
 import { customScan, scanBarcode, scanCore, detectBarcode } from '@kit.ScanKit';
 import EventChannel, { EventSink } from '@ohos/flutter_ohos/src/main/ets/plugin/common/EventChannel';
@@ -45,19 +45,19 @@ export class MobileScannerPlugin implements FlutterPlugin, MethodCallHandler, Ab
 
   onAttachedToAbility(binding: AbilityPluginBinding): void {
     Log.i(TAG, "onAttachedToAbility");
-    this.ability = binding.getAbility()
+    this.context = binding.getAbilityContext()
   }
 
   onDetachedFromAbility(): void {
     Log.i(TAG, "onDetachedFromAbility");
-    this.ability = null;
+    this.context = null;
   }
 
   private methodChannel: MethodChannel | null = null;
   private eventChannel: EventChannel | null = null;
   private eventSink: EventSink | null = null
   private applicationContext: Context | null = null;
-  private ability: UIAbility | null = null;
+  private context: common.UIAbilityContext | null = null;
   private textureId: number | null = null;
   private surfaceId: string | null = null;
   private binding: FlutterPluginBinding | null = null;
@@ -119,7 +119,7 @@ export class MobileScannerPlugin implements FlutterPlugin, MethodCallHandler, Ab
         });
         result.notImplemented()
       } else if (call.method === "request") {
-        requestPermissions(this.ability!.context, (err, msg) => {
+        requestPermissions(this.context, (err, msg) => {
           if (err) {
             result.success(false)
           } else {
-- 
Gitee