修复在新版本VSCODE上二维码无法显示

wilinz · wilinz · commit 47a8b286ac8c · 2022-12-12T00:20:56.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to the "auto-js-vscodeext-fixed" extension will be documente
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
+### 1.110.0
+- 修复在新版本VSCODE上二维码无法显示
+
 ### 1.109.0
 - 添加心跳检测（需要Autox.js 6.2.9 版本以上才会启用）
 - 设备断开连接后关闭日志通道
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "auto-js-vsce-fixed",
   "displayName": "Auto.js-Autox.js-VSCodeExt",
   "description": "用于在pc上vscode中开发autoxjs的自动化脚本的插件。兼容autojs 和autoxjs,增加功能：usb方式adb进行连接; 右键【文件夹】保存项目到设备;右键【js文件】运行;js文件中点击右上角运行; 结合webpack自动编译，js自动运行到手机",
-  "version": "1.109.0",
+  "version": "1.110.0",
   "publisher": "aaroncheng",
   "icon": "logo.png",
   "repository": {
diff --git a/src/extension.ts b/src/extension.ts
@@ -109,12 +109,12 @@ class Extension {
         _context.subscriptions
       );
     }
-    this.qrCodeViewPanel.webview.html = Extension.getQrCodeHtml(url)
+    this.qrCodeViewPanel.webview.html = this.getQrCodeHtml(url)
   }
 
-  private static getQrCodeHtml(text: string): string {
-    const icon = Extension.getVscodeResourceUrl("logo.png")
-    const qrcodejs = Extension.getVscodeResourceUrl("assets/qrcode.js")
+  private getQrCodeHtml(text: string): string {
+    const icon = Extension.getVscodeResourceUrl(this.qrCodeViewPanel, "logo.png")
+    const qrcodejs = Extension.getVscodeResourceUrl(this.qrCodeViewPanel, "assets/qrcode.js")
     return `<!DOCTYPE html>
 <html lang="en">
 <head>
@@ -145,10 +145,10 @@ class Extension {
 </html>`
   }
 
-  private static getVscodeResourceUrl(relativePath: string): string {
-    return vscode.Uri.file(
-      path.join(_context.extensionPath, relativePath)
-    ).with({ scheme: 'vscode-resource' }).toString();
+  static getVscodeResourceUrl(webviewPanel: any, relativePath: string): string {
+    return webviewPanel.webview.asWebviewUri(
+      vscode.Uri.file(path.join(_context.extensionPath, relativePath))
+    );
   }
 
   openDocument() {
