From 3d11f3aa94869baeb8d679dd8b93075ce52a9cb9 Mon Sep 17 00:00:00 2001 From: donghongyu-pc Date: Tue, 10 Sep 2024 11:26:19 +0800 Subject: [PATCH] =?UTF-8?q?[6.6.0]=201=E3=80=81=E5=A2=9E=E5=8A=A0Okhttp?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E8=AF=B7=E6=B1=82=E6=AF=8F=E4=B8=AA=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E7=9A=84=E6=97=A5=E5=BF=97=E5=9B=9E=E8=B0=83=202?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9Okhttp=E7=9A=84=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=BA=E6=80=BB=E4=BD=9320=E7=A7=92=20CONN?= =?UTF-8?q?ECT=5FTIMEOUT=20=3D=2010000L=20READ=5FTIMEOUT=20=3D=205000L=20W?= =?UTF-8?q?RITE=5FTIMEOUT=20=3D=205000L?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DevaToolsProvider.kt | 4 +-- .../weaknetwork/WeakNetworkStrategy.kt | 33 +++++++++++++++---- gradle.properties | 16 ++++----- 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt index 316ba7b6e8..7c6cc2fb8c 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt @@ -177,9 +177,9 @@ class DevaToolsProvider : IDevaToolsProvider, IAppStateListener { BadCaseManager.init(mContext!!) if (DebugConfig.isDebug()) { SdtManager.init(mContext!!, true, DetectResultImpl()) - // 监听弱网 - WeakNetworkStrategy.startListen() } + // 监听弱网 + WeakNetworkStrategy.startListen() lookAroundDataProvider.init(mContext!!) (mContext as? Application)?.also { mofangProvider.init(it) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/weaknetwork/WeakNetworkStrategy.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/weaknetwork/WeakNetworkStrategy.kt index 1fe1cf76da..a1bc16a124 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/weaknetwork/WeakNetworkStrategy.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/weaknetwork/WeakNetworkStrategy.kt @@ -3,6 +3,7 @@ package com.zhjt.mogo_core_function_devatools.weaknetwork import android.util.Log import com.mogo.cloud.network.WeakNetworkManager import com.mogo.cloud.network.WeakNetworkManager.setListener +import com.mogo.commons.utils.MogoAnalyticUtils import com.mogo.eagle.core.data.deva.chain.ChainConstant import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.ToastUtils @@ -10,6 +11,7 @@ import com.mogo.weak.network.SdtManager import com.zhjt.service.chain.ChainLog import java.util.concurrent.locks.ReentrantReadWriteLock + object WeakNetworkStrategy { private const val TAG = "WeakNetworkStrategy" @@ -19,7 +21,8 @@ object WeakNetworkStrategy { private const val WEAK_HTTP_RTT = 1300 - private const val VERY_CONSUMING_TIME_URL = "/yycp-launcherSnapshot/launcherSnapshot/querySnapshotSync" + private const val VERY_CONSUMING_TIME_URL = + "/yycp-launcherSnapshot/launcherSnapshot/querySnapshotSync" private var lastOutputTime = 0L @@ -41,16 +44,34 @@ object WeakNetworkStrategy { setListener(object : WeakNetworkManager.OnWeakHttpListener { override fun onHttpRttReceived(hashCode: Int, url: String, timeStamp: Long) { if (VERY_CONSUMING_TIME_URL in url) return - outputLog(url, timeStamp) + //outputLog(url, timeStamp) } - override fun onFailEvent(hashCode: Int, url: String, timeStamp: Long, currentFailCount: Long) { - outputLog(url, timeStamp, true) + override fun onFailEvent( + hashCode: Int, + url: String, + timeStamp: Long, + currentFailCount: Long + ) { + //outputLog(url, timeStamp, true) } override fun onWeakNetworkEvent() { -// // 大而全接口干扰，需排除掉 -// Log.d(TAG, "收到弱网事件!") + // 大而全接口干扰，需排除掉 + //Log.d(TAG, "收到弱网事件!") + } + + override fun logMethod(name: String, startTime: Long) { + ToastUtils.showShort("当前网络质量差!") + + // 网络质量差的请求上报埋点 + val elapsedTime: Long = System.nanoTime() - startTime + val properties: MutableMap = HashMap() + properties["http_request"] = name + properties["http_request_start_time"] = startTime + properties["http_request_elapsed_time"] = elapsedTime + + MogoAnalyticUtils.track("http_net_status", properties) } }) } diff --git a/gradle.properties b/gradle.properties index 03867ca71b..51358453fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -64,21 +64,21 @@ bytex.ASM_API=ASM7 LOGLIB_VERSION=1.10.18 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION -MOGO_NETWORK_VERSION=1.4.7.33 +MOGO_NETWORK_VERSION=1.4.7.35 # 鉴权 -MOGO_PASSPORT_VERSION=1.4.7.33 +MOGO_PASSPORT_VERSION=1.4.7.35 # 长链接 -MOGO_SOCKET_VERSION=1.4.7.33 +MOGO_SOCKET_VERSION=1.4.7.35 # 数据采集 -MOGO_REALTIME_VERSION=1.4.7.33 +MOGO_REALTIME_VERSION=1.4.7.35 # 直播推流 -MOGO_LIVE_VERSION=1.4.7.33 +MOGO_LIVE_VERSION=1.4.7.35 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.4.7.33 +MOGO_TRAFFICLIVE_VERSION=1.4.7.35 # 定位服务 -MOGO_LOCATION_VERSION=1.4.7.33 +MOGO_LOCATION_VERSION=1.4.7.35 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.4.7.33 +MOGO_TELEMATIC_VERSION=1.4.7.35 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=3.4.0.6