single

单例
2022-09-02 13:46:28 +08:00 · 2022-09-02 13:42:13 +08:00 · 2022-09-02 13:33:42 +08:00
12 changed files with 29 additions and 48 deletions
--- a/main.js
+++ b/main.js
@@ -214,12 +214,7 @@ let mainMenu = [
                type: 'separator',
            },
            {
-                label: 'Darkmode',
-                accelerator: !isOsx ? 'Ctrl+Shift+D' : 'Shift+Cmd+D',
-                click() {
-                    mainWindow.show();
-                    mainWindow.webContents.send('darkmode');
-                }
+                label: ''
            },
            {
                type: 'separator',
@@ -336,6 +331,8 @@ let avatarCache = {};
 let avatarPlaceholder = `${__dirname}/src/assets/images/user-fallback.png`;
 const icon = `${__dirname}/src/assets/images/dock.png`;

+
+
 async function getIcon(cookies, userid, src) {
    var cached = avatarCache[userid];
    var icon;
@@ -482,19 +479,20 @@ function createMenu() {
        mainWindow.setMenu(menu);
    }
 }
+// 实现单例，在启动第二个实例后，激活主窗口，然后退出第二个实例
 const shouldQuit = app.makeSingleInstance(() => {
    if (mainWindow) {
-        if (mainWindow.isMinimized()) mainWindow.restore();
-        mainWindow.show();
-        mainWindow.focus();
+        if (mainWindow.isMinimized()) mainWindow.restore()
+        mainWindow.focus()
    }
-});
-shouldQuit && app.quit();
+})
+
+shouldQuit && app.quit()

 const createMainWindow = () => {
    var mainWindowState = windowStateKeeper({
-        defaultWidth: 745,
-        defaultHeight: 450,
+        defaultWidth: 1300,
+        defaultHeight: 700,
    });

    mainWindow = new BrowserWindow({
@@ -716,7 +714,6 @@ const createMainWindow = () => {
    mainWindow.webContents.setUserAgent('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/10.1.2 Safari/603.3.8');
    createMenu();
 };
-
 app.setName(pkg.name);
 app.dock && app.dock.setIcon(icon);

@@ -725,6 +722,7 @@ app.on('before-quit', () => {
    // Fix issues #14
    forceQuit = true;
 });
+
 app.on('activate', e => {
    if (!mainWindow.isVisible()) {
        mainWindow.show();
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "wewechat",
-  "version": "1.2.3",
+  "version": "1.2.2",
  "description": "make weweChat great again!!!",
  "main": "main.js",
  "scripts": {
@@ -23,7 +23,7 @@
  "author": {
    "email": "845541909@qq.com"
  },
-  "homepage": "https://gitee.com/spark-community-works-collections/wewechat-plus-plus/README.md",
+"homepage": "https://gitee.com/spark-community-works-collections/wewechat-plus-plus/README.md",
  "repository": {
    "type": "git",
    "url": "https://gitee.com/spark-community-works-collections/wewechat-plus-plus"
@@ -57,7 +57,7 @@
      "category": "Chat",
      "executableName": "wewechat",
      "target": [
-        "deb",
+	 "deb",
        "AppImage"
      ]
    },
@@ -86,7 +86,6 @@
    "axios": "^0.18.0",
    "browser-md5-file": "^1.0.0",
    "classname": "^0.0.0",
-    "darkmode-js": "^1.5.7",
    "delegate": "^3.1.3",
    "electron-context-menu": "^0.10.0",
    "electron-json-storage": "^4.0.2",
--- a/src/app.js
+++ b/src/app.js
@@ -4,7 +4,6 @@ import { render } from 'react-dom';
 import { Provider } from 'mobx-react';
 import { HashRouter } from 'react-router-dom';
 import { ipcRenderer } from 'electron';
-import Darkmode from 'darkmode-js';

 import './global.css';
 import './assets/fonts/icomoon/style.css';
@@ -28,11 +27,6 @@ class App extends Component {

    componentDidMount() {
        var navigator = this.refs.navigator;
-        const options = {
-            time: '0.5s',
-            mixColor: '#cccccc',
-        };
-        const darkmode = new Darkmode(options);

        // Hide the tray icon
        ipcRenderer.on('hide-tray', () => {
@@ -136,11 +130,6 @@ class App extends Component {
        ipcRenderer.on('show-errors', (event, args) => {
            stores.snackbar.showMessage(args.message);
        });
-
-        // Dark mode
-        ipcRenderer.on('darkmode', () => {
-            darkmode.toggle();
-        });
    }

    render() {
--- a/src/js/components/MessageInput/style.css
+++ b/src/js/components/MessageInput/style.css
@@ -14,7 +14,7 @@
        border: 0;
        padding-right: 17px;
        background: 0;
-        color: #808080;
+        color: #333;
        font-size: 14px;
        outline: 0;
    }
--- a/src/js/pages/Footer/Settings.js
+++ b/src/js/pages/Footer/Settings.js
@@ -19,8 +19,8 @@ export default class Placeholder extends Component {
                    className={classes.button}
                    href="https://gitee.com/spark-community-works-collections/wewechat-plus-plus"
                    target="_blank">
-                    Fork on Gitee
-                    <i className="icon-ion-fork-repo" />
+                    Fork on Github
+                    <i className="icon-ion-social-github" />
                </a>
            </div>
        );
--- a/src/js/pages/Footer/style.css
+++ b/src/js/pages/Footer/style.css
@@ -7,6 +7,7 @@

 .footer {
    position: relative;
+    background: #fff;
    box-shadow: inset 0 1px 0 0 var(--shadow-color);
    z-index: 9;

@@ -77,7 +78,7 @@
        line-height: 60px;
        border: 0;
        background: 0;
-        color: #808080;
+        color: #333;
        font-size: 14px;
        outline: 0;
    }
@@ -106,7 +107,7 @@
        position: relative;
        margin-right: 17px;
        width: 166px;
-        color: #808080;
+        color: rgba(0, 0, 0, .8);
        font-size: 14px;
        padding: 9px 8px;
        font-family: 'Roboto';
--- a/src/js/pages/Header/style.css
+++ b/src/js/pages/Header/style.css
@@ -8,7 +8,7 @@
    font-family: "system-ui";
    font-weight: normal;
    width: 100%;
-    color: #c3c3c3;
+    color: #777;
    text-align: center;
    background: rgba(255, 255, 255, 1);
    -webkit-user-select: none;
--- a/src/js/pages/Home/ChatContent/style.css
+++ b/src/js/pages/Home/ChatContent/style.css
@@ -114,7 +114,7 @@
        width: 32px;
        border-radius: 0;
        z-index: 9;
-        box-shadow: 0 0 10px 0 rgba(225, 225, 225, 0.5);
+        box-shadow: 0 0 10px 0 rgba(0, 0, 0, .5);
        cursor: pointer;
    }

@@ -165,7 +165,7 @@
    & .content {
        position: relative;
        max-width: 100%;
-        background: rgba(225, 225, 225, 0.5);
+        background: #fff;
        box-shadow: 0 6px 28px 0 rgba(230, 230, 230, 100);
    }

@@ -538,7 +538,7 @@
    }

    & .content {
-        background: rgba(0, 0, 200, 0.5);
+        background: #7ebef8;
    }

    & p {
--- a/src/js/pages/Layout.css
+++ b/src/js/pages/Layout.css
@@ -3,6 +3,7 @@
    height: calc(100vh - 100px);
    overflow: hidden;
    overflow-y: auto;
+    background: rgba(255, 255, 255, .8);
    box-shadow: inset 0 1px 0 0 #eaedea;
    filter: blur(0);
    transition: .2s;
--- a/src/js/pages/NewChat/style.css
+++ b/src/js/pages/NewChat/style.css
@@ -1,6 +1,6 @@

 .container {
-    background: rgba(142, 142, 142, 0.6);
+    background: #fff;
    height: 100vh;
    width: 100vw;
    display: flex;
--- a/src/js/pages/Settings/index.js
+++ b/src/js/pages/Settings/index.js
@@ -172,14 +172,7 @@ export default class Settings extends Component {
                    </ul>
                </div>
                <div className={classes.column}>
-                    <h2>更新记录:</h2>
-
-                    <p>
-                        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
-                    </p>
+                    <h2>TODO:</h2>
                </div>
            </div>
        );
--- a/src/js/pages/Settings/style.css
+++ b/src/js/pages/Settings/style.css
@@ -4,7 +4,7 @@
    justify-content: space-between;
    padding: 12px 17px 0;
    font-family: 'Helvetica Neue';
-    color: #808080;
+    color: #000;

    & h2 {
        font-weight: 300;
Author	SHA1	Message	Date
shenmo	c4703eb5ba	single	2022-09-02 13:46:28 +08:00
shenmo	c8c60e693f	单例	2022-09-02 13:42:13 +08:00
shenmo	f2aa5bdcf2	单例	2022-09-02 13:33:42 +08:00