From 6583e3d0c9f4d5c421c0e53b410b47f0f14d8cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Fri, 9 Aug 2024 14:14:45 +0800
Subject: [PATCH] fix: system api

---
 src/core/apis/system.ts | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/core/apis/system.ts b/src/core/apis/system.ts
index 0b397f83..466cc431 100644
--- a/src/core/apis/system.ts
+++ b/src/core/apis/system.ts
@@ -1,24 +1,29 @@
 
 
-import { NTEventDispatch } from '@/common/utils/EventTask';
-import { GeneralCallResult, NTQQFileApi, NTQQUserApi, napCatCore } from '@/core';
+import { GeneralCallResult, InstanceContext, NapCatCore } from '@/core';
 export class NTQQSystemApi {
+    context: InstanceContext;
+    core: NapCatCore;
+    constructor(context: InstanceContext, core: NapCatCore) {
+        this.context = context;
+        this.core = core;
+    }
     async hasOtherRunningQQProcess() {
-        return napCatCore.util.hasOtherRunningQQProcess();
+        return this.context.wrapper.util.hasOtherRunningQQProcess();
     }
     async ORCImage(filePath: string) {
-        return napCatCore.session.getNodeMiscService().wantWinScreenOCR(filePath);
+        return this.context.session.getNodeMiscService().wantWinScreenOCR(filePath);
     }
     async translateEnWordToZn(words: string[]) {
-        return napCatCore.session.getRichMediaService().translateEnWordToZn(words);
+        return this.context.session.getRichMediaService().translateEnWordToZn(words);
     }
     //调用会超时 没灯用 (好像是通知listener的) onLineDev
     async getOnlineDev() {
-        return napCatCore.session.getMsgService().getOnLineDev();
+        return this.context.session.getMsgService().getOnLineDev();
     }
     //1-2-162b9b42-65b9-4405-a8ed-2e256ec8aa50
     async getArkJsonCollection(cid: string) {
-        const ret = await NTEventDispatch.CallNoListenerEvent
+        const ret = await this.core.eventWrapper.callNoListenerEvent
             <(cid: string) => Promise<GeneralCallResult & { arkJson: string }>>(
                 'NodeIKernelCollectionService/collectionArkShare',
             5000,
@@ -27,9 +32,9 @@ export class NTQQSystemApi {
         return ret;
     }
     async BootMiniApp(appfile: string, params: string) {
-        await napCatCore.session.getNodeMiscService().setMiniAppVersion('2.16.4');
-        const c = await napCatCore.session.getNodeMiscService().getMiniAppPath();
+        await this.context.session.getNodeMiscService().setMiniAppVersion('2.16.4');
+        const c = await this.context.session.getNodeMiscService().getMiniAppPath();
 
-        return napCatCore.session.getNodeMiscService().startNewMiniApp(appfile, params);
+        return this.context.session.getNodeMiscService().startNewMiniApp(appfile, params);
     }
 }