android-midscene-automation 0.1.37 → 0.1.39

package/src/appium-recorder/flow-labels.ts

@@ -47,7 +47,7 @@ export function flowTypeLabel(step: AppiumRecordedStep) {
     checkboxState: 'Checkbox 状态',
     checkedState: '判断勾选',
     radioButtonState: 'RadioButton 状态',
-    aiRecognition: 'AI 识别',
+    aiRecognition: 'AI 识别（已移除）',
     imageCheck: '图像判断',
     textClick: '文字点击',
     assertText: '断言文本',
@@ -81,7 +81,7 @@ export function flowStepMeta(step: AppiumRecordedStep) {
   if (step.type === 'loop') return `最多 ${step.loop?.maxIterations ?? '?'} 次 · ${step.loop?.exitWhen === 'exists' ? '元素出现时退出' : step.loop?.exitWhen === 'notExists' ? '元素消失时退出' : '固定次数'}${step.loop?.exitWhen !== 'never' ? ` ${step.selector?.value || ''}` : ''}`;
   if (step.type === 'breakLoop') return step.breakLoopTargetId ? '退出指定循环，继续循环结束后的流程' : '退出当前循环，继续循环结束后的流程';
   if (step.type === 'log') return `${step.logPrefix ?? DEFAULT_LOG_PREFIX}:${step.value || ''}`;
-  if (step.type === 'aiRecognition') return step.value || '未填写识别内容';
+  if (step.type === 'aiRecognition') return '此操作已移除，请替换为图像判断或原生组件判断';
   if (step.type === 'longPress') {
     const target = longPressMode(step) === 'element'
       ? `元素 ${step.selector?.strategy || ''} ${step.selector?.value || ''}`

package/src/appium-recorder/image-check.ts

@@ -1,4 +1,5 @@
 import type { AppiumVisualChangeRegion } from './types';
+import { DEFAULT_NODE_TIMEOUT_MS } from './node-timeout';
 
 export const IMAGE_CHECK_MODES = { template: '模板匹配', state: '图片状态判断', black: '黑屏检测', color: '区域颜色判断', change: '多帧变化检测' } as const;
 export type ImageCheckConfig = {
@@ -20,6 +21,8 @@ export type ImageCheckConfig = {
   consecutive: number;
 };
 export type ImageCheckResult = {
+  templateMatch?: { matched: boolean; expected: 'present' | 'absent'; score: number; threshold: number };
+  timedOut?: boolean;
   result: boolean | null;
   mode: ImageCheckConfig['mode'];
   region: AppiumVisualChangeRegion;
@@ -33,7 +36,7 @@ export type ImageCheckResult = {
 export function createImageCheckConfig(): ImageCheckConfig {
   return { mode: 'template', target: 'region', region: { x: 0, y: 0, width: 100, height: 100 },
     screenWidth: 0, screenHeight: 0, expectation: 'present', threshold: 0.9, minScoreGap: 0.1,
-    color: '#000000', tolerance: 30, ratio: 95, durationMs: 5000, intervalMs: 1000, consecutive: 1 };
+    color: '#000000', tolerance: 30, ratio: 95, durationMs: DEFAULT_NODE_TIMEOUT_MS, intervalMs: 1000, consecutive: 1 };
 }
 
 // 只读取 PNG 头部尺寸，避免为了表单校验解码整张模板。
@@ -113,5 +116,6 @@ export function validateImageCheck(config: ImageCheckConfig | undefined) {
 
 export function imageCheckSummary(config?: ImageCheckConfig) {
   if (!config) return '未配置图像判断';
-  return `${IMAGE_CHECK_MODES[config.mode]} · ${config.target === 'element' ? '组件区域' : '框选区域'} · ${config.durationMs}ms`;
+  const expectation = config.mode === 'template' ? ` · ${config.expectation === 'present' ? '匹配到模板' : '未匹配到模板'}` : '';
+  return `${IMAGE_CHECK_MODES[config.mode]}${expectation} · ${config.target === 'element' ? '组件区域' : '框选区域'} · ${config.durationMs}ms`;
 }

package/src/appium-recorder/node-timeout.ts

@@ -0,0 +1 @@
+export const DEFAULT_NODE_TIMEOUT_MS = 3000;

package/src/appium-recorder/run-history.ts

@@ -6,6 +6,7 @@ export type HistoryNode = {
 };
 
 export type RunSummary = {
+  video?: { filePath: string; fileName: string; startedAt: string; warning?: string };
   id: string;
   scriptId: string;
   scriptName: string;

package/src/appium-recorder/types.ts

@@ -121,6 +121,7 @@ export type AppiumRecordedStep = {
   returns?: ScriptReturn[];
   keyCode?: number;
   timeoutMs?: number;
+  timeoutBranch?: 'stop' | 'yes' | 'no';
   longPressMode?: 'element' | 'coordinates';
   breakLoopTargetId?: string;
   loop?: {

package/src/components/config/AppiumConfigPanel.vue

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import type { ConfigForm } from '../../types';
 import FlowAppearanceSettings from './FlowAppearanceSettings.vue';
-import { DEFAULT_FLOW_BACKGROUND, isHexColor } from '../../appium-recorder/flow-appearance';
 
 defineProps<{
   configForm: ConfigForm;
@@ -13,39 +12,5 @@ defineEmits<{ testModel: []; saveModelConfig: [] }>();
 </script>
 
 <template>
-  <el-card shadow="never" class="config-module-card config-appium-card">
-    <template #header>
-      <div class="panel-header">
-        <span>节点模型配置</span>
-        <el-button type="primary" :loading="isSavingModelConfig" :disabled="!isHexColor(configForm.appium.flowBackgroundColor ?? DEFAULT_FLOW_BACKGROUND)" @click="$emit('saveModelConfig')">
-          保存模型配置
-        </el-button>
-      </div>
-    </template>
-    <section class="appium-model-form">
-      <div class="panel-header panel-header--sub">
-        <span>AI 识别模型</span>
-        <el-button :loading="testingModelKey === 'appium'" @click="$emit('testModel')">测试模型</el-button>
-      </div>
-      <el-form label-position="top">
-        <el-form-item label="Base URL">
-          <el-input v-model="configForm.appium.model.baseUrl" />
-        </el-form-item>
-        <el-form-item label="API Key">
-          <el-input v-model="configForm.appium.model.apiKey" show-password />
-        </el-form-item>
-        <el-form-item label="Model Name">
-          <el-input v-model="configForm.appium.model.name" placeholder="支持图片输入的模型" />
-        </el-form-item>
-        <el-form-item v-if="testStatus" label="测试结果">
-          <el-input :model-value="testStatus" readonly />
-        </el-form-item>
-      </el-form>
-    </section>
-  </el-card>
   <FlowAppearanceSettings v-model="configForm.appium.flowBackgroundColor" :saving="isSavingModelConfig" @save="$emit('saveModelConfig')" />
 </template>
-
-<style scoped>
-.appium-model-form { max-width: 640px; }
-</style>

package/src/appium-recorder/components/AiRecognitionTestDialog.vue

@@ -1,71 +0,0 @@
-<script setup lang="ts">
-import { onBeforeUnmount, onMounted, shallowRef } from 'vue';
-import { Refresh } from '@element-plus/icons-vue';
-import { testAiRecognition } from '../api';
-import { AI_MODEL_CONFIG_HINT, validateAiRecognitionPrompt } from '../ai-recognition';
-import type { AppiumRecordedStep } from '../types';
-
-const props = defineProps<{ step: AppiumRecordedStep; deviceId: string; modelConfigured: boolean }>();
-defineEmits<{ close: [] }>();
-const loading = shallowRef(false);
-const error = shallowRef('');
-const result = shallowRef<Awaited<ReturnType<typeof testAiRecognition>> | null>(null);
-let controller: AbortController | undefined;
-
-async function runTest() {
-  if (loading.value) return;
-  error.value = '';
-  result.value = null;
-  controller = new AbortController();
-  loading.value = true;
-  try {
-    if (!props.modelConfigured) throw new Error(AI_MODEL_CONFIG_HINT);
-    if (!props.deviceId) throw new Error('请选择设备');
-    const prompt = validateAiRecognitionPrompt(props.step.value);
-    result.value = await testAiRecognition({ deviceId: props.deviceId, prompt, timeoutMs: props.step.timeoutMs }, controller.signal);
-  } catch (cause) {
-    if (!controller.signal.aborted) error.value = cause instanceof Error ? cause.message : 'AI 识别测试失败';
-  } finally {
-    loading.value = false;
-  }
-}
-
-onMounted(runTest);
-onBeforeUnmount(() => controller?.abort());
-</script>
-
-<template>
-  <el-dialog :model-value="true" title="测试 AI 识别" width="min(560px, calc(100vw - 32px))" append-to-body @close="$emit('close')">
-    <div class="ai-recognition-test" aria-live="polite">
-      <p class="ai-recognition-test__prompt">{{ step.value }}</p>
-      <el-alert v-if="error" type="error" :title="error" :closable="false" show-icon />
-      <p v-if="loading">识别中…</p>
-      <template v-if="result">
-        <div class="ai-recognition-test__result">
-          <strong>{{ String(result.result) }}</strong>
-          <span>{{ result.durationMs }}ms</span>
-        </div>
-        <p>{{ result.reason }}</p>
-        <el-image
-          v-if="result.imageBase64"
-          class="ai-recognition-test__image" fit="contain"
-          :src="`data:image/png;base64,${result.imageBase64}`"
-          :preview-src-list="[`data:image/png;base64,${result.imageBase64}`]"
-          preview-teleported alt="AI 识别使用的设备截图"
-        />
-      </template>
-    </div>
-    <template #footer>
-      <el-button @click="$emit('close')">关闭</el-button>
-      <el-button type="primary" :icon="Refresh" :loading="loading" :disabled="!modelConfigured || !deviceId" @click="runTest">重新测试</el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style scoped>
-.ai-recognition-test { overflow-wrap: anywhere; }
-.ai-recognition-test__prompt { white-space: pre-wrap; margin-top: 0; }
-.ai-recognition-test__result { display: flex; align-items: center; gap: 16px; }
-.ai-recognition-test__result strong { font-size: 20px; }
-.ai-recognition-test__image { display: block; width: 100%; height: 280px; }
-</style>