diff --git a/CHANGELOG.MD b/CHANGELOG.MD
deleted file mode 100644
index a7fe933..0000000
--- a/CHANGELOG.MD
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-# 1.1.4
-
-### 2017-09-22
-
-#### Improvements
-- 发送消息后滚动到对话窗口最下面
-
-#### Bug fixed
-- 修复 #34 快速`enter`时会重复发送消息
-- 修复点击状态栏小图标展开菜单后，收到消息后重新创建小图标导致程序退出的问题
-
-# 1.1.3
-
-### 2017-09-19
-
-#### Bug fixed
-- #36 #34 优化内存使用，修复由于1.1.1显示头像到菜单栏，接收新消息时刷新菜单中会话列表，重复创建nativeImage导致GC无法及时回收所造成内存占用过高
-
-
-# 1.1.2
-
-### 2017-09-18
-
-#### Improvements
-- 增加自动更新
-
-
-# 1.1.1
-
-### 2017-09-14
-
-#### Improvements
-- 增加用户头像到菜单栏
-
-#### Bug fixed
-- 修复登出时网络错误，导致未提示客户端已离线
-
-### 2017-09-12
-#29 替换`html`为对应`emoji`
-
-### 2017-09-11
-#28 在 windows 和 linux 上不显示菜单
-
-### 2017-09-10
-
-#### Bug fixed
-- 联系人列表只显示好友，不显示临时联系人
-
-### 2017-09-08
-
-#### Improvements
-- 添加文件助手, #27
-
-#### Bug fixed
-- 修改样式，防止文字信息内容过长
-
-### 2017-09-07
-
-#### Improvements
-- 调整表情框表情大小
-- 聊天窗口用户名取消换行
-
-#### Feature
-- 多文件拖拽发送
-
-#### Bug fixed
-- 仅在聊天开启时允许文件拖拽
-- 修复手机端消息同步客户端错误
-- 修复图片加载失败使用错误`src`进行回滚导致客户端卡死的问题
diff --git a/main.js b/main.js
index 4576bea..d1f51a0 100644
--- a/main.js
+++ b/main.js
@@ -1,16 +1,14 @@
import fs from 'fs';
import tmp from 'tmp';
-import { app, powerMonitor, BrowserWindow, Tray, Menu, ipcMain, clipboard, shell, nativeImage, dialog } from 'electron';
+import { app, powerMonitor, BrowserWindow, Tray, Menu, ipcMain, clipboard, shell, nativeImage, Notification } from 'electron';
import windowStateKeeper from 'electron-window-state';
import AutoLaunch from 'auto-launch';
-import { autoUpdater } from 'electron-updater';
import axios from 'axios';
import pkg from './package.json';
let forceQuit = false;
-let downloading = false;
let mainWindow;
let tray;
let settings = {};
@@ -28,6 +26,17 @@ let mainMenu = [
{
label: `About ${pkg.name}`,
selector: 'orderFrontStandardAboutPanel:',
+ click() {
+ let note = new Notification({
+ title: 'WeweChat',
+ subtitle: 'about',
+ icon: `${__dirname}/src/assets/images/dock.png`,
+ body: `Made with 💖 by trazyn.\nRevise with 🔥 By Riceneeder\nversion: ${pkg.version}`,
+ silent: true,
+ closeButtonText: '了解了'
+ });
+ note.show();
+ }
},
{
label: '首选项...',
@@ -153,9 +162,6 @@ let mainMenu = [
label: 'Loading...',
}
],
- },
- {
-
},
{
label: '编辑',
@@ -375,22 +381,6 @@ async function getIcon(cookies, userid, src) {
return image;
}
-function checkForUpdates() {
- if (downloading) {
- dialog.showMessageBox({
- type: 'info',
- buttons: ['OK'],
- title: pkg.name,
- message: `Downloading...`,
- detail: `Please leave the app open, the new version is downloading. You'll receive a new dialog when downloading is finished.`
- });
-
- return;
- }
-
- autoUpdater.checkForUpdates();
-}
-
function updateTray(unread = 0) {
if (!isOsx) {
// Always show the tray icon on windows
@@ -697,15 +687,15 @@ const createMainWindow = () => {
isSuspend = true;
});
- if (isOsx) {
- app.setAboutPanelOptions({
- applicationName: pkg.name,
- applicationVersion: pkg.version,
- copyright: 'Made with 💖 by trazyn. \n https://github.com/trazyn/weweChat \nRevise By Riceneeder \n https://gitee.com/spark-community-works-collections/wewechat-plus-plus',
- credits: `With the invaluable help of: \n web.wechat.com`,
- version: pkg.version
- });
- }
+ // if (isOsx) {
+ // app.setAboutPanelOptions({
+ // applicationName: pkg.name,
+ // applicationVersion: pkg.version,
+ // copyright: 'Made with 💖 by trazyn. \n https://github.com/trazyn/weweChat \nRevise By Riceneeder \n https://gitee.com/spark-community-works-collections/wewechat-plus-plus',
+ // credits: `With the invaluable help of: \n web.wechat.com`,
+ // version: pkg.version
+ // });
+ // }
[imagesCacheDir, voicesCacheDir].map(e => {
if (!fs.existsSync(e)) {
@@ -730,55 +720,3 @@ app.on('activate', e => {
mainWindow.show();
}
});
-
-autoUpdater.on('update-not-available', e => {
- dialog.showMessageBox({
- type: 'info',
- buttons: ['OK'],
- title: pkg.name,
- message: `${pkg.name} is up to date :)`,
- detail: `${pkg.name} ${pkg.version} is currently the newest version available, It looks like you're already rocking the latest version!`
- });
-
- console.log('Update not available.');
-});
-
-autoUpdater.on('update-available', e => {
- downloading = true;
- checkForUpdates();
-});
-
-autoUpdater.on('error', err => {
- dialog.showMessageBox({
- type: 'error',
- buttons: ['Cancel update'],
- title: pkg.name,
- message: `Failed to update ${pkg.name} :(`,
- detail: `An error occurred in retrieving update information, Please try again later.`,
- });
-
- downloading = false;
- console.error(err);
-});
-
-autoUpdater.on('update-downloaded', info => {
- var { releaseNotes, releaseName } = info;
- var index = dialog.showMessageBox({
- type: 'info',
- buttons: ['Restart', 'Later'],
- title: pkg.name,
- message: `The new version has been downloaded. Please restart the application to apply the updates.`,
- detail: `${releaseName}\n\n${releaseNotes}`
- });
- downloading = false;
-
- if (index === 1) {
- return;
- }
-
- autoUpdater.quitAndInstall();
- setTimeout(() => {
- mainWindow = null;
- app.quit();
- });
-});
diff --git a/package.json b/package.json
index 0e2ba3d..b4a930a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wewechat",
- "version": "1.2.3",
+ "version": "1.2.4",
"description": "make weweChat great again!!!",
"main": "main.js",
"scripts": {
@@ -54,7 +54,10 @@
},
"linux": {
"icon": "../resource",
- "category": "Network",
+ "category": [
+ "Network",
+ "Chat"
+ ],
"executableName": "wewechat",
"target": [
"deb",
@@ -125,7 +128,6 @@
"css-loader": "^1.0.0",
"electron": "^2.0.16",
"electron-builder": "^19.56.2",
- "electron-updater": "^3.0.1",
"eslint": "^5.1.0",
"eslint-config-standard": "^11.0.0",
"eslint-config-standard-react": "^6.0.0",
diff --git a/src/assets/images/icon-new-message.png b/src/assets/images/icon-new-message.png
index 668dea9..f838291 100644
Binary files a/src/assets/images/icon-new-message.png and b/src/assets/images/icon-new-message.png differ
diff --git a/src/assets/images/icon.png b/src/assets/images/icon.png
index 09dcb38..9d97ba0 100644
Binary files a/src/assets/images/icon.png and b/src/assets/images/icon.png differ
diff --git a/src/js/pages/Settings/index.js b/src/js/pages/Settings/index.js
index c5d73f7..df6c9da 100644
--- a/src/js/pages/Settings/index.js
+++ b/src/js/pages/Settings/index.js
@@ -175,10 +175,13 @@ export default class Settings extends Component {
<h2>更新记录:</h2>
<p>
+ v1.2.4 更多的翻译;为darkmode添加过渡动画;删去不必要的代码，去除自动检查更新;修改托盘图标让其更加明显<br />
v1.2.3 增添darkmode，调整优化界面、颜色，以适应darkmode<br />
v1.2.2 添加单例运行，在后台时在启动器中启动会拉到前台而不是再启动一个wewechat，更多的汉化<br />
v1.2.1 汉化<br />
- v1.2.0 Make weweChat great again!!! Fix uos support
+ v1.2.0 Make weweChat great again!!! Fix uos support<br />
+ <hr />
+ <strong>Riceneeder: 本人不会React且较为业余，此项目除重大bug外不再更新，有能力者可提PR或联系星火的shenmo参与项目</strong>
</p>
</div>
</div>