From 92177ae5f22eee64b40e169a287c44631f7258b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= <yeziwei@ghzhushou.com>
Date: Thu, 19 Dec 2024 17:03:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=8C=E5=BC=80?=
 =?UTF-8?q?=E5=88=86=E8=BA=AB=E6=B8=B8=E6=88=8F=E6=97=A0=E6=B3=95=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E7=99=BB=E5=BD=95=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                    |  3 +++
 .../authorization/AuthorizationActivity.kt          | 13 ++++++++++++-
 .../gamecenter/common/constant/EntranceConsts.java  |  2 ++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 39b99920ae..b45b293587 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,6 +68,9 @@
     <!-- 悬浮窗 -->
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
+    <!-- 适配 双开/分身 游戏授权登录 -->
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
+
     <uses-sdk tools:overrideLibrary="
         com.shuyu.gsyvideoplayer,
         com.shuyu.gsyvideoplayer.lib,
diff --git a/app/src/main/java/com/gh/gamecenter/authorization/AuthorizationActivity.kt b/app/src/main/java/com/gh/gamecenter/authorization/AuthorizationActivity.kt
index 31b4203c1b..f8f46afc3d 100644
--- a/app/src/main/java/com/gh/gamecenter/authorization/AuthorizationActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/authorization/AuthorizationActivity.kt
@@ -4,6 +4,7 @@ import android.app.Dialog
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
+import android.os.UserHandle
 import com.gh.common.util.CheckLoginUtils
 import com.gh.common.util.DialogUtils
 import com.gh.common.util.NewFlatLogUtils
@@ -71,6 +72,11 @@ class AuthorizationActivity : ToolBarActivity() {
     //授权token
     private var mToken = ""
 
+    /**
+     * 游戏UID (适配双开/分身游戏)
+     */
+    private var gameUid = -1
+
     private var loadingDialog: Dialog? = null
 
     override fun getLayoutId(): Int {
@@ -160,6 +166,7 @@ class AuthorizationActivity : ToolBarActivity() {
         mContent = uri.getQueryParameter(EntranceConsts.KEY_CONTENT) ?: ""
         gameId = uri.getQueryParameter(EntranceConsts.KEY_GAME_ID) ?: ""
         gameName = uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME) ?: ""
+        gameUid = uri.getQueryParameter(EntranceConsts.KEY_UID)?.toIntOrNull() ?: -1
         if (mRemotePkgName == null) {
             finish()
             return
@@ -234,7 +241,11 @@ class AuthorizationActivity : ToolBarActivity() {
         intent.putExtra(EntranceConsts.KEY_USER_ID, userId)
         intent.putExtra(EntranceConsts.KEY_USER_NAME, username)
         intent.putExtra(EntranceConsts.KEY_USER_AVATAR, userAvatar)
-        sendBroadcast(intent)
+        if (gameUid != -1 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            sendBroadcastAsUser(intent, UserHandle.getUserHandleForUid(gameUid))
+        } else {
+            sendBroadcast(intent)
+        }
         logAuthResult(true)
         backToLaunchApp()
         finish()
diff --git a/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java b/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java
index df7b551be9..2f003ddbd8 100644
--- a/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java
+++ b/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java
@@ -365,4 +365,6 @@ public class EntranceConsts {
     public static final String TAB_TYPE_ARCHIVE = "云存档";
     public static final String TAB_TYPE_RATING = "评价";
     public static final String TAB_TYPE_BBS = "论坛";
+
+    public static final String KEY_UID = "uid";
 }