Merge branch 'main' of github.com:Sjj1024/PakePlus-Android

merge

Author: Sjj1024

.github/workflows/build.yml

@@ -51,7 +51,7 @@ jobs:
                   mv app-debug.apk ${{ env.NAME }}-v${{ env.VERSION }}.apk
 
             - name: Create GitHub Release
-              uses: softprops/action-gh-release@v2
+              uses: softprops/action-gh-release@v1
               with:
                   files: app/build/outputs/apk/debug/*.apk
                   tag_name: '${{ env.NAME }}'

app/src/main/java/com/app/pakeplus/MainActivity.kt

@@ -11,17 +11,17 @@ import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.activity.enableEdgeToEdge
-//import android.view.Menu
-//import android.view.WindowInsets
-//import com.google.android.material.snackbar.Snackbar
-//import com.google.android.material.navigation.NavigationView
-//import androidx.navigation.findNavController
-//import androidx.navigation.ui.AppBarConfiguration
-//import androidx.navigation.ui.navigateUp
-//import androidx.navigation.ui.setupActionBarWithNavController
-//import androidx.navigation.ui.setupWithNavController
-//import androidx.drawerlayout.widget.DrawerLayout
-//import com.app.pakeplus.databinding.ActivityMainBinding
+// import android.view.Menu
+// import android.view.WindowInsets
+// import com.google.android.material.snackbar.Snackbar
+// import com.google.android.material.navigation.NavigationView
+// import androidx.navigation.findNavController
+// import androidx.navigation.ui.AppBarConfiguration
+// import androidx.navigation.ui.navigateUp
+// import androidx.navigation.ui.setupActionBarWithNavController
+// import androidx.navigation.ui.setupWithNavController
+// import androidx.drawerlayout.widget.DrawerLayout
+// import com.app.pakeplus.databinding.ActivityMainBinding
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GestureDetectorCompat
 import androidx.core.view.ViewCompat
@@ -59,8 +59,8 @@ class MainActivity : AppCompatActivity() {
             setSupportMultipleWindows(true)
         }
 
-//        webView.settings.userAgentString =
-//            "Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.3 Mobile/15E148 Safari/604.1"
+        // webView.settings.userAgentString = ""
+
         webView.settings.loadWithOverviewMode = true
         webView.settings.setSupportZoom(false)
 

package.json

@@ -4,7 +4,8 @@
     "description": "Pake Plus Android",
     "main": "index.js",
     "scripts": {
-        "pp:worker": "node ./scripts/ppworker.cjs"
+        "pp:worker": "node ./scripts/ppworker.cjs",
+        "restore": "git restore ."
     },
     "keywords": [
         "pakeplus",

scripts/ppconfig.json

@@ -105,6 +105,15 @@
             "fontSize": 16,
             "fontWeight": "bold",
             "tabBarItem": []
+        },
+        "webview": {
+            "userAgent": "",
+            "javaScriptEnabled": true,
+            "domStorageEnabled": true,
+            "allowFileAccess": true,
+            "loadWithOverviewMode": true,
+            "setSupportZoom": true,
+            "clearCache": true
         }
     },
     "ios": {

scripts/ppworker.cjs

@@ -133,8 +133,10 @@ const updateAppName = async (androidResDir, appName) => {
     }
 }
 
-const updateWebEnv = async (androidResDir, webUrl, debug) => {
+const updateWebEnv = async (androidResDir, webUrl, debug, webview) => {
     try {
+        const { userAgent } = webview
+
         // Assuming MainActivity.kt is in the standard location
         const mainActivityPath = path.join(
             androidResDir.replace('res', ''),
@@ -167,6 +169,15 @@ const updateWebEnv = async (androidResDir, webUrl, debug) => {
                 'private var debug = true'
             )
         }
+
+        // update webview userAgent
+        if (userAgent) {
+            updatedContent = updatedContent.replace(
+                '// webView.settings.userAgentString = ""',
+                `webView.settings.userAgentString = "${userAgent}"`
+            )
+        }
+
         await fs.writeFile(mainActivityPath, updatedContent)
         console.log(`✅ Updated web URL to: ${webUrl}`)
     } catch (error) {
@@ -270,6 +281,7 @@ const updateAndroidId = async (id) => {
 
 // Main execution
 const main = async () => {
+    const { webview } = ppconfig.phone
     const {
         name,
         version,
@@ -282,6 +294,7 @@ const main = async () => {
         showName,
         debug,
     } = ppconfig.android
+
     const outPath = path.resolve(output)
     await generateAdaptiveIcons(input, outPath)
 
@@ -293,7 +306,7 @@ const main = async () => {
     await updateAppName(dest, showName)
 
     // Update web URL if provided
-    await updateWebEnv(dest, webUrl, debug)
+    await updateWebEnv(dest, webUrl, debug, webview)
 
     // 删除根目录的res
     await fs.remove(outPath)
@@ -309,12 +322,12 @@ const main = async () => {
 }
 
 // run
-try {
-    ;(async () => {
+;(async () => {
+    try {
         console.log('🚀 worker start')
         await main()
         console.log('🚀 worker end')
-    })()
-} catch (error) {
-    console.error('❌ Worker Error:', error)
-}
+    } catch (error) {
+        console.error('❌ Worker Error:', error)
+    }
+})()