Pārlūkot izejas kodu

Merge branch 'dev-4.8' into uat

huangxiaojing 3 gadi atpakaļ
vecāks
revīzija
bd7fe4efe7

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
microserviceUserH5/cloud/index.html


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
microserviceUserH5/cloud/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 303 - 0
microserviceUserH5/index.html

@@ -0,0 +1,303 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <meta charset="UTF-8">
+    <title>双子星</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
+
+    <link rel="stylesheet" href="../static/js/vender/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" href="../static/css/normalize.css">
+    <link rel="stylesheet" href="../static/css/experience.css">
+    <link rel="stylesheet" href="../static/js/vender/toastr/toastr.min.css">
+    <script src="../static/js/vender/jquery-3.4.1.min.js"></script>
+    <script src="../static/js/vender/bootstrap/js/bootstrap.min.js"></script>
+    <script src="../static/js/vender/toastr/toastr.min.js"></script>
+    <script src="../static/js/vender/crypto-js.js"></script>
+	<script src="../static/js/vender/base64.js"></script>
+    <script>
+        toastr.options.positionClass = 'toast-center-center';
+    </script>
+</head>
+
+<body>
+    <div class="top free-code-con" style="position:relative;">
+        <div>
+            <img src="../static/img/bg.png" alt="" class="bottom-img">
+            <div class="user-info">
+                <div class="head"><img src="" alt="" /></div>
+                <div class="username"></div>
+                <div class="txt">
+                    <div style="width: 2.97rem;"><img src="../static/img/register/tuoguan_icon.png" class="icon" alt="">7*24h智能托管</div>
+                    <div style="width: 1.76rem;"><img src="../static/img/register/haodian_icon.png" class="icon" alt="">0耗电</div>
+                    <div><img src="../static/img/register/liuliang_icon.png" class="icon" alt="">0流量</div>
+                    <div style="width: 2.97rem;"><img src="../static/img/register/wang_icon.png" class="icon" alt="">应用24h 不断网</div>
+                    <div style="width: 1.76rem;"><img src="../static/img/register/shou_icon.png" class="icon" alt="">解放双手</div>
+                </div>
+            </div>
+        </div>
+        <div class="center-pic">
+            <div class="recv-cont" id="recv_cont">
+                <div style="position: relative;">
+                    <input type="tel" class="recv-ipt" id="recv_ipt" placeholder="请输入手机号码">
+                </div>
+                <div onclick="handleClick()" style="position: relative">
+                    <div class="recv-btn" id="recv_btn">立即加入</div>
+                </div>
+                <div class="bottom">
+                    <div class="mb8">双子星</div>
+                    <div class="wl">云智能 · 享未来</div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script type="text/javascript" th:inline="javascript">
+        var url = window.location.href;
+        url = url.split('/')
+        // var baseUrl = 'http://' + url[2]
+        var baseUrl = 'http://14.215.128.96'
+
+        $("#recv_ipt").bind('input propertychange', function (e) {
+            var ipt_phones = $('#recv_ipt').val();
+            var c = $(this);
+            if (/[^\d]/.test(c.val())) {//替换非数字字符
+                var temp_amount = c.val().replace(/[^\d]/g, '');
+                $(this).val(temp_amount);
+                toastr.error('请填写正确的手机号')
+            }
+            if (ipt_phones.length >= 12) {
+                toastr.error('请填写正确的手机号')
+                var recvstr = ipt_phones.substring(0, 11)
+                $("#recv_ipt").val(recvstr);
+            }
+        });
+
+        function getUserInfo() {
+            var userName = [[${ userName }]]
+            userName = Base64.decode(userName)
+            $.ajax({
+                url: baseUrl + '/api/user/v3/invitation/getNickname?username=' + userName,
+                type: 'get',
+                cache: false,
+                dataType: 'text',
+                success: function (res) {
+                    var result = JSON.parse(res)
+                    if (result.status === 0) {
+                        $(".username").text(result.data.nickName)
+                        getHead(result.data.fileId)
+                    }
+                }
+            })
+        }
+
+        function getHead(fileId) {
+            $('.head img').attr('src', '../static/img/invite/header-img.png');
+            var timestamp = new Date().getTime()
+            var encrypts = encrypt(
+                'RuiChiSecurityGo' + timestamp,
+                'RuiChiSecurityGo'
+            )
+            var data = {
+                keyType: 2,
+                security: encrypts
+            }
+            $.ajax({
+                url: baseUrl + '/file-center/fileOperate/getImage?id=' + fileId,
+                type: 'get',
+                headers: data,
+                xhrFields: { responseType: "blob" },
+                cache: false,
+                success: function (res) {
+                    var xhr = new XMLHttpRequest();
+                    var imageType = xhr.getResponseHeader("Content-Type");
+                    var blob = new Blob([res], { type: imageType });
+                    var imageUrl = (window.URL || window.webkitURL).createObjectURL(blob);
+                    $('.head img').attr('src', imageUrl);
+                }
+            })
+        }
+
+        function encrypt(word, keyStr) {
+            keyStr = keyStr || 'RuiChiSecurityGo' // 判断是否存在ksy,不存在就用定义好的key
+            var key = CryptoJS.enc.Utf8.parse(keyStr)
+            var srcs = CryptoJS.enc.Utf8.parse(word)
+            var encrypted = CryptoJS.AES.encrypt(srcs, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
+            return encrypted.toString()
+        }
+
+        getUserInfo();
+        function handleClick() {
+            stopManyClick(result);
+        }
+
+        function result() {
+            var time = new Date().getTime()
+            var data = {}
+            toastr.options = {
+                positionClass: "toast-center-center"
+            };
+            var ipt_phone = $('#recv_ipt').val();
+            var validator = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/
+            var res = validator.test(ipt_phone)
+            if (!ipt_phone) {
+                toastr.error('请填写正确的手机号')
+            } else if (!res) {
+                toastr.error('请填写正确的手机号')
+            } else {
+                data.newPhone = ipt_phone
+                data.type = [[${ type }]]
+                data.code = [[${ code }]]
+                data.username = [[${ userName }]]
+                $.ajax({
+                    url: baseUrl + '/promote/commitPhone',
+                    data: JSON.stringify(data),
+                    type: 'post',
+                    contentType: "application/json",
+                    dataType: 'json',
+                    cache: false,
+                    success: function (res) {
+                        if (res.status === 0) {
+                            toastr.error('领取成功')
+                            $(window).attr('location', res.data);
+                        } else if (res.status === 1) {
+                            toastr.error(res.msg)
+                            setTimeout(function () {
+                                $(window).attr('location', 'http://www.androidscloud.com/');
+                            }, 1000)
+                        } else {
+                            toastr.error(res.msg)
+                        }
+                    }
+                })
+                var Sys = {};
+                var ua = navigator.userAgent.toLowerCase();
+                var s, browserType;
+                (s = ua.match(/msie ([\d.]+)/)) ? Sys.ie = s[1] :
+                    (s = ua.match(/firefox\/([\d.]+)/)) ? Sys.firefox = s[1] :
+                        (s = ua.match(/chrome\/([\d.]+)/)) ? Sys.chrome = s[1] :
+                            (s = ua.match(/opera.([\d.]+)/)) ? Sys.opera = s[1] :
+                                (s = ua.match(/version\/([\d.]+).*safari/)) ? Sys.safari = s[1] : 0;
+                if (Sys.ie) {
+                    browserType = 'IE: ' + Sys.ie
+                }
+                if (Sys.firefox) {
+                    browserType = 'Firefox: ' + Sys.firefox
+                }
+                if (Sys.chrome) {
+                    browserType = 'Chrome: ' + Sys.chrome
+                }
+                if (Sys.opera) {
+                    browserType = 'Opera: ' + Sys.opera
+                }
+                if (Sys.safari) {
+                    browserType = 'Safari: ' + Sys.safari
+                }
+                var form = {
+                    platform: 4,
+                    visitType: 4,
+                    time: time,
+                    phoneNum: ipt_phone,
+                    downLoaderCount: Number(localStorage.getItem('downLoaderCount')),
+                    browserType: browserType
+                }
+                var list = []
+                list.push(form)
+                // 推广页面下载埋点接口
+                $.ajax({
+                    url: baseUrl + '/promote/burialSiteLog',
+                    data: JSON.stringify(list),
+                    type: 'post',
+                    contentType: "application/json",
+                    dataType: 'json',
+                    cache: false,
+                    success: function (res) {
+                    }
+                })
+            }
+        }
+        function visit() {
+            $.ajax({
+                url: baseUrl + '/promote/addInviteData',
+                type: 'get',
+                cache: false,
+                dataType: 'text',
+                success: function () {
+                }
+            })
+        }
+
+        visit();
+
+        //防止提示一秒内重复显示
+        function stopManyClick(fn) {
+            if (flag) {
+                fn();
+            }
+            flag = false;
+            if (timer) { clearTimeout(timer); }
+            timer = setTimeout(function () { flag = true }, 1500);
+        }
+    </script>
+</body>
+<style>
+    #toast-container>.toast-error {
+        background-image: none !important;
+    }
+
+    .toast-error {
+        background-color: rgba(0, 0, 0, 0.8);
+    }
+
+    #toast-container>div {
+        font-size: 14px;
+        min-width: 80px !important;
+        padding: 12px !important;
+        box-shadow: none;
+    }
+
+    @media (max-width: 480px) and (min-width: 241px) {
+        #toast-container>div {
+            min-width: 80px !important;
+            width: auto;
+        }
+    }
+
+    @media only screen and (min-width: 640px) {
+        .toast-center-center {
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+        }
+    }
+
+    @media only screen and (max-width: 640px) {
+        .toast-center-center {
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+        }
+    }
+
+    input::-webkit-input-placeholder {
+        color: #BBBBBB;
+    }
+
+    input::-moz-placeholder {
+        /* Mozilla Firefox 19+ */
+        color: #BBBBBB;
+    }
+
+    input:-moz-placeholder {
+        /* Mozilla Firefox 4 to 18 */
+        color: #BBBBBB;
+    }
+
+    input:-ms-input-placeholder {
+        /* Internet Explorer 10-11 */
+        color: #BBBBBB;
+    }
+</style>
+
+</html>

