Explorar el Código

Merge branch 'bug-5.2' of Software/android-cloud-H5 into test

hutao hace 3 años
padre
commit
634a554452
Se han modificado 1 ficheros con 3 adiciones y 8 borrados
  1. 3 8
      microserviceUserH5/vcloud/yunActivity.html

+ 3 - 8
microserviceUserH5/vcloud/yunActivity.html

@@ -91,7 +91,7 @@
 		toastr.options.timeOut = '3000';
 	</script>
 	<script type="text/javascript">
-		var baseUrl = 'http://14.18.190.141:1280'
+		// var baseUrl = 'http://14.18.190.141:1280'
 		let timer, flag = true;
 		let time = 60, codeTimer = null, isStart = false, myCode = '';
 		var url = window.location.href;
@@ -283,13 +283,8 @@
 		},false);
 		function download() {
             if (isAndroid) {
-                // if (baseUrl == 'https://prese.phone.androidscloud.com') {
-                //     window.location.href = 'http://prese.phone.androidscloud.com:8888'
-                // } else {
-                //     window.location.href = 'http://www.androidscloud.com?timestamp=' + Math.random();
-                // }
-				// document.location.href = 'https://www.androidscloud.com?timestamp=' + Math.random();
-				document.location.href = 'https://file.phone.androidscloud.com:8121/document/newFile/download/1/edv834e74a9c43eaac02/LowLevelMultipartUpload_16680379050659020888/shuangzixing.apk';
+				window.location.href = window.location.protocol === 'https:' ? 'https://file.phone.androidscloud.com:8121/document/newFile/download/0/edv834e74a9c43eaac02?fileKey=LowLevelMultipartUpload_18708543811604070422' :
+				'http://110.53.221.195:8210/document/newFile/download/0/edv834e74a9c43eaac02?fileKey=LowLevelMultipartUpload_18708543811604070422';
             } else if (isIOS) {
                 document.location.href = 'https://www.pgyer.com/gemini6?timestamp=' + Math.random();
             }