From 0dfe68c7d957d2af70b7bc99701887dc29dddd65 Mon Sep 17 00:00:00 2001 From: Coding Zhang <2291200076@qq.com> Date: Thu, 10 Feb 2022 08:34:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0SS=E5=BF=AB=E6=8D=B7=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=BC=80=E5=85=B3=EF=BC=9B=E8=B0=83=E6=95=B4=E4=B8=BB?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E5=8A=9F=E8=83=BD=E5=BC=80=E5=85=B3=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/js/advanced-search/background.js | 36 ++++++++++++++++--- packages/shell-chrome/assets/js/popup.js | 16 +++++++++ packages/shell-chrome/popup.html | 16 +++++++-- 3 files changed, 61 insertions(+), 7 deletions(-) diff --git a/packages/shell-chrome/assets/js/advanced-search/background.js b/packages/shell-chrome/assets/js/advanced-search/background.js index 85323eb..e920b7b 100644 --- a/packages/shell-chrome/assets/js/advanced-search/background.js +++ b/packages/shell-chrome/assets/js/advanced-search/background.js @@ -871,7 +871,9 @@ var ajaxUrl = "https://www.baidu.com/s?wd="; /** * 用户开始输入文本 */ -chrome.omnibox.onInputStarted.addListener(function () { +chrome.omnibox.onInputStarted.addListener(async function () { + if (!await checkIsActived()) return; + console.log("chrome.omnibox.onInputStarted"); updateDefaultSuggestion(''); }); @@ -879,7 +881,9 @@ chrome.omnibox.onInputStarted.addListener(function () { /** * 搜索框失去焦点 */ -chrome.omnibox.onInputCancelled.addListener(function () { +chrome.omnibox.onInputCancelled.addListener(async function () { + if (!await checkIsActived()) return; + console.log("chrome.omnibox.onInputCancelled"); updateDefaultSuggestion(''); }); @@ -887,7 +891,9 @@ chrome.omnibox.onInputCancelled.addListener(function () { /** * 输入框文本改变事件 */ -chrome.omnibox.onInputChanged.addListener(function (text, suggest) { +chrome.omnibox.onInputChanged.addListener(async function (text, suggest) { + if (!await checkIsActived()) return; + console.log("chrome.omnibox.onInputChanged", text); // 停止上一次搜索行为 @@ -912,7 +918,9 @@ chrome.omnibox.onInputChanged.addListener(function (text, suggest) { /** * 用户输入完成，按下回车键 */ -chrome.omnibox.onInputEntered.addListener(function (text) { +chrome.omnibox.onInputEntered.addListener(async function (text) { + if (!await checkIsActived()) return; + console.log("chrome.omnibox.onInputEntered"); // 更新输入框回显提示信息 @@ -936,6 +944,26 @@ chrome.omnibox.onInputEntered.addListener(function (text) { * **************************************************************************************** */ +/** + * 读取功能开启状态，如果没有开启，则显示一个提示信息 + * @returns + */ +async function checkIsActived() { + var isActived = await new Promise((resolve) => { + chrome.storage.sync.get('State_SSSearch', function (State) { + resolve(State.State_SSSearch); + }); + }); + console.log("SS快捷搜索功能开启状态：" + isActived); + if (!isActived) { + chrome.omnibox.setDefaultSuggestion({ + description: "SS快捷搜索功能未开启，请在学生助手扩展设置中开启后再试" + }); + } + return isActived; +} + + /** * 将 & < > 等特殊字符转义，但保留中文不进行转义 * diff --git a/packages/shell-chrome/assets/js/popup.js b/packages/shell-chrome/assets/js/popup.js index 7e7bd21..14994ee 100644 --- a/packages/shell-chrome/assets/js/popup.js +++ b/packages/shell-chrome/assets/js/popup.js @@ -78,6 +78,22 @@ $(function() { }) + /** + * SS 快捷搜索 + */ + const btnSSSearch = document.querySelector("#btnSSSearch"); + // 页面加载时，更新界面开关状态 + chrome.storage.sync.get('State_SSSearch', function(budget) { + btnSSSearch.checked = !budget.State_SSSearch; + }); + + // 点击开关时存储按钮状态并刷新页面 + $("#btnSSSearch").click(function() { + chrome.storage.sync.set({ 'State_SSSearch': !btnSSSearch.checked }); + // refreshPage('SS Search'); + }) + + /** * 截图 */ diff --git a/packages/shell-chrome/popup.html b/packages/shell-chrome/popup.html index ed9dbe8..03556f3 100644 --- a/packages/shell-chrome/popup.html +++ b/packages/shell-chrome/popup.html @@ -64,9 +64,9 @@