+ 9 - 8
screenAndroid/WXdraw.js

@@ -32,6 +32,7 @@ form.ip = parameters["ip"];
 form.domainName = parameters["domainName"];
 var isWSS = true;
 var cUrl = isWSS ? "wss://" + form.domainName + "/card?cardIp=" + form.ip : "ws://" + form.domainName + "/card?cardIp=" + form.ip;
+// var cUrl = "ws://192.168.199.46:9101?token=test0123456789";
 
 var wsss,errorTime = 0;
 doConnect();
@@ -63,7 +64,7 @@ function doConnect() {
 			},
 			"event": "bitRate"
 		}
-		wsss.send(ExexuteMove(JSON.stringify(bitRate), form.sn))
+		wsss.send(JSON.stringify(bitRate))
 	};
 	wsss.onclose = function (evt) {
 		wsss.close();
@@ -124,7 +125,7 @@ $(".PictureQuality").on("click", function () {
 		},
 		"event": "bitRate"
 	}
-	wsss.send(ExexuteMove(JSON.stringify(bitRate), form.sn))
+	wsss.send(JSON.stringify(bitRate))
 })
 
 //画图形
@@ -160,7 +161,7 @@ var draw_graph = function (graphType, obj) {
 					"event": "0"
 				}
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		} else {
 			var ping;
 			for (var i = 0; i < touchfor.length; i++) {
@@ -178,7 +179,7 @@ var draw_graph = function (graphType, obj) {
 				}
 
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn));
+			wsss.send(JSON.stringify(ping));
 		}
 		canDraw = true;
 	};
