[pull] master from yujincheng08:master

.github/workflows/PR.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, windows-latest ]
+        os: [ ubuntu-latest ]
 
     steps:
     - name: Check out
@@ -28,13 +28,19 @@ jobs:
         distribution: 'temurin'
         java-version: '17'
         cache: 'gradle'
+    - name: Setup Android SDK
+      uses: android-actions/setup-android@v3
+    - uses: seanmiddleditch/gha-setup-ninja@master
+      with:
+        version: 1.12.0
     - name: Set up ccache
       uses: hendrikmuhs/[email protected]
       with:
         key: ${{ runner.os }}-${{ github.sha }}
         restore-keys: ${{ runner.os }}
     - name: Build with Gradle
       run: |
+        sudo rm -rf $ANDROID_HOME/cmake
         echo 'org.gradle.caching=true' >> gradle.properties
         echo 'org.gradle.parallel=true' >> gradle.properties
         echo 'org.gradle.vfs.watch=true' >> gradle.properties

.github/workflows/android.yml

@@ -23,6 +23,11 @@ jobs:
           distribution: 'temurin'
           java-version: 17
           cache: 'gradle'
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+      - uses: seanmiddleditch/gha-setup-ninja@master
+        with:
+          version: 1.12.0
       - name: Retrieve version
         run: |
           echo VERSION=$(echo ${{ github.event.head_commit.id }} | head -c 10) >> $GITHUB_ENV
@@ -33,6 +38,7 @@ jobs:
           restore-keys: ${{ runner.os }}
       - name: Build with Gradle
         run: |
+          sudo rm -rf $ANDROID_HOME/cmake
           echo 'org.gradle.caching=true' >> gradle.properties
           echo 'org.gradle.parallel=true' >> gradle.properties
           echo 'org.gradle.vfs.watch=true' >> gradle.properties

app/build.gradle.kts

