Ana Sayfa Keşfet Yardım
Üye Ol Giriş Yap
tangdehang
/
android-cloud-H5
İzle 1
Yıldızla 0
Çatalla 0
Files Sorunlar 0 Değişiklik İstekleri 0 Wiki
Kaynağa Gözat

Merge branch 'dev-4.9.3' into dev-4.9.3-replacementActivities

huangxiaojing 3 yıl önce
ebeveyn
d6990d26cc 1676355d48
işleme
8a23f9e4bd
12 değiştirilmiş dosya ile 140 ekleme ve 57 silme
Görünümü Böl Farklılık Durumunu Göster
  1. BIN
      microserviceUserH5.rar
  2. 2 1
      microserviceUserH5/static/js/vender/vue/config.js
  3. BIN
      microserviceUserH5/static/offImg/zhiyin_pic.png
  4. 6 4
      microserviceUserH5/vcloud/actFission.html
  5. 17 6
      microserviceUserH5/vcloud/actFissionShare.html
  6. 3 2
      microserviceUserH5/vcloud/doubleChristmasActivity.html
  7. 53 11
      microserviceUserH5/vcloud/share.html
  8. 15 13
      screenAndroid/WXdraw.js
  9. 0 1
      screenAndroid/WXtrialInterface.html
  10. 15 13
      screenIos/WXdraw.js
  11. 6 3
      screenIos/WXtrialInterface.html
  12. 23 3
      screenIos/decoder.js

BIN
microserviceUserH5.rar
Dosyayı Görüntüle


+ 2 - 1
microserviceUserH5/static/js/vender/vue/config.js
Dosyayı Görüntüle 

@@ -4,7 +4,8 @@
 
 // var base_url = 'http://192.168.100.98:3001'; //测试服务器
 
 var base_url = baseUrl; //测试服务器
 
 //http://test.androidscloud.com
 
-//var base_url = 'https://per.cs.se.androidscloud.com/';
 
+// var base_url = 'https://per.cs.se.androidscloud.com/';
 
+//var base_url = 'https://per.cs.se.androidscloud.com/'
 
 //https://www.nn-jtjt.com/app
 
 // var base_url = 'http://kmpark.cdwatertek.com/appwechatpay'; //测试服务器
 
 // var base_url = 'http://192.168.100.83:3001'; //测试服务器

BIN
microserviceUserH5/static/offImg/zhiyin_pic.png
Dosyayı Görüntüle


+ 6 - 4
microserviceUserH5/vcloud/actFission.html
Dosyayı Görüntüle 

@@ -264,8 +264,9 @@
 
 				<van-notice-bar :scrollable="false">
 
 					<van-swipe vertical class="notice-swipe" :autoplay="2000" :show-indicators="false">
 
 						<van-swipe-item v-for="(item,index) in marqueeList">
 
-							<img :src="standarImg(item.headImgUrl)" :onerror="defaultImg" alt="">
 
-							<p>{{item.surfaceName}}</p>
 
+							<!-- <img :src="standarImg(item.headImgUrl)" :onerror="defaultImg" alt=""> -->
 
+							<img src="" :onerror="defaultImg" alt="">
 
+							<p>{{item.sharerSurfaceName}}</p>
 
 							<p>已领取分享奖励</p>
 
 						</van-swipe-item>
 
 
@@ -291,7 +292,7 @@
 
 								<img :src="standarImg(item.headImgUrl)" class="tou" :onerror="defaultImg" alt="">
 
 								<div class="text">
 
 									<p>{{item.surfaceName}}</p>
 
-									<p>{{item.createTime}}</p>
 
+									<p>{{item.registerTime}}</p>
 
 								</div>
 
 							</div>
 
 							<div class="right-nav">
 
