Merge branch 'dev-5.0' of http://192.168.32.253:3000/Software/android-cloud-H5 into dev-5.0

microserviceUserH5/vcloud/exchangePhoneActivity.html

@@ -287,7 +287,7 @@
 		//提交表单内容
 		function submit(){
 			$.ajax({
-				url: baseUrl + '/api/user/v1/client/regist/changePhone',
+				url: baseUrl + '/api/user/v5/client/register/changePhone',
 				type: 'post',
 				data: JSON.stringify({
 					changePhoneType: changePhoneType,

screenAndroid/WXtrialInterface.html

@@ -155,7 +155,7 @@
 		var parameters = GetRequest();
 		var ip = parameters["ip"];
 		var cardToken = parameters["cardToken"];
-		cardToken = cardToken && cardToken.replace(/@/g,"=");
+		cardToken = cardToken && cardToken.replace(/@/g, "=");
 		var appletPushAddress = parameters["appletPushAddress"];
 		var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken : "ws://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken;
 		// var socketURL = "wss://192.168.31.198/businessChannel?cardIp=192.168.20.53&token=LDAz32tutqS9wQqi0WlmvJ68/Is83cX+kavJQij1IMRvewgZ1dLvviFZqd4b8gcaR1eLztR/ViRLyyAVvZO7GA==";
@@ -199,16 +199,16 @@
 			ws = new WebSocket(socketURL);
 			ws.binaryType = 'arraybuffer';
 			intervaler = setInterval(() => {
-        if (ws.readyState === 1) {
-          ws.send("ping");
-        } else {
+				if (ws.readyState === 1) {
+					ws.send("ping");
+				} else {
 					clearInterval(intervaler);
 					$.toast("画面异常,请重新进入", "text");
-          wx.miniProgram.switchTab({
+					wx.miniProgram.switchTab({
 						url: '/pages/home/home'
 					});
-        }
-      }, 3000);
+				}
+			}, 3000);
 
 			ws.addEventListener('open', function (event) {
 				// sn只要长度满足17位随机数，不需要从后台获取
@@ -339,11 +339,11 @@
 				curTime = new Date().getTime();
 				duration = 24;
 			} else if (input[0] == 0x68) {
-				if(input[23] == 0x5c){
+				if (input[23] == 0x5c) {
 					console.log("收到消息:" + PrintArry(input));
-				
-					if(CheckVerifyCode(input)) {
-						ws.send(ConfigChannel('RK3923C1201900139'));					
+
+					if (CheckVerifyCode(input)) {
+						ws.send(ConfigChannel('RK3923C1201900139'));
 						var checkBuffer = GetScreenState();
 						ws.send(checkBuffer);
 					}
@@ -370,7 +370,7 @@
 						resolving = 0;
 					}
 				}
-				if(input[23] == 0x0B)//多端登录处理, 数据从索引24开始取, input 是接收到的原始数据
+				if (input[23] == 0x0B)//多端登录处理, 数据从索引24开始取, input 是接收到的原始数据
 				{
 					var jsonobj = checkMultiLoginInfo(input);
 				}
@@ -402,7 +402,7 @@
 			return false;
 		}
 
-		var url = window.location.href; 
+		var url = window.location.href;
 		url = url.split('/');
 		var baseUrl = url[0] + '//' + url[2];
 		var form = {};
@@ -414,7 +414,7 @@
 			})
 		}
 		var cutList = [];
-		let timer,isFlag = true;
+		let timer, isFlag = true;
 		function showShearPlate() {
 			stopManyClick(() => {
 				$('.box-shear-plate').empty();
@@ -437,7 +437,6 @@
 								$('.box-shear-plate').append(str);
 							} else {
 								$('.box-shear-plate').append('<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪贴板为空</div>')
-
 							}
 							$('.mask').show();
 							initSlider();
@@ -451,12 +450,12 @@
 		}
 		//防止提示一秒内重复显示
 		function stopManyClick(fn) {
-		if (isFlag) {
+			if (isFlag) {
 				fn();
 			}
 			isFlag = false;
-			if(timer){clearTimeout(timer);}
-			timer = setTimeout(() => {isFlag = true}, 1500);
+			if (timer) { clearTimeout(timer); }
+			timer = setTimeout(() => { isFlag = true }, 1500);
 		}
 		// 清空剪贴板
 		function handleClear() {
@@ -485,9 +484,9 @@
 		}
 		function handleCopy(content) {
 			var cutting = {
-				"type":"cutting",
-				"data":{
-						"str": content
+				"type": "cutting",
+				"data": {
+					"str": content
 				}
 			};
 			wsss.send(JSON.stringify(cutting));
@@ -775,7 +774,7 @@
 			selectText(x);
 			document.execCommand("copy");
 		}
-		window.onbeforeunload = function() {
+		window.onbeforeunload = function () {
 			ws.close();
 			wsss.close();
 		}