Browse Source

注掉信号源预览视频,暂时解决不了同时播放报错的问题

liuwei 4 years ago
parent
commit
bd0c2dd0fc
68 changed files with 19994 additions and 26 deletions
  1. 0 2
      src/renderer/components/Button.vue
  2. 11 9
      src/renderer/components/SignalList.vue
  3. 4 0
      src/renderer/components/player.vue
  4. BIN
      static/Data/1.png
  5. BIN
      static/Data/10.png
  6. BIN
      static/Data/11.png
  7. BIN
      static/Data/12.png
  8. BIN
      static/Data/13.png
  9. BIN
      static/Data/14.png
  10. BIN
      static/Data/15.png
  11. BIN
      static/Data/16.png
  12. BIN
      static/Data/17.png
  13. BIN
      static/Data/18.png
  14. BIN
      static/Data/19.png
  15. BIN
      static/Data/2.png
  16. BIN
      static/Data/20.png
  17. BIN
      static/Data/21.png
  18. BIN
      static/Data/22.png
  19. BIN
      static/Data/23.png
  20. BIN
      static/Data/24.png
  21. BIN
      static/Data/25.png
  22. BIN
      static/Data/26.png
  23. BIN
      static/Data/27.png
  24. BIN
      static/Data/28.png
  25. BIN
      static/Data/29.png
  26. BIN
      static/Data/3.png
  27. BIN
      static/Data/30.png
  28. BIN
      static/Data/31.png
  29. BIN
      static/Data/32.png
  30. BIN
      static/Data/33.png
  31. BIN
      static/Data/34.png
  32. BIN
      static/Data/35.png
  33. BIN
      static/Data/36.png
  34. BIN
      static/Data/37.png
  35. BIN
      static/Data/38.png
  36. BIN
      static/Data/39.png
  37. BIN
      static/Data/4.png
  38. BIN
      static/Data/40.png
  39. BIN
      static/Data/41.png
  40. BIN
      static/Data/42.png
  41. BIN
      static/Data/43.png
  42. BIN
      static/Data/44.png
  43. BIN
      static/Data/45.png
  44. BIN
      static/Data/46.png
  45. BIN
      static/Data/47.png
  46. BIN
      static/Data/48.png
  47. BIN
      static/Data/49.png
  48. BIN
      static/Data/5.png
  49. BIN
      static/Data/50.png
  50. BIN
      static/Data/6.png
  51. BIN
      static/Data/7.png
  52. BIN
      static/Data/8.png
  53. BIN
      static/Data/9.png
  54. 230 1
      static/Data/EnityBigScreen.Data
  55. 4911 1
      static/Data/EnityButton.Data
  56. 8608 1
      static/Data/EnityDevice.Data
  57. 4182 1
      static/Data/EnityIcon.Data
  58. 170 1
      static/Data/EnityImage.Data
  59. 427 1
      static/Data/EnityLable.Data
  60. 35 1
      static/Data/EnityLogin.Data
  61. 24 1
      static/Data/EnityMemory.Data
  62. 1 1
      static/Data/EnitySignalPreviewList.Data
  63. 230 1
      static/Data/EnitySlider.Data
  64. 16 1
      static/Data/EnityTimer.Data
  65. 346 1
      static/Data/EnityTopology.Data
  66. 422 1
      static/Data/EnityTopologyConnection.Data
  67. 1 1
      static/Data/EnityView.Data
  68. 376 1
      static/Data/EnityWindow.Data

+ 0 - 2
src/renderer/components/Button.vue

