恢复虎牙绑定二维码自动识别角色
生成二维码后后端轮询扫码与角色同步,扫码完成无需再手动点查询角色。 用 bind_polling 区分真实轮询与僵尸 running,避免再次锁死任务台。
This commit is contained in:
@@ -623,8 +623,8 @@ export default function HuyaTasksPage() {
|
||||
: `已选 ${selectedIds.length} 个账号`;
|
||||
|
||||
const runningTaskBatchId = useMemo(() => {
|
||||
// 支付监听会长期 running;绑定二维码若仍 running 也算活跃。
|
||||
// 但“已生成二维码/已识别角色”这类终态不应再锁 UI。
|
||||
// 支付监听会长期 running;绑定二维码自动轮询角色时也算活跃。
|
||||
// 仅当 get_bind_qr 已结束轮询但仍残留 running 时,不锁 UI。
|
||||
const task = tasks.find((item) => {
|
||||
if (!['pending', 'running'].includes(item.status)) return false;
|
||||
if (item.task_type === 'create_recharge_order') {
|
||||
@@ -632,8 +632,10 @@ export default function HuyaTasksPage() {
|
||||
return !status || !['paid', 'timeout', 'stopped'].includes(status);
|
||||
}
|
||||
if (item.task_type === 'get_bind_qr') {
|
||||
// 旧版轮询中断后可能残留 running,但已有二维码结果;不作为活跃批次。
|
||||
if (hasMiniQrcode(item)) return false;
|
||||
// 正在自动轮询扫码/角色
|
||||
if (item.status === 'running' && item.result?.bind_polling === true) return true;
|
||||
// 有二维码但未标记轮询:可能是历史僵尸,不锁 UI
|
||||
if (hasMiniQrcode(item) && item.result?.bind_polling !== true) return false;
|
||||
}
|
||||
return true;
|
||||
});
|
||||
@@ -919,9 +921,10 @@ export default function HuyaTasksPage() {
|
||||
const qrQueryFinished = Boolean(qrQueryTask && qrTask && qrQueryTask.id > qrTask.id && qrQueryTask.status !== 'running');
|
||||
const qrImage = resultText(qrResult, 'mini_qrcode_image');
|
||||
const qrBindPhase = resultText(qrResult, 'bind_phase');
|
||||
const qrAutoPolling = qrTask?.status === 'running' && qrResult?.bind_polling === true;
|
||||
const qrBindReady = bindReadyForConfirm(qrTask) || Boolean(resultText(qrQueryResult, 'role_name'));
|
||||
const qrRoleSourceResult = resultText(qrQueryResult, 'role_name') ? qrQueryResult : qrResult;
|
||||
const qrWaitingRole = qrQueryRunning;
|
||||
const qrWaitingRole = qrAutoPolling || qrQueryRunning;
|
||||
const qrGameTitle = resultText(qrRoleSourceResult, 'game_title');
|
||||
const qrRoleName = resultText(qrRoleSourceResult, 'role_name');
|
||||
const qrGameRole = resultObject(qrRoleSourceResult, 'game_role');
|
||||
@@ -930,19 +933,29 @@ export default function HuyaTasksPage() {
|
||||
const qrRoleLine = qrBindReady ? [qrRolePlat, qrRoleArea, qrRoleName].filter(Boolean).join(' - ') : '';
|
||||
const qrStatusText = qrBindReady
|
||||
? '已识别角色,待确认'
|
||||
: qrQueryRunning
|
||||
? '查询角色中'
|
||||
: qrQueryFinished
|
||||
? '未检测到角色'
|
||||
: qrBindPhase === 'role_timeout'
|
||||
: qrAutoPolling
|
||||
? (
|
||||
qrBindPhase === 'qrcode_completed'
|
||||
? '等待角色同步'
|
||||
: qrBindPhase === 'qrcode_scanned'
|
||||
? '已扫码'
|
||||
: qrBindPhase === 'qrcode_expired'
|
||||
? '二维码已失效'
|
||||
: '等待扫码绑定'
|
||||
)
|
||||
: qrQueryRunning
|
||||
? '查询角色中'
|
||||
: qrQueryFinished
|
||||
? '未检测到角色'
|
||||
: qrBindPhase === 'qrcode_completed'
|
||||
? '等待角色同步'
|
||||
: qrBindPhase === 'qrcode_scanned'
|
||||
? '已扫码'
|
||||
: qrBindPhase === 'qrcode_expired'
|
||||
? '二维码已失效'
|
||||
: '等待绑定';
|
||||
: qrBindPhase === 'role_timeout'
|
||||
? '未检测到角色'
|
||||
: qrBindPhase === 'qrcode_completed'
|
||||
? '等待角色同步'
|
||||
: qrBindPhase === 'qrcode_scanned'
|
||||
? '已扫码'
|
||||
: qrBindPhase === 'qrcode_expired'
|
||||
? '二维码已失效'
|
||||
: '等待绑定';
|
||||
const qrAccountName = qrTask
|
||||
? resultProfileNick(qrResult) || qrTask.account_nickname || qrTask.account_uid || `#${qrTask.account_id}`
|
||||
: '';
|
||||
@@ -986,9 +999,8 @@ export default function HuyaTasksPage() {
|
||||
};
|
||||
|
||||
const renderTaskResult = (value: Record<string, unknown> | null, record: HuyaTaskItem) => {
|
||||
const bindQrImage = resultText(value, 'mini_qrcode_image');
|
||||
if (bindQrImage) {
|
||||
if (bindReadyForConfirm(record)) {
|
||||
if (hasMiniQrcode(record) || resultText(value, 'mini_qrcode_image')) {
|
||||
if (bindReadyForConfirm(record) || Boolean(resultText(value, 'role_name'))) {
|
||||
const roleName = resultText(value, 'role_name');
|
||||
return (
|
||||
<Space size={6}>
|
||||
@@ -1000,6 +1012,22 @@ export default function HuyaTasksPage() {
|
||||
</Space>
|
||||
);
|
||||
}
|
||||
if (record.status === 'running' && value?.bind_polling === true) {
|
||||
const phase = resultText(value, 'bind_phase');
|
||||
const phaseText = phase === 'qrcode_scanned'
|
||||
? '已扫码'
|
||||
: phase === 'qrcode_completed'
|
||||
? '等待角色'
|
||||
: '等待扫码';
|
||||
return (
|
||||
<Space size={6}>
|
||||
<Tag color="processing">{phaseText}</Tag>
|
||||
<Button size="small" icon={<QrcodeOutlined />} onClick={() => openQrTask(record)}>
|
||||
查看二维码
|
||||
</Button>
|
||||
</Space>
|
||||
);
|
||||
}
|
||||
return (
|
||||
<Button size="small" icon={<QrcodeOutlined />} onClick={() => openQrTask(record)}>
|
||||
查看二维码
|
||||
@@ -1961,10 +1989,10 @@ export default function HuyaTasksPage() {
|
||||
<Button
|
||||
icon={<SearchOutlined />}
|
||||
disabled={!canTask || batchBusy || starting || stopping || qrWaitingRole}
|
||||
loading={starting}
|
||||
loading={starting || qrQueryRunning}
|
||||
onClick={queryQrRole}
|
||||
>
|
||||
查询角色
|
||||
{qrAutoPolling ? '自动识别中' : '查询角色'}
|
||||
</Button>
|
||||
<Button
|
||||
type="primary"
|
||||
|
||||
Reference in New Issue
Block a user