diff --git a/ota/h5/index-v6.html b/ota/h5/index-v6.html index 45a38d0..fbe2e25 100644 --- a/ota/h5/index-v6.html +++ b/ota/h5/index-v6.html @@ -34,33 +34,30 @@ h1{font-size:20px;color:#fff;margin:0}
diff --git a/ota/version.txt b/ota/version.txt index a402374..4bdb7f5 100644 --- a/ota/version.txt +++ b/ota/version.txt @@ -1 +1 @@ -0.1.0-dav-android-6 \ No newline at end of file +0.1.0-dav-android-6|https://git.childish-ghost.com/LukeMackin/Yuzu-GCA/raw/branch/main/ota/h5/index-v6.html \ No newline at end of file diff --git a/packages/client-android/android/app/src/main/assets/index.html b/packages/client-android/android/app/src/main/assets/index.html index f3f26dc..552d156 100644 --- a/packages/client-android/android/app/src/main/assets/index.html +++ b/packages/client-android/android/app/src/main/assets/index.html @@ -23,19 +23,20 @@ function checkUpdate(){ log('checking...'); fetch(BASE+'/version.txt?t='+Date.now(),{cache:'no-store'}) .then(r=>{if(!r.ok)throw Error('HTTP '+r.status);return r.text()}) - .then(t=>{t=t.trim();log('remote: '+t); + .then(function(t){t=t.trim();log('remote: '+t); + var parts=t.indexOf('|')>0?t.split('|'):[t];var remoteVer=parts[0];dlUrl=parts[1]||''; + if(!dlUrl)dlUrl=BASE+'/h5/index-v'+remoteVer.replace('0.1.0-dav-android-','')+'.html'; var local=document.getElementById('ver').innerText; - if(t!==local&&t!=='v'+local&&'v'+t!==local){dlVer=t;dlUrl=BASE+'/h5/index-v6.html'; - log('*** NEW VERSION ***');document.getElementById('btnApply').disabled=false} + if(remoteVer!==local&&remoteVer!=='v'+local&&'v'+remoteVer!==local){ + dlVer=remoteVer;log('*** NEW VERSION ***');document.getElementById('btnApply').disabled=false} else log('up to date')}) - .catch(e=>log('ERR: '+e.message)) + .catch(function(e){log('ERR: '+e.message)}) } function applyUpdate(){ - log('downloading...'); + log('downloading: '+dlUrl+' ...'); fetch(dlUrl+'?t='+Date.now(),{cache:'no-store'}) .then(r=>{if(!r.ok)throw Error('HTTP '+r.status);return r.text()}) - .then(t=>{Android.saveCache(t);log('OK! restart app to apply'); - document.getElementById('btnApply').disabled=true}) - .catch(e=>log('ERR: '+e.message)) + .then(function(t){Android.saveCache(t);log('OK! restart app to apply')}) + .catch(function(e){log('ERR: '+e.message)}) }