@@ -74,8 +74,6 @@
         methods: {
             // 点击按钮
             async clickBtn(e) {
-                console.log(e)
-
                 // 控制按钮数组
                 const controlBtns = this.buttonJson.filter(item => item.ButtonType === 1 && item.GroupNumber === e.GroupNumber)
                 if(controlBtns.some(item => item === e)){

+ 11 - 9
src/renderer/components/SignalList.vue

@@ -34,10 +34,11 @@
             <div class="signal_item_bg">
                 <div class="signal_item_bg_body">
                     <div v-show="item.preview" class="signal_item_bg_body_space">
-                        <VideoPlayer
-                                :options="videoPlayObj[item.sourceId]"
-                                :playsinline="true"
-                        />
+<!--                        <VideoPlayer-->
+<!--                                :options="videoPlayObj2[item.sourceId]"-->
+<!--                                :playsinline="true"-->
+<!--                                ref="myPlayer"-->
+<!--                        />-->
                     </div>
                     <div class="signal_item_bg_body_font">{{item.deviceName}}</div>
                 </div>
@@ -56,7 +57,7 @@
         data() {
             return {
                 signalBorder: [], // 信号源容器
-                videoPlayObj: {}, // 视频播放配置对象
+                videoPlayObj2: {}, // 视频播放配置对象
             }
         },
 
@@ -71,24 +72,25 @@
 
         beforeUpdate() {
             const signalList = this.$store.state.signalListJson
-            const videoPlayObj = {}
+            const videoPlayObj2 = {}
             for (const item of signalList) {
-                videoPlayObj[item.sourceId] = {
+                videoPlayObj2[item.sourceId] = {
                     sources: [
                         {
                             "src": item.previewUrl,
                             "type": "rtmp/flv"
                         }
                     ],
-                    techOrder: ['flash'],
+                    techOrder: ['html5','flash'],
                     autoplay: true,
+                    muted: true, // 是否静音
                     controls: false,
                     fluid: true,
                     preload: 'auto',
                     notSupportedMessage: '此视频暂无法播放,请稍后再试',
                 }
             }
-            this.videoPlayObj = videoPlayObj
+            this.videoPlayObj2 = videoPlayObj2
         },
 
         updated() {

+ 4 - 0
src/renderer/components/player.vue

@@ -121,6 +121,10 @@
       }
     },
     beforeDestroy() {
+      // if (this.player.techName_ !== 'Flash' && this.player.pause) { this.player.pause() }
+
+      const videoDom = this.$refs.video
+      videojs(videoDom).dispose()
       if (this.player) {
         this.dispose()
       }

BIN
static/Data/1.png


BIN
static/Data/10.png


BIN
static/Data/11.png


BIN
static/Data/12.png


BIN
static/Data/13.png


BIN
static/Data/14.png


BIN
static/Data/15.png


BIN
static/Data/16.png


BIN
static/Data/17.png


BIN
static/Data/18.png


BIN
static/Data/19.png


BIN
static/Data/2.png


BIN
static/Data/20.png


BIN
static/Data/21.png


BIN
static/Data/22.png


BIN
static/Data/23.png


BIN
static/Data/24.png


BIN
static/Data/25.png


BIN
static/Data/26.png


BIN
static/Data/27.png


BIN
static/Data/28.png


BIN
static/Data/29.png


BIN
static/Data/3.png


BIN
static/Data/30.png


BIN
static/Data/31.png


BIN
static/Data/32.png


BIN
static/Data/33.png


BIN
static/Data/34.png


BIN
static/Data/35.png


BIN
static/Data/36.png


BIN
static/Data/37.png


BIN
static/Data/38.png


BIN
static/Data/39.png


BIN
static/Data/4.png


BIN
static/Data/40.png


BIN
static/Data/41.png


BIN
static/Data/42.png


BIN
static/Data/43.png


BIN
static/Data/44.png


BIN
static/Data/45.png


BIN
static/Data/46.png


BIN
static/Data/47.png


BIN
static/Data/48.png


BIN
static/Data/49.png


BIN
static/Data/5.png


BIN
static/Data/50.png


BIN
static/Data/6.png


BIN
static/Data/7.png


BIN
static/Data/8.png


BIN
static/Data/9.png


File diff suppressed because it is too large
+ 230 - 1
static/Data/EnityBigScreen.Data


File diff suppressed because it is too large
+ 4911 - 1
static/Data/EnityButton.Data


File diff suppressed because it is too large
+ 8608 - 1
static/Data/EnityDevice.Data


File diff suppressed because it is too large
+ 4182 - 1
static/Data/EnityIcon.Data


File diff suppressed because it is too large
+ 170 - 1
static/Data/EnityImage.Data


File diff suppressed because it is too large
+ 427 - 1
static/Data/EnityLable.Data


+ 35 - 1
static/Data/EnityLogin.Data

@@ -1 +1,35 @@
-[]
+[
+    {
+        "IsBorder":true,
+        "BorderStr":"#FFFFFFFF",
+        "ForegroundStr":"#FFD6D6D6",
+        "BTNForegroundStr":"#FF000000",
+        "BrackgroupStr":"#FF03A9F4",
+        "BackIconObjID":"",
+        "BackIcon":null,
+        "ActionIconObjID":"",
+        "ActionIcon":null,
+        "FontSize":16,
+        "IsPanel":false,
+        "ValidatType":1,
+        "EnityName":"Login",
+        "VerifyPassActionList":[
+
+        ],
+        "ID":"cb3c80b1-f1e4-459d-88ae-e2979666b5e3",
+        "Name":"V1--Login0",
+        "Left":294,
+        "Top":194,
+        "Width":411,
+        "Height":266,
+        "ZIndex":20100,
+        "GroupNumber":"",
+        "IsRunVisiable":true,
+        "IsVisibility":false,
+        "isSyn":false,
+        "WindowID":"b7872c9a-45ec-46c6-a388-f8d364a9f2d7",
+        "PanelID":null,
+        "IsLock":false,
+        "IsWindow":false
+    }
+]

+ 24 - 1
static/Data/EnityMemory.Data

@@ -1 +1,24 @@
-[]
+[
+  {
+    "ID":"01",
+    "Code":"01",
+    "Name":"LoginUser",
+    "isInt":false,
+    "Value":null,
+    "IsSyn":false,
+    "IsSystem":false,
+    "Mark":null,
+    "ActionType":4
+  },
+  {
+    "ID":"02",
+    "Code":"02",
+    "Name":"LoginRole",
+    "isInt":false,
+    "Value":null,
+    "IsSyn":false,
+    "IsSystem":false,
+    "Mark":null,
+    "ActionType":4
+  }
+]

File diff suppressed because it is too large
+ 1 - 1
static/Data/EnitySignalPreviewList.Data


+ 230 - 1
static/Data/EnitySlider.Data

@@ -1 +1,230 @@
-[]
+[
+  {
+    "BackIcon":"77.png",
+    "SliderIcon":"76.png",
+    "Orientation":0,
+    "InitValue":0,
+    "SliderFrequency":10,
+    "MinValue":1,
+    "MaxValue":100,
+    "DevCode":null,
+    "Channel":0,
+    "VolMargin":"5",
+    "SliderMargin":"0",
+    "ShowVol":true,
+    "imgBgWidth":67,
+    "imgBgHeight":215,
+    "imgSliderWidth":33,
+    "imgSliderHeight":54,
+    "Cmd":null,
+    "BindVar":null,
+    "DeviceID":null,
+    "IsPanel":false,
+    "EnityName":"Slider",
+    "ID":"b3539067-d6ea-4dbf-9e43-fd6d043f8684",
+    "Name":"Slider0",
+    "Left":244,
+    "Top":472,
+    "Width":54,
+    "Height":226,
+    "ZIndex":10600,
+    "GroupNumber":"",
+    "IsRunVisiable":true,
+    "IsVisibility":false,
+    "isSyn":true,
+    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
+    "PanelID":null,
+    "IsLock":false,
+    "IsWindow":false
+  },
+  {
+    "BackIcon":"77.png",
+    "SliderIcon":"76.png",
+    "Orientation":0,
+    "InitValue":0,
+    "SliderFrequency":10,
+    "MinValue":1,
+    "MaxValue":100,
+    "DevCode":null,
+    "Channel":0,
+    "VolMargin":"6",
+    "SliderMargin":"0",
+    "ShowVol":true,
+    "imgBgWidth":67,
+    "imgBgHeight":215,
+    "imgSliderWidth":33,
+    "imgSliderHeight":54,
+    "Cmd":null,
+    "BindVar":null,
+    "DeviceID":null,
+    "IsPanel":false,
+    "EnityName":"Slider",
+    "ID":"228f105d-ebe4-45ba-a072-a1196bf6030e",
+    "Name":"Slider1",
+    "Left":307,
+    "Top":471,
+    "Width":56,
+    "Height":226,
+    "ZIndex":10900,
+    "GroupNumber":"",
+    "IsRunVisiable":true,
+    "IsVisibility":false,
+    "isSyn":true,
+    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
+    "PanelID":null,
+    "IsLock":false,
+    "IsWindow":false
+  },
+  {
+    "BackIcon":"77.png",
+    "SliderIcon":"76.png",
+    "Orientation":0,
+    "InitValue":0,
+    "SliderFrequency":10,
+    "MinValue":1,
+    "MaxValue":100,
+    "DevCode":null,
+    "Channel":0,
+    "VolMargin":"6",
+    "SliderMargin":"0",
+    "ShowVol":true,
+    "imgBgWidth":67,
+    "imgBgHeight":215,
+    "imgSliderWidth":33,
+    "imgSliderHeight":54,
+    "Cmd":null,
+    "BindVar":null,
+    "DeviceID":null,
+    "IsPanel":false,
+    "EnityName":"Slider",
+    "ID":"a4ada37c-c564-45fe-a049-48650cf7d66e",
+    "Name":"Slider2",
+    "Left":374,
+    "Top":472,
+    "Width":61,
+    "Height":226,
+    "ZIndex":11000,
+    "GroupNumber":"",
+    "IsRunVisiable":true,
+    "IsVisibility":false,
+    "isSyn":true,
+    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
+    "PanelID":null,
+    "IsLock":false,
+    "IsWindow":false
+  },
+  {
+    "BackIcon":"77.png",
+    "SliderIcon":"76.png",
+    "Orientation":0,
+    "InitValue":0,
+    "SliderFrequency":10,
+    "MinValue":1,
+    "MaxValue":100,
+    "DevCode":null,
+    "Channel":0,
+    "VolMargin":"6",
+    "SliderMargin":"0",
+    "ShowVol":true,
+    "imgBgWidth":67,
+    "imgBgHeight":215,
+    "imgSliderWidth":33,
+    "imgSliderHeight":54,
+    "Cmd":null,
+    "BindVar":null,
+    "DeviceID":null,
+    "IsPanel":false,
+    "EnityName":"Slider",
+    "ID":"42cf859e-bcd1-43b2-8eb0-63964eeab067",
+    "Name":"Slider3",
+    "Left":449,
+    "Top":472,
+    "Width":61,
+    "Height":227,
+    "ZIndex":11200,
+    "GroupNumber":"",
+    "IsRunVisiable":true,
+    "IsVisibility":false,
+    "isSyn":true,
+    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
+    "PanelID":null,
+    "IsLock":false,
+    "IsWindow":false
+  },
+  {
+    "BackIcon":"77.png",
+    "SliderIcon":"76.png",
+    "Orientation":0,
+    "InitValue":0,
+    "SliderFrequency":10,
+    "MinValue":1,
+    "MaxValue":100,
+    "DevCode":null,
+    "Channel":0,
+    "VolMargin":"6",
+    "SliderMargin":"0",
+    "ShowVol":true,
+    "imgBgWidth":67,
+    "imgBgHeight":215,
+    "imgSliderWidth":33,
+    "imgSliderHeight":54,
+    "Cmd":null,
+    "BindVar":null,
+    "DeviceID":null,
+    "IsPanel":false,
+    "EnityName":"Slider",
+    "ID":"87f9e83f-38a5-4db6-82ca-76edc5a32e05",
+    "Name":"Slider4",
+    "Left":520,
+    "Top":472,
+    "Width":62,
+    "Height":230,
+    "ZIndex":11600,
+    "GroupNumber":"",
+    "IsRunVisiable":true,
+    "IsVisibility":false,
+    "isSyn":true,
+    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
+    "PanelID":null,
+    "IsLock":false,
+    "IsWindow":false
+  },
+  {
+    "BackIcon":"77.png",
+    "SliderIcon":"76.png",
+    "Orientation":0,
+    "InitValue":0,
+    "SliderFrequency":10,
+    "MinValue":1,
+    "MaxValue":100,
+    "DevCode":null,
+    "Channel":0,
+    "VolMargin":"6",
+    "SliderMargin":"0",
+    "ShowVol":true,
+    "imgBgWidth":67,
+    "imgBgHeight":215,
+    "imgSliderWidth":33,
+    "imgSliderHeight":54,
+    "Cmd":null,
+    "BindVar":null,
+    "DeviceID":null,
+    "IsPanel":false,
+    "EnityName":"Slider",
+    "ID":"96b74f03-87ce-48cf-80d8-718d21059530",
+    "Name":"Slider5",
+    "Left":593,
+    "Top":472,
+    "Width":59,
+    "Height":225,
+    "ZIndex":11700,
+    "GroupNumber":"",
+    "IsRunVisiable":true,
+    "IsVisibility":false,
+    "isSyn":true,
+    "WindowID":"cb2687fd-931a-4b38-a76d-9c3ea171b8d8",
+    "PanelID":null,
+    "IsLock":false,
+    "IsWindow":false
+  }
+]

+ 16 - 1
static/Data/EnityTimer.Data

@@ -1 +1,16 @@
-[{"ID":"d4469bbc-3ef3-4912-85a1-c43059b90b54","Code":"d4469bbc-3ef3-4912-85a1-c43059b90b54","Name":"延时1","ActionType":0,"Milliseconds":500},{"ID":"736ecb94-11a7-4315-9045-7f4f50fb2d89","Code":"736ecb94-11a7-4315-9045-7f4f50fb2d89","Name":"电源延时","ActionType":0,"Milliseconds":10000},{"ID":"bf9c0da6-85d0-4d9f-847c-130d34be7d12","Code":"bf9c0da6-85d0-4d9f-847c-130d34be7d12","Name":"会商延时","ActionType":0,"Milliseconds":1000}]
+[
+  {
+    "ID":"f5f1217e-f606-4372-8650-4363931fa8e1",
+    "Code":"f5f1217e-f606-4372-8650-4363931fa8e1",
+    "Name":"500ms",
+    "ActionType":0,
+    "Milliseconds":500
+  },
+  {
+    "ID":"08be426e-f9ae-469c-8ea3-ab41403c9f47",
+    "Code":"08be426e-f9ae-469c-8ea3-ab41403c9f47",
+    "Name":"1s",
+    "ActionType":0,
+    "Milliseconds":1000
+  }
+]

File diff suppressed because it is too large
+ 346 - 1
static/Data/EnityTopology.Data


File diff suppressed because it is too large
+ 422 - 1
static/Data/EnityTopologyConnection.Data


+ 1 - 1
static/Data/EnityView.Data

@@ -1 +1 @@
-[]
+[]

File diff suppressed because it is too large
+ 376 - 1
static/Data/EnityWindow.Data