[fix]修复移动端切换主题无效问题

yujianbohz · yujianbohz · commit bf400e0eb68b · 2022-04-07T21:27:05.000+08:00
diff --git a/demos/base-demo/ezuikit.js b/demos/base-demo/ezuikit.js
@@ -25448,6 +25448,7 @@ class MobilePtz {
     mobileContainer.style = `display:inline-block;width: ${this.jSPlugin.width}px;text-align:center;`;
     var mobileContainerTitle = document.createElement('div');
     mobileContainerTitle.className = "live-ptz-title";
+    mobileContainerTitle.id = "live-ptz-title";
     mobileContainerTitle.innerHTML = "云台控制";
     const ptzWrap = document.createElement('div');
     ptzWrap.id = "mobile-ez-ptz-item";
@@ -26134,14 +26135,6 @@ class Theme {
     if (!this.jSPlugin.Talk) {
       this.jSPlugin.Talk = new Talk(this.jSPlugin);
     }
-    if (matchEzopenUrl(jSPlugin.url).type === 'live') {
-      if (this.isMobile) {
-        this.MobilePtz = new MobilePtz(jSPlugin);
-        this.Ptz = new Ptz(jSPlugin);
-      } else {
-        this.Ptz = new Ptz(jSPlugin);
-      }
-    }
   }
   fetchThemeData(themeId) {
     const url = `${this.jSPlugin.env.domain}/jssdk/ezopen/template/getDetail?accessToken=${this.jSPlugin.accessToken}&id=${themeId}`;
@@ -26172,6 +26165,7 @@ class Theme {
   }
   changeTheme(options) {
     if(typeof options === 'string') {
+      this.jSPlugin.themeId = options;
       switch (this.jSPlugin.themeId) {
         case 'pcLive':
           this.themeData = pcLiveData.data;
@@ -26933,6 +26927,11 @@ class Theme {
     this.isNeedRenderFooter = lodash.findIndex(footer.btnList, (v)=>{
       return v.isrender > 0;
     }) >= 0;
+    ["date-switch-container-wrap","rec-type-container-wrap","mobile-rec-wrap","mobile-ez-ptz-container"].forEach((item,index)=> {
+      if(document.getElementById(item)) {
+        document.getElementById(item).parentElement.removeChild(document.getElementById(item));
+      }
+    });
     if (this.isNeedRenderHeader) {
       if (!document.getElementById(`${this.jSPlugin.id}-headControl`)) {
         const headerContainer = document.createElement('div');
@@ -27020,6 +27019,15 @@ class Theme {
         this.Rec = new Rec(this.jSPlugin);
       }
     }
+    var isNeedRenderPTZ = (lodash.findIndex(this.themeData.header.btnList, (v)=>{
+      return (v.iconId === 'pantile' && v.isrender === 1);
+    }) >= 0 || (this.isMobile && matchEzopenUrl(this.jSPlugin.url).type.indexOf('live') !== -1)) && !this.jSPlugin.disabledPTZ;
+    if (isNeedRenderPTZ) {
+      this.MobilePtz = new MobilePtz(this.jSPlugin);
+      this.Ptz = new Ptz(this.jSPlugin);
+    } else {
+      this.Ptz = new Ptz(this.jSPlugin);
+    }
     //  监听全屏事件触发
     const fullscreenchange = () => {
       const { expend, webExpend } = this.decoderState.state;
diff --git a/demos/react-demo/package.json b/demos/react-demo/package.json
@@ -7,7 +7,7 @@
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",
     "axios": "^0.19.2",
-    "ezuikit-js": "^0.5.0",
+    "ezuikit-js": "^0.5.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-scripts": "3.4.1"
diff --git a/demos/vue-demo/package.json b/demos/vue-demo/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "core-js": "^3.6.4",
-    "ezuikit-js": "^0.5.0",
+    "ezuikit-js": "^0.5.2",
     "vue": "^2.6.11"
   },
   "devDependencies": {
diff --git a/ezuikit.js b/ezuikit.js
@@ -25448,6 +25448,7 @@ class MobilePtz {
     mobileContainer.style = `display:inline-block;width: ${this.jSPlugin.width}px;text-align:center;`;
     var mobileContainerTitle = document.createElement('div');
     mobileContainerTitle.className = "live-ptz-title";
+    mobileContainerTitle.id = "live-ptz-title";
     mobileContainerTitle.innerHTML = "云台控制";
     const ptzWrap = document.createElement('div');
     ptzWrap.id = "mobile-ez-ptz-item";
@@ -26134,14 +26135,6 @@ class Theme {
     if (!this.jSPlugin.Talk) {
       this.jSPlugin.Talk = new Talk(this.jSPlugin);
     }
-    if (matchEzopenUrl(jSPlugin.url).type === 'live') {
-      if (this.isMobile) {
-        this.MobilePtz = new MobilePtz(jSPlugin);
-        this.Ptz = new Ptz(jSPlugin);
-      } else {
-        this.Ptz = new Ptz(jSPlugin);
-      }
-    }
   }
   fetchThemeData(themeId) {
     const url = `${this.jSPlugin.env.domain}/jssdk/ezopen/template/getDetail?accessToken=${this.jSPlugin.accessToken}&id=${themeId}`;
@@ -26172,6 +26165,7 @@ class Theme {
   }
   changeTheme(options) {
     if(typeof options === 'string') {
+      this.jSPlugin.themeId = options;
       switch (this.jSPlugin.themeId) {
         case 'pcLive':
           this.themeData = pcLiveData.data;
@@ -26933,6 +26927,11 @@ class Theme {
     this.isNeedRenderFooter = lodash.findIndex(footer.btnList, (v)=>{
       return v.isrender > 0;
     }) >= 0;
+    ["date-switch-container-wrap","rec-type-container-wrap","mobile-rec-wrap","mobile-ez-ptz-container"].forEach((item,index)=> {
+      if(document.getElementById(item)) {
+        document.getElementById(item).parentElement.removeChild(document.getElementById(item));
+      }
+    });
     if (this.isNeedRenderHeader) {
       if (!document.getElementById(`${this.jSPlugin.id}-headControl`)) {
         const headerContainer = document.createElement('div');
@@ -27020,6 +27019,15 @@ class Theme {
         this.Rec = new Rec(this.jSPlugin);
       }
     }
+    var isNeedRenderPTZ = (lodash.findIndex(this.themeData.header.btnList, (v)=>{
+      return (v.iconId === 'pantile' && v.isrender === 1);
+    }) >= 0 || (this.isMobile && matchEzopenUrl(this.jSPlugin.url).type.indexOf('live') !== -1)) && !this.jSPlugin.disabledPTZ;
+    if (isNeedRenderPTZ) {
+      this.MobilePtz = new MobilePtz(this.jSPlugin);
+      this.Ptz = new Ptz(this.jSPlugin);
+    } else {
+      this.Ptz = new Ptz(this.jSPlugin);
+    }
     //  监听全屏事件触发
     const fullscreenchange = () => {
       const { expend, webExpend } = this.decoderState.state;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ezuikit-js",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "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.5.1",`
	`3`	`+ "version": "0.5.2",`
`4`	`4`	`"description": "ezuikit javascript for npm",`
`5`	`5`	`"main": "ezuikit.js",`
`6`	`6`	`"scripts": {`