From 12d6db5780d8a2121a3bef2d58bf897b24ff552a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 15:54:29 +0800
Subject: [PATCH] Merge branch 'dev'
---
app/src/main/assets/data/dcloud_error.html | 125 +++++++++++++++--------------------------
1 files changed, 47 insertions(+), 78 deletions(-)
diff --git a/app/src/main/assets/data/dcloud_error.html b/app/src/main/assets/data/dcloud_error.html
index 2eacd0f..0f29c7c 100644
--- a/app/src/main/assets/data/dcloud_error.html
+++ b/app/src/main/assets/data/dcloud_error.html
@@ -1,92 +1,61 @@
<!DOCTYPE html>
<html>
<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
+ <meta charset="utf-8"/>
+ <meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<meta name="HandheldFriendly" content="true"/>
<meta name="MobileOptimized" content="320"/>
<title>Error</title>
<script type="text/javascript">
-// H5 plus浜嬩欢澶勭悊
-var ws=null;
-function plusReady(){
- // Android澶勭悊杩斿洖閿�
- plus.key.addEventListener('backbutton',function(){
- (history.length==1)&&ws.close();
- var c=setTimeout(function(){
- ws.close();
- },1000);
- window.onbeforeunload=function(){
- clearTimeout(c);
- }
- history.go(-2);
- },false);
- ws=plus.webview.currentWebview();
-}
-if(window.plus){
- plusReady();
-}else{
- document.addEventListener('plusready',plusReady,false);
-}
-document.addEventListener('touchstart',function(){
- return false;
-},true);
-// 绂佹閫夋嫨
-document.oncontextmenu=function(){
- return false;
-};
-// 鑾峰彇閿欒淇℃伅
-document.addEventListener("error",function(e){
- info.innerText="璇锋眰鐨勯〉闈紙"+e.url+"锛夋棤娉曟墦寮�";
- console.log("璇锋眰鐨勯〉闈㈡棤娉曟墦寮�锛�"+e.href);
-},false);
+ // H5 plus浜嬩欢澶勭悊
+<script type="text/javascript">
+ // H5 plus浜嬩欢澶勭悊
+ window.onload = function(){
+ console.log("杩涘叆onload鏂规硶")
+ //鐣岄潰寮傚父鍚庯紝绛�1绉掑悗灏濊瘯閲嶆柊鍔犺浇
+ setTimeout(function(){
+ console.log("鎵цsettimeout鏂规硶")
+ plus.runtime.restart()
+ },1000);
+ };
+ </script>
</script>
<style>
-*{
- -webkit-user-select: none;
-}
-html,body{
- margin: 0px;
- padding: 0px;
- width: 100%;
- height: 100%;
- text-align: center;
- word-break: break-all;
- -webkit-touch-callout:none;
- -webkit-tap-highlight-color:rgba(0,0,0,0);
-}
-.button{
- width: 50%;
- font-size: 18px;
- font-weight: normal;
- text-decoration: none;
- text-align: center;
- padding: .5em 0em;
- margin: .5em auto;
- color: #333333;
- background-color: #EEEEEE;
- border: 1px solid #CCCCCC;
- -webkit-border-radius: 5px;
- border-radius: 5px;
-}
-.button:active{
- background-color: #CCCCCC;
-}
+ *{
+ -webkit-user-select: none;
+ }
+ html,body{
+ margin: 0px;
+ padding: 0px;
+ width: 100%;
+ height: 100%;
+ text-align: center;
+ word-break: break-all;
+ -webkit-touch-callout:none;
+ -webkit-tap-highlight-color:rgba(0,0,0,0);
+ }
+ .button{
+ width: 50%;
+ font-size: 18px;
+ font-weight: normal;
+ text-decoration: none;
+ text-align: center;
+ padding: .5em 0em;
+ margin: .5em auto;
+ color: #333333;
+ background-color: #EEEEEE;
+ border: 1px solid #CCCCCC;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+ }
+ .button:active{
+ background-color: #CCCCCC;
+ }
+
</style>
</head>
<body>
- <div style="width:100%;height:20%;"></div>
- <svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 512 512" style="height:20%;width:30%">
- <g id="icomoon-ignore">
- <line stroke-width="1" x1="" y1="" x2="" y2="" stroke="#449FDB" opacity=""></line>
- </g>
- <path d="M256 0c-141.385 0-256 114.615-256 256s114.615 256 256 256 256-114.615 256-256-114.615-256-256-256zM352 128c17.673 0 32 14.327 32 32s-14.327 32-32 32-32-14.327-32-32 14.327-32 32-32zM160 128c17.673 0 32 14.327 32 32s-14.327 32-32 32-32-14.327-32-32 14.327-32 32-32zM352.049 390.37c-19.587-32.574-55.272-54.37-96.049-54.37s-76.462 21.796-96.049 54.37l-41.164-24.698c27.98-46.535 78.958-77.672 137.213-77.672s109.232 31.137 137.213 77.672l-41.164 24.698z" fill="#666666"></path>
- </svg>
- <p style="font-size:18px;font-weight:bolder;">We're sorry ...</p>
- <p id="info" style="font-size:12px;"></p>
- <!--<div class="button" onclick="history.back()">Retry</div>-->
- <div class="button" onclick="if(history.length == 1){ws.close();}else{ws.back();ws.back();}">Back</div>
- <div class="button" onclick="ws.close()">Close</div>
- <div class="button" onclick="plus.runtime.restart()">Restart</div>
+<div style="height:200px"></div>
+<p style="font-size:18px;font-weight:bolder;">Loading..........</p>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.8.0