add a button of the reward in setting page

Author: Java-S12138

frankElectron/index.js

@@ -2,5 +2,5 @@ export {createMainWindow} from './home'
 export {createAssistWindow} from './assist'
 export {makeTray} from './makeTray'
 export {listenIpc} from './listenCommonIpc'
-export {createMatchHistoryWindow} from './matchHistory'
+export {matchHistoryIpc} from './matchHistory'
 export {queryMatchIpc} from './queryMatch'

frankElectron/matchHistory.js

@@ -1,7 +1,7 @@
 import {BrowserWindow, ipcMain} from "electron";
 import {createProtocol} from "vue-cli-plugin-electron-builder/lib";
 
-export const createMatchHistoryWindow = async (userHeader) => {
+const createMatchHistoryWindow = async (userHeader) => {
   const matchHistoryWindow = new BrowserWindow({
     title: 'FrankMatchHistory',
     show: false,
@@ -33,3 +33,29 @@ export const createMatchHistoryWindow = async (userHeader) => {
   return matchHistoryWindow
 }
 
+export const matchHistoryIpc = (userHeader) => {
+  let matchHistoryWindow
+  // 展示战力分析窗口
+  ipcMain.on('showCharts',async () => {
+    matchHistoryWindow = await createMatchHistoryWindow(userHeader)
+    // if (clientStatus === '"Matchmaking"' || clientStatus === '"GameStart"' || clientStatus==='"InProgress"'){
+    //   matchHistoryWindow.webContents.send('query-enemy-summoner')
+    // }
+  })
+// 移动游戏历史窗口
+  ipcMain.on('move-match-history-window', (event, pos) => {
+    matchHistoryWindow.setBounds({ x: pos.x, y: pos.y, width: 1024, height: 576 })
+  })
+// 最小化游戏历史窗口
+  ipcMain.on('match-history-window-min', () => {
+    matchHistoryWindow.minimize()
+  })
+// 关闭游戏历史窗口
+  ipcMain.on('close-match-history-window', () => {
+    for (const currentWindow of BrowserWindow.getAllWindows()) {
+      if (currentWindow.title === 'MatchHistory'){
+        currentWindow.close()
+      }
+    }
+  })
+}

frankElectron/queryMatch.js

@@ -39,7 +39,6 @@ export const queryMatchIpc = async (mainWindow,userHeader) => {
   ipcMain.on('show-query-match',async () => {
     queryMatchWindow = await createQueryMatchWindow(userHeader)
     mainWindow.hide()
-
   })
 // 移动游戏历史窗口
   ipcMain.on('move-query-match-window', (event, pos) => {
@@ -70,8 +69,9 @@ const closeWin = (showMain) => {
     }
   }
   if (showMain){
-    queryMatchWin.close()
     mainWin.show()
+    queryMatchWin.hide()
+    queryMatchWin.close()
   }else {
     queryMatchWin.close()
   }

src/background.js

@@ -13,7 +13,7 @@ import {
   createMainWindow,
   listenIpc,
   makeTray,
-  createMatchHistoryWindow,
+  matchHistoryIpc,
   queryMatchIpc
 } from "../frankElectron";
 const Store = require("electron-store");Store.initRenderer()
@@ -24,7 +24,7 @@ const iconPath = path.join(
   'app-icon.png',
 )
 const userHeader =userAgentList[Math.floor((Math.random()*userAgentList.length))]
-let credentials;let mainWindow;let assistWindow;let matchHistoryWindow;
+let credentials;let mainWindow;let assistWindow
 
 // -----------------------------main---------------------------- //
 
@@ -35,7 +35,7 @@ const init = async () => {
   await startClient() // 启动英雄联盟客户端
   listenIpc(mainWindow,assistWindow) // 监听主窗口和助手窗口的事件
   queryMatchIpc(mainWindow,userHeader) // 战绩查询窗口
-  mathcHistoryIpc()  // 战绩历史窗口
+  matchHistoryIpc(userHeader)  // 战绩历史窗口
 }
 
 app.whenReady().then(async () => {
@@ -78,12 +78,7 @@ const runLcu = async () => {
 
     }else if (data ==='GameStart') {
       // 选择英雄结束后,发送消息给渲染进程, 让渲染进程获取到敌方召唤师信息
-      if ( matchHistoryWindow != null) {
-        if (!matchHistoryWindow.isDestroyed()) {
-          matchHistoryWindow.webContents.send('query-enemy-summoner')
-        }
-      }
-
+      queryEnemyInfo()
       assistWindow.hide()
       assistWindow.webContents.send('query-enemy-summoner')
       clearInterval(idSetInterval)
@@ -151,26 +146,10 @@ const closeWin = (window) => {
     }
   }
 }
-
-const mathcHistoryIpc = async () => {
-  // 展示战力分析窗口
-  ipcMain.on('showCharts',async () => {
-    matchHistoryWindow = await createMatchHistoryWindow(userHeader)
-    // if (clientStatus === '"Matchmaking"' || clientStatus === '"GameStart"' || clientStatus==='"InProgress"'){
-    //   matchHistoryWindow.webContents.send('query-enemy-summoner')
-    // }
-  })
-// 移动游戏历史窗口
-  ipcMain.on('move-match-history-window', (event, pos) => {
-    matchHistoryWindow.setBounds({ x: pos.x, y: pos.y, width: 1024, height: 576 })
-  })
-// 最小化游戏历史窗口
-  ipcMain.on('match-history-window-min', () => {
-    matchHistoryWindow.minimize()
-  })
-// 关闭游戏历史窗口
-  ipcMain.on('close-match-history-window', () => {
-    closeWin('MatchHistory')
-  })
+const queryEnemyInfo  = () => {
+  for (const currentWindow of BrowserWindow.getAllWindows()) {
+    if (currentWindow.title === 'MatchHistory'){
+      currentWindow.webContents.send('query-enemy-summoner')
+    }
+  }
 }
-

src/render/assets/pay/wxpay.jpg

@@ -61,6 +61,14 @@
             一切都将一去杳然
           </n-popconfirm>
         </n-space>
+
+        <n-space>
+          <n-tag :bordered="false" >赞助发电</n-tag>
+          <n-button size="small" type="success" style="width: 214px;"
+                    secondary @click="showModal = true">赞助作者持续开发
+          </n-button>
+        </n-space>
+
         <n-space class="alignCent">
           <n-tag :bordered="false">运行文件</n-tag>
 
@@ -75,6 +83,7 @@
             <span>例如 C:\LOL\英雄联盟\TCLS\Client.exe</span>
           </n-popover>
 
+
           <n-popover trigger="hover" v-else>
             <template #trigger>
               <n-tag :bordered="false" type="success" style="line-height: 28px !important;" @click="getGameDirectory">
@@ -88,6 +97,7 @@
           </n-popover>
 
         </n-space>
+
         <n-space>
           <n-tag :bordered="false">回到首页</n-tag>
           <n-button size="small" type="success" style="width: 214px;"
@@ -96,14 +106,47 @@
         </n-space>
       </n-space>
     </n-card>
+    <n-modal v-model:show="showModal" >
+      <n-card
+        style="width: 356px"
+        :bordered="false"
+        size="small"
+        role="dialog"
+      >
 
+        <div>
+          <n-space justify="space-between" style="padding: 0px 4px 0px 4px">
+            <n-tag type="success" :bordered = false style="width: 142px;justify-content: center">
+              微信 ٩(◕‿◕｡)۶
+            </n-tag>
+            <n-tag type="info" :bordered = false style="width: 142px;justify-content: center">
+              支付宝(●'◡'●)
+            </n-tag>
+          </n-space>
+          <n-space justify="space-between">
+            <img style="width: 150px;" src="../../../render/assets/pay/wxpay.jpg">
+            <img style="width: 150px;" src="../../../render/assets/pay/zfbpay.jpg">
+          </n-space>
+        </div>
+        <template #footer>
+         <div style="margin-left: 4px">
+           <p>
+             Frank 全新的 LOL助手软件 [永久免费 代码开源]
+           </p>
+           <p>
+             您的赞助会使作者越做越好 感谢您的大力支持❤️
+           </p>
+         </div>
+        </template>
+      </n-card>
+    </n-modal>
   </div>
 </template>
 
 <script setup>
 import {
   NCard, NSpace, NTag, NButton, NEllipsis, NPopover,
-  NSelect, NSwitch, NSlider, useMessage, NPopconfirm
+  NSelect, NSwitch, NSlider, useMessage, NPopconfirm,NModal
 } from 'naive-ui'
 import {optionsChampion} from '@/utils/render/lolDataList'
 import {ref} from "vue";
@@ -123,6 +166,7 @@ let banChampion = ref(appConfig.get('autoBanChampion.championId'))
 const optionsChampionBan = optionsChampion
 let isAccept = ref(appConfig.get('autoAccept'))
 const message = useMessage()
+const showModal = ref(false)
 
 // 判断是否已经获取路径
 if (appConfig.get('gameDirectory') != '') {
@@ -194,6 +238,7 @@ const toReset = async () => {
   message.success('设置已恢复默认, 建议重启Frank')
 }
 
+
 </script>
 
 <style scoped>

src/render/assets/pay/zfbpay.jpg

@@ -47,9 +47,11 @@
         <n-input style="width: 153px;" size="small" v-model:value="searchName" @keydown.enter="searchSummonerInfo" placeholder="仅支持当前大区玩家"/>
         <n-button type="success" size="small" @click="searchSummonerInfo" >搜索</n-button>
       </n-space>
-      <n-pagination :on-update-page="changePage(page)"
+      <n-pagination style="font-family: Arial"
+        :on-update-page="changePage(page)"
         v-model:page="page" :page-count="20" :page-slot="7" />
 
+
     </n-space>
 
   </header>

src/render/components/home/setting.vue

@@ -11,11 +11,20 @@ const champSelectPatchAction = async (credentials, actionID, champId, type) => {
   }
 
   try {
-    const res = await createHttp1Request({
+    // const res = await createHttp1Request({
+    //   method: "PATCH",
+    //   url: `/lol-champ-select/v1/session/actions/${actionID}`,
+    //   body: localBody
+    // }, credentials)
+    // todo http2 PATCH
+    const session = await createHttpSession(credentials)
+    const res = await createHttp2Request({
       method: "PATCH",
       url: `/lol-champ-select/v1/session/actions/${actionID}`,
       body: localBody
-    }, credentials)
+    },session, credentials)
+    session.close()
+    console.log(res.raw)
     return res.status
   } catch (e) {
     console.log('Json Error Can Ignore')