diff --git a/README.md b/README.md
index 49d1b90e..d0633ae3 100755
--- a/README.md
+++ b/README.md
@@ -128,7 +128,7 @@
>34、修复右键复制无效问题(仅限文字消息,不包括链接)
->35、可以正确的使用是否允许多实例运行
+>35、可以正确地使用是否允许多实例运行
diff --git a/package.json b/package.json
index a18aeefd..75237be8 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "electronic-wechat",
- "version": "2.1.6",
+ "version": "2.1.7",
"description": "An Electron application for WeChat",
"main": "src/main.js",
"scripts": {
diff --git a/scripts/build.sh b/scripts/build.sh
index 37352abc..e91aeefe 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -27,7 +27,7 @@ fi
ignore_list="dist|scripts|\.idea|.*\.md|.*\.yml|node_modules/nodejieba|install"
-electron-packager . "${APP_NAME}" --platform=$PLATFORM --arch=$ARCH --electronVersion=2.0.0 --app-version=2.1.6 --asar --icon=assets/icon.icns --overwrite --out=./dist --ignore=${ignore_list}
+electron-packager . "${APP_NAME}" --platform=$PLATFORM --arch=$ARCH --electronVersion=2.0.0 --app-version=2.1.7 --asar --icon=assets/icon.icns --overwrite --out=./dist --ignore=${ignore_list}
if [ $? -eq 0 ]; then
echo -e "$(tput setaf 2)Packaging for $PLATFORM $ARCH succeeded.$(tput sgr0)\n"
diff --git a/src/common_en.js b/src/common_en.js
index ccea26f8..033e6562 100755
--- a/src/common_en.js
+++ b/src/common_en.js
@@ -88,6 +88,8 @@ Common.trayTitle = 'Tray Icon color (Black/White)';
Common.trayDesc = 'Select a color to match your desktop theme';
Common.proxyTitle = 'Set Proxy'
Common.proxyDesc = 'Select Proxy Mode'
+Common.blurTitle = 'Blur Processing'
+Common.blurDesc = 'Whether to go into suspended state when blur'
Common.UPGRADE = 'UPGRADE';
Common.FEEDBACK = 'FEEDBACK';
diff --git a/src/main.js b/src/main.js
index 561c16ef..36ec34b8 100755
--- a/src/main.js
+++ b/src/main.js
@@ -50,7 +50,7 @@ class ElectronicWeChat {
}
initSetting(){
- if (!AppConfig.readSettings('chat-area-offset-y')) {
+ if (!AppConfig.readSettings('blur')) {
AppConfig.saveSettings('language', AppConfig.readSettings('language')||'zh-CN');
AppConfig.saveSettings('prevent-recall', AppConfig.readSettings('prevent-recall')||'on');
AppConfig.saveSettings('icon', AppConfig.readSettings('icon')||'black');
@@ -64,6 +64,7 @@ class ElectronicWeChat {
AppConfig.saveSettings('proxy',AppConfig.readSettings('proxy')||'on')
AppConfig.saveSettings('proxy-url',AppConfig.readSettings('proxy-url')||'socks5://127.0.0.1:1080')
AppConfig.saveSettings('chat-area-offset-y',AppConfig.readSettings('chat-area-offset-y')||'0')
+ AppConfig.saveSettings('blur',AppConfig.readSettings('blur')||'on')
}
}
diff --git a/src/windows/controllers/settings.js b/src/windows/controllers/settings.js
index 855de218..3c481129 100755
--- a/src/windows/controllers/settings.js
+++ b/src/windows/controllers/settings.js
@@ -44,8 +44,10 @@ class SettingsWindow {
this.settingsWindow = null;
this.isShown = false;
});
+ // debug
// this.settingsWindow.once('ready-to-show', () => {
// this.settingsWindow.show();
+ // this.settingsWindow.toggleDevTools();
// });
}
@@ -55,7 +57,6 @@ class SettingsWindow {
}
this.settingsWindow.show();
this.isShown = true;
- //this.settingsWindow.toggleDevTools();
}
hide() {
diff --git a/src/windows/controllers/wechat.js b/src/windows/controllers/wechat.js
index e5c072c5..0c452df9 100755
--- a/src/windows/controllers/wechat.js
+++ b/src/windows/controllers/wechat.js
@@ -209,8 +209,10 @@ class WeChatWindow {
});
this.wechatWindow.on('blur', () => {
- this.isShown = false;
- this.wechatWindow.webContents.send('hide-wechat-window');
+ if(AppConfig.readSettings('blur') === 'on'){
+ this.isShown = false;
+ this.wechatWindow.webContents.send('hide-wechat-window');
+ }
});
this.wechatWindow.on('resize',(event) => {
diff --git a/src/windows/views/settings.html b/src/windows/views/settings.html
index 62b2be15..ac3e96c9 100755
--- a/src/windows/views/settings.html
+++ b/src/windows/views/settings.html
@@ -18,7 +18,7 @@