|
|
@@ -26,16 +26,15 @@ import com.baidu.mapapi.model.LatLngBounds
|
|
|
import com.nostra13.universalimageloader.core.DisplayImageOptions
|
|
|
import com.nostra13.universalimageloader.core.assist.ImageScaleType
|
|
|
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer
|
|
|
-import com.sikey.interconnect.component.designpattern.observerpattern.datamanager.IAvatarObserver
|
|
|
import com.sikey.interconnect.R
|
|
|
import com.sikey.interconnect.app.DataManager
|
|
|
import com.sikey.interconnect.app.DataManager.Companion.instance
|
|
|
+import com.sikey.interconnect.component.VersionMatch.VersionMatch
|
|
|
+import com.sikey.interconnect.component.designpattern.observerpattern.datamanager.IAvatarObserver
|
|
|
import com.sikey.interconnect.component.log.Logger
|
|
|
import com.sikey.interconnect.component.network.http.model.ChildInfo
|
|
|
-import com.sikey.interconnect.component.VersionMatch.VersionMatch
|
|
|
import com.sikey.interconnect.constant.Constant
|
|
|
import com.sikey.interconnect.constant.RoleTypeConstants
|
|
|
-import com.sikey.interconnect.data.AccountManager
|
|
|
import com.sikey.interconnect.k2.utils.BitmapUtils
|
|
|
import com.sikey.interconnect.ui.adapter.ChildInfoAdapter
|
|
|
import com.sikey.interconnect.ui.custom.menu.satellite.CustomSatelliteMenu
|
|
|
@@ -135,7 +134,7 @@ class BaiduMapFragment : Fragment(), BaiduMap.OnMarkerClickListener, IAvatarObse
|
|
|
lifecycleScope.launch {
|
|
|
delay(500)
|
|
|
for (info in items) {
|
|
|
- if (info.roleType <= RoleTypeConstants.FAMILY) {
|
|
|
+ if (info.roleType <= RoleTypeConstants.FAMILY && info.lastLocation != null) {
|
|
|
var lat = info.lastLocation?.lat ?: "0.0"
|
|
|
if (lat.isEmpty()) lat = "0.0"
|
|
|
var lng = info.lastLocation?.lng ?: "0.0"
|
