From a78fb7d31b65303c5f19b13b435063b195520209 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 17 Jun 2022 22:37:48 +0800
Subject: [PATCH] no message

---
 manifest.json                               |   4 ++--
 pages/camera-list/index.vue                 |  21 +++++++++++++-------
 pages/digital-workshops/index.vue           |  18 ++++++++++++-----
 static/imgs/digital-workshops/icon-play.png | Bin 0 -> 1541 bytes
 4 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 static/imgs/digital-workshops/icon-play.png

diff --git a/manifest.json b/manifest.json
index fe7ee60..acf209c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "印包管家",
     "appid" : "__UNI__EBBA73E",
     "description" : "",
-    "versionName" : "1.0.4",
-    "versionCode" : 100,
+    "versionName" : "1.0.5",
+    "versionCode" : 101,
     "transformPx" : false,
     "networkTimeout" : {
         "request" : 6000
diff --git a/pages/camera-list/index.vue b/pages/camera-list/index.vue
index ae35ee2..72befe8 100644
--- a/pages/camera-list/index.vue
+++ b/pages/camera-list/index.vue
@@ -2,15 +2,16 @@
   <view class="content">
     <uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="全部摄像头"></uni-nav-bar>
     <view class="flex-col section_8" v-for="(camera, index) in cameraList" :key="index">
-      <view class="flex-col items-center group_12">
-		<video :src="camera.hlsUrl" autoplay class="image_2"></video>
-        <!-- <image src="/static/imgs/digital-workshops/camera-tip-bg.png" class="image_2" @click="go2('video-play', { url: camera.videoUrl })" /> -->
-        <text class="text_18" style="margin-top: 8rpx;">{{ camera.name }}</text>
+      <view class="flex-col items-center group_12" @click="go2('video-play', { url: encodeURIComponent(camera.hlsUrl) })">
+        <image :src="getImageurl(camera)" class="image_2" />
+		<image src="/static/imgs/digital-workshops/icon-play.png" class="image_3" v-if="camera.defaultImg"/>
+        <text class="text_18" style="color: black">{{ camera.name }}</text>
       </view>
     </view>
   </view>
 </template>
 
+
 <script>
 import { go2, back } from '@/utils/hook.js'
 import { getCameraListApi } from '@/apis/factoryApi'
@@ -37,7 +38,13 @@ export default {
       		    this.cameraList = res
       		}		
       })
-    }
+    },
+	getImageurl(camera){
+		if(!camera.defaultImg){
+			return '/static/imgs/digital-workshops/camera-tip-bg.png'
+		}
+		return camera.defaultImg
+	}
   }
 }
 </script>
