feat: va_core 启用sentry

fix: 本地测试手动安装游戏包安装到一体化畅玩

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

app/src/internal/java/com/gh/vspace/ExternalGameUsage.kt

@@ -32,43 +32,11 @@ class ExternalGameUsage : ITestCase {
             it.titleTv.text = context.getString(R.string.title_install_external_game)
             it.iconIv.setImageResource(R.drawable.ic_personal_my_game)
             it.root.setOnClickListener {
-                VHelper.connectService {
-                    context.startActivity(
-                        InstallExternalGameActivity.getIntent(context)
-                            .apply { flags = flags or Intent.FLAG_ACTIVITY_NEW_TASK })
-                }
+                context.startActivity(
+                    InstallExternalGameActivity.getIntent(context)
+                        .apply { flags = flags or Intent.FLAG_ACTIVITY_NEW_TASK })
             }
         }
     }
 
-    override fun addInstallPluginButton(viewParent: ViewGroup) {
-        buttonTemplate(viewParent, R.id.install_plugin) {
-            it.titleTv.text = "安装64位插件"
-            it.root.setOnClickListener {
-                val file = File("/data/local/tmp/gh-plugins/artifacts.zip")
-                if (file.exists()) {
-                    Utils.log(VHelper.LOG_TAG, "有本地更新文件: 64位插件")
-                    // TODO: 补充debug插件更新
-                    ToastUtils.showToast("暂未实现debug功能")
-                } else {
-                    ToastUtils.showToast("data/local/tmp没有push文件")
-                }
-            }
-        }
-    }
-
-    override fun addInstallPlugin32Button(viewParent: ViewGroup) {
-        buttonTemplate(viewParent, R.id.install_plugin_32) {
-            it.titleTv.text = "安装32位插件"
-            it.root.setOnClickListener {
-                val file = File("/data/local/tmp/gh-plugins/artifacts32.zip")
-                if (file.exists()) {
-                    // TODO: 补充debug插件更新
-                    ToastUtils.showToast("暂未实现debug功能")
-                } else {
-                    ToastUtils.showToast("data/local/tmp没有push文件")
-                }
-            }
-        }
-    }
 }

app/src/internal/java/com/gh/vspace/installexternalgames/InstallExternalGameFragment.kt

@@ -1,7 +1,12 @@
 package com.gh.vspace.installexternalgames
 
+import android.Manifest
 import android.app.Dialog
+import android.content.ComponentName
+import android.content.pm.PackageManager
 import android.os.Bundle
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.gh.common.util.DialogUtils
 import com.gh.gamecenter.R
@@ -40,6 +45,19 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
 
     private lateinit var dialog: Dialog
 
+
+    private val requestPermissionLauncher = registerForActivityResult<String, Boolean>(
+        ActivityResultContracts.RequestPermission()
+    ) { result ->
+        if (result == true) {
+            // grant
+            mViewModel.scanPaths()
+        } else {
+            // not grant
+        }
+    }
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setNavigationTitle(getString(com.gh.gamecenter.R.string.title_install_external_game))
@@ -56,11 +74,30 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
             )
             adapter.notifyDataSetChanged()
         }
-        mViewModel.scanPaths()
-
 
+        requestStoragePermission()
     }
 
