fix: 删除任务/分组持久化(重启不再复活)+ feat: APK 安装支持本机 USB 设备
This commit is contained in:
@@ -2365,11 +2365,10 @@ async function deleteApk(id){
|
||||
async function openInstallModal(apkId){
|
||||
const apk=_apksCache.find(a=>a.id===apkId);
|
||||
const apkName=apk?(apk.display_name||'APK'):'APK';
|
||||
const sr=await apiGet('/api/status');if(!sr||!sr.ok)return;
|
||||
const devices=sr.devices||[];
|
||||
const online=devices.filter(d=>d.present);
|
||||
const r=await apiGet('/api/apks/install/devices');
|
||||
const online=(r&&r.ok)?(r.devices||[]):[];
|
||||
if(!online.length){
|
||||
showToast('没有在线设备','error');return;
|
||||
showToast('没有可用设备(STF 池或本机 adb 均无)','error');return;
|
||||
}
|
||||
const body=
|
||||
'<div style="margin-bottom:12px">'+
|
||||
@@ -2383,11 +2382,11 @@ async function openInstallModal(apkId){
|
||||
'</div>'+
|
||||
'<div id="install-dev-list" class="device-list">'+
|
||||
online.map(d=>{
|
||||
const running=d.worker_status==='running'||d.worker_status==='connecting';
|
||||
const st='<span class="label label-'+(running?'success':'default')+'" style="margin-left:6px">'+(running?'运行中':'空闲')+'</span>';
|
||||
const isUsb=d.source==='usb';
|
||||
const st='<span class="label label-'+(isUsb?'primary':'default')+'" style="margin-left:6px">'+(isUsb?'本地USB':(d.source==='stf'?'STF':'adb'))+'</span>';
|
||||
// serial 唯一,显示 IP + 型号便于区分同型号设备
|
||||
const label=(d.serial||'').replace(/:5555$/,'')+' · '+(d.device_name||d.model||'设备');
|
||||
return '<label><input type="checkbox" value="'+esc(d.serial)+'"'+(running?'':' checked')+'>'+esc(label)+st+'</label>';
|
||||
const label=(d.serial||'').replace(/:5555$/,'')+' · '+(d.model||(isUsb?'USB 有线设备':'设备'));
|
||||
return '<label><input type="checkbox" value="'+esc(d.serial)+'" checked>'+esc(label)+st+'</label>';
|
||||
}).join('')+
|
||||
'</div>';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user