diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/view/OchCustomViewProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/view/OchCustomViewProvider.kt index f3506c099d..0cee2cdba1 100644 --- a/OCH/facade/src/main/java/com/mogo/och/facade/view/OchCustomViewProvider.kt +++ b/OCH/facade/src/main/java/com/mogo/och/facade/view/OchCustomViewProvider.kt @@ -8,20 +8,33 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.och.IOchCustomViewProvider import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON +import com.mogo.och.common.module.biz.login.ILoginCallback +import com.mogo.och.common.module.biz.login.LoginStatusEnum +import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.common.module.biz.provider.CommonService import com.mogo.och.facade.constant.FacadeConst import com.mogo.och.facade.route.FacadeProvider -import kotlin.random.Random @Route(path = FacadeConst.OCH_VIEW_PATH) -class OchCustomViewProvider : IOchCustomViewProvider { +class OchCustomViewProvider : IOchCustomViewProvider, ILoginCallback { companion object { - const val TAG = "OchCustomViewProvider" + const val TAG = M_OCHCOMMON+"OchCustomViewProvider" + } + + init { + LoginStatusManager.addListener(TAG,this) } private var commonService: CommonService?=null + override fun onStatusChange(currentStatus: LoginStatusEnum?) { + if(currentStatus!=LoginStatusEnum.Login){ + commonService = null + } + } + override fun init(context: Context?) { CallerLogger.d(TAG, "init") } diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/RepositoryManager.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/RepositoryManager.kt index 120c014415..d837a15762 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/RepositoryManager.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/RepositoryManager.kt @@ -230,8 +230,9 @@ object RepositoryManager { if (lineInfo == null && taskAndsite.lineId != null && taskAndsite.lineName != null) { lineInfo = LineInfo(taskAndsite.lineId!!, taskAndsite.lineName!!, orderId = taskAndsite.taskId.toString()) } - lineInfo?.multiMap?.put("taskInfo",LineModel.getTaskTime()) } + lineInfo?.multiMap?.put("taskInfo",LineModel.getTaskTime()) + lineInfo?.siteInfos = result LineManager.setLineInfo(lineInfo) return Pair(result,currentStationIndex)