Fun/TeyvatGuide
1
0
Fork 0
mirror of https://github.com/BTMuli/TeyvatGuide.git synced 2026-04-04 07:05:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

♻️ 重构刷新逻辑，提取获取账号和Cookie的辅助函数

Browse Source
This commit is contained in:
BTMuli
2026-03-26 01:12:35 +08:00
parent ac4ed5dedf
commit b95f0a8f9b
7 changed files with 112 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/pages/User/Abyss.vue
View File

@@ -138,6 +138,7 @@ import { getVersion } from "@tauri-apps/api/app";
import { open } from "@tauri-apps/plugin-dialog";
import { readTextFile } from "@tauri-apps/plugin-fs";
import { openUrl } from "@tauri-apps/plugin-opener";
import { getRfAc } from "@utils/acUtils.js";
import TGLogger from "@utils/TGLogger.js";
import { generateShareImg } from "@utils/TGShare.js";
import { storeToRefs } from "pinia";
@@ -212,37 +213,14 @@ async function loadAbyss(): Promise<void> {
}
async function refreshAbyss(): Promise<void> {
let rfAccount = account.value;
let rfCk = cookie.value;
if (!uidCur.value) {
if (!rfCk) {
showSnackbar.warn("请先登录");
await TGLogger.Warn(`[Abyss][refreshAbyss][${rfAccount.gameUid}] 未登录`);
return;
}
} else {
const gcFind = await TSUserAccount.game.getAccountByGid(uidCur.value.toString());
console.log(uidCur.value, gcFind);
if (!gcFind) {
const check = await showDialog.check(
`确定刷新？`,
`未找到 ${uidCur.value} 对应 UID，将刷新 ${rfAccount.gameUid} 数据`,
);
if (!check) return;
} else {
const acFind = await TSUserAccount.account.getAccount(gcFind.uid);
if (!acFind) {
const check = await showDialog.check(
`确定刷新？`,
`未找到 ${uidCur.value} 对应 CK，将刷新 ${rfAccount.gameUid} 数据`,
);
if (!check) return;
} else {
rfAccount = gcFind;
rfCk = acFind.cookie;
}
}
}
const refreshData = await getRfAc(
uidCur.value,
account.value,
cookie.value,
"Abyss.refreshAbyss",
);
if (!refreshData) return;
const { account: rfAccount, cookie: rfCk } = refreshData;
await TGLogger.Info("[Abyss][refreshAbyss] 更新深渊数据");
await showLoading.start(`正在获取 ${rfAccount.gameUid} 的深渊数据`, "正在获取上期数据");
const resP = await recordReq.spiralAbyss(rfCk!, rfAccount, "2");

41
src/pages/User/Challenge.vue
View File

@@ -149,13 +149,13 @@ import TucOverview from "@comp/userChallenge/tuc-overview.vue";
import TucPopItem from "@comp/userChallenge/tuc-pop-item.vue";
import gameEnum from "@enum/game.js";
import recordReq from "@req/recordReq.js";
import TSUserAccount from "@Sqlm/userAccount.js";
import TSUserChallenge from "@Sqlm/userChallenge.js";
import useUserStore from "@store/user.js";
import { getVersion } from "@tauri-apps/api/app";
import { open } from "@tauri-apps/plugin-dialog";
import { readTextFile } from "@tauri-apps/plugin-fs";
import { openUrl } from "@tauri-apps/plugin-opener";
import { getRfAc } from "@utils/acUtils.js";
import TGLogger from "@utils/TGLogger.js";
import { generateShareImg } from "@utils/TGShare.js";
import { storeToRefs } from "pinia";
@@ -254,37 +254,14 @@ async function loadChallenge(): Promise<void> {
}
async function refreshChallenge(): Promise<void> {
let rfAccount = account.value;
let rfCk = cookie.value;
if (!uidCur.value) {
if (!rfCk) {
showSnackbar.warn("请先登录");
await TGLogger.Warn(`[Challenge][refreshChallenge][${rfAccount.gameUid}] 未登录`);
return;
}
} else {
const gcFind = await TSUserAccount.game.getAccountByGid(uidCur.value.toString());
console.log(uidCur.value, gcFind);
if (!gcFind) {
const check = await showDialog.check(
`确定刷新？`,
`未找到 ${uidCur.value} 对应 UID，将刷新 ${rfAccount.gameUid} 数据`,
);
if (!check) return;
} else {
const acFind = await TSUserAccount.account.getAccount(gcFind.uid);
if (!acFind) {
const check = await showDialog.check(
`确定刷新？`,
`未找到 ${uidCur.value} 对应 CK，将刷新 ${rfAccount.gameUid} 数据`,
);
if (!check) return;
} else {
rfAccount = gcFind;
rfCk = acFind.cookie;
}
}
}
const refreshData = await getRfAc(
uidCur.value,
account.value,
cookie.value,
"Challenge.refreshChallenge",
);
if (!refreshData) return;
const { account: rfAccount, cookie: rfCk } = refreshData;
await TGLogger.Info("[Challenge][refreshChallenge] 开始刷新挑战数据");
await showLoading.start(`正在获取${rfAccount.gameUid}的幽境危战数据`);
isRefresh.value = true;

36
src/pages/User/Characters.vue
View File

@@ -163,11 +163,11 @@ import TuaSelectVals from "@comp/userAvatar/tua-select-vals.vue";
import UavSelect, { type UavSelectModel } from "@comp/userAvatar/uav-select.vue";
import TurRoleInfo from "@comp/userRecord/tur-role-info.vue";
import recordReq from "@req/recordReq.js";
import TSUserAccount from "@Sqlm/userAccount.js";
import TSUserAvatar from "@Sqlm/userAvatar.js";
import TSUserRecord from "@Sqlm/userRecord.js";
import useUserStore from "@store/user.js";
import { getVersion } from "@tauri-apps/api/app";
import { getRfAc } from "@utils/acUtils.js";
import TGLogger from "@utils/TGLogger.js";
import { generateShareImg } from "@utils/TGShare.js";
import { getZhElement, timestampToDate } from "@utils/toolFunc.js";
@@ -413,37 +413,9 @@ async function loadRole(): Promise<void> {
}
async function refresh(): Promise<void> {
let rfAccount = account.value;
let rfCk = cookie.value;
if (!uidCur.value) {
if (!rfCk) {
showSnackbar.warn("请先登录");
await TGLogger.Warn(`[Character][refresh][${rfAccount.gameUid}] 未登录`);
return;
}
} else {
const gcFind = await TSUserAccount.game.getAccountByGid(uidCur.value.toString());
console.log(uidCur.value, gcFind);
if (!gcFind) {
const check = await showDialog.check(
`确定刷新？`,
`未找到 ${uidCur.value} 对应 UID，将刷新 ${rfAccount.gameUid} 数据`,
);
if (!check) return;
} else {
const acFind = await TSUserAccount.account.getAccount(gcFind.uid);
if (!acFind) {
const check = await showDialog.check(
`确定刷新？`,
`未找到 ${uidCur.value} 对应 CK，将刷新 ${rfAccount.gameUid} 数据`,
);
if (!check) return;
} else {
rfAccount = gcFind;
rfCk = acFind.cookie;
}
}
}
const refreshData = await getRfAc(uidCur.value, account.value, cookie.value, "Character.refresh");
if (!refreshData) return;
const { account: rfAccount, cookie: rfCk } = refreshData;
await hideAllOverlay();
await TGLogger.Info(`[Character][refresh][${rfAccount.gameUid}] 正在更新角色数据`);
await showLoading.start(`正在更新${rfAccount.gameUid}的角色数据`);

40
src/pages/User/Combat.vue
View File

@@ -165,6 +165,7 @@ import { getVersion } from "@tauri-apps/api/app";
import { open } from "@tauri-apps/plugin-dialog";
import { readTextFile } from "@tauri-apps/plugin-fs";
import { openUrl } from "@tauri-apps/plugin-opener";
import { getRfAc } from "@utils/acUtils.js";
import TGLogger from "@utils/TGLogger.js";
import { generateShareImg } from "@utils/TGShare.js";
import { storeToRefs } from "pinia";
@@ -265,37 +266,14 @@ async function tryLoginHutao(): Promise<void> {
}
async function refreshCombat(): Promise<void> {
let rfAccount = account.value;
let rfCk = cookie.value;
if (!uidCur.value) {
if (!rfCk) {
showSnackbar.warn("请先登录");
await TGLogger.Warn(`[Combat][refreshCombat][${rfAccount.gameUid}] 未登录`);
return;
}
} else {
const gcFind = await TSUserAccount.game.getAccountByGid(uidCur.value.toString());
console.log(uidCur.value, gcFind);
if (!gcFind) {
const check = await showDialog.check(
`确定刷新？`,
`未找到 ${uidCur.value} 对应 UID，将刷新 ${rfAccount.gameUid} 数据`,
);
if (!check) return;
} else {
const acFind = await TSUserAccount.account.getAccount(gcFind.uid);
if (!acFind) {
const check = await showDialog.check(
`确定刷新？`,
`未找到 ${uidCur.value} 对应 CK，将刷新 ${rfAccount.gameUid} 数据`,
);
if (!check) return;
} else {
rfAccount = gcFind;
rfCk = acFind.cookie;
}
}
}
const refreshData = await getRfAc(
uidCur.value,
account.value,
cookie.value,
"Combat.refreshCombat",
);
if (!refreshData) return;
const { account: rfAccount, cookie: rfCk } = refreshData;
await TGLogger.Info("[Combat][refreshCombat] 更新剧诗数据");
await showLoading.start(`正在获取${rfAccount.gameUid}的剧诗数据`);
const res = await recordReq.combat.base(rfCk!, rfAccount);

41
src/pages/User/Record.vue
View File

@@ -81,10 +81,10 @@ import TurOverviewGrid from "@comp/userRecord/tur-overview-grid.vue";
import TurRoleInfo from "@comp/userRecord/tur-role-info.vue";
import TurWorldGrid from "@comp/userRecord/tur-world-grid.vue";
import recordReq from "@req/recordReq.js";
import TSUserAccount from "@Sqlm/userAccount.js";
import TSUserRecord from "@Sqlm/userRecord.js";
import useUserStore from "@store/user.js";
import { getVersion } from "@tauri-apps/api/app";
import { getRfAc } from "@utils/acUtils.js";
import TGLogger from "@utils/TGLogger.js";
import { generateShareImg } from "@utils/TGShare.js";
import { storeToRefs } from "pinia";
@@ -135,37 +135,14 @@ async function loadRecord(): Promise<void> {
}
async function refreshRecord(): Promise<void> {
let rfAccount = account.value;
let rfCk = cookie.value;
if (!uidCur.value) {
if (!rfCk) {
showSnackbar.warn("请先登录");
await TGLogger.Warn(`[UserRecord][refresh][${rfAccount.gameUid}] 未登录`);
return;
}
} else {
const gcFind = await TSUserAccount.game.getAccountByGid(uidCur.value.toString());
console.log(uidCur.value, gcFind);
if (!gcFind) {
const check = await showDialog.check(
`确定刷新？`,
`未找到 ${uidCur.value} 对应 UID，将刷新 ${rfAccount.gameUid} 数据`,
);
if (!check) return;
} else {
const acFind = await TSUserAccount.account.getAccount(gcFind.uid);
if (!acFind) {
const check = await showDialog.check(
`确定刷新？`,
`未找到 ${uidCur.value} 对应 CK，将刷新 ${rfAccount.gameUid} 数据`,
);
if (!check) return;
} else {
rfAccount = gcFind;
rfCk = acFind.cookie;
}
}
}
const refreshData = await getRfAc(
uidCur.value?.toString(),
account.value,
cookie.value,
"UserRecord.refresh",
);
if (!refreshData) return;
const { account: rfAccount, cookie: rfCk } = refreshData;
await showLoading.start(`正在刷新${rfAccount.gameUid}的战绩数据`);
await TGLogger.Info(`[UserRecord][refresh][${rfAccount.gameUid}] 刷新战绩数据`);
isRefresh.value = true;