diff --git a/app/src/main/java/com/gh/common/provider/IAcceleratorDataHolderProviderImpl.kt b/app/src/main/java/com/gh/common/provider/IAcceleratorDataHolderProviderImpl.kt index 0bfd24fd82..c53aaa010a 100644 --- a/app/src/main/java/com/gh/common/provider/IAcceleratorDataHolderProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/IAcceleratorDataHolderProviderImpl.kt @@ -13,14 +13,6 @@ class IAcceleratorDataHolderProviderImpl : IAcceleratorDataHolderProvider { } } - override fun addInitFunResult(result: String) { - AcceleratorDataHolder.instance.addInitFunResult(result) - } - - override fun getInitFunResults(): List { - return AcceleratorDataHolder.instance.initResults - } - override fun getGhVersionName(): String { return PackageUtils.getGhVersionName() } diff --git a/app/src/main/java/com/halo/assistant/accelerator/repository/AcceleratorDataHolder.kt b/app/src/main/java/com/halo/assistant/accelerator/repository/AcceleratorDataHolder.kt index ea774b829d..f2b2f3acda 100644 --- a/app/src/main/java/com/halo/assistant/accelerator/repository/AcceleratorDataHolder.kt +++ b/app/src/main/java/com/halo/assistant/accelerator/repository/AcceleratorDataHolder.kt @@ -20,14 +20,6 @@ class AcceleratorDataHolder { private val listeners = mutableSetOf() - private val _initResults = arrayListOf() - val initResults: List - get() = _initResults - - fun addInitFunResult(result: String) { - _initResults.add(result) - } - private var _hasAcctGameInfoInLocal = false val hasAcctGameInfoInLocal: Boolean get() = _hasAcctGameInfoInLocal diff --git a/feature/accelerator/src/main/java/com/gh/gamecenter/accelerator/provider/AcceleratorProviderImpl.kt b/feature/accelerator/src/main/java/com/gh/gamecenter/accelerator/provider/AcceleratorProviderImpl.kt index 4c7dfd6175..e790bdb42e 100644 --- a/feature/accelerator/src/main/java/com/gh/gamecenter/accelerator/provider/AcceleratorProviderImpl.kt +++ b/feature/accelerator/src/main/java/com/gh/gamecenter/accelerator/provider/AcceleratorProviderImpl.kt @@ -8,6 +8,7 @@ import com.gh.gamecenter.core.callback.OnAccelerateListener import com.gh.gamecenter.core.provider.IAcceleratorDataHolderProvider import com.gh.gamecenter.core.provider.IAcceleratorProvider import com.gh.gamecenter.feature.entity.AcctGameInfo +import com.gh.gamecenter.feature.utils.NewFlatLogUtils import com.gh.gamecenter.feature.utils.SentryHelper import com.lightgame.utils.Utils import com.qeeyou.qyvpn.QyAccelerator @@ -25,6 +26,8 @@ import java.io.File class AcceleratorProviderImpl : IAcceleratorProvider { private var _token = "" + private val initResults = arrayListOf() + // 根据包名回调 private val listeners = hashMapOf() @@ -93,8 +96,7 @@ class AcceleratorProviderImpl : IAcceleratorProvider { override fun onExecLifecycleInitFun(isEnter: Boolean) { super.onExecLifecycleInitFun(isEnter) Utils.log(LOG_TAG, "onExecLifecycleInitFun:$isEnter") - TheRouter.get(IAcceleratorDataHolderProvider::class.java) - ?.addInitFunResult("onExecLifecycleInitFun:$isEnter") + initResults.add("onExecLifecycleInitFun:$isEnter") } }) QyAccelerator.getInstance().bindQyAccRelatedListener(qyListener) @@ -113,8 +115,8 @@ class AcceleratorProviderImpl : IAcceleratorProvider { if (isSuccess) { _token = token } else { - // 将setToken错误事件上报的sentry,便于后期分析原因 - SentryHelper.onEventInAllChannel(SENTRY_EVENT_ID, KEY_SET_TOKEN_ERROR_MESSAGE, errMsg) + // 将setToken错误事件上报的火山云,便于后期分析原因 + NewFlatLogUtils.logAcceleratorSetTokenError(initResults, errMsg ?: "") } callback?.invoke(isSuccess) }) @@ -142,6 +144,7 @@ class AcceleratorProviderImpl : IAcceleratorProvider { _token = "" listeners.clear() allListener.clear() + initResults.clear() return isDeleted } @@ -186,8 +189,6 @@ class AcceleratorProviderImpl : IAcceleratorProvider { companion object { private const val LOG_TAG = "AcceleratorProviderImpl" - private const val SENTRY_EVENT_ID = "ACCELERATOR_SET_TOKEN_ERROR" - private const val KEY_SET_TOKEN_ERROR_MESSAGE = "set_token_error" } } \ No newline at end of file diff --git a/feature/sentry/src/main/java/com/lg/SentryProviderImpl.kt b/feature/sentry/src/main/java/com/lg/SentryProviderImpl.kt index 6419d473af..8960c0d7a4 100644 --- a/feature/sentry/src/main/java/com/lg/SentryProviderImpl.kt +++ b/feature/sentry/src/main/java/com/lg/SentryProviderImpl.kt @@ -131,23 +131,7 @@ class SentryProviderImpl : ISentryProvider { } Utils.log("Sentry", "$eventId + [${kv.joinToString(" , ")}]") - Sentry.captureEvent(sentryEvent) { - // 添加Breadcrumb - it.addBreadcrumb(Breadcrumb().apply { - type = "initSdk" - category = "Init" - this.message = "init qiyou sdk" - level = SentryLevel.INFO - - val iAcceleratorDataHolderProvider = TheRouter.get(IAcceleratorDataHolderProvider::class.java) - if (iAcceleratorDataHolderProvider != null) { - val initFunResults = iAcceleratorDataHolderProvider.getInitFunResults() - initFunResults.forEachIndexed { index, result -> - setData("init_sdk_fun_$index", result) - } - } - }) - } + Sentry.captureEvent(sentryEvent) } override fun captureException(e: Throwable) { diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IAcceleratorDataHolderProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IAcceleratorDataHolderProvider.kt index 41eb2e9f65..2ba0a5b757 100644 --- a/module_core/src/main/java/com/gh/gamecenter/core/provider/IAcceleratorDataHolderProvider.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IAcceleratorDataHolderProvider.kt @@ -4,10 +4,6 @@ interface IAcceleratorDataHolderProvider { fun setVipEntity(vip: Any) - fun addInitFunResult(result: String) - - fun getInitFunResults(): List - fun getGhVersionName(): String fun clear() diff --git a/module_core_feature/src/main/java/com/gh/gamecenter/feature/utils/NewFlatLogUtils.kt b/module_core_feature/src/main/java/com/gh/gamecenter/feature/utils/NewFlatLogUtils.kt index 1b17a6193b..f6c7e8b79b 100644 --- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/utils/NewFlatLogUtils.kt +++ b/module_core_feature/src/main/java/com/gh/gamecenter/feature/utils/NewFlatLogUtils.kt @@ -13,6 +13,8 @@ object NewFlatLogUtils { private const val KEY_GAME_ID = "game_id" private const val KEY_GAME_NAME = "game_name" private const val KEY_TEXT = "text" + private const val KEY_ERROR = "error" + private const val KEY_INIT_SDK_FUN = "init_sdk_fun" private fun log(jsonObject: JSONObject, logStore: String = "event", uploadImmediately: Boolean = false) { Utils.log("NewFlatLogUtils", jsonObject.toString(4)) @@ -52,4 +54,14 @@ object NewFlatLogUtils { } log(json) } + + @JvmStatic + fun logAcceleratorSetTokenError(initResults: List, error: String) { + json { + KEY_EVENT to "accelerator_set_token_error" + KEY_ERROR to error + KEY_INIT_SDK_FUN to initResults.toString() + parseAndPutMeta().invoke(this) + }.let(::log) + } } \ No newline at end of file