Начало Каталог Помощ
Регистрация Вход
tangdehang
/
android-cloud-H5
Наблюдаван 1
Харесван 0
Разклонения 0
Файлове Задачи 0 Заявки за сливане 0 Уики
Преглед на файлове

Merge branch 'dev-5.2' of Software/android-cloud-H5 into uat

huangxiaojing преди 3 години
родител
45b1111298 30b2a0dc96
ревизия
d4a4e5786b
променени са 25 файла, в които са добавени 273 реда и са изтрити 15 реда
Разделен изглед Покажи статистика за разликите
  1. 177 0
      microserviceUserH5/static/css/anniversaryCelebrate.css
  2. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/activity-text.png
  3. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/activity-tips.png
  4. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/fifce.png
  5. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/get-award.png
  6. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/get-times.png
  7. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/icon1.png
  8. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/icon2.png
  9. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/icon3.png
  10. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/icon4.png
  11. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/left-selected.png
  12. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/once.png
  13. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/right-selected.png
  14. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/rule.png
  15. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/small-star.png
  16. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/star.png
  17. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/station.png
  18. BIN
      microserviceUserH5/static/img/anniversaryCelebrate/used.png
  19. 80 0
      microserviceUserH5/vcloud/anniversaryCelebrate.html
  20. 1 1
      microserviceUserH5/vcloud/browser.html
  21. 2 2
      microserviceUserH5/vcloud/browserDetail.html
  22. 2 2
      screenAndroid/WXdraw.js
  23. 5 4
      screenAndroid/WXtrialInterface.html
  24. 5 5
      screenIos/WXdraw.js
  25. 1 1
      screenIos/websocket.js

+ 177 - 0
microserviceUserH5/static/css/anniversaryCelebrate.css
Целия файл 

@@ -0,0 +1,177 @@
 
+@media screen and (max-width: 750px) {
 
+  html {
 
+    font-size: calc(100vw / 7.5);
 
+  }
 
+}
 
+
 
+@media screen and (min-width: 750px) {
 
+  html {
 
+    font-size: calc(450px / 7.5);
 
+  }
 
+}
 
+
 
+html, body, div, ul, li, p {
 
+  padding: 0;
 
+  margin: 0;
 
+}
 
+
 
+ul, li {
 
+  list-style: none;
 
+}
 
+
 
+.container{
 
+  width: 7.5rem;
 
+  min-height: 100vh;
 
+  background-color: rgba(22, 12, 31, 1);
 
+}
 
+
 
+.rule-wrap{
 
+  display: flex;
 
+  justify-content: flex-end;
 
+  padding: 0.1rem 0.18rem 0 0;
 
+}
 
+
 
+.rule{
 
+  width: 1.06rem;
 
+  height: 1.06rem;
 
+}
 
+
 
+.activity-text-wrap{
 
+  width: 5.62rem;
 
+  height: 0.92rem;
 
+  margin: auto;
 
+}
 
+
 
+.activity-text{
 
+  width: 100%;
 
+  height: 100%;
 
+}
 
+
 
+.activity-tips-wrap{
 
+  width: 4.58rem;
 
+  height: 0.68rem;
 
+  margin: auto;
 
+}
 
+
 
+.activity-tips{
 
+  width: 100%;
 
+  height: 100%;
 
+}
 
+
 
+.star-wrap{
 
+  width: 5.71rem;
 
+  height: 3.88rem;
 
+  margin: auto;
 
+  margin-top: 1rem;
 
+}
 
+
 
+.star{
 
+  width: 100%;
 
+  height: 100%;
 
+}
 
+
 
+.station-wrap{
 
+  width: 7.05rem;
 
+  height: 4.25rem;
 
+  margin: auto;
 
+  position: relative;
 
+}
 
+
 
+.station{
 
+  width: 100%;
 
+  height: 100%;
 
+}
 
+
 
+.station-text-wrap{
 
+  position: absolute;
 
+  bottom: 1.3rem;
 
+  left: 50%;
 
+  transform: translateX(-50%);
 
+  width: 6.63rem;
 
+  height: 1.15rem;
 
+  display: flex;
 
+  flex-direction: column;
 
+  justify-content: center;
 
+  align-items: center;
 
+  background: rgba(37, 36, 75, 0.2);
 
+  box-shadow: -0.03rem -0.02rem 0.18rem 0 #0F2141;
 
+  opacity: 0.2;
 
+  border-radius: 0.16rem;
 
+  font-size: 0.28rem;
 
+  color: #FFFFFF;
 
+}
 
+
 
+.once-text{
 
+  opacity: 1;
 
+}
 
+
 
+.btn-list{
 
+  width: 100%;
 
+  position: absolute;
 
+  bottom: 0.22rem;
 
+  display: flex;
 
+  justify-content: space-around;
 
+}
 
+
 