@@ -68,12 +75,12 @@ export default {
       }
     }
     .group_12 {
-      // color: rgb(255, 255, 255);
+      color: rgb(255, 255, 255);
       font-size: 30rpx;
       font-weight: 500;
       line-height: 40rpx;
       white-space: nowrap;
-      // position: relative;
+      position: relative;
       .image_2 {
         width: 91.5vw;
         height: 51.5vw;
diff --git a/pages/digital-workshops/index.vue b/pages/digital-workshops/index.vue
index e8502ed..c74bc78 100644
--- a/pages/digital-workshops/index.vue
+++ b/pages/digital-workshops/index.vue
@@ -58,8 +58,9 @@
 	        <image src="/static/imgs/digital-workshops/right-arrow-icon.png" class="image_1" />
 	      </view>
 	      <view class="flex-col items-center group_12">
-	        <image src="/static/imgs/digital-workshops/camera-tip-bg.png" class="image_2" @click="go2('video-play', { url: encodeURIComponent(cameraList[0].hlsUrl) })" />
-	        <text class="text_18">{{ cameraList[0].address }}</text>
+	        <image :src="cameraList[0].defaultImg" class="image_2" @click="go2('video-play', { url: encodeURIComponent(cameraList[0].hlsUrl) })" />
+	        <text class="text_18">{{ cameraList[0].name }}</text>
+			<image src="/static/imgs/digital-workshops/icon-play.png" class="image_3" />
 			<!-- <video :src="cameraList[0].hlsUrl" autoplay class="image_2"></video> -->
 	      </view>
 	    </view>
@@ -183,7 +184,7 @@ export default {
     factoryId(val, oldVal) {
       this.getCameraList()
       this.getList()
-	  this.upCallback()
+	  this.downCallback()
       this.isExample = this.factoryList.find((factory) => factory.value == val).isExample
     },
     refresh(val) {
@@ -260,8 +261,7 @@ export default {
             // }
 			 data['所有设备'].type[list[i].typeName][0]++
           }
-		  
-		  data['所有设备'].list.push(list[i])
+		  // data['所有设备'].list.push(list[i])
         }
         this.listObj = data
       }).catch(err => {
@@ -566,6 +566,14 @@ export default {
           width: 91.5vw;
           height: 51.5vw;
         }
+		.image_3 {
+		  width: 87rpx;
+		  height: 87rpx;
+		  position: absolute;
+		  left: 50%;
+		  top: 50%;
+		  transform: translate(-50%, -50%);
+		}
         .text_18 {
           position: absolute;
           left: 24rpx;
diff --git a/static/imgs/digital-workshops/icon-play.png b/static/imgs/digital-workshops/icon-play.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5d9a84a778d1b7c0e40e251aa0a624adacaec9f
GIT binary patch
literal 1541
zcmV+g2KxDlP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000HdNkl<ZcwX&W
zS*%`D6#l;OAm)S^Vn_@z#-kFd2};CN!-Evj#7sSr7%FIqRz*E2YG^_XK`1RET9u%p
z`Y5K-N|dN6F~<Y>WW~O+yYJrT?0wGp@BhoWJ2}Zs{&m(~`@3uHH6Ehpi#<O-CIOh#
zfC)fA(s2Mz0kE5UcK7}^3BGgBx8C2ck$ij5;tk9MB%KK0WB@Y(?9=cdn*clw;B}I3
zG~`kFTBiU=+6BPX04@Y@P{#tV2k-=d`$_)T74J>}khG0ExE=n0u7peQ*<c_zApUH-
zS8D(yUFi;gL|b7B-~YgY@L=J4TadQ`K++NbmuCp@m)S9ZcL01HJofrt!86s}A6sYe
zeu(518FW#S#sElK31E7~#y<df27uA6B>6{)kdn3qaFTn@1F&nw`>RMAZSiUZfF!fS
z{VR4`3gB*%pB76Lc|p>_0ImmcaRtAPB#ZB#VgMwmLWni);LE!>c*sN2nGT3!Q~XI5
zovDae()$38Ol;oD7E1uDxqH@;oRZ5g8vsd*-EAM^J(uLX+)cZnlXM$^xd~ntE6mQ>
zCkp^ccLBH|!SHaBALVS;HI1ah0DPF>yO89Kb$iwV;Qagp2}XO9G`BXiCCOaqR|x^G
zB3T(HR07~4JhS^)kaG^nWkWl;x3Q$N0lW~A#e$_NB$E+i9RSw?SQKHrfaIJ}IQ*Cl
zlI8=rDI(K#B=1dnjnoe=u~{35?bndBNNwbnB#Sgd7ilreQK<wfsR5F10dRZdlru;U
z#Lu@y)Wr!eMfluG@{Sn)DgZu@{P&lVyrhYslFVgUA!Hdz%L@jwBt0657&nkSFdKjb
zk`~)fZ4%x}GL1RI6Tp(FMI=A#8U+_Nn<<33LsWC48X)Om0G9^BEg@;CZ}Ccm&)>TX
z)_|~Vv9l$~Twj<WK0@-caFY}O-vHPnAijX)Q%$6-$sg7MxQFDkO?b!Nk#s(QCxhQM
zliafw09VUf6%hUnU}uuQH4(A~fH9T^fB|8Ev|5t32k;YstpY~V!`k9F4UlvvfY8S`
z&bLi~OaP43Ou^y~GYd13#w$^;m{0O%pJ@z$nElToxuB^u1ptg~VV9$UV3%d1CCP#!
z3y%CX?jDE%V1Cr{Zhy@p`FJBq$}}L{!rY|+QS3G)T?F8<fZ=kIGwL+pJ&T;`Y^MZ_
z1{x5uFLs-WyKF7Vqw4_J2w=ZJf<sAuQgUdYwgUi+o!tpDa~mX*4gv6SAoCX_w<zVs
zOu%mX?SdC~B>C%*0kG}YleGF^?UJ+ufL{W_-$|N>_;3B+0LU(PwE<w1O<*?3=W74`
z|6aU}O`!LeVDH^v?*pM&DEunP({gMtMpNJhy9|Y20dQ&{PgW>w(;ROFFPdOGmG<|>
zcw_?5Win)a#h(F$&DCk))JZBG{xUMvaTdu~xv5q$hL8?hxcg!t*d~(uhQg)*Sm=6i
zKK){n*VLXiLNJ7a$bA69&X6^0$2E6S0N8v_SQBVd60@f1F&;L>v3)M^6(zB8wE*K;
zRTQ<>b~xwLwkT?QzS|_bD*zx?6itTElV$M~vb}GN7%-Ajt+5H41t?Jc)Vxx&)|dmp
z#@|xS(Rn0O{rOzEJE5zX6=>HSbs$(TAk`ip+H8OqWL3=wv}=!hn^cX%4Q)oCW;P(p
zOlt=uJP@kJ;wF4npkgM#M9wbbX9M8Op=vyC!e$04W&uphqH(z*02~PY9h39Sp=w;t
z$c8Z}nO!gRT~DzFcpy}b%^8{H4$r&P+8Po?eMQ&bvj)vH0O!_>%4UznWo3i8&belM
z&SzuI)i(jG&K#CL0l@K*=4MQ^tZ}&1nHp<=rwRQXm-j&E?*|jUYI&c`%o@O#Bj$pw
z**SWj%*5==%^BHT(CLwBliX`&Gk})?tQgc}TI)L?=OnIEYZqI|XLGA_8=*Ne4D1qY
rv-v2zJ0Th{3J0CkfCK`)*MNTjsF1E-D)i?r00000NkvXXu0mjf2KLI(

literal 0
HcmV?d00001