究极更新

manifest.json

@@ -2,8 +2,8 @@
 	"name": "种植溯源",
 	"appid": "__UNI__D087881",
 	"description": "",
-	"versionName": "1.0.4",
-	"versionCode": 104,
+	"versionName": "1.0.7",
+	"versionCode": 107,
 	"transformPx": false,
 	/* 5+App特有相关 */
 	"app-plus": {

pages/Login/resgier.vue

@@ -42,7 +42,7 @@
 
 					<view class="get-code" :style="{color: countDown?'#ADADAD':''}" @click="getCode"><text
 							class="lineY"></text>
-						获取验证码 <text v-if='countDown'>{{countDown}}s</text> </view>
+						验证码 <text v-if='countDown'>{{countDown}}s</text> </view>
 				</view>
 
 				<view class="" style="margin: 30rpx 0;">

pages/live/live.vue

@@ -32,7 +32,7 @@
 				shwovideo: false,
 				shwovideoTimer: "",
 				initFailTimer: "",
-				flag: true
+				flag: true,
 
 			}
 		},
@@ -49,7 +49,7 @@
 				scene: 'app',
 			}
 			this.openScoket(data)
-			this.canplay(option.device)
+			// this.canplay(option.device)
 			this.platform = uni.getSystemInfoSync().platform
 			this.windowWidth = uni.getSystemInfoSync().screenWidth //获取屏幕宽度
 			this.boxStyle.width = this.windowWidth + 'px' //给宽度加px
@@ -95,22 +95,7 @@
 				}
 			},
 
-			plusDownloader(url, options = {}) {
-				return new Promise((result, reject) => {
-					let dtask = plus.downloader.createDownload(url, options, function(d, status) {
-						if (status == 200) {
-							console.log("Download success: " + JSON.stringify(d));
-							plus.runtime.openFile(d.filename, (err) => {
-								console.log(err);
-							});
-						} else {
-							console.log("Download failed: " + status);
-						}
-					});
-					dtask.start();
-				})
 
-			},
 
 			// 接收图片的base64编码  
 			receiveImg(data) {
@@ -134,16 +119,21 @@
 				this.vsrc = options;
 			},
 			openScoket(scoketData) {
+				let that = this
 				uni.connectSocket({
 					url: 'wss://iot.lihaink.cn/test'
 				});
 				uni.onSocketOpen(function(res) {
+
+					console.log("scoket open")
 					uni.sendSocketMessage({
 						data: JSON.stringify(scoketData)
-
 					});
 					uni.onSocketMessage(function(res) {
-						console.log(res);
+						console.log(JSON.parse(res.data).code, "收到消息")
+						if (JSON.parse(res.data).code == 200) {
+							that.shwovideo = true
+						}
 					});
 				});
 				uni.onSocketError(function(res) {

pages/live/loading.nvue

@@ -2,7 +2,7 @@
 	<view id="subNvue">
 		<view class="" style="background-color: white;width: 750rpx;height:1000px;position: relative;">
 			<view class="" style="margin-top: 350px;">
-				<u-loading-icon mode="semicircle" text="疯狂加载中..." textSize="18"></u-loading-icon>
+				<u-loading-icon mode="semicircle" text="初始化中,请稍等..." textSize="18"></u-loading-icon>
 			</view>
 		</view>
 

unpackage/dist/build/app-plus/manifest.json

@@ -7,8 +7,8 @@
   "id": "__UNI__D087881",
   "name": "种植溯源",
   "version": {
-    "name": "1.0.4",
-    "code": 104
+    "name": "1.0.7",
+    "code": 107
   },
   "description": "",
   "developer": {