From a70e319462bc1913d0f61f20ec3dec20268dbfe2 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 24 Feb 2025 17:10:03 +0800 Subject: [PATCH] =?UTF-8?q?[6.10.0]=20[fix]=20[=E6=89=BE=E5=9B=9E=20?= =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E6=A8=A1=E5=BC=8F=E5=B1=95=E7=A4=BA=E7=99=BB?= =?UTF-8?q?=E5=BD=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/biz/time/TimeProvider.kt | 2 +- .../och/offline/ui/go2login/GoLoginModel.kt | 30 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/time/TimeProvider.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/time/TimeProvider.kt index 95a50fae0a..e70b87282e 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/time/TimeProvider.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/time/TimeProvider.kt @@ -126,7 +126,7 @@ class TimeProvider : TimeService { } fun tryload(){ - if (netTime > 3_000) { + if (netTime > 3_000 || FunctionBuildConfig.isOffLine) { // 网络延迟大 10s 同步一次 RxUtils.disposeSubscribe(nextGetTime) nextGetTime = RxUtils.createSubscribeOnOwnThread(30_000) { diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/go2login/GoLoginModel.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/go2login/GoLoginModel.kt index fe121c0f47..fc1722f77b 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/go2login/GoLoginModel.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/go2login/GoLoginModel.kt @@ -78,21 +78,21 @@ class GoLoginModel : ViewModel(), IBusLinesCallback { fun createTimelater(){ d(TAG,"开始检查是否展示登录页面") -// if(FunctionBuildConfig.isOffLine){ -// // 2分钟内有网络成功过 -// if(System.currentTimeMillis()- OchCommonNet.getLastNetSuccessTime()<60*1000){ -// if (NetworkUtils.isConnected()) { -// BizLoopManager.runInMainThread{ -// this.viewCallback?.showView() -// } -// } -// } -// } -// RxUtils.disposeSubscribe(time60_000) -// time60_000 = RxUtils.createSubscribeOnOwnThread(60_000) { -// // 检测是否需要展示 -// createTimelater() -// } + if(FunctionBuildConfig.isOffLine){ + // 2分钟内有网络成功过 + if(System.currentTimeMillis()- OchCommonNet.getLastNetSuccessTime()<60*1000){ + if (NetworkUtils.isConnected()) { + BizLoopManager.runInMainThread{ + this.viewCallback?.showView() + } + } + } + } + RxUtils.disposeSubscribe(time60_000) + time60_000 = RxUtils.createSubscribeOnOwnThread(60_000) { + // 检测是否需要展示 + createTimelater() + } } override fun onRunningTask() {