feat(desktop): 新窗口打开视频播放

aooiuu · May 27, 2024 · b8f7961 · b8f7961
1 parent 59f3139
commit b8f7961
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 10 deletions.
diff --git a/packages/web/electron/api.ts b/packages/web/electron/api.ts
@@ -56,4 +56,20 @@ export function createAPI(win: BrowserWindow) {
     pinned ? win.setAlwaysOnTop(true, 'screen-saver') : win.setAlwaysOnTop(false);
     return success(win.isAlwaysOnTop());
   });
+
+  pm.answer('post@openWindow', (data) => {
+    const window = new BrowserWindow({
+      title: 'AnyReader',
+      // titleBarStyle: 'hidden',
+      webPreferences: { nodeIntegration: true, contextIsolation: false }
+    });
+
+    if (process.env.VITE_DEV_SERVER_URL) {
+      window.loadURL(process.env.VITE_DEV_SERVER_URL + '/#' + data.url);
+    } else {
+      window.loadFile('dist/electron-template/index.html', {
+        hash: data.url
+      });
+    }
+  });
 }
diff --git a/packages/web/package.json b/packages/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "any-reader-web",
-  "version": "1.0.0-dev.1",
+  "version": "1.0.0-dev.4",
   "private": true,
   "scripts": {
     "dev": "cross-env VITE_APP_PLATFORM=browser vite",

diff --git a/packages/web/src/api/electron.ts b/packages/web/src/api/electron.ts
@@ -34,3 +34,12 @@ export function alwaysOnTop(pinned: boolean) {
     }
   });
 }
+
+// 打开新窗口
+export function openWindow(data: any) {
+  return request({
+    method: 'post',
+    url: 'openWindow',
+    data
+  });
+}
diff --git a/packages/web/src/pages/pc/chapter/index.vue b/packages/web/src/pages/pc/chapter/index.vue
@@ -12,7 +12,9 @@
 </template>
 
 <script setup>
+import { stringify } from 'qs';
 import { getChapter, getContent } from '@/api';
+import { openWindow } from '@/api/electron';
 import { useRulesStore } from '@/stores/rules';
 
 const route = useRoute();
@@ -45,11 +47,12 @@ async function showContent(item) {
     }).catch(() => {});
     console.log('getContent', res);
     if (res?.code === 0) {
-      router.push({
-        path: '/pc/player',
-        query: {
-          url: res?.data?.content || ''
-        }
+      openWindow({
+        url:
+          '/player?' +
+          stringify({
+            url: res?.data?.content || ''
+          })
       });
       return;
     }

diff --git a/packages/web/src/router/router.ts b/packages/web/src/router/router.ts
@@ -8,6 +8,11 @@ const router = createRouter({
       path: '/',
       redirect: '/pc/books'
     },
+    {
+      path: '/player',
+      name: '/player',
+      component: () => import('@/pages/pc/player/index.vue')
+    },
     // pc
     {
       path: '/pc',
@@ -33,10 +38,6 @@ const router = createRouter({
           path: 'rules',
           component: () => import('@/pages/pc/rules/index.vue')
         },
-        {
-          path: 'player',
-          component: () => import('@/pages/pc/player/index.vue')
-        },
         {
           path: 'chapter',
           component: () => import('@/pages/pc/chapter/index.vue')