+.btn{
 
+  width: 3.1rem;
 
+  height: 0.9rem;
 
+}
 
+
 
+.number-wrap{
 
+  width: 7.08rem;
 
+  height: 2.02rem;
 
+  background: #25244B;
 
+  border-radius: 0.11rem;
 
+  font-size: 0.28rem;
 
+  color: #FFFFFF;
 
+  margin: auto;
 
+}
 
+
 
+.rest-times{
 
+  padding: 0.66rem 0 0 0.22rem;
 
+  font-size: 0.28rem;
 
+  color: #FFFFFF;
 
+}
 
+
 
+.rest-number{
 
+  color: rgba(253, 255, 65, 1);
 
+}
 
+
 
+.small-star{
 
+  width: 0.33rem;
 
+  height: 0.32rem;
 
+}
 
+
 
+#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;
 
+}
 
+
 
+.toast-center-center {
 
+  position: fixed;
 
+  min-width: 220px;
 
+  top: 50%;
 
+  left: 50%;
 
+  text-align: center;
 
+  transform: translateX(-50%);
 
+  color: #FFFFFF;
 
+  border-radius: 0.1rem;
 
+}
 
+
 
+@media (max-width: 480px) and (min-width: 241px) {
 
+  #toast-container>div {
 
+    min-width: 80px !important;
 
+    width: auto;
 
+  }
 
+}

BIN
microserviceUserH5/static/img/anniversaryCelebrate/activity-text.png
Целия файл


BIN
microserviceUserH5/static/img/anniversaryCelebrate/activity-tips.png
Целия файл


BIN
microserviceUserH5/static/img/anniversaryCelebrate/fifce.png
Целия файл


BIN
microserviceUserH5/static/img/anniversaryCelebrate/get-award.png
Целия файл


BIN
microserviceUserH5/static/img/anniversaryCelebrate/get-times.png
Целия файл


BIN
microserviceUserH5/static/img/anniversaryCelebrate/icon1.png
Целия файл


BIN
microserviceUserH5/static/img/anniversaryCelebrate/icon2.png
Целия файл


BIN
microserviceUserH5/static/img/anniversaryCelebrate/icon3.png
Целия файл


BIN
microserviceUserH5/static/img/anniversaryCelebrate/icon4.png
Целия файл


BIN
microserviceUserH5/static/img/anniversaryCelebrate/left-selected.png
Целия файл


BIN
microserviceUserH5/static/img/anniversaryCelebrate/once.png
Целия файл


BIN
microserviceUserH5/static/img/anniversaryCelebrate/right-selected.png
Целия файл


BIN
microserviceUserH5/static/img/anniversaryCelebrate/rule.png
Целия файл


BIN
microserviceUserH5/static/img/anniversaryCelebrate/small-star.png
Целия файл


BIN
microserviceUserH5/static/img/anniversaryCelebrate/star.png
Целия файл


BIN
microserviceUserH5/static/img/anniversaryCelebrate/station.png
Целия файл


BIN
microserviceUserH5/static/img/anniversaryCelebrate/used.png
Целия файл


+ 80 - 0
microserviceUserH5/vcloud/anniversaryCelebrate.html
Целия файл 

@@ -0,0 +1,80 @@
 
+<!DOCTYPE html>
 
+<html lang="zh-CN">
 
+
 
+<head>
 
+	<meta charset="UTF-8">
 
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
 
+	<title>周年庆活动</title>
 
+	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
 
+	<link rel="stylesheet" href="../static/js/vender/toastr/toastr.min.css">
 
+	<link rel="stylesheet" href="../static/css/anniversaryCelebrate.css">
 
+	<script src="../static/js/vender/jquery-3.4.1.min.js"></script>
 
+	<script src="../static/js/vender/toastr/toastr.min.js"></script>
 
+	<script src="../static/js/vender/config.js"></script>
 
+</head>
 
+
 
+<body>
 
+	<div class="container">
 
+		<div class="rule-wrap">
 
+			<img class="rule" src="../static/img/anniversaryCelebrate/rule.png" />
 
+		</div>
 
+		<div class="activity-text-wrap">
 
+			<img class="activity-text" src="../static/img/anniversaryCelebrate/activity-text.png" />
 
+		</div>
 
+		<div class="activity-tips-wrap">
 
+			<img class="activity-tips" src="../static/img/anniversaryCelebrate/activity-tips.png" />
 
+		</div>
 
+		<div class="star-wrap">
 
+			<img class="star" src="../static/img/anniversaryCelebrate/star.png" />
 
+		</div>
 
+		<div class="station-wrap">
 
+			<img class="station" src="../static/img/anniversaryCelebrate/station.png" />
 
+			<div class="station-text-wrap">
 
+				<div class="once-text">购买／续费星曜月卡，获得 1次 点亮资格</div>
 
