From f6d5aa8c49f690ee75451d1dfdf8b56b280dfa6a Mon Sep 17 00:00:00 2001 From: enjoyeetime Date: Sun, 29 Jan 2023 11:16:13 +0800 Subject: [PATCH] update --- JD.js | 17 ++++++++--------- _LSP.js | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/JD.js b/JD.js index 45783bf..cb70534 100644 --- a/JD.js +++ b/JD.js @@ -621,7 +621,6 @@ class Widget extends BaseWidget { } } else { console.error('用户信息获取失败!'); - this.notify('JD', `登录可能失效了!`); } console.log(`用户信息:`); console.log( @@ -886,14 +885,15 @@ await new Widget(Script.name()).run(); async function downloadLSPDependency() { let fm = FileManager.local(); const dependencyURL = `${remoteRoot}/_LSP.js`; + const update = needUpdateDependency(); if (isDev) { const iCloudPath = FileManager.iCloud().documentsDirectory(); const localIcloudDependencyExit = fm.isFileStoredIniCloud(`${iCloudPath}/_LSP.js`); const localDependencyExit = fm.fileExists(`${rootDir}/_LSP.js`); const fileExist = localIcloudDependencyExit || localDependencyExit; console.log(`🚀 DEV开发依赖文件${fileExist ? '已存在 ✅' : '不存在 🚫'}`); - if (!fileExist || needUpdateDependency()) { - console.log(`🤖 DEV 开始下载依赖~`); + if (!fileExist || update) { + console.log(`🤖 DEV 开始${update ? '更新' : '下载'}依赖~`); await downloadFile2Scriptable('_LSP', dependencyURL); keySave('VERSION', dependencyLSP); } @@ -904,15 +904,14 @@ async function downloadLSPDependency() { console.log(`----------------------------------------`); const remoteDependencyExit = fm.fileExists(`${cacheDir}/_LSP.js`); console.log(`🚀 RELEASE依赖文件${remoteDependencyExit ? '已存在 ✅' : '不存在 🚫'}`); - console.log(`----------------------------------------`); // ------------------------------ - if (!remoteDependencyExit || needUpdateDependency()) { // 下载依赖 + if (!remoteDependencyExit || update) { // 下载依赖 // 创建根目录 if (!fm.fileExists(cacheDir)) { fm.createDirectory(cacheDir, true); } // 下载 - console.log('🤖 RELEASE开始下载依赖~'); + console.log(`🤖 RELEASE开始${update ? '更新' : '下载'}依赖~`); console.log(`----------------------------------------`); const req = new Request(dependencyURL); const moduleJs = await req.load(); @@ -971,17 +970,17 @@ async function downloadFile2Scriptable(moduleName, url) { /** * 是否需要更新依赖版本 */ -async function needUpdateDependency() { +function needUpdateDependency() { return dependencyLSP != keyGet('VERSION'); }; -async function keySave(cacheKey, cache) { +function keySave(cacheKey, cache) { if (cache) { Keychain.set(cacheKey, cache); } } -async function keyGet(cacheKey, defaultValue = '') { +function keyGet(cacheKey, defaultValue = '') { if (Keychain.contains(cacheKey)) { return Keychain.get(cacheKey); } else { diff --git a/_LSP.js b/_LSP.js index dcfbd7a..e7a3262 100644 --- a/_LSP.js +++ b/_LSP.js @@ -1921,7 +1921,7 @@ class BaseWidget { async renderAppView(options = {}, previewWebView = new WebView()) { this.logDivider(); - console.log(`👉 组件主界面渲染 👇`); + console.log(`👉 组件控制面板渲染预览 👇`); this.logDivider(); const { showWidgetSettingBg = false, // 是否显示组件背景设置的图片 -- GitLab