diff --git a/.DS_Store b/.DS_Store index a8a5cf6..f399ba0 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index 02213ce..5a5ee82 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ src/dont_include/ src/dont_include.js src/node_modules/ +dist/ diff --git a/src/app.jsc b/src/app.jsc index 4c4f758..a037473 100644 Binary files a/src/app.jsc and b/src/app.jsc differ diff --git a/src/images/head_sheng.jpg b/src/images/head_sheng.jpg new file mode 100644 index 0000000..4abf0de Binary files /dev/null and b/src/images/head_sheng.jpg differ diff --git a/src/images/head_shuai.jpg b/src/images/head_shuai.jpg new file mode 100644 index 0000000..7e98f2e Binary files /dev/null and b/src/images/head_shuai.jpg differ diff --git a/src/images/head_xia.jpg b/src/images/head_xia.jpg new file mode 100644 index 0000000..ef9384c Binary files /dev/null and b/src/images/head_xia.jpg differ diff --git a/src/images/head_yang.jpg b/src/images/head_yang.jpg new file mode 100644 index 0000000..727d87e Binary files /dev/null and b/src/images/head_yang.jpg differ diff --git a/src/index.html b/src/index.html index 69640ee..4bbb5a7 100644 --- a/src/index.html +++ b/src/index.html @@ -83,7 +83,7 @@ }); - +
@@ -113,5 +113,6 @@
+
diff --git a/src/index.js b/src/index.js index 42dc133..41d8e62 100644 --- a/src/index.js +++ b/src/index.js @@ -16,7 +16,6 @@ const fs = require("fs"); const package = require("./package.json"); const bn = require('bytenode'); const path = require('path'); -const http = require('http'); const userDataPath = app.getPath ('userData'); let mainWindow; @@ -26,6 +25,33 @@ var windowobj; var defaultSize={width:300,height:300}; // if (process.platform == 'darwin') app.dock.hide(); +ipcMain.on("showNotification",function(event,obj){ + // console.log(obj); + showNotification(obj.msg,{title:obj.title,icon:obj.icon,click:()=>{ + shell.openExternal(obj.url); + }}) +}) + +function showNotification(msg='',options){ + if(!Notification.isSupported())return; + + if(!options)options={}; + + let notification = new Notification({ + title: options.title??"提醒您", + body: msg, + icon:nativeImage.createFromPath(path.posix.join(__dirname,options.icon)), + silent: options.silent??false + }) + notification.show(); + + if(options.click){ + notification.addListener("click",function(e){ + options.click(); + }); + } +} + function createMainWindow(loadpath) { const { width, diff --git a/src/package-lock.json b/src/package-lock.json index 20eb99e..02db05a 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -2115,6 +2115,14 @@ "resolved": "https://registry.npm.taobao.org/aws4/download/aws4-1.10.1.tgz", "integrity": "sha1-4eguTz6Zniz9YbFhKA0WoRH4ZCg=" }, + "axios": { + "version": "0.21.0", + "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.21.0.tgz?cache=0&sync_timestamp=1603468826655&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.21.0.tgz", + "integrity": "sha1-Jt8IiAOiNQ3/LCf5b++Z/klEKso=", + "requires": { + "follow-redirects": "^1.10.0" + } + }, "babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npm.taobao.org/babel-code-frame/download/babel-code-frame-6.26.0.tgz", @@ -5766,6 +5774,11 @@ "readable-stream": "^2.3.6" } }, + "follow-redirects": { + "version": "1.13.0", + "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.13.0.tgz?cache=0&sync_timestamp=1597059692702&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.13.0.tgz", + "integrity": "sha1-tC6Nk6Kn7qXtiGM2dtZZe8jjhNs=" + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/for-in/download/for-in-1.0.2.tgz?cache=0&sync_timestamp=1573184298867&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffor-in%2Fdownload%2Ffor-in-1.0.2.tgz", diff --git a/src/package.json b/src/package.json index ced3520..cb7a404 100644 --- a/src/package.json +++ b/src/package.json @@ -20,6 +20,7 @@ }, "dependencies": { "@tarojs/cli": "^3.0.15", + "axios": "^0.21.0", "bytenode": "^1.1.7", "cheerio": "^1.0.0-rc.3", "child_process": "^1.0.2",