+				<div class="ten-text">购买/续费星曜年卡，获得 10次 点亮资格</div>
 
+			</div>
 
+			<div class="btn-list">
 
+				<img class="once-btn btn" src="../static/img/anniversaryCelebrate/once.png" />
 
+				<img class="five-btn btn" src="../static/img/anniversaryCelebrate/fifce.png" />
 
+			</div>
 
+		</div>
 
+		<div class="number-wrap">
 
+			<div class="rest-times">剩余次数<span class="rest-number">1000</span>次</div>
 
+			<div class="small-star-wrap">
 
+				<img class="small-star" src="../static/img/anniversaryCelebrate/small-star.png" />
 
+			</div>
 
+		</div>
 
+	</div>
 
+	<script>
 
+		toastr.options.positionClass = 'toast-center-center';
 
+		toastr.options.timeOut = '1500';
 
+	</script>
 
+	<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
 
+	<script type="text/javascript">
 
+        // var baseUrl = 'https://per.cs.se.androidscloud.com'
 
+	    let timer,flag = true;
 
+		var url = window.location.href;
 
+		url = url.split('/')
 
+		var loc = window.location.search,
 
+		    n1 = loc.length,//地址的总长度 
+		    n2 = loc.indexOf("="),//取得=号的位置
 
+		    id = loc.substr(n2 + 1, n1 - n2),//从=号后面的内容
 
+			u = navigator.userAgent,
 
+			ua = navigator.userAgent.toLowerCase(),
 
+			isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
 
+			isMiniprogram = false,
 
+			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
 
+		// 
+		//防止提示一秒内重复显示
 
+		function stopManyClick(fn) {
 
+			if (flag) {
 
+				fn();
 
+			}
 
+			flag = false;
 
+			if(timer){clearTimeout(timer);}
 
+			timer = setTimeout(() => {flag = true}, 1500);
 
+		}
 
+	</script>
 
+</body>
 
+
 
+</html>

+ 1 - 1
microserviceUserH5/vcloud/browser.html
Целия файл 

