[2.15.0][Fix]解决首次安装App时无法获得高德定位导致的高精地图缓存问题

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/map/OfflineMapDialog.kt

@@ -8,6 +8,7 @@ import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
+import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.hmi.R
@@ -37,6 +38,8 @@ class OfflineMapDialog(context: Context): BaseFloatDialog(context) {
     private var isConfirm = true
     private var isRetry = false
 
+    var location: MogoLocation? = null
+
     init {
         setContentView(R.layout.dialog_offline_map)
         setCanceledOnTouchOutside(true)
@@ -89,8 +92,8 @@ class OfflineMapDialog(context: Context): BaseFloatDialog(context) {
         }
     }
 
-    private fun cacheHDOfflineData() {
-        CallerMapUIServiceManager.cacheHDDataByCity(object : IHdCacheListener {
+    private fun cacheHDDataByCityByLonLat() {
+        CallerMapUIServiceManager.cacheHDDataByCityByLonLat(object : IHdCacheListener {
             override fun onMapHdCacheProgress(cityId: Int, progress: Double) {
                 updateProgress(progress.toInt())
             }
@@ -100,7 +103,25 @@ class OfflineMapDialog(context: Context): BaseFloatDialog(context) {
                     showNewContent(isLoading = false, false)
                 }
             }
-        })
+        }, location!!)
+    }
+
+    private fun cacheHDOfflineData() {
+        if (location == null) {// 拿到了高德地图的cityCode
+            CallerMapUIServiceManager.cacheHDDataByCity(object : IHdCacheListener {
+                override fun onMapHdCacheProgress(cityId: Int, progress: Double) {
+                    updateProgress(progress.toInt())
+                }
+
+                override fun onMapHdCacheResult(cityId: Int, state: Int) {
+                    if (state == 0) {// 失败
+                        showNewContent(isLoading = false, false)
+                    }
+                }
+            })
+        } else {// 只拿到了高精的经纬度
+            cacheHDDataByCityByLonLat()
+        }
     }
 
     @SuppressLint("SetTextI18n")

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt

@@ -8,10 +8,13 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
 import com.mogo.eagle.core.data.deva.bindingcar.AdUpgradeStateHelper
 import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo
+import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
+import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationWGS84Listener
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
 import com.mogo.eagle.core.function.api.hmi.autopilot.IMoGoCheckAutoPilotBtnListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
+import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
@@ -37,7 +40,7 @@ class SystemVersionView @JvmOverloads constructor(
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoAutopilotStatusListener,
-    IMoGoDevaToolsListener, IMoGoCheckAutoPilotBtnListener {
+    IMoGoDevaToolsListener, IMoGoCheckAutoPilotBtnListener, IMoGoChassisLocationWGS84Listener {
 
     companion object {
         const val TAG = "SystemVersionView"
@@ -55,6 +58,7 @@ class SystemVersionView @JvmOverloads constructor(
     private var currentProgress: Int = -1 //当前已下载包体大小
 
     private var isHDCached = false
+    private var location: MogoLocation? = null
 
     init {
         LayoutInflater.from(context).inflate(R.layout.view_system_version, this, true)
@@ -137,7 +141,17 @@ class SystemVersionView @JvmOverloads constructor(
             if (isHDCached) {// 已缓存
                 ToastUtils.showShort(resources.getString(R.string.offline_had_downloaded))
             } else {// 未缓存
-                OfflineMapDialog(context).show()
+                if (CallerMapUIServiceManager.getCityCode().isNullOrEmpty()) {// 未拿到高德的cityCode
+                    if (location == null || (location!!.longitude <= 0.0 && location!!.latitude <= 0.0)) {// 未拿到高精的经纬度
+                        ToastUtils.showShort(resources.getString(R.string.location_try_again))
+                    } else {// 拿到了高精的经纬度
+                        val dialog = OfflineMapDialog(context)
+                        dialog.location = location
+                        dialog.show()
+                    }
+                } else {// 拿到高德的cityCode
+                    OfflineMapDialog(context).show()
+                }
             }
         }
 
@@ -292,6 +306,7 @@ class SystemVersionView @JvmOverloads constructor(
         CallerHmiListenerManager.addListener(TAG, this)
         CallerAutoPilotStatusListenerManager.addListener(TAG, this)
         CallerDevaToolsListenerManager.addListener(TAG,this)
+        CallerChassisLocationWGS84ListenerManager.addListener(TAG, this)
         needQueryContainers = true
     }
 
@@ -303,6 +318,7 @@ class SystemVersionView @JvmOverloads constructor(
         CallerHmiListenerManager.removeListener(TAG)
         CallerAutoPilotStatusListenerManager.removeListener(TAG)
         CallerDevaToolsListenerManager.removeListener(TAG)
+        CallerChassisLocationWGS84ListenerManager.removeListener(TAG)
         needQueryContainers = false
     }
 
@@ -361,4 +377,7 @@ class SystemVersionView @JvmOverloads constructor(
         adCircularProgressView?.visibility = View.GONE
     }
 
+    override fun onChassisLocationWGS84(gnssInfo: MogoLocation) {
+        location = gnssInfo
+    }
 }

core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml

@@ -75,6 +75,7 @@
     <string name="offline_download_success">离线地图下载成功</string>
     <string name="offline_download_failure">离线地图下载失败</string>
     <string name="offline_had_downloaded">当前已为最新版本</string>
+    <string name="location_try_again">请检查定位是否正常</string>
     <string name="ok_tip">确定</string>
     <string name="retry">重试</string>
 </resources>