Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2941ddd

Browse files
committed
【CHG】H5端回放时间轴拖动问题修复
1 parent 320eba7 commit 2941ddd

File tree

4 files changed

+36
-8
lines changed

4 files changed

+36
-8
lines changed

demos/base-demo/ezuikit.js

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17352,7 +17352,7 @@ var MobileRec = /*#__PURE__*/function () {
1735217352
};
1735317353
var localRecSeek = function localRecSeek(callback) {
1735417354
_this.disabled = true;
17355-
_this.jSPlugin.pause().then(function () {
17355+
_this.jSPlugin.pause(date).then(function () {
1735617356
console.log("暂停成功");
1735717357
_this.jSPlugin.resume(date).then(function (data) {
1735817358
console.log("恢复成功");
@@ -28934,6 +28934,7 @@ var Theme = /*#__PURE__*/function () {
2893428934
if (typeof jSPlugin.isMobile !== 'undefined') {
2893528935
this.isMobile = jSPlugin.isMobile;
2893628936
}
28937+
this.pauseTime = null;
2893728938
// 默认主题 - 按钮全部展示
2893828939
this.themeData = emptyData.data;
2893928940
// 自适应主题数据
@@ -29706,7 +29707,16 @@ var Theme = /*#__PURE__*/function () {
2970629707
if (play) {
2970729708
if (rec || cloudRec) {
2970829709
//回放时调用暂停,而不是结束播放
29709-
_this9.jSPlugin.pause();
29710+
if (_this9.isMobile) {
29711+
_this9.jSPlugin.jSPlugin.JS_GetOSDTime(0).then(function (data) {
29712+
var pauseDate = new Date(data * 1000);
29713+
var pauseTime = "".concat(pauseDate.getFullYear()) + (pauseDate.getMonth() > 8 ? pauseDate.getMonth() + 1 : "0".concat(pauseDate.getMonth() + 1)) + (pauseDate.getDate() > 9 ? pauseDate.getDate() : "0".concat(pauseDate.getDate())) + (pauseDate.getHours() > 9 ? pauseDate.getHours() : "0".concat(pauseDate.getHours())) + (pauseDate.getMinutes() > 9 ? pauseDate.getMinutes() : "0".concat(pauseDate.getMinutes())) + (pauseDate.getSeconds() > 9 ? pauseDate.getSeconds() : "0".concat(pauseDate.getSeconds()));
29714+
_this9.pauseTime = pauseTime;
29715+
_this9.jSPlugin.pause(pauseTime);
29716+
});
29717+
} else {
29718+
_this9.jSPlugin.pause();
29719+
}
2971029720
} else {
2971129721
_this9.jSPlugin.stop();
2971229722
_this9.jSPlugin.Zoom.stopZoom();
@@ -29722,7 +29732,11 @@ var Theme = /*#__PURE__*/function () {
2972229732
} else {
2972329733
if (rec || cloudRec) {
2972429734
//回放时调用恢复播放状态
29725-
_this9.jSPlugin.resume();
29735+
if (_this9.isMobile) {
29736+
_this9.jSPlugin.resume(_this9.pauseTime);
29737+
} else {
29738+
_this9.jSPlugin.resume();
29739+
}
2972629740
} else {
2972729741
_this9.jSPlugin.play();
2972829742
}

demos/react-demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@testing-library/react": "^9.5.0",
88
"@testing-library/user-event": "^7.2.1",
99
"axios": "^0.19.2",
10-
"ezuikit-js": "^7.6.2",
10+
"ezuikit-js": "^7.6.3",
1111
"react": "^16.13.1",
1212
"react-dom": "^16.13.1",
1313
"react-scripts": "3.4.1"

demos/vue-demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"dependencies": {
1111
"core-js": "^3.6.4",
12-
"ezuikit-js": "^7.6.2",
12+
"ezuikit-js": "^7.6.3",
1313
"vue": "^2.6.11"
1414
},
1515
"devDependencies": {

ezuikit.js

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17352,7 +17352,7 @@ var MobileRec = /*#__PURE__*/function () {
1735217352
};
1735317353
var localRecSeek = function localRecSeek(callback) {
1735417354
_this.disabled = true;
17355-
_this.jSPlugin.pause().then(function () {
17355+
_this.jSPlugin.pause(date).then(function () {
1735617356
console.log("暂停成功");
1735717357
_this.jSPlugin.resume(date).then(function (data) {
1735817358
console.log("恢复成功");
@@ -28934,6 +28934,7 @@ var Theme = /*#__PURE__*/function () {
2893428934
if (typeof jSPlugin.isMobile !== 'undefined') {
2893528935
this.isMobile = jSPlugin.isMobile;
2893628936
}
28937+
this.pauseTime = null;
2893728938
// 默认主题 - 按钮全部展示
2893828939
this.themeData = emptyData.data;
2893928940
// 自适应主题数据
@@ -29706,7 +29707,16 @@ var Theme = /*#__PURE__*/function () {
2970629707
if (play) {
2970729708
if (rec || cloudRec) {
2970829709
//回放时调用暂停,而不是结束播放
29709-
_this9.jSPlugin.pause();
29710+
if (_this9.isMobile) {
29711+
_this9.jSPlugin.jSPlugin.JS_GetOSDTime(0).then(function (data) {
29712+
var pauseDate = new Date(data * 1000);
29713+
var pauseTime = "".concat(pauseDate.getFullYear()) + (pauseDate.getMonth() > 8 ? pauseDate.getMonth() + 1 : "0".concat(pauseDate.getMonth() + 1)) + (pauseDate.getDate() > 9 ? pauseDate.getDate() : "0".concat(pauseDate.getDate())) + (pauseDate.getHours() > 9 ? pauseDate.getHours() : "0".concat(pauseDate.getHours())) + (pauseDate.getMinutes() > 9 ? pauseDate.getMinutes() : "0".concat(pauseDate.getMinutes())) + (pauseDate.getSeconds() > 9 ? pauseDate.getSeconds() : "0".concat(pauseDate.getSeconds()));
29714+
_this9.pauseTime = pauseTime;
29715+
_this9.jSPlugin.pause(pauseTime);
29716+
});
29717+
} else {
29718+
_this9.jSPlugin.pause();
29719+
}
2971029720
} else {
2971129721
_this9.jSPlugin.stop();
2971229722
_this9.jSPlugin.Zoom.stopZoom();
@@ -29722,7 +29732,11 @@ var Theme = /*#__PURE__*/function () {
2972229732
} else {
2972329733
if (rec || cloudRec) {
2972429734
//回放时调用恢复播放状态
29725-
_this9.jSPlugin.resume();
29735+
if (_this9.isMobile) {
29736+
_this9.jSPlugin.resume(_this9.pauseTime);
29737+
} else {
29738+
_this9.jSPlugin.resume();
29739+
}
2972629740
} else {
2972729741
_this9.jSPlugin.play();
2972829742
}

0 commit comments

Comments
 (0)