From 439c9066e22b9c9fe8d633167b5cb9f0e267d1e6 Mon Sep 17 00:00:00 2001
From: LukeMackin <luke@yuzu-gca.dev>
Date: Wed, 22 Jul 2026 00:22:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20OTA=E5=9B=9B=E5=B1=82=E6=9E=B6=E6=9E=84?=
 =?UTF-8?q?=20=E2=80=94=20manifest.json=E7=BB=9F=E4=B8=80+=E6=B8=A0?=
 =?UTF-8?q?=E9=81=93=E9=BB=98=E8=AE=A4stable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- manifest.json: stable/beta/nightly三渠道H5+APK统一
- version.txt: 指向manifest.json URL
- v5嵌入页: channel默认stable, localStorage.channel可切换
- Bridge.fetchManifest: 自动读manifest.json解析对应渠道
- index-stable/beta/nightly: 业务页(开发期beta/nightly→stable)
- 删除旧版index-v6/v7
- 构建成功
---
 ota/version.txt                               |   2 +-
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .../android/app/src/main/assets/index.html    | Bin 3990 -> 4756 bytes
 .../main/java/dev/yuzu/gca/MainActivity.kt    |  20 +++++++++---------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ota/version.txt b/ota/version.txt
index 253e5a9..afc5405 100644
--- a/ota/version.txt
+++ b/ota/version.txt
@@ -1 +1 @@
-0.1.0-dav-android-6|https://git.childish-ghost.com/LukeMackin/Yuzu-GCA/raw/branch/main/ota/h5/index-v6.html|0cf100fc879264e61e20ef595986fafb46d48c6be035215b6df07b2f33c78625
\ No newline at end of file
+https://git.childish-ghost.com/LukeMackin/Yuzu-GCA/raw/branch/main/ota/manifest.json
diff --git a/packages/client-android/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/packages/client-android/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index f32ed8a30da29f171d44feb719b9cbe9c7b345fa..98c9c0ff503479e74ea2e8dcd7c838dbff7ba57a 100644
GIT binary patch
literal 17
UcmZQ>(-v{$|HmrA00yi~0303yHvj+t

literal 17
UcmZQ>(-v{$|HmrA00t}v0UX-`^#A|>

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 c55b26bdff5241c38afcccb5490c7bf0bfce4e9d..0c465acf99d8e143ffb8f364f868a4cae77371eb 100644
GIT binary patch
delta 1308
zcmbVMO-~b16g`*_+Cg2pAx&)?g_))}Eh-SeYFxNL;zvT%MN^w83@xP4W;!$)H2ndt
z%riz;=r2&i?=b!%jpx4CVcJ4mm`OYDy?gGx=iGbWe9U~9{r+jH-Ghe!S!|)n)d3$L
zEtL6d^UULW6Cu|D*A3cS{U2hTr#|-Kz~+e{Yhy8N<ne}&jV`es>Wt;9_fzlGmy1`F
zn{Xe*`BurmMqw;M9&4~@i8$^v$^mw<!^{%%8CkW|w?uU%M<(ak$kyZzi0<MAeM9OL
z&P}dDbW}B&p50|s$<d;HTj%o`xyxOf7MHkJ2-UHbo7rP!9<m}&@R;Wv`UuX4qkbe(
z<ws*2oHKeNMWVsM9%D$RK<cZ!Wct$R$yY1WZ(@--<y=;4x-Si_pv7#`15p^&PcSYq
zv86z*Syo3hj-t$2jmn4BMhpivuhU#+IurPO7t>^Ew@WEL%OV7}xN=ZL1us#;4XmKb
zT?6wZB-nY9dM&ZlujyOrk9D>Ge{sx+n1aR)S*P5P`6Y*mThdwY3^gsn^bFzxN-_-_
z_wf`PteH%Go9{N|$W%BC>GLrYBGdY>qDbBIoSB*BZTjm;rC8%}$TGFqOR;S7%saJo
z_3kFSxTGppYQb1VKv9?R2urw)x46!|%%$nR6Gu|DWGXXym$T$8I_fy&6i|z>N}Gb6
zotGTBl%tkho5S3I^YBb*4E6Q+D@0g3k0X6svzpCwatls%4SApZoVF+WF6q0vBcoTm
zLzlQ<a(!i*<l4%mEow5wfnW4lkeQQDR)-P!iJ{yE@lD*t0`3tjBE_dbM1^NntXgpr
Tb(~n9)FIUG#OITp%cY6G83gk5

delta 653
zcma)3!Ab&A6g{qTiV1a7Ey5Y1o)W1IWKam&BHBxBqD44k4vl7$Ns!>aO^YW{e-Zc@
z{Xv_)p+D%nXM>su@fP>pch5QZ-tz{VFX{K!1v!YPq!kYt%ch4KuHmDFD_F8(tfVb;
znP0-f5klTvRy^eN5y;Bt#J(&WMfsU{>Ib-CH3LDUhbFTQ;{mw>+q`FSh(%^y>V=GL
z9Xq%~iPaoq8v%QCv__9C#fZ?8nrGAv$r>x1qfo~M;VvakSq%P^cUkT62%ZtDiUtRm
z7ICIfYFHn2j$@B?Wj?vK)Z%g$?o}W8ZP<ody+$==X0<<BbHtn-+h)%a=lf+~i)S86
zaD8RoG&*{n!*V9zSv+dbExkbG+YE8|wJc))`Rolr*Y=R7FD*)Xc)$*4Eb{vr{J17t
m3;B_FlgDOC7Lu#$Rh*y#hnylEQ;l!wo3C%K@@^O;GqE4@QGFW#

diff --git a/packages/client-android/android/app/src/main/java/dev/yuzu/gca/MainActivity.kt b/packages/client-android/android/app/src/main/java/dev/yuzu/gca/MainActivity.kt
index eb2b2c3..b26d065 100644
--- a/packages/client-android/android/app/src/main/java/dev/yuzu/gca/MainActivity.kt
+++ b/packages/client-android/android/app/src/main/java/dev/yuzu/gca/MainActivity.kt
@@ -62,21 +62,21 @@ class MainActivity : AppCompatActivity() {
             return digest.joinToString("") { "%02x".format(it) }
         }
 
-        /** Fetch manifest JSON from Gitea — proxy to avoid CORS in WebView */
+        /** Fetch manifest JSON from Gitea and return channel's section */
         @android.webkit.JavascriptInterface
         fun fetchManifest(channel: String): String {
-            val url = "https://git.childish-ghost.com/LukeMackin/Yuzu-GCA/raw/branch/main/ota/h5-manifest-$channel.json"
-            Log.i(TAG, "Bridge fetching $url")
+            val manifestUrl = "https://git.childish-ghost.com/LukeMackin/Yuzu-GCA/raw/branch/main/ota/manifest.json"
+            Log.i(TAG, "Bridge fetching $manifestUrl → $channel")
             return try {
-                val conn = URL(url).openConnection() as HttpURLConnection
-                conn.connectTimeout = 10_000
-                conn.readTimeout = 10_000
+                val conn = URL(manifestUrl).openConnection() as HttpURLConnection
+                conn.connectTimeout = 10_000; conn.readTimeout = 10_000
                 conn.instanceFollowRedirects = true
-                val code = conn.responseCode
-                if (code != 200) throw Exception("HTTP $code")
-                conn.inputStream.bufferedReader().readText()
+                if (conn.responseCode != 200) throw Exception("HTTP ${conn.responseCode}")
+                val raw = conn.inputStream.bufferedReader().readText()
+                val json = org.json.JSONObject(raw)
+                json.getJSONObject(channel).toString()
             } catch (e: Exception) {
-                Log.e(TAG, "Bridge fetch failed: ${e.message}")
+                Log.e(TAG, "Bridge fetchManifest($channel) failed: ${e.message}")
                 """{"error":"${e.message}"}"""
             }
         }