add badge support

wildfirechat · Sep 26, 2020 · e5eee02 · e5eee02
1 parent 5f8b008
commit e5eee02
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 34 deletions.
diff --git a/main.js b/main.js
@@ -23,6 +23,8 @@ import i18n from 'i18n';
 import proto from './marswrapper.node';
 
 import pkg from './package.json';
+import Badge from 'electron-windows-badge';
+
 
 let Locales = {};
 i18n.configure({
@@ -557,6 +559,8 @@ const createMainWindow = () => {
         frame: !isWin,
         icon
     });
+    const badgeOptions = {}
+    new Badge(mainWindow, badgeOptions);
 
     mainWindow.setSize(400, 480);
     mainWindow.loadURL(
@@ -765,6 +769,7 @@ const createMainWindow = () => {
         var counter = args.counter;
         //if (settings.showOnTray) {
         updateTray(counter);
+        app.setBadgeCount(counter);
         //}
     });
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -109,6 +109,7 @@
     "electron-json-storage": "^4.0.2",
     "electron-screenshots": "0.0.10",
     "electron-window-state": "^4.1.1",
+    "electron-windows-badge": "^1.1.0",
     "emoji-mart": "^2.11.1",
     "file-saver": "^2.0.2",
     "han": "^0.0.7",

diff --git a/src/js/ui/pages/Footer/index.js b/src/js/ui/pages/Footer/index.js
@@ -57,7 +57,7 @@ export default class Footer extends Component {
 
         return (
             <footer className={clazz(classes.footer,{
-                [classes.winrleft]:this.props.isMac(),
+                [classes.winrleft]:this.props.isWin(),
             })}>
                 <div className={classes.user} onClick= {()=>this.showUserCard()}>
                     <img src={user.portrait}/>
@@ -114,7 +114,7 @@ export default class Footer extends Component {
 
                 <div className={clazz(classes.right, {
                     [classes.hideConversation]: !showConversation,
-                    [classes.winright]:this.props.isMac()
+                    [classes.winright]:this.props.isWin()
                 })}>
                     {
                         component ? React.createElement(component) : ""

diff --git a/src/js/ui/pages/Layout.js b/src/js/ui/pages/Layout.js
@@ -174,12 +174,16 @@ export default class Layout extends Component {
         });
         stores.sessions.setUnreadMessageCount(counter)
         if (ipcRenderer) {
-            ipcRenderer.send(
-                'message-unread',
-                {
-                    counter,
-                }
-            );
+            if(this.isWin()){
+                ipcRenderer.sendSync('update-badge', counter > 0 ? counter : null);
+            }else {
+                ipcRenderer.send(
+                    'message-unread',
+                    {
+                        counter,
+                    }
+                );
+            }
         } else {
             document.title = counter === 0 ? "野火IM" : (`野火IM(有${counter}条未读消息)`);
         }
@@ -235,7 +239,7 @@ export default class Layout extends Component {
         wfc.eventEmitter.removeListener(EventType.ConversationInfoUpdate, this.updateUnreadStatus);
         wfc.eventEmitter.removeListener(EventType.SettingUpdate, this.updateUnreadStatus);
     }
-    isMac(){
+    isWin(){
         // var agent = navigator.userAgent.toLowerCase();
         // var isMac = /macintosh|mac os x/i.test(navigator.userAgent);
         // if(isMac){
@@ -270,15 +274,15 @@ export default class Layout extends Component {
                 <Loader show={loading} />
                 <div
                     className={clazz(classes.container,{
-                        [classes.winContainer]:this.isMac()
+                        [classes.winContainer]:this.isWin()
                     })}
                     ref="viewport">
                     {this.props.children}
                 </div>
                 <Footer
                     className={classes.footer}
                     location={location}
-                    isMac={this.isMac}
+                    isWin={this.isWin}
                     ref="footer" />
                 <UserInfo />
                 <AddFriend />