[CHG]全屏/取消全屏回调支持ESC按键

yujianbohz · yujianbohz · commit b0efa6b7c126 · 2021-08-02T23:46:29.000+08:00
diff --git a/README.md b/README.md
@@ -81,6 +81,7 @@ import  EZUIKit from 'ezuikit-js';
 |stopSaveCallBack |function	| 结束录像回调 |N|
 |capturePictureCallBack |function	| 截图回调 |N|
 |fullScreenCallBack |function	| 全屏回调 |N|
+|fullScreenChangeCallBack |function	| 全屏变化回调-全局（含ESC退出全屏等） |N|
 |getOSDTimeCallBack |function	| 获取OSD时间回调 |N|
 
 
diff --git a/demos/base-demo/ezuikit.js b/demos/base-demo/ezuikit.js
@@ -1177,7 +1177,6 @@
             }
 
             break;
-
           case 'getOSDTime':
             if (id == event.data.id && params.getOSDTimeCallBack) {
               params.getOSDTimeCallBack(event.data);
@@ -1208,6 +1207,29 @@
         }
       }
     });
+    // 全屏变化回调
+    function fullscreenchange(data) {
+      _this.opt.fullScreenStatus = data ? 1 : 0;
+      if (params.fullScreenChangeCallBack) {
+        params.fullScreenChangeCallBack({data:data,id: _this.opt.id});
+      }
+    }
+    if (typeof document.fullScreen !== "undefined") {
+      document.addEventListener("fullscreenchange", function() {
+        var e = document.fullscreen || false;
+        fullscreenchange(e)
+      })
+    } else if (typeof document.webkitIsFullScreen !== "undefined") {
+      document.addEventListener("webkitfullscreenchange", function() {
+        var e = document.webkitIsFullScreen || false;
+        fullscreenchange(e)
+      })
+    } else if (typeof document.mozFullScreen !== "undefined") {
+      document.addEventListener("mozfullscreenchange", function() {
+        var e = document.mozFullScreen || false;
+        fullscreenchange(e)
+      })
+    }
   }; // 播放相关API
 
 
diff --git a/demos/base-demo/index.html b/demos/base-demo/index.html
@@ -48,6 +48,7 @@ <h2>视频模式使用示例：</h2>
       stopSaveCallBack: (data) => console.log("录像回调",data),
       capturePictureCallBack: (data) => console.log("截图成功回调",data),
       fullScreenCallBack: (data) => console.log("全屏回调",data),
+      fullScreenChangeCallBack: (data) => console.log("全屏变化回调",data),
       getOSDTimeCallBack: (data) => console.log("获取OSDTime回调",data),
       handleSuccess: (data) = function(){console.log("播放成功回调",data)},
       handleError: (data) => console.log("播放失败回调",data),
diff --git a/ezuikit.js b/ezuikit.js
@@ -1177,7 +1177,6 @@
             }
 
             break;
-
           case 'getOSDTime':
             if (id == event.data.id && params.getOSDTimeCallBack) {
               params.getOSDTimeCallBack(event.data);
@@ -1208,6 +1207,29 @@
         }
       }
     });
+    // 全屏变化回调
+    function fullscreenchange(data) {
+      _this.opt.fullScreenStatus = data ? 1 : 0;
+      if (params.fullScreenChangeCallBack) {
+        params.fullScreenChangeCallBack({data:data,id: _this.opt.id});
+      }
+    }
+    if (typeof document.fullScreen !== "undefined") {
+      document.addEventListener("fullscreenchange", function() {
+        var e = document.fullscreen || false;
+        fullscreenchange(e)
+      })
+    } else if (typeof document.webkitIsFullScreen !== "undefined") {
+      document.addEventListener("webkitfullscreenchange", function() {
+        var e = document.webkitIsFullScreen || false;
+        fullscreenchange(e)
+      })
+    } else if (typeof document.mozFullScreen !== "undefined") {
+      document.addEventListener("mozfullscreenchange", function() {
+        var e = document.mozFullScreen || false;
+        fullscreenchange(e)
+      })
+    }
   }; // 播放相关API
 
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ezuikit-js",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "ezuikit javascript for npm",
   "main": "ezuikit.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ezuikit-js",`
`3`		`- "version": "0.2.5",`
	`3`	`+ "version": "0.2.6",`
`4`	`4`	`"description": "ezuikit javascript for npm",`
`5`	`5`	`"main": "ezuikit.js",`
`6`	`6`	`"scripts": {`