mirror of
https://github.com/EasyTier/EasytierGame.git
synced 2025-05-19 10:27:56 +00:00
增加gui日志,修复config.json无效的问题,修复下载内核失败一直加载的问题
This commit is contained in:
@@ -39,7 +39,7 @@ export const updateConfigJson = async (configJsonSeverUrl: Array<string> | strin
|
||||
}
|
||||
await writeTextFile(path, JSON.stringify({ serverUrl: writeServerUrl, ...otherConfig }, null, 4), { baseDir: BaseDirectory.Resource });
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
console.error(err);
|
||||
ElMessage.error(`更新config.json失败`);
|
||||
}
|
||||
};
|
||||
|
||||
+12
-4
@@ -2,6 +2,8 @@ import { invoke } from "@tauri-apps/api/core";
|
||||
import { Command } from "@tauri-apps/plugin-shell";
|
||||
import { ElMessage, type TabPaneName } from "element-plus";
|
||||
import useMainStore from "@/stores/index";
|
||||
import { BaseDirectory } from "@tauri-apps/api/path";
|
||||
import { exists } from "@tauri-apps/plugin-fs";
|
||||
|
||||
const getWinIpBroadcastPid = async () => {
|
||||
const mainStore = useMainStore();
|
||||
@@ -19,17 +21,23 @@ export const handleWinipBcStart = async () => {
|
||||
if (!mainStore.winipBcStart) {
|
||||
try {
|
||||
await invoke("stop_command", { child_id: mainStore.winipBcPid || 0 });
|
||||
const isExists = await exists("easytier/tool/WinIPBroadcast.exe", { baseDir: BaseDirectory.Resource });
|
||||
if(!isExists) {
|
||||
ElMessage.error(`WinipBc不存在`);
|
||||
console.error(`WinipBc不存在`);
|
||||
return;
|
||||
}
|
||||
const child = await Command.create("WinIPBroadcast", ["run"]).spawn();
|
||||
mainStore.winipBcPid = child.pid || 0;
|
||||
if (mainStore.winipBcPid) {
|
||||
mainStore.winipBcStart = true;
|
||||
mainStore.winIpBcAutoStart = true;
|
||||
} else {
|
||||
ElMessage.error(`启动失败`);
|
||||
ElMessage.error(`WinipBc失败`);
|
||||
}
|
||||
} catch (err) {
|
||||
ElMessage.error(`启动失败`);
|
||||
console.log(err);
|
||||
ElMessage.error(`WinipBc失败`);
|
||||
console.error(err);
|
||||
}
|
||||
} else {
|
||||
mainStore.winIpBcAutoStart = false;
|
||||
@@ -41,7 +49,7 @@ export const handleWinipBcStart = async () => {
|
||||
export const initStartWinIpBroadcast = async () => {
|
||||
const mainStore = useMainStore();
|
||||
await getWinIpBroadcastPid();
|
||||
// console.log(mainStore.winipBcStart, mainStore.winIpBcAutoStart)
|
||||
// console.error(mainStore.winipBcStart, mainStore.winIpBcAutoStart)
|
||||
if (mainStore.winIpBcAutoStart && !mainStore.winipBcStart) {
|
||||
await handleWinipBcStart();
|
||||
}
|
||||
|
||||
+1
-1
@@ -36,7 +36,7 @@ export async function useTray(init: boolean = false, beforExit: Function) {
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn("Error while creating tray icon:", error);
|
||||
console.error("Error while creating tray icon:", error);
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -26,13 +26,13 @@ export default async (
|
||||
if (appWindow) {
|
||||
const appSize = await appWindow.outerSize();
|
||||
// const monitor = await currentMonitor();
|
||||
// console.log(monitor)
|
||||
// console.error(monitor)
|
||||
const factor = await appWindow.scaleFactor();
|
||||
const appPosition = await appWindow.outerPosition();
|
||||
// console.log((appPosition.x + appSize.width) / 1.25);
|
||||
// console.error((appPosition.x + appSize.width) / 1.25);
|
||||
const logicalPosition = new PhysicalPosition(appPosition.x + appSize.width, appPosition.y).toLogical(factor);
|
||||
defaultOpts.parent = appWindow;
|
||||
// console.log(logicalPosition);
|
||||
// console.error(logicalPosition);
|
||||
defaultOpts.x = logicalPosition.x;
|
||||
defaultOpts.y = logicalPosition.y;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user