From b6f4d87ca99138167fd774cf381dd8b02ee95e77 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 24 Apr 2023 21:07:22 +0800
Subject: [PATCH] =?UTF-8?q?[login]=20[3.2.0]=20[=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=8F=E7=BA=AC=E5=BA=A6=20=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E7=9B=91=E5=90=AC=E7=9B=B4=E6=8E=A5=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=80=BC]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/biz/model/OchCommonLoginModel.kt   | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt
index 4b48f87c59..27f4b19f7b 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginModel.kt
@@ -3,8 +3,6 @@ package com.mogo.och.common.module.biz.model
 import android.annotation.SuppressLint
 import android.content.Context
 import com.mogo.eagle.core.data.BaseData
-import com.mogo.eagle.core.data.map.MogoLocation
-import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.mogo.eagle.core.utilcode.util.SharedPrefs
@@ -26,17 +24,13 @@ import com.mogo.och.common.module.utils.ToastUtilsOch
  * 网约车 - 出租车业务逻辑处理
  */
 @SuppressLint("StaticFieldLeak")
-object OchCommonLoginModel : IMoGoChassisLocationGCJ02Listener {
+object OchCommonLoginModel {
 
     private val TAG = "TaxiLoginModel"
     private var mContext: Context? = null
     var iTaxiLoginCallback: ITaxiLoginCallback? = null
-    private var mLongitude = 0.0
-    private var mLatitude = 0.0
     fun init(context: Context) {
         mContext = context.applicationContext
-        // 达到起始站围栏监听
-        CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this)
     }
 
     fun hasInit(): Boolean {
@@ -46,13 +40,6 @@ object OchCommonLoginModel : IMoGoChassisLocationGCJ02Listener {
         return true
     }
 
-    override fun onChassisLocationGCJ02(gnssInfo: MogoLocation?) {
-        gnssInfo?.let {
-            mLongitude = it.longitude
-            mLatitude = it.latitude
-        }
-    }
-
     fun getiTaxiLoginCallback(): ITaxiLoginCallback? {
         return iTaxiLoginCallback
     }
@@ -64,8 +51,6 @@ object OchCommonLoginModel : IMoGoChassisLocationGCJ02Listener {
     fun release() {
         mContext = null
         iTaxiLoginCallback = null
-        // 注销到达起始站围栏监听
-        CallerChassisLocationGCJ02ListenerManager.removeListener(TAG)
     }
 
     /**
@@ -105,7 +90,8 @@ object OchCommonLoginModel : IMoGoChassisLocationGCJ02Listener {
 
     fun gotoLogin(phone: String, code: String) {
         mContext?.let {
-            val location4Login = TaxiLoginReqBean.Location4Login(mLatitude, mLongitude)
+            val location = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
+            val location4Login = TaxiLoginReqBean.Location4Login(location.latitude, location.longitude)
             OchCommonServiceManager.gotoLoginBycode(it, phone, code, location4Login,
                 object : OchCommonServiceCallback<TaxiLoginRespBean> {
                     override fun onSuccess(data: TaxiLoginRespBean?) {