Change the game.exit function to restart the app for WKWebview users using ios. And added the macintosh field to the judgment of lib.device

This commit is contained in:
shijian 2023-06-12 15:55:23 +08:00
parent 3ab657e354
commit d5802fea37
1 changed files with 24 additions and 23 deletions

View File

@ -7472,7 +7472,7 @@
if(ua.indexOf('android')!=-1){ if(ua.indexOf('android')!=-1){
lib.device='android'; lib.device='android';
} }
else if(ua.indexOf('iphone')!=-1||ua.indexOf('ipad')!=-1){ else if(ua.indexOf('iphone')!=-1||ua.indexOf('ipad')!=-1||ua.indexOf('macintosh')!=-1){
lib.device='ios'; lib.device='ios';
} }
lib.assetURL=noname_inited; lib.assetURL=noname_inited;
@ -33051,27 +33051,10 @@
} }
}, },
exit:function(){ exit:function(){
//安卓 / ios var ua=navigator.userAgent.toLowerCase();
if(lib.device) { var ios=ua.indexOf('iphone')!=-1||ua.indexOf('ipad')!=-1||ua.indexOf('macintosh')!=-1;
if(lib.device=='ios'){
game.saveConfig('mode');
if(_status){
if(_status.reloading)return;
_status.reloading=true;
}
if(_status.video&&!_status.replayvideo) {
localStorage.removeItem(lib.configprefix + 'playbackmode');
}
window.location.reload();
}
else{
if(navigator.app&&navigator.app.exitApp){
navigator.app.exitApp();
}
}
}
//electron //electron
else if(typeof process=='function'){ if(typeof window.process=='object'&&typeof window.require=='function'){
var versions=window.process.versions; var versions=window.process.versions;
var electronVersion=parseFloat(versions.electron); var electronVersion=parseFloat(versions.electron);
var remote; var remote;
@ -33084,8 +33067,26 @@
thisWindow.destroy(); thisWindow.destroy();
window.process.exit(); window.process.exit();
} }
//网页版 // android-cordova环境
else{ else if(lib.device==='android'){
if(navigator.app&&navigator.app.exitApp){
navigator.app.exitApp();
}
}
//ios-cordova环境或ios浏览器环境
else if(lib.device==='ios'||!lib.device&&ios){
game.saveConfig('mode');
if(_status){
if(_status.reloading)return;
_status.reloading=true;
}
if(_status.video&&!_status.replayvideo) {
localStorage.removeItem(lib.configprefix+'playbackmode');
}
window.location.reload();
}
//非ios的网页版
else if(!ios){
window.onbeforeunload = null; window.onbeforeunload = null;
window.close(); window.close();
} }