feat: expo-updates热更新构建成功(387 tasks,128MB)

- npm替换pnpm(扁平node_modules兼容Expo Gradle)
- 硬编码react块路径替代node execute调用
- Kotlin 1.9.24→2.0.21版本升级
- execute工作目录修复(rootDir→rootDir.parentFile)
- assets/图标占位符
- BUILD SUCCESSFUL 4m31s

packages/client-android/android/app/src/main/AndroidManifest.xml

@@ -2,14 +2,23 @@
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+  <uses-permission android:name="android.permission.VIBRATE"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-  <application android:name=".MainApplication" android:label="Yuzu GCA v0.1.0" android:allowBackup="false" android:supportsRtl="true" android:theme="@style/Theme.AppCompat.DayNight">
+  <queries>
+    <intent>
+      <action android:name="android.intent.action.VIEW"/>
+      <category android:name="android.intent.category.BROWSABLE"/>
+      <data android:scheme="https"/>
+    </intent>
+  </queries>
+  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false" android:theme="@style/AppTheme" android:supportsRtl="true">
     <meta-data android:name="expo.modules.updates.ENABLED" android:value="true"/>
     <meta-data android:name="expo.modules.updates.EXPO_RUNTIME_VERSION" android:value="@string/expo_runtime_version"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="3000"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATE_URL" android:value="https://git.childish-ghost.com/LukeMackin/Yuzu-GCA/raw/branch/main/ota/expo-manifest.json"/>
-    <activity android:name=".MainActivity" android:label="Yuzu GCA v0.1.0" android:launchMode="singleTask" android:exported="true" android:screenOrientation="portrait" android:windowSoftInputMode="adjustResize">
+    <activity android:name=".MainActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.App.SplashScreen" android:exported="true" android:screenOrientation="portrait">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <category android:name="android.intent.category.LAUNCHER"/>
@@ -21,8 +30,5 @@
         <data android:scheme="dev.yuzu.gca"/>
       </intent-filter>
     </activity>
-    <provider android:name="androidx.core.content.FileProvider" android:authorities="${applicationId}.fileprovider" android:exported="false" android:grantUriPermissions="true">
-      <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
-    </provider>
   </application>
 </manifest>

packages/client-android/android/app/src/main/java/dev/yuzu/gca/MainActivity.kt

@@ -1,255 +1,61 @@
 package dev.yuzu.gca
 
-import android.app.PendingIntent
-import android.content.Intent
-import android.content.pm.PackageInstaller
-import android.graphics.Color
-import android.net.Uri
+import android.os.Build
 import android.os.Bundle
-import android.provider.Settings
-import android.widget.Button
-import android.widget.LinearLayout
-import android.widget.ScrollView
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-import kotlinx.coroutines.*
-import java.io.File
-import java.io.FileOutputStream
-import java.net.HttpURLConnection
-import java.net.URL
-import java.security.MessageDigest
-import android.util.Log
-import androidx.core.content.FileProvider
-import org.json.JSONObject
 
-class MainActivity : AppCompatActivity() {
-    private lateinit var logView: TextView
-    private var selectedChannel = "stable"
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactActivityDelegate
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
+import com.facebook.react.defaults.DefaultReactActivityDelegate
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+import expo.modules.ReactActivityDelegateWrapper
 
-        val scroll = ScrollView(this)
-        val layout = LinearLayout(this).apply {
-            orientation = LinearLayout.VERTICAL
-            setPadding(24, 24, 24, 24)
-        }
+class MainActivity : ReactActivity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    // Set the theme to AppTheme BEFORE onCreate to support
+    // coloring the background, status bar, and navigation bar.
+    // This is required for expo-splash-screen.
+    setTheme(R.style.AppTheme);
+    super.onCreate(null)
+  }
 
-        val title = TextView(this).apply {
-            text = "Yuzu GCA"
-            textSize = 20f
-            setPadding(0, 0, 0, 4)
-        }
-        layout.addView(title)
+  /**
+   * Returns the name of the main component registered from JavaScript. This is used to schedule
+   * rendering of the component.
+   */
+  override fun getMainComponentName(): String = "main"
 
-        val versionInfo = TextView(this).apply {
-            text = "v0.1.0-dav-android-8-debug"
-            textSize = 12f
-            setTextColor(Color.GRAY)
-            setPadding(0, 0, 0, 12)
-        }
-        layout.addView(versionInfo)
+  /**
+   * Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate]
+   * which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
+   */
+  override fun createReactActivityDelegate(): ReactActivityDelegate {
+    return ReactActivityDelegateWrapper(
+          this,
+          BuildConfig.IS_NEW_ARCHITECTURE_ENABLED,
+          object : DefaultReactActivityDelegate(
+              this,
+              mainComponentName,
+              fabricEnabled
+          ){})
+  }
 
