fix: 优化 OCR ，解决题目选项没有识别的BUG

ocsjs · Apr 28, 2022 · e534658 · e534658
1 parent 479d8dd
commit e534658
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 4 deletions.
diff --git a/packages/core/src/core/store.ts b/packages/core/src/core/store.ts
@@ -34,4 +34,6 @@ export interface OCSStore {
   videojs: HTMLElement | null
   /** 搜索结果存储 */
   workResults: WorkResult<any>[]
+  /** 是否正在识别文字 */
+  isRecognizing: boolean
 }
diff --git a/packages/core/src/core/utils/common.ts b/packages/core/src/core/utils/common.ts
@@ -1,3 +1,4 @@
+import { store } from '../../script';
 import { DefineScript, GlobPattern, ScriptPanel, ScriptRoute } from '../define.script';
 
 export async function sleep (period: number): Promise<void> {
@@ -90,3 +91,17 @@ export function getNumber (...nums: number[]) {
 export function isInBrowser (): boolean {
   return typeof window !== 'undefined' && typeof window.document !== 'undefined';
 }
+
+/**
+ * 等待文字识别
+ */
+export function waitForRecognize() {
+  return new Promise<void>((resolve) => {
+    const timer = setInterval(() => {
+      if (store.isRecognizing === false) {
+        clearInterval(timer);
+        resolve();
+      }
+    }, 100);
+  });
+}
diff --git a/packages/core/src/script/cx/index.ts b/packages/core/src/script/cx/index.ts
@@ -179,7 +179,7 @@ export const CXScript = defineScript({
     },
     {
       name: '文字识别脚本',
-      url: ['**/mycourse/studentstudy**', '**/work/doHomeWorkNew**'],
+      url: ['**/mycourse/studentstudy**', '**/work/doHomeWorkNew**', '**/mooc2/exam/preview**', '**/mooc2/work/dowork**'],
       async onload() {
         /** 文字识别 */
         const ocr = new OCR({
@@ -196,11 +196,13 @@ export const CXScript = defineScript({
         const fonts = CXAnalyses.getSecretFont();
         if (fonts.length) {
           logger('info', '文字识别功能启动');
+          store.isRecognizing = true;
           await ocr.load();
           for (const font of fonts) {
             const text = await ocr.recognize(OCR.suit(font));
             font.innerHTML = text;
           }
+          store.isRecognizing = false;
           logger('info', '文字识别完成');
         }
       }

diff --git a/packages/core/src/script/cx/study.ts b/packages/core/src/script/cx/study.ts
@@ -1,5 +1,5 @@
 import defaults from 'lodash/defaults';
-import { domSearch, domSearchAll, getNumber, searchIFrame, sleep, StringUtils } from '../../core/utils';
+import { domSearch, domSearchAll, getNumber, searchIFrame, sleep, StringUtils, waitForRecognize } from '../../core/utils';
 import { OCSWorker } from '../../core/worker';
 import { defaultAnswerWrapperHandler } from '../../core/worker/answer.wrapper.handler';
 import { logger } from '../../logger';
@@ -237,6 +237,9 @@ async function chapterTestTask(setting: ScriptSettings['cx']['work'], frame: HTM
     return;
   }
 
+  // 等待文字识别
+  await waitForRecognize();
+
   const { window: frameWindow } = frame.contentWindow;
 
   const { TiMu } = domSearchAll({ TiMu: '.TiMu' }, frameWindow.document);

diff --git a/packages/core/src/script/cx/utils.ts b/packages/core/src/script/cx/utils.ts
@@ -41,7 +41,7 @@ const CXAnalyses = {
   },
   /** 检测页面是否使用字体加密 */
   getSecretFont(doc:Document = document) {
-    return Array.from(doc.querySelectorAll('.Zy_TItle .clearfix.font-cxsecret')) as HTMLElement[];
+    return Array.from(doc.querySelectorAll('.font-cxsecret')) as HTMLElement[];
   }
 
 };

diff --git a/packages/core/src/script/cx/work.ts b/packages/core/src/script/cx/work.ts
@@ -1,6 +1,6 @@
 import defaults from 'lodash/defaults';
 import { store } from '..';
-import { domSearch, sleep, StringUtils } from '../../core/utils';
+import { domSearch, sleep, StringUtils, waitForRecognize } from '../../core/utils';
 import { OCSWorker } from '../../core/worker';
 import { defaultAnswerWrapperHandler } from '../../core/worker/answer.wrapper.handler';
 import { logger } from '../../logger';
@@ -25,6 +25,9 @@ export async function workOrExam(
   /** 清空内容 */
   store.workResults = [];
 
+  // 等待文字识别
+  await waitForRecognize();
+
   /** 新建答题器 */
   const worker = new OCSWorker({
     root: '.questionLi',