From dbf252626d8d77c7cc3db665570ffd5bda238dad Mon Sep 17 00:00:00 2001
From: zhenyuWang <13641039885@163.com>
Date: Thu, 28 Mar 2024 18:47:10 +0800
Subject: [PATCH] =?UTF-8?q?test:=20webview=20=E6=88=AA=E5=9B=BE=20?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=20pages=20=E6=88=AA=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/webview-screenshot/webview-screenshot.test.js | 13 ++++++++++---
 pages/webview-screenshot/webview-screenshot.uvue    | 13 ++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pages/webview-screenshot/webview-screenshot.test.js b/pages/webview-screenshot/webview-screenshot.test.js
index 34d23bed..30c6f35e 100644
--- a/pages/webview-screenshot/webview-screenshot.test.js
+++ b/pages/webview-screenshot/webview-screenshot.test.js
@@ -255,6 +255,13 @@ describe("shot-compare", () => {
   let pageIndex = 0;
   let baseSrc = "";
   beforeAll(async () => {
+    // 获取导航栏+状态栏高度
+    page = await program.reLaunch('/pages/API/get-window-info/get-window-info')
+    await page.callMethod('getWindowInfo')
+    // 获取设备像素比
+    page = await program.reLaunch('/pages/API/get-device-info/get-device-info')
+    await page.callMethod('getDeviceInfo')
+
     page = await program.reLaunch(PAGE_PATH);
     await page.waitFor(500);
 
@@ -279,7 +286,7 @@ describe("shot-compare", () => {
     const isNeedAdbScreenshot = needAdbScreenshot(pages[pageIndex]);
     const isCustomNavigation = customNavigationPages.includes(pages[pageIndex]);
     const {
-      headerHeight,
+      statusBarHeight,
       devicePixelRatio
     } = await page.data();
     const screenshotParams = {
@@ -288,7 +295,7 @@ describe("shot-compare", () => {
       // deviceShot 截图时跳过状态栏
       area: {
         x: 0,
-        y: (headerHeight - 44) * devicePixelRatio,
+        y: (statusBarHeight - 44) * devicePixelRatio,
       },
     }
     const screenshotPath = `__webview-shot__/${pages[pageIndex].replace(/\//g, "-")}`;
@@ -326,7 +333,7 @@ describe("shot-compare", () => {
     // web 端非 deviceShot 截图时设置 offsetY 移除导航栏
     const webSnapshot = await program.screenshot({
       ...screenshotParams,
-      offsetY: `${isCustomNavigation ? 0 : headerHeight}`
+      offsetY: `${isCustomNavigation ? 0 : statusBarHeight + 44}`
     });
     expect(webSnapshot).toSaveImageSnapshot({
       customSnapshotIdentifier() {
diff --git a/pages/webview-screenshot/webview-screenshot.uvue b/pages/webview-screenshot/webview-screenshot.uvue
index e7dab64e..8c8c3507 100644
--- a/pages/webview-screenshot/webview-screenshot.uvue
+++ b/pages/webview-screenshot/webview-screenshot.uvue
@@ -1,15 +1,22 @@
 <template>
-  <web-view id="webview-screenshot" class="webview-screenshot" :webview-styles='webviewStyles' :src="src"
-    @loaded="loaded" @error="error">
-  </web-view>
+  <view style="flex:1;">
+    <view :style='{height: `${statusBarHeight}px`}'></view>
+    <web-view id="webview-screenshot" class="webview-screenshot" :webview-styles='webviewStyles' :src="src"
+      @loaded="loaded" @error="error">
+    </web-view>
+  </view>
 </template>
 
 <script>
+  import { state } from '@/store/index.uts'
+
   export default {
     data() {
       return {
         baseSrc: '',
         src: '',
+        statusBarHeight: state.statusBarHeight,
+        devicePixelRatio: state.devicePixelRatio,
         webviewContext: null as WebviewContext | null,
         isLoaded: false,
         webviewStyles: {
-- 
GitLab