@@ -63,7 +63,7 @@
 
 					let node = '';
 
 					for(let i=0; i < list.length; i++){
 
 						node += `<div class="tag-item" data-plateName="${list[i].plateName}" data-id="${list[i].id}">
 
-								<img class="icon-row" data-plateName="${list[i].plateName}" data-id="${list[i].id}" src=${fileCenterApi}/document/newFile/download/0/3dn9b4585511476691c6?fileKey=${list[i].iconImage} />
 
+								<img class="icon-row" data-plateName="${list[i].plateName}" data-id="${list[i].id}" src=${fileCenterApi}/document/newFile/download/0/13d0arghebcc4cm49cf04?fileKey=${list[i].iconImage} />
 
 								<div class="icon-title" data-plateName="${list[i].plateName}" data-id="${list[i].id}">${list[i].plateName}</div>
 
 								<img class="right-arrow" src="../static/img/browser/right-arrow.png" data-plateName="${list[i].plateName}" data-id="${list[i].id}" />
 
 								<div class="right-arrow-heght"></div>

+ 2 - 2
microserviceUserH5/vcloud/browserDetail.html
Целия файл 

@@ -141,7 +141,7 @@
 
 						for(let i=0; i < appList.length; i++){
 
 							node += `<div class="download-item">
 
 										<div class="main-wrap">
 
-											<img class="app-icon" src=${fileCenterApi}/document/newFile/download/0/3dn9b4585511476691c6?fileKey=${appList[i].iconKey} />
 
+											<img class="app-icon" src=${fileCenterApi}/document/newFile/download/0/13d0arghebcc4cm49cf04?fileKey=${appList[i].iconKey} />
 
 											<div class="app-wrap">
 
 												<div class="app-title">${appList[i].appName}</div>
 
 												<div class="app-description">${appList[i].introduction}</div>
 
@@ -231,7 +231,7 @@
 
 				cache: false,
 
 				success: function (res) {
 
 					if(res.status === 0){
 
-						const downloadUrl = `${fileCenterApi}/document/newFile/breakpointDownloadFile/3dn9b4585511476691c6?fileKey=${key}`;
 
+						const downloadUrl = `${fileCenterApi}/document/newFile/breakpointDownloadFile/13d0arghebcc4cm49cf04?fileKey=${key}`;
 
 						window.location.href = downloadUrl;
 
 						let xhr = new XMLHttpRequest();
 
 						xhr.open('GET', downloadUrl, true);

+ 2 - 2
screenAndroid/WXdraw.js
Целия файл 

@@ -23,7 +23,7 @@ var parameters = GetRequest();
 
 var form = {};
 
 
 var cardToken = parameters["cardToken"];
 
-cardToken = cardToken && cardToken.replace(/@/g, "=");
 
+cardToken = cardToken && decodeURIComponent(cardToken);
 
 form.cardIp = parameters["cardIp"];
 
 form.port = parameters["port"];
 
 form.username = parameters["username"];
 
@@ -104,7 +104,7 @@ function doConnect() {
 
       return
 
     }
 
     if (result.type === 'forwardMsg' && isAuth !== 'none') {
 
-      if (result.data.code === 4000) {
 
+      if (result.data.code === 4000 || result.data.code === 3000) {
 
         if (isAuth === 'huo') {
 
           $.confirm("授权方已收回控制权，您进入观看屏幕模式", function () {
 
             //点击确认后的回调函数

+ 5 - 4
screenAndroid/WXtrialInterface.html
Целия файл 

@@ -308,7 +308,8 @@
 
     var isWSS = true;
 
     var ip = parameters["ip"];
 
     var cardToken = parameters["cardToken"];
 
-    cardToken = cardToken && cardToken.replace(/@/g, "=");
 
+    cardToken = cardToken && decodeURIComponent(cardToken);
 
+    console.log(decodeURIComponent(cardToken));
 
     var appletPushAddress = parameters["appletPushAddress"];
 
     // "&type=business"
 
     var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken : "ws://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken;
 
@@ -353,7 +354,7 @@
 
           ws.send("ping");
 
         } else {
 
           clearInterval(intervaler);
 
-          $.toast("画面异常,请重新进入1", "text");
 
+          $.toast("画面异常,请重新进入", "text");
 
           if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
 
             tt.miniProgram.switchTab({
 
               url: '/pages/home/home'
 
@@ -378,7 +379,7 @@
 
         clearInterval(intervaler);
 
         throttle(doConnect, 100);
 
         if (errorTime > 1000) {
 
-          $.toast("画面异常,请重新进入2", "text");
 
+          $.toast("画面异常,请重新进入", "text");
 
           wsss.close();
 
           if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
 
             tt.miniProgram.switchTab({
 
@@ -523,7 +524,7 @@
 
             ws.send(checkBuffer);
 
           }
 
           else {
 
-            $.toast("画面异常,请重新进入3", "text");
 
+            $.toast("画面异常,请重新进入", "text");
 
             clearInterval(intervaler);
 
             ws.close();
 
             wsss.close();

+ 5 - 5
screenIos/WXdraw.js
Целия файл 

@@ -11,7 +11,7 @@ if (numse <= 70) {
 
 } else {
 
   var voheight = window.screen.height - topwinHeightDraw - 20
 
 }
 
- 
+
 
 //画笔大小
 
 var resolving = 1; // 1: 竖屏；2：横屏；
 
 var url = window.location.href;
 
@@ -21,7 +21,7 @@ var parameters = GetRequest();
 
 
 var form = {};
 
 var cardToken = parameters["cardToken"];
 
-cardToken = cardToken && cardToken.replace(/@/g, "=");
 
+cardToken = cardToken && decodeURIComponent(cardToken);
 
 form.cardIp = parameters['cardIp'];
 
 form.port = parameters['port'];
 
 form.sn = parameters['sn'];
 
@@ -86,12 +86,12 @@ function doConnect() {
 
         tt.miniProgram.switchTab({
 
           url: '/pages/home/home'
 
         })
 
-      } else if(window.__wxjs_environment === 'miniprogram') {
 
+      } else if (window.__wxjs_environment === 'miniprogram') {
 
         wx.miniProgram.switchTab({
 
           url: '/pages/home/home'
 
         })
 
       } else {
 
-        document.addEventListener('UniAppJSBridgeReady', function() {
 
+        document.addEventListener('UniAppJSBridgeReady', function () {
 
           uni.navigateTo({
 
             url: '/pages/index/index'
 
           });
 
@@ -110,7 +110,7 @@ function doConnect() {
 
       return
 
     }
 
     if (result.type === 'forwardMsg' && isAuth !== 'none') {
 
-      if (result.data.code === 4000) {
 
+      if (result.data.code === 4000 || result.data.code === 3000) {
 
         if (isAuth === 'huo') {
 
           $.confirm("授权方已收回控制权，您进入观看屏幕模式", function () {
 
             //点击确认后的回调函数

+ 1 - 1
screenIos/websocket.js
Целия файл 

@@ -3,7 +3,7 @@ var parameters = GetRequest();
 
 var ip = parameters["ip"];
 
 var appletPushAddress = parameters["appletPushAddress"];
 
 var cardToken = parameters["token"];
 
-cardToken = cardToken && cardToken.replace(/@/g, "=");
 
+cardToken = cardToken && decodeURIComponent(cardToken);
 
 var isWSS = true;
 
 var errorTime = 0;
 
 var socketURL = isWSS ? "wss://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken + "&type=business" : "ws://" + appletPushAddress + "?cardIp=" + ip + "&token=" + cardToken + "&type=business";