-        val channelLabel = TextView(this).apply {
-            text = "选择更新渠道:"
-            textSize = 13f
-            setPadding(0, 8, 0, 4)
-        }
-        layout.addView(channelLabel)
+  /**
+    * Align the back button behavior with Android S
+    * where moving root activities to background instead of finishing activities.
+    * @see <a href="https://developer.android.com/reference/android/app/Activity#onBackPressed()">onBackPressed</a>
+    */
+  override fun invokeDefaultOnBackPressed() {
+      if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
+          if (!moveTaskToBack(false)) {
+              // For non-root activities, use the default implementation to finish them.
+              super.invokeDefaultOnBackPressed()
+          }
+          return
+      }
 
-        // 渠道按钮行
-        val channelRow = LinearLayout(this).apply {
-            orientation = LinearLayout.HORIZONTAL
-            setPadding(0, 0, 0, 12)
-        }
-
-        fun makeChannelBtn(label: String, channel: String): Button {
-            return Button(this).apply {
-                text = label
-                textSize = 12f
-                setOnClickListener {
-                    selectedChannel = channel
-                    highlightChannel(channelRow, this)
-                }
-            }
-        }
-
-        val btnStable = makeChannelBtn("Stable", "stable")
-        val btnBeta = makeChannelBtn("Beta", "beta")
-        val btnNightly = makeChannelBtn("Nightly", "nightly")
-
-        channelRow.addView(btnStable)
-        channelRow.addView(btnBeta)
-        channelRow.addView(btnNightly)
-        layout.addView(channelRow)
-        highlightChannel(channelRow, btnStable)
-
-        logView = TextView(this).apply {
-            textSize = 12f
-            setTextColor(Color.LTGRAY)
-        }
-        layout.addView(logView)
-
-        val btn = Button(this).apply {
-            text = "检查更新"
-            setOnClickListener {
-                val ch = selectedChannel
-                CoroutineScope(Dispatchers.IO).launch { doOtaTest(ch) }
-            }
-        }
-        layout.addView(btn)
-
-        scroll.addView(layout)
-        setContentView(scroll)
-
-        appendLog("渠道: stable | 点击[检查更新]开始")
-    }
-
-    private fun highlightChannel(row: LinearLayout, active: Button) {
-        for (i in 0 until row.childCount) {
-            val b = row.getChildAt(i) as Button
-            b.isSelected = (b == active)
-        }
-    }
-
-    private fun appendLog(msg: String) {
-        Log.i(TAG, msg)
-        runOnUiThread { logView.append("$msg\n") }
-    }
-
-    companion object { private const val TAG = "GCA-OTA" }
-
-    private fun manifestUrl(channel: String): String {
-        val base = "https://git.childish-ghost.com/LukeMackin/Yuzu-GCA/raw/branch/main/ota"
-        return when (channel) {
-            "beta" -> "$base/manifest-beta.json"
-            "nightly" -> "$base/manifest-nightly.json"
-            else -> "$base/manifest-stable.json"
-        }
-    }
-
-    private suspend fun doOtaTest(channel: String) = withContext(Dispatchers.IO) {
-        val url = manifestUrl(channel)
-        appendLog("=== OTA 渠道: $channel ===")
-        appendLog("manifest: $url")
-
-        // 1. 拉取 manifest
-        appendLog("[1/4] 拉取 manifest...")
-        val manifestJson: String
-        try {
-            manifestJson = httpGet(url)
-            appendLog("  ✅ 获取成功 (${manifestJson.length}B)")
-        } catch (e: Exception) {
-            appendLog("  ❌ 获取失败: ${e.message}")
-            appendLog("=== 测试中止 ===")
-            return@withContext
-        }
-
-        // 2. 解析
-        appendLog("[2/4] 解析 manifest...")
-        var manifestSha256 = ""
-        var manifestApkUrl = ""
-        var manifestTag = ""
-        try {
-            val json = JSONObject(manifestJson)
-            if (!json.getJSONObject("builds").has("android")) {
-                appendLog("  ℹ️ 该渠道暂无可用更新")
-                appendLog("=== $channel 渠道测试完成 ===")
-                return@withContext
-            }
-            val android = json.getJSONObject("builds").getJSONObject("android")
-            manifestSha256 = android.getString("sha256")
-            manifestApkUrl = android.getString("url")
-            manifestTag = android.getString("tag")
-            appendLog("  渠道: $channel  版本: $manifestTag")
-            appendLog("  SHA256: ${manifestSha256.take(16)}...")
-
-            // 版本比较：一致则跳过
-            val localTag = "v0.1.0-dav-android-${packageManager.getPackageInfo(packageName, 0).versionCode}"
-            if (manifestTag == localTag) {
-                appendLog("  ✅ 已是最新版本，无需更新")
-                appendLog("=== $channel 渠道测试完成 ===")
-                return@withContext
-            }
-            appendLog("  发现新版本，开始更新...")
-        } catch (e: Exception) {
-            appendLog("  ❌ 解析失败: ${e.message}")
-            return@withContext
-        }
-
-        // 3. 下载
-        appendLog("[3/4] 下载 APK...")
-        val apkFile = File(cacheDir, "update-$channel.apk")
-        try {
-            downloadFile(manifestApkUrl, apkFile)
-            appendLog("  ✅ 下载完成: ${apkFile.length()} bytes")
-        } catch (e: Exception) {
-            appendLog("  ❌ 下载失败: ${e.message}")
-            return@withContext
-        }
-
-        // 4. SHA256 校验
-        appendLog("[4/4] SHA256 校验...")
-        val actualSha256 = computeSha256(apkFile)
-        if (actualSha256 == manifestSha256) {
-            appendLog("  ✅ SHA256 校验通过!")
-            // 5. 安装 APK
-            appendLog("[5/5] 提交安装...")
-            try {
-                installApk(apkFile)
-                appendLog("  ✅ 安装已提交，稍后通知栏点击重启")
-            } catch (e: Exception) {
-                appendLog("  ❌ 安装失败: ${e.message}")
-            }
-        } else {
-            appendLog("  ❌ SHA256 校验失败!")
-            appendLog("  expected: ${manifestSha256.take(32)}")
-            appendLog("  actual:   ${actualSha256.take(32)}")
-        }
-
-        appendLog("=== $channel 渠道测试完成 ===")
-    }
-
-    private fun httpGet(url: String): String {
-        val conn = URL(url).openConnection() as HttpURLConnection
-        conn.connectTimeout = 10000
-        conn.readTimeout = 10000
-        return conn.inputStream.bufferedReader().readText()
-    }
-
-    private val ALLOWED_HOSTS = setOf("git.childish-ghost.com", "github.com")
-
-    private fun downloadFile(url: String, dest: File) {
-        val host = URL(url).host
-        if (!ALLOWED_HOSTS.any { host == it || host.endsWith(".$it") }) {
-            throw SecurityException("不允许的下载域名: $host")
-        }
-        val conn = URL(url).openConnection() as HttpURLConnection
-        conn.connectTimeout = 30000
-        conn.readTimeout = 120000
-        conn.inputStream.use { input ->
-            FileOutputStream(dest).use { output -> input.copyTo(output) }
-        }
-    }
-
-    private fun installApk(apkFile: File) {
-        val uri = FileProvider.getUriForFile(this, "${packageName}.fileprovider", apkFile)
-        val intent = Intent(Intent.ACTION_VIEW).apply {
-            setDataAndType(uri, "application/vnd.android.package-archive")
-            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK)
-        }
-        startActivity(intent)
-    }
-
-    private fun computeSha256(file: File): String {
-        val digest = MessageDigest.getInstance("SHA-256")
-        file.inputStream().use { input ->
-            val buf = ByteArray(8192)
-            var read: Int
-            while (input.read(buf).also { read = it } != -1) {
-                digest.update(buf, 0, read)
-            }
-        }
-        return digest.digest().joinToString("") { "%02x".format(it) }
-    }
+      // Use the default back button implementation on Android S
+      // because it's doing more than [Activity.moveTaskToBack] in fact.
+      super.invokeDefaultOnBackPressed()
+  }
 }

