~

pages/timeVideo/timeVideo.vue

@@ -10,7 +10,9 @@
 					<text>{{item.deviceTypeName}}-摄像机#2</text>
 				</view>
 				<view class="video" >
-					<image src="../../static/video1.png" mode=""></image>
+					
+					<video v-if="item.ezopen" style="width: 100%;height: 100%;border-radius: 8rpx;" :src="item.ezopen" :controls='false' :autoplay='false' :show-play-btn='false' :show-center-play-btn='false' object-fit='fill' :is-live='true'></video>
+					<image v-else src="../../static/video1.png" mode=""></image>
 				</view>
 				<view class="timer">
 					<view class="left">
@@ -75,11 +77,28 @@
 					if (res.code == 200) {
 						uni.hideLoading()
 						uni.stopPullDownRefresh();
-						this.deviceList = res.data
-						// this.deviceList.forEach(el=>{
-						// 	this.getVideoData(el.cameraSerialNumber,el.cameraChannelNumber)
-						// })
-						// this.getVideoData("AD6463273", 11)
+						this.deviceList = res.data;
+						this.deviceList = this.deviceList.map(el=>{
+							return {
+								...el,
+								ezopen:''
+							}
+						})
+						this.deviceList.forEach(el=>{
+							this.$http({
+								url: this.api.camera_getphonehls,
+								method: 'GET',
+								data: {
+									cameraid: el.cameraSerialNumber,
+									channelid: el.cameraChannelNumber,
+								}
+							}).then(res => {
+								if (res.code == 200) {
+									el.ezopen = res.data.ezopen
+								}
+							})
+						})
+						// console.log(this.deviceList,'0000');
 					} else {
 						this.$refs.uToast.show({
 							title: res.msg,

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1557,7 +1557,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8934,7 +8934,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8955,14 +8955,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9058,7 +9058,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -12674,7 +12674,7 @@ function _extends() {
 var formatRegExp = /%[sdj%]/g;
 var warning = function warning() {}; // don't print warning message when in production env or node runtime
 
-if (typeof process !== 'undefined' && Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
+if (typeof process !== 'undefined' && Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"greenhouse-wisdom-applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}) && "development" !== 'production' && typeof window !== 'undefined' && typeof document !== 'undefined') {
   warning = function warning(type, errors) {
     if (typeof console !== 'undefined' && console.warn) {
       if (errors.every(function (e) {

unpackage/dist/dev/mp-weixin/pages/timeVideo/timeVideo.js

@@ -160,10 +160,16 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 /* WEBPACK VAR INJECTION */(function(uni) {
 
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+//
+//
 //
 //
 //
@@ -240,10 +246,26 @@ var _default = {
           uni.hideLoading();
           uni.stopPullDownRefresh();
           _this2.deviceList = res.data;
-          // this.deviceList.forEach(el=>{
-          // 	this.getVideoData(el.cameraSerialNumber,el.cameraChannelNumber)
-          // })
-          // this.getVideoData("AD6463273", 11)
+          _this2.deviceList = _this2.deviceList.map(function (el) {
+            return _objectSpread(_objectSpread({}, el), {}, {
+              ezopen: ''
+            });
+          });
+          _this2.deviceList.forEach(function (el) {
+            _this2.$http({
+              url: _this2.api.camera_getphonehls,
+              method: 'GET',
+              data: {
+                cameraid: el.cameraSerialNumber,
+                channelid: el.cameraChannelNumber
+              }
+            }).then(function (res) {
+              if (res.code == 200) {
+                el.ezopen = res.data.ezopen;
+              }
+            });
+          });
+          // console.log(this.deviceList,'0000');
         } else {
           _this2.$refs.uToast.show({
             title: res.msg,

unpackage/dist/dev/mp-weixin/pages/timeVideo/timeVideo.wxml

@@ -1 +1 @@
-<view class="timeVideo data-v-dd7dcdb8"><u-navbar vue-id="d23ae73c-1" background="{{background}}" is-back="{{true}}" back-icon-color="#FFFFFF" border-bottom="{{false}}" title="实时视频" title-color="#FFFFFF" title-bold="{{true}}" title-size="32" class="data-v-dd7dcdb8" bind:__l="__l"></u-navbar><view class="content data-v-dd7dcdb8"><block wx:for="{{deviceList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item data-v-dd7dcdb8"><view class="nav data-v-dd7dcdb8"><image src="../../static/video.png" mode class="data-v-dd7dcdb8"></image><text class="data-v-dd7dcdb8">{{item.deviceTypeName+"-摄像机#2"}}</text></view><view class="video data-v-dd7dcdb8"><image src="../../static/video1.png" mode class="data-v-dd7dcdb8"></image></view><view class="timer data-v-dd7dcdb8"><view class="left data-v-dd7dcdb8"><image src="../../static/timer.png" mode class="data-v-dd7dcdb8"></image><text class="data-v-dd7dcdb8">{{time}}</text></view><view data-event-opts="{{[['tap',[['toVideoLive',['$0','$1'],[[['deviceList','',index,'cameraSerialNumber']],[['deviceList','',index,'cameraChannelNumber']]]]]]]}}" class="right data-v-dd7dcdb8" bindtap="__e"><image src="../../static/play.png" mode class="data-v-dd7dcdb8"></image><text class="data-v-dd7dcdb8">现场实况</text></view></view></view></block></view></view>
+<view class="timeVideo data-v-dd7dcdb8"><u-navbar vue-id="d23ae73c-1" background="{{background}}" is-back="{{true}}" back-icon-color="#FFFFFF" border-bottom="{{false}}" title="实时视频" title-color="#FFFFFF" title-bold="{{true}}" title-size="32" class="data-v-dd7dcdb8" bind:__l="__l"></u-navbar><view class="content data-v-dd7dcdb8"><block wx:for="{{deviceList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item data-v-dd7dcdb8"><view class="nav data-v-dd7dcdb8"><image src="../../static/video.png" mode class="data-v-dd7dcdb8"></image><text class="data-v-dd7dcdb8">{{item.deviceTypeName+"-摄像机#2"}}</text></view><view class="video data-v-dd7dcdb8"><block wx:if="{{item.ezopen}}"><video style="width:100%;height:100%;border-radius:8rpx;" src="{{item.ezopen}}" controls="{{false}}" autoplay="{{false}}" show-play-btn="{{false}}" show-center-play-btn="{{false}}" object-fit="fill" is-live="{{true}}" class="data-v-dd7dcdb8"></video></block><block wx:else><image src="../../static/video1.png" mode class="data-v-dd7dcdb8"></image></block></view><view class="timer data-v-dd7dcdb8"><view class="left data-v-dd7dcdb8"><image src="../../static/timer.png" mode class="data-v-dd7dcdb8"></image><text class="data-v-dd7dcdb8">{{time}}</text></view><view data-event-opts="{{[['tap',[['toVideoLive',['$0','$1'],[[['deviceList','',index,'cameraSerialNumber']],[['deviceList','',index,'cameraChannelNumber']]]]]]]}}" class="right data-v-dd7dcdb8" bindtap="__e"><image src="../../static/play.png" mode class="data-v-dd7dcdb8"></image><text class="data-v-dd7dcdb8">现场实况</text></view></view></view></block></view></view>

unpackage/dist/dev/mp-weixin/project.config.json

@@ -22,24 +22,7 @@
     "libVersion": "3.2.0",
     "appid": "wx05b45a2699f02a2b",
     "projectname": "greenhouse-wisdom-applet",
-    "condition": {
-        "search": {
-            "current": -1,
-            "list": []
-        },
-        "conversation": {
-            "current": -1,
-            "list": []
-        },
-        "game": {
-            "current": -1,
-            "list": []
-        },
-        "miniprogram": {
-            "current": -1,
-            "list": []
-        }
-    },
+    "condition": {},
     "editorSetting": {
         "tabIndent": "insertSpaces",
         "tabSize": 4

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -3,18 +3,5 @@
     "projectname": "wszhyWx",
     "setting": {
         "compileHotReLoad": true
-    },
-    "condition": {
-        "miniprogram": {
-            "list": [
-                {
-                    "name": "",
-                    "pathName": "pages/videoLive/videoLive",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                }
-            ]
-        }
     }
 }