Fix: play and pause publish both

synctv-org · Oct 7, 2023 · ffd4142 · ffd4142
1 parent 981c834
commit ffd4142
Showing 1 changed file with 24 additions and 27 deletions.
diff --git a/src/plugins/sync.ts b/src/plugins/sync.ts
@@ -37,46 +37,43 @@ export const sync = (cbk: callback) => {
       });
     };
 
-    const publishPlay = useDebounceFn(() => {
-      isDev() && console.log("视频播放,seek:", art.currentTime);
-      if (!room.currentMovie.live)
+    const publishPlayOrPause = useDebounceFn(() => {
+      // isDev() && console.log("视频播放,seek:", art.currentTime);
+      if (room.currentMovie.live) return;
+      if (art.playing) {
         cbk["set-player-status"](
           JSON.stringify({
             Type: WsMessageType.PLAY,
             Seek: art.currentTime,
             Rate: art.playbackRate
           })
         );
-    }, debounceTime);
-
-    const setAndNoPublishPlay = () => {
-      isDev() && console.log("视频播放(no publish),seek:", art.currentTime);
-      art.off("play", publishPlay);
-      art.play();
-      art.once("play", () => {
-        art.on("play", publishPlay);
-      });
-    };
-
-    const publishPause = useDebounceFn(() => {
-      isDev() && console.log("视频暂停,seek:", art.currentTime);
-      if (!room.currentMovie.live)
+      } else {
         cbk["set-player-status"](
           JSON.stringify({
             Type: WsMessageType.PAUSE,
             Seek: art.currentTime,
             Rate: art.playbackRate
           })
         );
+      }
     }, debounceTime);
 
-    const setAndNoPublishPause = () => {
-      isDev() && console.log("视频暂停(no publish),seek:", art.currentTime);
-      art.off("pause", publishPause);
-      art.pause();
-      art.once("pause", () => {
-        art.on("pause", publishPause);
-      });
+    const setAndNoPublishPlayOrPause = (playing: boolean) => {
+      isDev() && console.log("视频播放(no publish),seek:", art.currentTime);
+      if (playing) {
+        art.off("play", publishPlayOrPause);
+        art.play();
+        art.once("play", () => {
+          art.on("play", publishPlayOrPause);
+        });
+      } else {
+        art.off("pause", publishPlayOrPause);
+        art.pause();
+        art.once("pause", () => {
+          art.on("pause", publishPlayOrPause);
+        });
+      }
     };
 
     const publishRate = () => {
@@ -107,7 +104,7 @@ export const sync = (cbk: callback) => {
           console.log("AAAAAAAA", art.playing);
           if (room.currentMovieStatus.playing === art.playing) return;
           console.log("BBBBBBBBB");
-          room.currentMovieStatus.playing ? setAndNoPublishPlay() : setAndNoPublishPause();
+          setAndNoPublishPlayOrPause(room.currentMovieStatus.playing);
         }
       }
     );
@@ -146,10 +143,10 @@ export const sync = (cbk: callback) => {
       // room.currentMovieStatus.playing ? setAndNoPublishPlay() : setAndNoPublishPause();
       cbk["ws-send"]("PLAYER：视频已就绪");
 
-      art.on("play", publishPlay);
+      art.on("play", publishPlayOrPause);
 
       // 视频暂停
-      art.on("pause", publishPause);
+      art.on("pause", publishPlayOrPause);
 
       // 空降