From e39a250fbe43c9e100dc9817318583767ca0e0b5 Mon Sep 17 00:00:00 2001
From: LukeMackin <luke@yuzu-gca.dev>
Date: Tue, 21 Jul 2026 19:16:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20version.txt=E6=A0=BC=E5=BC=8F=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAversion|url=20=E2=80=94=20=E6=B6=88=E9=99=A4=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E7=A1=AC=E7=BC=96=E7=A0=81dlUrl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- version.txt: 0.1.0-dav-android-6|完整下载URL
- index.html: 动态解析|分隔符获取下载路径
- index-v6.html: 同逻辑,不硬编码
- 以后升级只需改version.txt指向新文件
---
 ota/h5/index-v6.html                          | 19 ++++++++-----------
 ota/version.txt                               |  2 +-
 .../android/app/src/main/assets/index.html    | 17 +++++++++--------
 3 files changed, 18 insertions(+), 20 deletions(-)

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}
 <button class="btn btn-download" onclick="applyUpdate()" id="btnApply" disabled>下载更新</button>
 <div class="log" id="log"></div>
 <script>
-var dlUrl='',dlVer='',channel='stable';
+var dlUrl='',dlVer='';
 var BASE='https://git.childish-ghost.com/LukeMackin/Yuzu-GCA/raw/branch/main/ota';
 
 function selectCh(ch){
- channel=ch;
- var chips=document.querySelectorAll('.chip');
- for(var i=0;i<chips.length;i++)chips[i].className='chip chip-off';
+ document.querySelectorAll('.chip').forEach(function(c){c.className='chip chip-off'});
  document.getElementById('ch-'+ch).className='chip chip-on';
  log('channel: '+ch)
 }
 function log(m){document.getElementById('log').innerText+=m+'\n'}
 function checkUpdate(){
- var url=BASE+'/version.txt?t='+Date.now();
- fetch(url,{cache:'no-store'})
+ 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]||'';
   var local='0.1.0-dav-android-6';
-  if(t!==local&&t!=='0.1.0-dav-android-6'){dlVer=t;dlUrl=BASE+'/h5/index-v6.html';
+  if(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...');
  fetch(dlUrl+'?t='+Date.now(),{cache:'no-store'})
  .then(r=>{if(!r.ok)throw Error('HTTP '+r.status);return r.text()})
  .then(function(t){Android.saveCache(t);log('OK! restart app to apply')})
- .catch(e=>log('ERR: '+e.message))
+ .catch(function(e){log('ERR: '+e.message)})
 }
 </script></body></html>
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)})
 }
 </script></body></html>