@@ -34,8 +34,11 @@ cmaker {
     default {
         targets("biliroaming")
         abiFilters("armeabi-v7a", "arm64-v8a", "x86")
-        arguments += "-DANDROID_STL=none"
-        cppFlags += "-Wno-c++2b-extensions"
+        arguments += arrayOf(
+            "-DANDROID_STL=none",
+            "-DCMAKE_CXX_STANDARD=23",
+            "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON",
+        )
     }
 
     buildTypes {
@@ -47,7 +50,7 @@ android {
     namespace = "me.iacn.biliroaming"
     compileSdk = 34
     buildToolsVersion = "34.0.0"
-    ndkVersion = "26.0.10792818"
+    ndkVersion = "27.0.11718014-beta1"
 
     buildFeatures {
         prefab = true
@@ -115,7 +118,7 @@ android {
     externalNativeBuild {
         cmake {
             path("src/main/jni/CMakeLists.txt")
-            version = "3.22.1+"
+            version = "3.28.0+"
         }
     }
 }

app/src/main/java/me/iacn/biliroaming/BiliBiliPackage.kt

@@ -161,6 +161,7 @@ class BiliBiliPackage constructor(private val mClassLoader: ClassLoader, mContex
     }
     val searchAllResponseClass by Weak { "com.bapis.bilibili.polymer.app.search.v1.SearchAllResponse" from mClassLoader }
     val searchVideoCardClass by Weak { "com.bapis.bilibili.polymer.app.search.v1.SearchVideoCard" from mClassLoader }
+    val playSpeedManager by Weak { mHookInfo.playSpeedManager from mClassLoader }
 
     val ids: Map<String, Int> by lazy {
         mHookInfo.mapIds.idsMap
@@ -231,12 +232,6 @@ class BiliBiliPackage constructor(private val mClassLoader: ClassLoader, mContex
 
     fun getPlaybackSpeed() = mHookInfo.playerCoreService.getPlaybackSpeed.orNull
 
-    fun setPlaybackSpeed() = mHookInfo.playerCoreService.setPlaybackSpeed.orNull
-
-    fun theseusPlayerSetSpeed() = mHookInfo.playerCoreService.theseusPlayerSetSpeed.orNull
-
-    fun playerOnPrepare() = mHookInfo.playerCoreService.playerOnPrepare.orNull
-
     fun urlField() = mHookInfo.okHttp.request.url.orNull
 
     fun gsonToJson() = mHookInfo.gsonHelper.toJson.orNull
@@ -1136,7 +1131,7 @@ class BiliBiliPackage constructor(private val mClassLoader: ClassLoader, mContex
                             dexHelper.decodeMethodIndex(it)
                         }
                     } ?: doSeekToMethod
-                } ?: return@playerCoreService
+                }
                 val playerCoreServiceClass = seekToMethod.declaringClass
                 seekTo = method { name = seekToMethod.name }
                 class_ = class_ { name = playerCoreServiceClass.name }
@@ -1173,58 +1168,34 @@ class BiliBiliPackage constructor(private val mClassLoader: ClassLoader, mContex
                         dexHelper.decodeMethodIndex(it)
                     }?.name ?: return@method
                 }
-                dexHelper.findMethodUsingString(
-                    "player_key_video_speed",
-                    true,
-                    -1,
-                    1,
-                    "VF",
-                    dexHelper.encodeClassIndex(playerCoreServiceClass),
-                    null,
-                    null,
-                    null,
-                    true
-                ).asSequence().firstOrNull()?.also { mIndex ->
-                    dexHelper.decodeMethodIndex(mIndex)?.let {
-                        setPlaybackSpeed = method {
-                            name = it.name
-                        }
-                    }
-                }?.let {
-                    dexHelper.findMethodInvoked(
-                        it,
-                        -1,
+            }
+            val playSpeedManagerClass = ("com.bilibili.player.tangram.basic.PlaySpeedManagerImpl" from classloader) ?: run {
+                val pcsFacadeClass = dexHelper.findMethodUsingString(
+                        "Cannot switch to quality ",
+                        false,
                         -1,
-                        "VF",
                         -1,
                         null,
-                        null,
-                        null,
-                        true
-                    ).asSequence().firstNotNullOfOrNull {
-                        dexHelper.decodeMethodIndex(it)
-                    }?.let {
-                        theseusPlayerSetSpeed = method {
-                            name = it.name
-                        }
-                    }
-                }
-                playerOnPrepare = method {
-                    name = dexHelper.findMethodUsingString(
-                        "[ijk][callback]player onPrepared",
-                        true,
-                        -1,
                         -1,
-                        "VLL",
-                        dexHelper.encodeClassIndex(playerCoreServiceClass),
                         null,
                         null,
                         null,
                         true
-                    ).asSequence().firstNotNullOfOrNull {
-                        dexHelper.decodeMethodIndex(it)
-                    }?.name ?: return@method
+                ).asSequence().firstNotNullOfOrNull {
+                    dexHelper.decodeMethodIndex(it)
+                }?.declaringClass ?: return@run null
+
+                val playSpeedManagerInterface = pcsFacadeClass.declaredFields.firstNotNullOfOrNull { f ->
+                    if (f.type.isInterface && f.type.declaredMethods.size == 1) f.type else null
                 }
+                classesList.filter {
+                    it.startsWith("com.bilibili.player.tangram")
+                }.firstNotNullOfOrNull { c ->
+                    c.findClass(classloader).takeIf { it.interfaces.contains(playSpeedManagerInterface) }
+                }
+            }
+            playSpeedManager = class_ {
+                name = playSpeedManagerClass?.name ?: return@class_
             }
             generalResponse = class_ {
                 name = "com.bilibili.okretro.GeneralResponse"

app/src/main/java/me/iacn/biliroaming/Constant.kt

@@ -23,6 +23,5 @@ object Constant {
     const val CUSTOM_COLOR_KEY = "biliroaming_custom_color"
     const val CURRENT_COLOR_KEY = "theme_entries_current_key"
     const val DEFAULT_CUSTOM_COLOR = -0xe6b7d
-    const val infoUrl = "https://api.bilibili.com/client_info"
     const val zoneUrl = "https://api.bilibili.com/x/web-interface/zone"
 }

app/src/main/java/me/iacn/biliroaming/SettingDialog.kt

@@ -7,9 +7,12 @@ import android.app.Activity
 import android.app.Activity.RESULT_CANCELED
 import android.app.AlertDialog
 import android.content.ActivityNotFoundException
+import android.content.ClipData
+import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
+import android.content.res.Resources
 import android.graphics.Bitmap
 import android.graphics.Color
 import android.graphics.Typeface
@@ -32,6 +35,7 @@ import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.*
 import android.widget.SeekBar.OnSeekBarChangeListener
+import android.widget.Toast
 import androidx.documentfile.provider.DocumentFile
 import kotlinx.coroutines.*
 import me.iacn.biliroaming.BiliBiliPackage.Companion.instance
@@ -104,6 +108,7 @@ class SettingDialog(context: Context) : AlertDialog.Builder(context) {
             findPreference("customize_dynamic")?.onPreferenceClickListener = this
             findPreference("filter_search")?.onPreferenceClickListener = this
             findPreference("filter_comment")?.onPreferenceClickListener = this
+            findPreference("copy_access_key")?.onPreferenceClickListener = this
             checkCompatibleVersion()
             searchItems = retrieve(preferenceScreen)
             checkUpdate()
@@ -846,6 +851,16 @@ class SettingDialog(context: Context) : AlertDialog.Builder(context) {
             }.show()
             return true
         }
+
+        private fun onCopyAccessKeyClick(): Boolean {
+            val manager = context.getSystemService(ClipboardManager::class.java)
+
+            manager.setPrimaryClip(ClipData.newPlainText("access_key", instance.accessKey))
+            Toast.makeText(context, R.string.copy_access_key_toast, Toast.LENGTH_SHORT).show()
+
+            return true
+        }
+
         @Deprecated("Deprecated in Java")
         override fun onPreferenceClick(preference: Preference) = when (preference.key) {
             "version" -> onVersionClick()
@@ -866,6 +881,7 @@ class SettingDialog(context: Context) : AlertDialog.Builder(context) {
             "default_speed" -> onDefaultSpeedClick()
             "filter_search" -> onFilterSearchClick()
             "filter_comment" -> onFilterCommentClick()
+            "copy_access_key" -> onCopyAccessKeyClick()
             else -> false
         }
     }
@@ -1060,7 +1076,16 @@ class SettingDialog(context: Context) : AlertDialog.Builder(context) {
         }
 
         fun show(context: Context) {
-            SettingDialog(context).show()
+            try {
+                SettingDialog(context).show()
+            } catch (e: Resources.NotFoundException) {
+                AlertDialog.Builder(context)
+                    .setTitle("需要重启")
+                    .setMessage("哔哩漫游更新了")
+                    .setPositiveButton("重启") { _, _ ->
+                        restartApplication(context as Activity)
+                    }.show()
+            }
         }
 
         const val SPLASH_SELECTION = 0

app/src/main/java/me/iacn/biliroaming/XposedInit.kt

@@ -16,7 +16,6 @@ import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.future.future
 import me.iacn.biliroaming.hook.*
 import me.iacn.biliroaming.utils.*
-import org.json.JSONObject
 import java.util.concurrent.CompletableFuture
 
 
@@ -69,16 +68,10 @@ class XposedInit : IXposedHookLoadPackage, IXposedHookZygoteInit {
                     )
 
                     country = MainScope().future(Dispatchers.IO) {
-                        fun JSONObject.optStringFix(name: String, fallback: String = "") =
-                            if (isNull(name)) fallback else optString(name, fallback)
-                        when (fetchJson(Constant.infoUrl)?.optJSONObject("data")
-                            ?.optStringFix("country").orEmpty().ifEmpty {
-                                fetchJson(Constant.zoneUrl)?.optJSONObject("data")
-                                    ?.optStringFix("country")
-                            }) {
-                            "中国" -> "cn"
-                            "香港", "澳门" -> "hk"
-                            "台湾" -> "tw"
+                        when (fetchJson(Constant.zoneUrl)?.optJSONObject("data")?.optInt("country_code", 0)?.or(0)) {
+                            86 -> "cn"
+                            852, 853 -> "hk"
+                            886 -> "tw"
                             else -> "global"
                         }.also { Log.d("当前地区: $it") }
                     }
@@ -127,6 +120,7 @@ class XposedInit : IXposedHookLoadPackage, IXposedHookZygoteInit {
                     startHook(PublishToFollowingHook(lpparam.classLoader))
                     startHook(UposReplaceHook(lpparam.classLoader))
                     startHook(SpeedHook(lpparam.classLoader))
+                    startHook(MultiWindowHook(lpparam.classLoader))
                 }
 
                 lpparam.processName.endsWith(":web") -> {

app/src/main/java/me/iacn/biliroaming/hook/AllowMiniPlayHook.kt

@@ -2,6 +2,7 @@ package me.iacn.biliroaming.hook
 
 import me.iacn.biliroaming.utils.from
 import me.iacn.biliroaming.utils.getStaticObjectField
+import me.iacn.biliroaming.utils.hookBeforeAllConstructors
 import me.iacn.biliroaming.utils.hookBeforeConstructor
 import me.iacn.biliroaming.utils.sPrefs
 
@@ -10,18 +11,27 @@ class AllowMiniPlayHook(classLoader: ClassLoader) : BaseHook(classLoader) {
         if (!sPrefs.getBoolean("main_func", false)) return
 
         if (sPrefs.getBoolean("allow_mini_play", false)) {
-            "com.bilibili.lib.media.resource.PlayConfig\$PlayMenuConfig".from(mClassLoader)
-                ?.hookBeforeConstructor(
-                    Boolean::class.javaPrimitiveType,
+            val miniPlayerType =
                     "com.bilibili.lib.media.resource.PlayConfig\$PlayConfigType"
+                            .from(mClassLoader)?.getStaticObjectField("MINIPLAYER")
+            "com.bilibili.lib.media.resource.PlayConfig\$PlayMenuConfig".from(mClassLoader)?.run {
+                hookBeforeConstructor(
+                        Boolean::class.javaPrimitiveType,
+                        "com.bilibili.lib.media.resource.PlayConfig\$PlayConfigType"
+                ) { param ->
+                    val type = param.args[1]
+                    if (type == miniPlayerType)
+                        param.args[0] = true
+                }
+                hookBeforeConstructor(Boolean::class.javaPrimitiveType,
+                        "com.bilibili.lib.media.resource.PlayConfig\$PlayConfigType",
+                        List::class.java
                 ) { param ->
                     val type = param.args[1]
-                    val miniPlayerType =
-                        "com.bilibili.lib.media.resource.PlayConfig\$PlayConfigType"
-                            .from(mClassLoader)?.getStaticObjectField("MINIPLAYER")
                     if (type == miniPlayerType)
                         param.args[0] = true
                 }
+            }
         }
     }
 }