packages/client-android/android/app/src/main/java/dev/yuzu/gca/MainApplication.kt

@@ -1,5 +1,57 @@
 package dev.yuzu.gca
 
 import android.app.Application
+import android.content.res.Configuration
 
-class MainApplication : Application()
+import com.facebook.react.PackageList
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactPackage
+import com.facebook.react.ReactHost
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
+import com.facebook.react.defaults.DefaultReactNativeHost
+import com.facebook.react.soloader.OpenSourceMergedSoMapping
+import com.facebook.soloader.SoLoader
+
+import expo.modules.ApplicationLifecycleDispatcher
+import expo.modules.ReactNativeHostWrapper
+
+class MainApplication : Application(), ReactApplication {
+
+  override val reactNativeHost: ReactNativeHost = ReactNativeHostWrapper(
+        this,
+        object : DefaultReactNativeHost(this) {
+          override fun getPackages(): List<ReactPackage> {
+            val packages = PackageList(this).packages
+            // Packages that cannot be autolinked yet can be added manually here, for example:
+            // packages.add(new MyReactNativePackage());
+            return packages
+          }
+
+          override fun getJSMainModuleName(): String = ".expo/.virtual-metro-entry"
+
+          override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
+
+          override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+          override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
+      }
+  )
+
+  override val reactHost: ReactHost
+    get() = ReactNativeHostWrapper.createReactHost(applicationContext, reactNativeHost)
+
+  override fun onCreate() {
+    super.onCreate()
+    SoLoader.init(this, OpenSourceMergedSoMapping)
+    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+      // If you opted-in for the New Architecture, we load the native entry point for this app.
+      load()
+    }
+    ApplicationLifecycleDispatcher.onApplicationCreate(this)
+  }
+
+  override fun onConfigurationChanged(newConfig: Configuration) {
+    super.onConfigurationChanged(newConfig)
+    ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig)
+  }
+}

packages/client-android/android/app/src/main/res/xml/file_paths.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths>
-    <cache-path name="apk" path="/" />
-</paths>