@@ -342,7 +343,7 @@
 
 			data: {
 
 				isshow: false,
 
 				token: GetRequest().token ? GetRequest().token :
 
-					'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyYW5kb20iOiI3ODM0NyIsImNsaWVudCI6IjUiLCJleHAiOjE2NDA4NDkxMjUsInVzZXJuYW1lX2FwcGxldCI6Iko4VENqMTYzODk0MTc2MyJ9.J4vY-mSQnxh0K9DxNVKbelL1IXMx0GGVTClRKqfbyLo',
 
+					'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyYW5kb20iOiI3MDY1NSIsImNsaWVudCI6IjUiLCJleHAiOjE2NDExOTA0MzMsInVzZXJuYW1lX2FwcGxldCI6Im5naEN0MTYzMTYwNDY4OSJ9.cXj7Ks5XYCnGFANZ0uHAkDn8MJtWrMm4I3qqvikewGg',
 
 				rewardList: [],
 
 				queryParams: {
 
 					pageNum: 1,
 
@@ -385,6 +386,7 @@
 
 							this.actStatus = res.data.actStatus;
 
 							this.shareInfo = res.data;
 
 							if (this.actStatus != 1) {
 
+								this.$toast('活动已下架');
 
 								return
 
 							}
 
 							// this.stopManyClick(() => {

+ 17 - 6
microserviceUserH5/vcloud/actFissionShare.html
Dosyayı Görüntüle 

@@ -255,7 +255,7 @@
 
 <body>
 
     <div class="ipt"></div>
 
     <div id="app" v-cloak class="container ">
 
-       
+
 
         <div v-if='isshow&&topic!=null' style="margin: 0 auto;">
 
             <div class="footer">
 
                 <div class="download-btn">
 
@@ -318,7 +318,7 @@
 
             data: {
 
                 isshow: true,
 
                 id: GetRequest().id ? GetRequest().id : 404,
 
-                username: GetRequest().username ? GetRequest().username : 'KtIC61639034703',
 
+                username: GetRequest().username ? GetRequest().username : '3yWfB1632299939',
 
                 topic: null,
 
                 defaultImg: 'this.src="' + "../static/offImg/tou.png" + '"',
 
                 marqueeList: [],
 
@@ -380,6 +380,11 @@
 
                     //     forbidClick: true,
 
                     //     loadingType: 'spinner',
 
                     this.stopManyClick(() => {
 
+                        systemBuriedPoint({
 
+                            pointName: 'dt_裂变_h5_复制激活码'
 
+                        }).then(res => {
 
+                          
+                        })
 
                         getActivationCode(this.username, this.tagId, this.uuid).then(res => {
 
                             this.$toast.clear();
 
                             if (res.status === 0) {
 
@@ -393,15 +398,15 @@
 
                                 });
 
                                 setTimeout(() => {
 
                                     this.$dialog.close();
 
-                                    this.download();
 
+                                    //this.download();
 
                                 }, 2000)
 
                             }
 
 
                         }).catch((error) => {
 
-                           
+
 
                             console.log(error)
 
                             this.$toast('复制失败');
 
-                            this.download()
 
+                            //this.download()
 
 
                         });
 
                     })
 
@@ -411,7 +416,13 @@
 
                 download() {
 
                     if (isAndroid) {
 
                         console.log(isAndroid);
 
-                        document.location.href = 'http://www.androidscloud.com/suanchou?timestamp=' + Math.random();
 
+                        console.log(baseUrl)
 
+                        if(baseUrl=='https://per.cs.se.androidscloud.com'){
 
+							window.location.href='http://per.cs.se.androidscloud.com:8888/suanchou'
 
+						}else{
 
+							window.location.href ='http://www.androidscloud.com/suanchou?timestamp=' + Math.random();
 
+						}
 
+
 
                     } else if (isIOS) {
 
                         document.location.href = 'https://www.pgyer.com/gemini6?timestamp=' + Math.random();
 
                     }

+ 3 - 2
microserviceUserH5/vcloud/doubleChristmasActivity.html
Dosyayı Görüntüle 

@@ -125,6 +125,7 @@
 
 						<div>时间</div>
 
 						<div>时长</div>
 
 					</div>
 
+					<div class="time-row-data"></div>
 
 					<div class="no-time-data">暂无分配时长</div>
 
 				</div>
 
 			</div>
 
@@ -460,7 +461,7 @@
 
 										<div class="time-content-day">${increaseDuration}天</div>
 
 									</div>`
 
 							}
 
-							$('.time-list').eq(0).append(str);
 
+							$('.time-row-data').eq(0).append(str);
 
 							if (len !== 0) {
 
 								$('.no-time-data').eq(0).css('display', 'none');
 
 							}
 
@@ -691,7 +692,7 @@
 
 						getList();
 
 						getLists();
 
 						distributionPageNum = 0;
 
-						$('.time-list').eq(0).text('');
 
+						$('.time-row-data').eq(0).text('');
 
 						distributionRecord();
 
 						distributionList.map((val) => {
 
 							totalRecords.map((item, indexs) => {

+ 53 - 11
microserviceUserH5/vcloud/share.html
Dosyayı Görüntüle 

@@ -4,14 +4,14 @@
 
 <head>
 
 	<meta charset="UTF-8">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
 
-	<meta name="description" content="分享朋友">
 
-	<title></title>
 
+	<meta name="description" content="分享文章">
 
 	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
 
 	<link rel="stylesheet" href="../static/css/index.css?v=1.0.0.1">
 
 	<link rel="stylesheet" href="../static/css/vant.css" />
 
 	<script src="../static/js/vender/vue/vue.min.js"></script>
 
 	<script src="../static/js/vender/vue/vant.min.js"></script>
 
 	<script src="../static/js/vender/config.js"></script>
 
+	<title>分享文章</title>
 
 	<style>
 
 		.container {
 
 			display: flex;
 
@@ -131,13 +131,43 @@
 
 			/* margin-bottom: 0.12rem;
 
 			margin-top: 0.12rem; */
 
 		}
 
+
 
+		.hide {
 
+			display: none !important;
 
+		}
 
+
 
+		.prompt {
 
+			position: fixed;
 
+			top: 0;
 
+			left: 0;
 
+			bottom: 0;
 
+			right: 0;
 
+			width: 100%;
 
+			height: 100%;
 
+			background: rgba(0, 0, 0, 0.5);
 
+			/* display: none; */
 
+		}
 
+
 
+		.prompt img {
 
+			width: 200px;
 
+			position: absolute;
 
+			right: 15px;
 
+			top: 6px;
 
+
 
+		}
 
 	</style>
 
 </head>
 
 
 <body>
 
 	<div id="app" v-cloak class="container">
 
-
 
+		<div v-if='isshow' class="hideContainer">
 
+			<div>
 
+				<img src="../static/offImg/404.png" alt="" />
 
+				<p>该资讯已被删除</p>
 
+			</div>
 
+		</div>
 
 		<div class="top-content" v-if='!isshow&&topic.content'>
 
+			<p class="hide">分享文章</p>
 
 			<p class="title">{{topic.title}}</p>
 
 			<p class="createTime"> 发布日期:{{topic.createTime}}</p>
 
 			<p class="line"></p>
 
@@ -147,11 +177,8 @@
 
 		<div class="footer">
 
 			<img src="../static/offImg/downLoad.png" alt="" @click="download" />
 
 		</div>
 
-		<div v-if='isshow' class="hideContainer">
 
-			<div>
 
-				<img src="../static//offImg/404.png" alt="" />
 
-				<p>该资讯已被删除</p>
 
-			</div>
 
+		<div class="prompt" v-show='showD'>
 
+			        <img src="../static/offImg/zhiyin_pic.png" alt="">
 
 		</div>
 
 	</div>
 
 	<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
 
@@ -165,7 +192,8 @@
 
 			data: {
 
 				isshow: false,
 
 				id: GetRequest().id ? GetRequest().id : 404,
 
-				topic: {}
 
+				topic: {},
 
+				showD: false,
 
 
 			},
 
 			created() {
 
@@ -184,14 +212,28 @@
 
 					var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //g
 
 					var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
 
 					if (isAndroid) {
 
-						window.location.href =
 
-							'http://www.androidscloud.com/admin/attachment/download/2117e9b7f3734b16b81b9d7bb1c5a601';
 
+						this.getBrowser()
 
+
 
 					} else if (isIOS) {
 
 						window.location.href = 'https://www.pgyer.com/gemini6';
 
 					} else {
 
 
 					}
 
 				},
 
+				getBrowser() {
 
+					var ua = navigator.userAgent.toLowerCase();
 
+					if (ua.match(/MicroMessenger/i) == "micromessenger" || ua.match(/QQ\/[0-9]/i)) {
 
+						this.showD = true;
 
+						return;
 
+					} else {
 
+						
+					
+							window.location.href ='http://www.androidscloud.com/admin/attachment/download/2117e9b7f3734b16b81b9d7bb1c5a601';
 
+					
+
 
+					}
 
+
 
+				},
 
 				getList() {
 
 					this.$toast.loading({
 
 						duration: 0,

+ 15 - 13
screenAndroid/WXdraw.js
Dosyayı Görüntüle 

@@ -33,7 +33,9 @@ form.domainName = parameters["domainName"];
 
 var isWSS = true;
 
 var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip : "ws://" + form.domainName + "?cardIp=" + form.ip;
 
 // var cUrl = "ws://192.168.199.46:9101?token=test0123456789";
 
-
 
+var deviceBoard = parameters['deviceBoard'];
 
+var videoWidth = deviceBoard.substring(0, 3) === 'MTK' ? 1080 : 720
 
+var videoHeight = deviceBoard.substring(0, 3) === 'MTK' ? 1920 : 1280
 
 var wsss,errorTime = 0;
 
 doConnect();
 
 function throttle(fn, delay) {
 
@@ -148,8 +150,8 @@ var draw_graph = function (graphType, obj) {
 
 		if (resolving == 0) {
 
 			var ping;
 
 			for (var i = 0; i < touchfor.length; i++) {
 
-				var cawidthXs = touchfor[i].pageY * (1280 / voheight)
 
-				var caheightYs = 720 - touchfor[i].pageX * (720 / vowidth)
 
+				var cawidthXs = touchfor[i].pageY * (videoHeight / voheight)
 
+				var caheightYs = videoWidth - touchfor[i].pageX * (videoWidth / vowidth)
 
 				ping = {
 
 					"data": {
 
 						"action": 0,
 
@@ -165,8 +167,8 @@ var draw_graph = function (graphType, obj) {
 
 		} else {
 
 			var ping;
 
 			for (var i = 0; i < touchfor.length; i++) {
 
-				var cawidthXs = touchfor[i].pageX * (720 / vowidth)
 
-				var caheightYs = touchfor[i].pageY * (1280 / voheight)
 
+				var cawidthXs = touchfor[i].pageX * (videoWidth / vowidth)
 
+				var caheightYs = touchfor[i].pageY * (videoHeight / voheight)
 
 				ping = {
 
 					"data": {
 
 						"action": 0,
 
@@ -191,8 +193,8 @@ var draw_graph = function (graphType, obj) {
 
 		if (resolving == 0) {
 
 			var ping;
 
 			for (var i = 0; i < touchfor.length; i++) {
 
-				var cawidthXs = touchfor[i].pageY * (1280 / voheight);
 
-				var caheightYs = 720 - touchfor[i].pageX * (720 / vowidth);
 
+				var cawidthXs = touchfor[i].pageY * (videoHeight / voheight);
 
+				var caheightYs = videoWidth - touchfor[i].pageX * (videoWidth / vowidth);
 
 				ping = {
 
 					"data": {
 
 						"action": 1,
 
@@ -208,8 +210,8 @@ var draw_graph = function (graphType, obj) {
 
 		} else {
 
 			var ping;
 
 			for (var i = 0; i < touchfor.length; i++) {
 
-				var cawidthXs = touchfor[i].pageX * (720 / vowidth);
 
-				var caheightYs = touchfor[i].pageY * (1280 / voheight);
 
+				var cawidthXs = touchfor[i].pageX * (videoWidth / vowidth);
 
+				var caheightYs = touchfor[i].pageY * (videoHeight / voheight);
 
 				ping = {
 
 					"data": {
 
 						"action": 1,
 
@@ -239,8 +241,8 @@ var draw_graph = function (graphType, obj) {
 
 		//是否横屏  morePortionMove
 
 		if (resolving == 0) {
 
 			for (var i = 0; i < touchfor.length; i++) {
 
-				var cawidthXs = touchfor[i].pageY * (1280 / voheight)
 
-				var caheightYs = 720 - touchfor[i].pageX * (720 / vowidth)
 
+				var cawidthXs = touchfor[i].pageY * (videoHeight / voheight)
 
+				var caheightYs = videoWidth - touchfor[i].pageX * (videoWidth / vowidth)
 
 				ping = {
 
 					"data": {
 
 						"action": 2,
 
@@ -257,8 +259,8 @@ var draw_graph = function (graphType, obj) {
 
 		} else {
 
 			var ping;
 
 			for (var i = 0; i < touchfor.length; i++) {
 
-				var cawidthXs = touchfor[i].pageX * (720 / vowidth);
 
-				var caheightYs = touchfor[i].pageY * (1280 / voheight);
 
+				var cawidthXs = touchfor[i].pageX * (videoWidth / vowidth);
 
+				var caheightYs = touchfor[i].pageY * (videoHeight / voheight);
 
 				ping = {
 
 					"data": {
 
 						"action": 2,

+ 0 - 1
screenAndroid/WXtrialInterface.html
Dosyayı Görüntüle 

@@ -395,7 +395,6 @@
 
 		})
 
 
 		form.clientType = parameters['clientType'];
 
-		form.diskName = parameters['diskName'];
 
 		form.id = parameters['id'];
 
 		form.userCardId = parameters['userCardId'];

+ 15 - 13
screenIos/WXdraw.js
Dosyayı Görüntüle 

@@ -30,7 +30,9 @@ form.ip = parameters['ip'];
 
 form.domainName = parameters["domainName"];
 
 var isWSS = true;
 
 var cUrl = isWSS ? "wss://" + form.domainName + "?cardIp=" + form.ip : "ws://" + form.domainName + "?cardIp=" + form.ip;
 
-
 
+var deviceBoard = parameters['deviceBoard'];
 
+var videoWidth = deviceBoard.substring(0, 3) === 'MTK' ? 1080 : 720
 
+var videoHeight = deviceBoard.substring(0, 3) === 'MTK' ? 1920 : 1280
 
 var wsss;
 
 var errorTime = 0;
 
 doConnect();
 
@@ -143,8 +145,8 @@ var draw_graph = function (graphType) {
 
 		if (resolving == 0) {
 
 			var ping
 
 			for (var i = 0; i < touchfor.length; i++) {
 
-				var cawidthXs = touchfor[i].pageY * (1280 / voheight)
 
-				var caheightYs = 720 - touchfor[i].pageX * (720 / vowidth)
 
+				var cawidthXs = touchfor[i].pageY * (videoHeight / voheight)
 
+				var caheightYs = videoWidth - touchfor[i].pageX * (videoWidth / vowidth)
 
 				ping = {
 
 					"data": {
 
 						"action": 0,
 
@@ -160,8 +162,8 @@ var draw_graph = function (graphType) {
 
 		} else {
 
 			var ping
 
 			for (var i = 0; i < touchfor.length; i++) {
 
-				var cawidthXs = touchfor[i].pageX * (720 / vowidth)
 
-				var caheightYs = touchfor[i].pageY * (1280 / voheight)
 
+				var cawidthXs = touchfor[i].pageX * (videoWidth / vowidth)
 
+				var caheightYs = touchfor[i].pageY * (videoHeight / voheight)
 
 				ping = {
 
 					"data": {
 
 						"action": 0,
 
@@ -188,8 +190,8 @@ var draw_graph = function (graphType) {
 
 		if (resolving == 0) {
 
 			var ping
 
 			for (var i = 0; i < touchfor.length; i++) {
 
-				var cawidthXs = touchfor[i].pageY * (1280 / voheight)
 
-				var caheightYs = 720 - touchfor[i].pageX * (720 / vowidth)
 
+				var cawidthXs = touchfor[i].pageY * (videoHeight / voheight)
 
+				var caheightYs = videoWidth - touchfor[i].pageX * (videoWidth / vowidth)
 
 				ping = {
 
 					"data": {
 
 						"action": 1,
 
@@ -205,8 +207,8 @@ var draw_graph = function (graphType) {
 
 		} else {
 
 			var ping
 
 			for (var i = 0; i < touchfor.length; i++) {
 
-				var cawidthXs = touchfor[i].pageX * (720 / vowidth)
 
-				var caheightYs = touchfor[i].pageY * (1280 / voheight)
 
+				var cawidthXs = touchfor[i].pageX * (videoWidth / vowidth)
 
+				var caheightYs = touchfor[i].pageY * (videoHeight / voheight)
 
 				ping = {
 
 					"data": {
 
 						"action": 1,
 
@@ -236,8 +238,8 @@ var draw_graph = function (graphType) {
 
 		//是否横屏  morePortionMove
 
 		if (resolving == 0) {
 
 			for (var i = 0; i < touchfor.length; i++) {
 
-				var cawidthXs = touchfor[i].pageY * (1280 / voheight)
 
-				var caheightYs = 720 - touchfor[i].pageX * (720 / vowidth)
 
+				var cawidthXs = touchfor[i].pageY * (videoHeight / voheight)
 
+				var caheightYs = videoWidth - touchfor[i].pageX * (videoWidth / vowidth)
 
 				ping = {
 
 					"data": {
 
 						"action": 2,
 
@@ -253,8 +255,8 @@ var draw_graph = function (graphType) {
 
 		} else {
 
 			var ping
 
 			for (var i = 0; i < touchfor.length; i++) {
 
-				var cawidthXs = touchfor[i].pageX * (720 / vowidth)
 
-				var caheightYs = touchfor[i].pageY * (1280 / voheight)
 
+				var cawidthXs = touchfor[i].pageX * (videoWidth / vowidth)
 
+				var caheightYs = touchfor[i].pageY * (videoHeight / voheight)
 
 				ping = {
 
 					"data": {
 
 						"action": 2,

+ 6 - 3
screenIos/WXtrialInterface.html
Dosyayı Görüntüle 

@@ -647,7 +647,10 @@
 
 		Module.onRuntimeInitialized = function () {
 
 			isFinish = true;
 
 		}
 
-
 
+		
+		var deviceBoard = parameters['deviceBoard'];
 
+		var videoWidth = deviceBoard.substring(0, 3) === 'MTK' ? 1080 : 720
 
+		var videoHeight = deviceBoard.substring(0, 3) === 'MTK' ? 1920 : 1280
 
 		function decodeAAC(data) {
 
 			var retPtr = Module._malloc(4 * 5 * 1024); //接收的数据
 
 			var inputPtr = Module._malloc(4 * data.length); //输入数据
 
@@ -670,7 +673,7 @@
 
 			Module._free(inputPtr);
 
 			Module._free(retPtr);
 
 		}
 
-		var decodeWoker = new Worker('decoder.js');
 
+		var decodeWoker = new Worker('decoder.js?deviceBoard=' + deviceBoard);
 
 		var myVideo = document.getElementById("playCanvas");
 
 		decodeWoker.onmessage = function (event) {
 
 			var objData = event.data;
 
@@ -682,7 +685,7 @@
 
 					if (renderCount++ < 4 || !isAudioPlay) {
 
 						return
 
 					}
 
-					webglPlayer.renderFrame(objData.data, 720, 1280, 720 * 1280, (720 / 2) * (1280 / 2));
 
+					webglPlayer.renderFrame(objData.data, videoWidth, videoHeight, videoWidth * videoHeight, (videoWidth / 2) * (videoHeight / 2));
 
 					$('.weui-mask_transparent').hide()
 
 					$('.weui-toast').hide()
 
 					$('.loading').hide()

+ 23 - 3
screenIos/decoder.js
Dosyayı Görüntüle 

@@ -2,10 +2,15 @@ var isFinish = false;
 
 var decodeCount = 0;
 
 var h264Queue = [];
 
 var isFirst = true;
 
+var parameters = GetRequest();
 
+var deviceBoard = parameters['deviceBoard'];
 
+var videoWidth = deviceBoard.substring(0, 3) === 'MTK' ? 1080 : 720
 
+var videoHeight = deviceBoard.substring(0, 3) === 'MTK' ? 1920 : 1280
 
+
 
 var ret = ''
 
 self.Module = {
 
 	onRuntimeInitialized: function () {
 
-		ret = Module._openDecoder(720, 1280);
 
+		ret = Module._openDecoder(videoWidth, videoHeight);
 
 		if (!ret) {
 
 			isFinish = true;
 
 		}
 
@@ -47,7 +52,8 @@ setInterval(
 
 
 
 function decodeH264(data) {
 
-	var retPtr = Module._malloc(2457600); //接收的数据
 
+	var size = videoWidth * videoHeight *3;
 
+	var retPtr = Module._malloc(size); //接收的数据
 
 	var inputPtr = Module._malloc(data.length); //输入数据
 
 
 	for (var i = 0; i < data.length; i++) {
 
@@ -66,7 +72,7 @@ function decodeH264(data) {
 
 		decodeCount++;
 
 	}
 
 
-	var yuvData = new Uint8Array(2457600);
 
+	var yuvData = new Uint8Array(size);
 
 	for (var i = 0; i < yuvData.length; i++) {
 
 		yuvData[i] = Module.HEAPU8[(retPtr) + i];
 
 	}
 
@@ -86,3 +92,17 @@ function decodeH264(data) {
 
 function closeDecoder() {
 
 	Module._destroyDecoder();
 
 }
 
+
 
+// 获取url中"?"符后的字串
 
+function GetRequest() {
 
+	var url = location.search;
 
+	var obj = new Object();
 
+	if (url.indexOf("?") != -1) {
 
+		var str = url.substr(1);
 
+		strs = str.split("&");
 
+		for (var i = 0; i < strs.length; i++) {
 
+			obj[strs[i].split("=")[0]] = (strs[i].split("=")[1]);
 
+		}
 
+	}
 
+	return obj;
 
+}