+    private fun requestStoragePermission() {
+        when {
+            ContextCompat.checkSelfPermission(
+                requireContext(),
+                Manifest.permission.READ_EXTERNAL_STORAGE
+            ) == PackageManager.PERMISSION_GRANTED -> {
+                mViewModel.scanPaths()
+            }
+
+            shouldShowRequestPermissionRationale(Manifest.permission.READ_EXTERNAL_STORAGE) -> {
+                requestPermissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+            }
+
+            else -> {
+                requestPermissionLauncher.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+            }
+        }
+    }
+
+
     private fun initView() {
         dialog = DialogUtils.showWaitDialog(requireContext(), "")
         mBinding.externalGamesList.let {
@@ -94,9 +131,11 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
             OnItemClickListener.ClickType.CLICK_INSTALL -> {
                 install(externalGameUiState)
             }
+
             OnItemClickListener.ClickType.CLICK_UNINSTALL -> {
                 uninstall(externalGameUiState)
             }
+
             OnItemClickListener.ClickType.CLICK_START -> {
                 start(externalGameUiState)
             }
@@ -104,9 +143,8 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
     }
 
     private fun install(externalGameUiState: ExternalGameUiState) {
-        val bit =
-            externalGameUiState.externalGameEntity.cpuAbi.let { if (it.size == 1 && it.contains("armeabi-v7a")) "32" else "64" }
 
+        VHelper.disableLaunchGameAfterInstallation()
         VHelper.install(requireContext(), DownloadEntity().apply {
             externalGameUiState.externalGameEntity.apply {
                 packageName = apkPackageName
@@ -114,20 +152,12 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
             }
         }, true)
 
-
-        if (VHelper.showDialogIfVSpaceIsNeeded(
-                requireContext(),
-                "",
-                externalGameUiState.externalGameEntity.appName,
-                "",
-                bit = bit
-            )
-        ) return
-        dialog.show()
-        externalGameUiState.externalGameEntity.let {
-            val intent = VirtualAppManager.getInstallIntent(context, it.apkPath, it.apkPackageName)
-            requireActivity().startActivity(intent)
+        VHelper.newCwValidateVspaceBeforeAction(
+            requireContext(),null,
+        ) {
+            dialog.show()
         }
+
     }
 
     private fun uninstall(externalGameUiState: ExternalGameUiState) {
@@ -158,6 +188,12 @@ class InstallExternalGameFragment : ToolbarFragment(), OnItemClickListener {
             com.gh.gamecenter.BuildConfig.VA_VERSION_NAME,
             HaloApp.getInstance().oaid
         )
+        intent.setComponent(
+            ComponentName(
+                com.gh.gamecenter.BuildConfig.APPLICATION_ID,
+                VirtualAppManager.AIDL_SERVER_REMOTE_GUIDE_ACTIVITY
+            )
+        )
         requireActivity().startActivity(intent)
     }
 

app/src/internal/res/values/ids.xml

@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <item name="install_game_from_external" type="id" />
-    <item name="install_plugin" type="id" />
-    <item name="install_plugin_32" type="id" />
 </resources>

app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt

@@ -699,8 +699,6 @@ class HaloPersonalFragment : BaseLazyFragment() {
             } catch (e: Exception) {
             } as? ITestCase)?.apply {
                 addInstallExternalGameButton(mStubBinding.otherItems)
-                addInstallPluginButton(mStubBinding.otherItems)
-                addInstallPlugin32Button(mStubBinding.otherItems)
             }
         }
 

app/src/main/java/com/gh/vspace/ITestCase.java

@@ -8,6 +8,4 @@ public interface ITestCase {
 
     void addInstallExternalGameButton(@NonNull ViewGroup viewParent);
 
-    void addInstallPluginButton(@NonNull ViewGroup viewParent);
-    void addInstallPlugin32Button(@NonNull ViewGroup viewParent);
 }

dependencies.gradle

@@ -7,8 +7,8 @@ ext {
     targetSdkVersion = 30
 
     // application info (每个大版本之间的 versionCode 增加 20)
-    versionCode = 1090
-    versionName = "5.37.0"
+    versionCode = 1110
+    versionName = "5.38.0"
     applicationId = "com.gh.gamecenter"
     applicationIdGat = "com.gh.gamecenter.intl"
 

module_va_impl/src/main/java/com/gh/gamecenter/va/HaloApp.kt

@@ -3,9 +3,15 @@ package com.gh.gamecenter.va
 import android.app.Application
 import android.content.Context
 import android.content.res.Configuration
+import com.alibaba.android.arouter.launcher.ARouter
+import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.iinterface.IApplication
+import com.gh.gamecenter.core.provider.IAppProvider
+import com.gh.gamecenter.core.provider.ISentryProvider
 import com.google.auto.service.AutoService
 import com.lg.vspace.common.CommonApp
+import com.lody.virtual.client.core.VirtualCore
+import com.lody.virtual.client.core.VirtualCore.VirtualInitializer
 
 @AutoService(IApplication::class)
 class HaloApp : IApplication {
@@ -17,6 +23,20 @@ class HaloApp : IApplication {
     }
 
     override fun onCreate(application: Application) {
+        VirtualCore.get().initialize(object : VirtualInitializer() {
+            override fun onServerProcess() {
+                (ARouter.getInstance().build(RouteConsts.provider.app)
+                    .navigation() as? IAppProvider)?.let { appProvider ->
+                    (ARouter.getInstance().build(RouteConsts.provider.sentry).navigation() as? ISentryProvider)?.init(
+                        application,
+                        appProvider.getChannel(),
+                        appProvider.getFlavor(),
+                        appProvider.getAppVersion()
+                    )
+                }
+            }
+        })
+
         commonApp.onCreate(application)
     }