fix: 修复 build_with_simple_backup.sh 不能在 mac Bash 上编译的问题

fix: 修复推广打包渠道不生效的问题

See merge request halo/android/assistant-android!2045

app/src/main/java/com/gh/gamecenter/authorization/AuthorizationActivity.kt

@@ -1,5 +1,7 @@
 package com.gh.gamecenter.authorization
 
+import android.app.Activity
+import android.app.Application.ActivityLifecycleCallbacks
 import android.app.Dialog
 import android.content.Intent
 import android.os.Build
@@ -22,6 +24,7 @@ import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.login.user.UserRepository
 import com.gh.gamecenter.login.view.LoginActivity
 import com.gh.vspace.VHelper
+import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
 
 /**
@@ -139,7 +142,7 @@ class AuthorizationActivity : ToolBarActivity() {
     override fun onRestart() {
         super.onRestart()
         if (!CheckLoginUtils.isLogin()) {
-            finish()
+            finishAndRemoveTask()
         } else {
             initUserInfo()
             initData()
@@ -150,12 +153,12 @@ class AuthorizationActivity : ToolBarActivity() {
     private fun checkParam() {
         val uri = intent.data
         if (uri == null) {
-            finish()
+            finishAndRemoveTask()
             return
         }
         val host = uri.host
         if (host != "authorize") {
-            finish()
+            finishAndRemoveTask()
             return
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
@@ -168,7 +171,7 @@ class AuthorizationActivity : ToolBarActivity() {
         gameName = uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME) ?: ""
         gameUid = uri.getQueryParameter(EntranceConsts.KEY_UID)?.toIntOrNull() ?: -1
         if (mRemotePkgName == null) {
-            finish()
+            finishAndRemoveTask()
             return
         }
     }
@@ -221,7 +224,7 @@ class AuthorizationActivity : ToolBarActivity() {
         val remotePkgName = mRemotePkgName
         if (remotePkgName == null) {
             logAuthResult(false)
-            finish()
+            finishAndRemoveTask()
             return
         }
         if (mToken.isEmpty()) {
@@ -242,13 +245,44 @@ class AuthorizationActivity : ToolBarActivity() {
         intent.putExtra(EntranceConsts.KEY_USER_NAME, username)
         intent.putExtra(EntranceConsts.KEY_USER_AVATAR, userAvatar)
         if (gameUid != -1 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            sendBroadcastAsUser(intent, UserHandle.getUserHandleForUid(gameUid))
+            try {
+                sendBroadcastAsUser(intent, UserHandle.getUserHandleForUid(gameUid))
+            } catch (e: Exception) {
+                // 双开/分身游戏进行授权时，如果无 INTERACT_ACROSS_USERS 权限，则使用Activity传递授权结果
+                authByActivity(intent)
+                return
+            }
         } else {
             sendBroadcast(intent)
         }
         logAuthResult(true)
         backToLaunchApp()
-        finish()
+        finishAndRemoveTask()
+    }
+
+    private fun authByActivity(intent: Intent) {
+        intent.setClassName(mRemotePkgName!!, AUTHORIZATION_RESULT_ACTIVITY)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        HaloApp.getInstance().registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
+            override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
+            override fun onActivityStarted(activity: Activity) {}
+            override fun onActivityResumed(activity: Activity) {}
+            override fun onActivityPaused(activity: Activity) {}
+            override fun onActivityStopped(activity: Activity) {
+                if (activity == this@AuthorizationActivity) {
+                    HaloApp.getInstance().unregisterActivityLifecycleCallbacks(this)
+                    finishAndRemoveTask()
+                }
+            }
+            override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
+            override fun onActivityDestroyed(activity: Activity) {
+                if (activity == this@AuthorizationActivity) {
+                    HaloApp.getInstance().unregisterActivityLifecycleCallbacks(this)
+                }
+            }
+        })
+        startActivity(intent)
+        logAuthResult(true)
     }
 
     private fun logAuthResult(isSuccess: Boolean) {
@@ -277,7 +311,7 @@ class AuthorizationActivity : ToolBarActivity() {
     }
 
     override fun onBackPressed() {
-        super.onBackPressed()
+        finishAndRemoveTask()
 
         backToLaunchApp(false)
 
@@ -292,6 +326,7 @@ class AuthorizationActivity : ToolBarActivity() {
         private const val BUTTON_TYPE_CONFIRM = "确定"
         private const val BUTTON_TYPE_BACK = "返回"
         private const val TYPE_PLUGIN = "plugin"
+        private const val AUTHORIZATION_RESULT_ACTIVITY = "com.gh.plugin.AuthorizationResultActivity"
     }
 
 }

module_core/src/main/java/com/gh/gamecenter/core/utils/DisplayUtils.java

@@ -185,7 +185,9 @@ public class DisplayUtils {
                 decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
             }
 
-            if (isKeepLowVersionMiui) {
+            if (isKeepLowVersionMiui
+                    && "miui".equals(Build.MANUFACTURER)
+                    && Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
                 Class clazz = window.getClass();
                 try {
                     int darkModeFlag = 0;

scripts/build_with_simple_backup.sh

@@ -16,7 +16,7 @@ git checkout module_sensors_data/build.gradle
 
 # 开启 mapping 上传
 if [[ "$OSTYPE" == "darwin"* ]]; then
-  sed -i '' '1 a plugins { id "io.sentry.android.gradle" version "3.7.0" } ' app/build.gradle
+  sed -i '' "1s|^|plugins { id \"io.sentry.android.gradle\" version \"3.7.0\" }\n|" app/build.gradle
 else
   sed -i '1 a plugins { id "io.sentry.android.gradle" version "3.7.0" }' app/build.gradle
 fi
@@ -77,7 +77,7 @@ done
 if [ $BUILD_WITH_INIT_GRADLE == false ]; then
     ./gradlew assemble${BUILD_VARIANT_ENV}${BUILD_VARIANT_REGION^}Release -PBUILD_PUSH_TYPE=${BUILD_PUSH_TYPE}
 else
-    ./gradlew assemble${BUILD_VARIANT_ENV}${BUILD_VARIANT_REGION^}Release -I init.gradle -PBUILD_PUSH_TYPE=${BUILD_PUSH_TYPE}
+    ./gradlew assemble${BUILD_VARIANT_ENV}${BUILD_VARIANT_REGION^}Release -I init.gradle -PBUILD_PUSH_TYPE=${BUILD_PUSH_TYPE} --no-daemon
 fi
 
 mkdir -p release-app/${versionName}_${versionCode}

scripts/meta_build.sh

@@ -165,7 +165,7 @@ if [ "${sdk_platform}" != "" ]; then
         echo "光环助手_${versionName}_${versionCode}_神马推广包_${git_sha}_${build_time}"
         cp -R app/build/outputs/apk/smCn/release/app-sm-cn-release.apk "${apk_release_path}"
     fi
-    updateChannelIfNeeded "${output}/${apk_release_path}"
+    updateChannelIfNeeded "${apk_release_path}"
 
 else
     apk_release_path="${output}/${PACKAGE_NAME}_${versionName}_${versionCode}_${MODULE_VERSION}_${va_version}_${unix_timestamp}_${buildType}.apk"