优化直播状态更新，修复上下播提醒bug

electron/src/main.ts

@@ -42,7 +42,6 @@ const ipcInit = () => {
         event.reply('getFollowedVtbMidsReply', vtbInfosService.getFollowedVtbMids());
     });
     ipcMain.on('getFollowLists', (event: Electron.IpcMainEvent) => {
-        console.log(FollowListService.getFollowLists())
         event.reply('getFollowListsReply', FollowListService.getFollowLists());
     });
     ipcMain.on('addFollowList', (event: Electron.IpcMainEvent, name: string) => {
@@ -80,7 +79,8 @@ const appInit = () => {
     let lastLiveVtbs: number[] = [];
     vtbInfosService.onUpdate((vtbInfos) => {
         if (mainWin) {
-            const followVtbs = FollowListService.getFollowLists().map((followList: FollowList) => ([...followList.mids]))[0];
+            const followVtbs = vtbInfosService.getFollowedVtbMids();
+            mainWin.webContents.send('updateVtbInfos', vtbInfosService.getFollowedVtbInfos());
             let nowLiveFollowedVtbs = vtbInfos.filter((vtbInfo: VtbInfo) => (followVtbs.includes(vtbInfo.mid) && vtbInfo.liveStatus)).map((vtbInfo: VtbInfo) => vtbInfo.mid);
             let upLiveFollowedVtbs: number[] = [];
             let downLiveFollowedVtbs: number[] = [];
@@ -106,8 +106,6 @@ const appInit = () => {
     ipcInit();
 }
 app.once('ready', () => {
+    mainWin = createMainWin(app, playerObjMap)
     appInit();
-    vtbInfosService.onceUpdate(() => {
-        createMainWin(app, playerObjMap)
-    })
 })

electron/src/mainWinMenu.ts

@@ -25,12 +25,9 @@ export const createMainWinMenu = (app: Electron.App, players: Map<number, Player
             [...players.values()].forEach((player: PlayerObj, index: number) => {
                 const row = Math.floor(index / Math.ceil(playerNum / betterRowNumber));
                 const col = index % Math.ceil(playerNum / betterRowNumber);
-                console.log(`${row} ${col}`)
                 try {
                     player.playerWin.setBounds({ x: display.bounds.x + col * playerWidth, y: display.bounds.y + row * playerHeight, height: playerHeight, width: playerWidth })
                 } catch (e) {
-                    console.log(e);
-                    console.log({ x: display.bounds.x + col * playerWidth, y: display.bounds.y + row * playerHeight, height: playerHeight, width: playerWidth })
                 }
             })
         }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bili-dd-monitor",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "author": "kinori",
   "scripts": {
     "ng": "ng",
@@ -75,8 +75,8 @@
       "output": "build"
     },
     "releaseInfo": {
-      "releaseName": "0.0.11",
-      "releaseNotes": "修复关注列表bug"
+      "releaseName": "0.0.12",
+      "releaseNotes": "优化直播状态更新，修复上下播提醒bug"
     },
     "win": {
       "icon": "./public/icon256.ico"

projects/app/src/app/components/app-living/app-living.component.ts

@@ -24,13 +24,13 @@ export class AppLivingComponent implements OnInit {
     })
   }
   ngOnInit() {
-    this.vtbInfoService.getFollowedVtbInfos().subscribe((followedVtbInfos: VtbInfo[]) => {
-      this.followedVtbInfos = followedVtbInfos;
+    this.loadData();
+    this.vtbInfoService.updateVtbInfos().subscribe((vtbInfos: VtbInfo[]) => {
+      this.followedVtbInfos = vtbInfos;
       this.zone.run(() => {
 
       })
     })
-    this.timer = setInterval(this.loadData, 2000);
   }
   ngOnDestroy(): void {
     clearInterval(this.timer);

projects/app/src/app/services/vtb-info.service.ts

@@ -32,9 +32,17 @@ export class VtbInfoService {
           })
           break;
         }
+        case 'updateVtbInfos': {
+          this.electron.ipcRenderer.on('updateVtbInfos', ((event: Electron.Event, vtbInfos: VtbInfo[]) => {
+            observer.next(vtbInfos);
+          }))
+        }
       }
     }
   }
+  updateVtbInfos(): Observable<VtbInfo[]> {
+    return new Observable(this.sequenceSubscriber('updateVtbInfos'));
+  }
   getVtbInfos(): Observable<VtbInfo[]> {
     this.electron.ipcRenderer.send('getVtbInfos');
     return new Observable(this.sequenceSubscriber('getVtbInfos'));