@supermapgis/vue-iclient-leaflet 11.2.0 → 11.2.1

package/src/common/video-player/VideoPlayer.vue

@@ -6,7 +6,6 @@
       :options="playerOptions"
       :playsinline="true"
       :data-autoplay="autoplay"
-      :data-isLive="isRtmp"
       :data-popupplay="`${options.popupToPlay}`"
       :events = "['fullscreenchange']"
       @play="onPlayerPlay($event)"
@@ -30,7 +29,6 @@
         :options="modalPlayerOptions"
         :playsinline="true"
         :data-autoplay="autoplay"
-        :data-isLive="isRtmp"
         :data-popupplay="`${options.popupToPlay}`"
         @play="onModalPlayerPlay($event)"
         @loadeddata="onModalPlayerLoadeddata($event)"
@@ -49,7 +47,6 @@ import flvjs from 'flv.js';
 import 'videojs-flvjs-es6';
 import 'videojs-flash';
 import { videoPlayer } from 'vue-videojs7';
-import clonedeep from 'lodash.clonedeep';
 import SmModal from 'vue-iclient/src/common/modal/main';
 import Message from 'vue-iclient/src/common/message/index.js';
 
@@ -98,8 +95,6 @@ class SmVideoPlayer extends Vue {
 
   @Prop({ default: 'https://vjs.zencdn.net/swf/5.4.2/video-js.swf' }) swf: string;
 
-  @Prop({ default: 3000 }) replayTime: number; // 黑屏重新播放rtmp
-
   @Prop({ default: false }) isFullscreen: Boolean;
 
   @Prop({ default: 'origin' }) ratio: String;
@@ -118,10 +113,6 @@ class SmVideoPlayer extends Vue {
     poster?:string; // 封面
   };
 
-  get isRtmp() {
-    return this.checkUrl(this.url) && this.url.includes('rtmp://');
-  }
-
   get isFlv() {
     if (!flvjs && this.checkUrl(this.url) && this.url.includes('.flv')) {
       console.error(this.$t('warning.flvPlayer'));
@@ -158,7 +149,6 @@ class SmVideoPlayer extends Vue {
   @Watch('url')
   urlChanged() {
     this.handlePlayerOptions();
-    this.replayRtmp();
   }
 
   @Watch('playerOptions')
@@ -197,9 +187,6 @@ class SmVideoPlayer extends Vue {
       this.smPlayer = this.$refs.videoPlayer && this.$refs.videoPlayer.player;
       // @ts-ignore
       this.modalVideoPlayer = this.$refs.modalVideoPlayer && this.$refs.modalVideoPlayer.player;
-      setTimeout(() => {
-        this.replayRtmp();
-      });
       const player = this.modalVisible ? this.modalVideoPlayer : this.smPlayer;
       if (player) {
         player.muted(this.options.muted);
@@ -211,24 +198,6 @@ class SmVideoPlayer extends Vue {
     });
   }
 
-  replayRtmp(player = this.player) {
-    if (this.isRtmp && player && player.el_) {
-      player.one('play', () => {
-        // @ts-ignore
-        this.timer = setTimeout(() => {
-          // @ts-ignore
-          clearTimeout(this.timer);
-          player.reset();
-          player.src(clonedeep(this.playerOptions.sources));
-        }, this.replayTime);
-      });
-      player.one('canplay', () => {
-        // @ts-ignore
-        clearTimeout(this.timer);
-      });
-    }
-  }
-
   clearSrc() {
     if (this.playerOptions.sources) {
       this.playerOptions.sources[0].src = '';
@@ -289,7 +258,7 @@ class SmVideoPlayer extends Vue {
       },
       notSupportedMessage: this.$t('warning.unavailableVideo')
     };
-    if (!this.url.includes('rtmp') && this.url.includes('.flv')) {
+    if (this.url.includes('.flv')) {
       commonOptions.techOrder = ['html5', 'flvjs'];
       // @ts-ignore
       commonOptions.sources[0].type = 'video/x-flv';
@@ -298,16 +267,11 @@ class SmVideoPlayer extends Vue {
       // @ts-ignore
       commonOptions.sources[0].type = 'video/mp4';
     }
-    if (this.url.includes('rtmp')) {
-      // @ts-ignore
-      commonOptions.techOrder = ['flash', 'html5'];
-      commonOptions.sources[0].type = 'rtmp/flv';
-    }
     if (this.url.includes('.m3u8')) {
       // @ts-ignore
       commonOptions.sources[0].type = 'application/x-mpegURL';
     }
-    this.playerOptions = Object.assign({}, commonOptions, { autoplay: this.isRtmp || options.autoplay });
+    this.playerOptions = Object.assign({}, commonOptions, { autoplay: options.autoplay });
     this.modalPlayerOptions = Object.assign({}, commonOptions, { autoplay: true, preload: 'none', height: '600' });
     return commonOptions;
   }
@@ -388,8 +352,7 @@ class SmVideoPlayer extends Vue {
         url.indexOf('mp4') < 0 &&
         url.indexOf('webm') < 0 &&
         url.indexOf('m3u8') < 0 &&
-        url.indexOf('flv') < 0 &&
-        url.indexOf('rtmp') < 0)
+        url.indexOf('flv') < 0)
     ) {
       match = false;
     } else {
@@ -402,7 +365,7 @@ class SmVideoPlayer extends Vue {
     if (!str) return false;
     const isFilePath = this.isMatchFileUrl(str);
     if(isFilePath) return true;
-    const reg = new RegExp('(https?|http|file|ftp|rtmp)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]');
+    const reg = new RegExp('(https?|http|file|ftp)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]');
     return reg.test(str);
   }
 

package/src/leaflet/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@supermapgis/vue-iclient-leaflet",
   "description": "SuperMap iClient for Vue.js",
-  "version": "11.2.0",
+  "version": "11.2.1",
   "homepage": "http://iclient.supermap.io",
   "main": "lib/index",
   "dependencies": {
@@ -18,7 +18,7 @@
     "@types/leaflet": "^1.5.5",
     "@types/node": "^12.0.3",
     "ant-design-vue": "1.7.2",
-    "axios": "^1.6.2",
+    "axios": "^1.7.4",
     "canvg": "~3.0.10",
     "clipboard": "^2.0.6",
     "colorcolor": "^1.1.1",