Skip to content

Commit

Permalink
优化了copilot难以打开msedge的问题
Browse files Browse the repository at this point in the history
  • Loading branch information
tjy-gitnub committed Feb 13, 2025
1 parent e401cd8 commit 59b294e
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 32 deletions.
69 changes: 37 additions & 32 deletions desktop.js
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ function addMenu() {
}
}
var run_cmd = '';
let nomax = { 'calc': 0 , 'notepad-fonts': 0, 'camera-notice': 0, 'winver': 0, 'run': 0, 'wsa': 0 };
let nomin = { 'notepad-fonts': 0, 'camera-notice': 0, 'run': 0 };
const nomax = { 'calc': 0 , 'notepad-fonts': 0, 'camera-notice': 0, 'winver': 0, 'run': 0, 'wsa': 0 };
const nomin = { 'notepad-fonts': 0, 'camera-notice': 0, 'run': 0 };
var topmost = [];
var sys_setting = [1, 1, 1, 0, 0, 1, 1];
var use_music = true;
Expand All @@ -227,7 +227,7 @@ var use_mic_voice = true;
形参 arg 为 showcm() 方法第三个位置的用以传参的参数内容,
返回内容或为 'null' 表示跳过此项,或参考条目 2 的格式
*/
let cms = {
const cms = {
'save-bar':[
arg => {
return ['<i class="bi bi-window-x"></i> 移除', `removeEdgeSaveUrl('${arg}')`];
Expand Down Expand Up @@ -463,9 +463,7 @@ function showcm(e, cl, arg) {
$('#cm>list')[0].innerHTML = h;
$('#cm').addClass('show-begin');
$('#cm>.foc').focus();
// 这个.foc是用来模拟焦点的,这句是将焦点放在右键菜单上,注释掉后果不堪设想 >u-)o
// 噢 可是如果设置焦点的话在移动设备上会显示虚拟键盘啊 QAQ (By: User782Tec)
// (By: tjy-gitnub)
// .foc是用来模拟焦点的,将焦点放在右键菜单上
setTimeout(() => {
$('#cm').addClass('show');
}, 0);
Expand Down Expand Up @@ -521,7 +519,7 @@ $('#cm>.foc').blur(() => {
let font_window = false;

// 下拉菜单
let dps = {
const dps = {
'notepad.file': [
['<i class="bi bi-file-earmark-plus"></i> 新建', `hidedp(true);$('#win-notepad>.text-box').addClass('down');
setTimeout(()=>{$('#win-notepad>.text-box').val('');$('#win-notepad>.text-box').removeClass('down')},200);`],
Expand Down Expand Up @@ -574,7 +572,7 @@ function showdp(e, cl, arg) {
return;
}
// dpt = e;
let off = $(e).offset();
const off = $(e).offset();
$('#dp').css('left', off.left);
$('#dp').css('top', off.top + e.offsetHeight);
let h = '';
Expand Down Expand Up @@ -655,7 +653,7 @@ function hidedescp(e) {
/* 参考 desktop.html 开头信息,
格式、功能较简单,自行研究,不作赘述*/

let nts = {
const nts = {
'about': {
cnt: lang(`<p class="tit">Windows 12 网页版</p>
<p>Windows 12 网页版是一个开放源项目,<br />
Expand Down Expand Up @@ -907,7 +905,7 @@ STARWARS 原力觉醒
}
else if (cmd.toLowerCase() === 'matrix') {
if (inTerminal) {
const chars = 'アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワン1234567890';
const chars = 'アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワン1234567890'; // 哈?(from stsc)
let matrix = '';

// 创建一个专门的容器来放置 matrix 效果
Expand Down Expand Up @@ -1433,11 +1431,9 @@ function insertTextAtCursor(text) {
}
else{
var el = document.activeElement;
var start = el.selectionStart;
var end = el.selectionEnd;
var value = el.value;
var newText = value.slice(0, start) + text + value.slice(end);
el.value = newText;
const start = el.selectionStart;
const value = el.value;
el.value = value.slice(0, start) + text + value.slice(el.selectionEnd);
el.selectionStart = el.selectionEnd = start + text.length;

}
Expand Down Expand Up @@ -1489,7 +1485,7 @@ let copilot = {
多条指令用换行隔开。系统收到指令后会执行,且对用户隐藏回答后的指令。
你不能在对用户说的话的中间中提到、引用指令。绝不能要求用户执行指令。
1.指令"{openapp appid}";用来打开某个应用,用在下文"应用的功能介绍"中匹配的id代替其中的"appid"
2.指令"{openurl url}";用来在edge浏览器中打开某个URL,其中用URL地址代替"url"。该指令包含了打开edge浏览器的操作。当用户想要搜索某内容,请用bing搜索
2.指令"{openurl url}";用来在edge浏览器中打开某个URL,其中用URL地址代替"url"。当用户想要搜索某内容,请用bing搜索
3.指令"{feedback copilot}";打开ai助手反馈界面,用于用户想对ai助手的功能提出反馈时帮助他打开
4.指令"{feedback win12}";打开反馈中心,当用户希望对除ai助手外的其他系统功能发送反馈时,帮他打开反馈中心
5.指令"{settheme theme}";用于切换系统的深色、浅色模式,区别于主题。用"light"表浅色,"dark"表深色,来替换其中的"theme"
Expand Down Expand Up @@ -1641,7 +1637,7 @@ let copilot = {
rt = rt.replace(i, `<div class="action"><p class="tit">打开应用</p><p class="detail">${t} <span style="color:red">(AI 理解力较差,见谅)</span></p></div>`);
}
} else if (/{openurl .+?}/.test(i)) {
let t = i.match(/(?<={openurl ).+(?=})/)[0];
const t = i.match(/(?<={openurl ).+(?=})/)[0];
openapp('edge');
apps.edge.newtab();
apps.edge.goto(t);
Expand All @@ -1653,7 +1649,7 @@ let copilot = {
shownotice('feedback-copilot');
rt = rt.replace(i, '<div class="action"><p class="tit">反馈</p><p class="detail">关于 Windows 12 Copilot</p></div>');
} else if (/{settheme .+?}/.test(i)) {
let t = i.match(/(?<={settheme ).+(?=})/)[0];
const t = i.match(/(?<={settheme ).+(?=})/)[0];
if ((t == 'light' && $(':root').hasClass('dark')) || (t == 'dark' && !$(':root').hasClass('dark'))) {
toggletheme();
}
Expand Down Expand Up @@ -1695,7 +1691,7 @@ let copilot = {
// 日期、时间
let da = new Date();

let date = {
const date = {
'zh-CN':`星期${['日', '一', '二', '三', '四', '五', '六'][da.getDay()]}, ${da.getFullYear()}${(da.getMonth() + 1).toString().padStart(2, '0')}${da.getDate().toString().padStart(2, '0')}日`,
'zh-TW':`星期${['日', '一', '二', '三', '四', '五', '六'][da.getDay()]}, ${da.getFullYear()}${(da.getMonth() + 1).toString().padStart(2, '0')}${da.getDate().toString().padStart(2, '0')}日`,
en:`${['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][da.getDay()]}, ${['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'][da.getMonth()]} ${da.getDate().toString().padStart(2, '0')}, ${da.getFullYear()}`
Expand Down Expand Up @@ -1739,7 +1735,7 @@ function pinapp(id, name, command) {
// 应用方法

// png 格式的图标在此备注,否则以 标识+.svg 的名称自动检索
let icon = {
const icon = {
bilibili: 'bilibili.png',
vscode: 'vscode.png',
// python: 'python.png',
Expand Down Expand Up @@ -1988,22 +1984,25 @@ function dragBrightness(e) {
clientX = e.touches[0].clientX;
}
var _offset = clientX - viewport;

const limit=2; // 亮度条件限制

if (_offset < 0) {
_offset = 0;
}
// else if (_offset > width) {
// _offset = width;
// }
else if (_offset > limit*width) {
_offset = limit*width;
}
slider.style.marginLeft = _offset + 'px';
after.style.left = _offset + 'px';
after.style.width = width - _offset + 'px';
if (_offset / width > 0.3 && _offset / width < 2) {
if (_offset / width > 0.3 && _offset / width < limit) {
page.style.filter = `brightness(${_offset / width})`;
}
else if (_offset / width < 2){
else if (_offset / width < limit){
page.style.filter = 'brightness(0.3)';
}else{
page.style.filter = 'brightness(2)';
page.style.filter = `brightness(${limit})`;
}
}
function up() {
Expand Down Expand Up @@ -2093,8 +2092,7 @@ function toggletheme() {
}
}

const isDarkTheme = window.matchMedia('(prefers-color-scheme: dark)');
if (isDarkTheme.matches) { //是深色
if (window.matchMedia('(prefers-color-scheme: dark)').matches) { //是深色
$('.dock.theme').toggleClass('dk');
$(':root').toggleClass('dark');
$('.window.whiteboard>.titbar>p').text('Blackboard');
Expand All @@ -2107,11 +2105,18 @@ if (isDarkTheme.matches) { //是深色

// 桌面图标的初始化
let desktopItem = [];

function saveDesktop() {
localStorage.setItem('desktop', /*$('#desktop')[0].innerHTML*/JSON.stringify(desktopItem));
localStorage.setItem('topmost', JSON.stringify(topmost));
localStorage.setItem('sys_setting', JSON.stringify(sys_setting));
localStorage.setItem('root_class', $(':root').attr('class'));
const data = {
desktop: JSON.stringify(desktopItem),
topmost: JSON.stringify(topmost),
sys_setting: JSON.stringify(sys_setting),
root_class: $(':root').attr('class')
};

Object.entries(data).forEach(([key, value]) => {
localStorage.setItem(key, value);
});
}

function setIcon() {
Expand Down
Empty file added index.html
Empty file.

0 comments on commit 59b294e

Please sign in to comment.