From 5a856e468e3235b12c4e8dc837fb0308fc1be7b3 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 1 May 2020 13:42:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20MAC=20=E9=A6=96=E6=AC=A1?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=A1=B5=E9=9D=A2=E6=97=A0=E6=B3=95=E6=8B=96?=
 =?UTF-8?q?=E5=8A=A8=E6=BB=91=E5=9D=97=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/rendererEvents/xm_verify.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/rendererEvents/xm_verify.js b/src/main/rendererEvents/xm_verify.js
index 359ec82d..909313bd 100644
--- a/src/main/rendererEvents/xm_verify.js
+++ b/src/main/rendererEvents/xm_verify.js
@@ -1,6 +1,7 @@
 const { BrowserView } = require('electron')
 const { mainHandle } = require('../../common/ipc')
 const { getWindowSizeInfo } = require('../utils')
+const { isMac } = require('../../common/utils')
 
 let view
 
@@ -20,6 +21,8 @@ mainHandle('xm_verify_open', (event, url) => new Promise((resolve, reject) => {
     view.destroy()
   }
 
+  let firstLoad = true
+
   view = new BrowserView({
     webPreferences: {
       enableRemoteModule: false,
@@ -28,7 +31,13 @@ mainHandle('xm_verify_open', (event, url) => new Promise((resolve, reject) => {
     movable: false,
   })
   view.webContents.on('did-finish-load', () => {
-    if (/punish\?/.test(view.webContents.getURL())) return
+    if (/punish\?/.test(view.webContents.getURL())) {
+      if (isMac) { // 解决 MAC 首次加载页面无法拖动滑块的问题
+        if (firstLoad) view.webContents.reload()
+        firstLoad = false
+      }
+      return
+    }
     let ses = view.webContents.session
     ses.cookies.get({ name: 'x5sec' })
       .then(async([x5sec]) => {
@@ -45,9 +54,8 @@ mainHandle('xm_verify_open', (event, url) => new Promise((resolve, reject) => {
   view.setBounds({ x: (windowSizeInfo.width - 360) / 2, y: ((windowSizeInfo.height - 320 + 52) / 2), width: 360, height: 320 })
   view.webContents.loadURL(url, {
     httpReferrer: 'https://www.xiami.com/',
-    userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.165 Electron/8.2.4 Safari/537.36',
   })
-  view.webContents.openDevTools()
+  // view.webContents.openDevTools()
 }))
 
 mainHandle('xm_verify_close', async() => {