@@ -203,7 +204,7 @@ var draw_graph = function (graphType, obj) {
 					"event": "1"
 				}
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn));
+			wsss.send(JSON.stringify(ping));
 		} else {
 			var ping;
 			for (var i = 0; i < touchfor.length; i++) {
@@ -220,7 +221,7 @@ var draw_graph = function (graphType, obj) {
 					"event": "1"
 				}
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		}
 		canDraw = false;
 	};
@@ -252,7 +253,7 @@ var draw_graph = function (graphType, obj) {
 				}
 
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		} else {
 			var ping;
 			for (var i = 0; i < touchfor.length; i++) {
@@ -269,7 +270,7 @@ var draw_graph = function (graphType, obj) {
 					"event": "2"
 				}
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn));
+			wsss.send(JSON.stringify(ping));
 		};
 	};
 

+ 4 - 2
screenAndroid/WXtrialInterface.html

@@ -158,7 +158,8 @@
 		var parameters = GetRequest();
 		var ip = parameters["ip"];
 		var domainName = parameters["domainName"];
-		var socketURL = isWSS ? "wss://" + domainName + "/card?cardIp=" + ip : "ws://" + domainName + "/card?cardIp=" + ip;
+		// var socketURL = isWSS ? "wss://" + domainName + "/card?cardIp=" + ip : "ws://" + domainName + "/card?cardIp=" + ip;
+		var socketURL = "ws://192.168.199.46:9100";
 
 		var jmuxer = new JMuxer({
 			node: 'playerVideo',
@@ -374,7 +375,8 @@
 
 		var url = window.location.href;
 		url = url.split('/');
-		var baseUrl = url[0] + '//' + url[2];
+		// var baseUrl = url[0] + '//' + url[2];
+		var baseUrl = 'http://per.cs.se.androidscloud.com';
 		var form = {};
 		$.ajax({
 			url: baseUrl + "/api/user/v1/config/download/isShow",

+ 9 - 9
screenAndroid/helper.js

@@ -40,10 +40,10 @@ function makeFrame(sn, dataType, jsonCmd) {
 	outPut[index++] = dataLen & 0x000000ff;
 	outPut[index++] = 0;//类型为client
 
-	//sn号赋值,string转ascii
-	for (i = 0; i < sn.length; i++) {
-		outPut[index++] = sn[i].charCodeAt();
-	}
+	// //sn号赋值,string转ascii
+	// for (i = 0; i < sn.length; i++) {
+	// 	outPut[index++] = sn[i].charCodeAt();
+	// }
 
 	outPut[index++] = dataType;//指定数据类型为json
 	//json string转ascii
@@ -61,28 +61,28 @@ function ExexuteKeyDown(code) {
 	var jsonObj = { "data": { "keyCode": code, "event": "keyDown" } };
 	var json = JSON.stringify(jsonObj);
 	var sn = "RK3923C1201900139";
-	return makeFrame(sn, 0, json);
+	return json;
 }
 //触发鼠标按下事件,x:x坐标, y:y坐标
 function ExexuteMouseDown(x, y) {
 	var jsonObj = { "data": { "action": 0, "count": 1, "pointerId": 0, "x": x, "y": y }, "event": "0" };
 	var json = JSON.stringify(jsonObj);
 	var sn = "RK3923C1201900139";
-	return makeFrame(sn, 0, json);
+	return json;
 }
 //触发鼠标移动事件,x:x坐标, y:y坐标
 function ExexuteMouseMove(x, y) {
 	var jsonObj = { "data": { "action": 2, "count": 1, "pointerId": 0, "x": x, "y": y }, "event": "2" };
 	var json = JSON.stringify(jsonObj);
 	var sn = "RK3923C1201900139";
-	return makeFrame(sn, 0, json);
+	return json;
 }
 
 function ExexuteKeyBoard(keycode) {
 	var jsonObj = { "data": { "keyCode": keycode.toString() }, "event": "keyCode" };
 	var json = JSON.stringify(jsonObj);
 	var sn = "RK3923C1201900139";
-	return makeFrame(sn, 0, json);
+	return json;
 }
 
 //触发鼠标抬起事件,x:x坐标, y:y坐标
@@ -90,7 +90,7 @@ function ExexuteMouseUp(x, y) {
 	var jsonObj = { "data": { "action": 1, "count": 1, "pointerId": 0, "x": x, "y": y }, "event": "1" };
 	var json = JSON.stringify(jsonObj);
 	var sn = "RK3923C1201900139";
-	return makeFrame(sn, 0, json);
+	return json;
 }
 //触发滑动事件
 function ExexuteMove(data, sn) {

+ 11 - 11
screenIos/WXdraw.js

@@ -63,7 +63,7 @@ function doConnect() {
 			},
 			"event": "bitRate"
 		}
-		wsss.send(ExexuteMove(JSON.stringify(bitRate), form.sn))
+		wsss.send(JSON.stringify(bitRate))
 	};
 	wsss.onclose = function () {
 		wsss.close();
@@ -104,11 +104,11 @@ $(".upload").on("click", function () {
 $(".botmat1img").on("click", function () {
 	var codes = $(this).attr("data-text")
 	if (codes == "home") {
-		wsss.send(ExexuteKeyBoard(3, form.sn));
+		wsss.send(ExexuteKeyBoard(3), form.sn);
 	} else if (codes == "return") {
-		wsss.send(ExexuteKeyBoard(4, form.sn));
+		wsss.send(ExexuteKeyBoard(4), form.sn);
 	} else if (codes == "gengduo") {
-		wsss.send(ExexuteKeyBoard(187, form.sn));
+		wsss.send(ExexuteKeyBoard(187), form.sn);
 	}
 })
 //高清控制
@@ -121,7 +121,7 @@ $(".PictureQuality").on("click", function () {
 		},
 		"event": "bitRate"
 	}
-	wsss.send(ExexuteMove(JSON.stringify(bitRate), form.sn))
+	wsss.send(JSON.stringify(bitRate))
 })
 var canDraw = false;
 //画图形
@@ -156,7 +156,7 @@ var draw_graph = function (graphType) {
 					"event": "0"
 				}
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		} else {
 			var ping
 			for (var i = 0; i < touchfor.length; i++) {
@@ -174,7 +174,7 @@ var draw_graph = function (graphType) {
 				}
 
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		}
 
 		canDraw = true;
@@ -201,7 +201,7 @@ var draw_graph = function (graphType) {
 					"event": "1"
 				}
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		} else {
 			var ping
 			for (var i = 0; i < touchfor.length; i++) {
@@ -218,7 +218,7 @@ var draw_graph = function (graphType) {
 					"event": "1"
 				}
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		}
 		canDraw = false;
 	};
@@ -249,7 +249,7 @@ var draw_graph = function (graphType) {
 					"event": "2"
 				}
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		} else {
 			var ping
 			for (var i = 0; i < touchfor.length; i++) {
@@ -266,7 +266,7 @@ var draw_graph = function (graphType) {
 					"event": "2"
 				}
 			}
-			wsss.send(ExexuteMove(JSON.stringify(ping), form.sn))
+			wsss.send(JSON.stringify(ping))
 		}
 	};