diff --git a/app/src/main/java/com/casic/smarttube/adapter/OverviewGroupListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/OverviewGroupListAdapter.kt index d19a013..fca5514 100644 --- a/app/src/main/java/com/casic/smarttube/adapter/OverviewGroupListAdapter.kt +++ b/app/src/main/java/com/casic/smarttube/adapter/OverviewGroupListAdapter.kt @@ -1,6 +1,8 @@ package com.casic.smarttube.adapter import android.content.Context +import android.os.Build +import android.text.Html import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -58,8 +60,24 @@ }) } holder.totalDeviceNumView.text = String.format("设备总数：${rowsBean.totalDevice}") - holder.inUseDeviceNumView.text = String.format("已激活：${rowsBean.alive}") - holder.notUseDeviceNumView.text = String.format("未激活：${rowsBean.unalive}") + + val inUseText = String.format("已激活：%s", rowsBean.alive) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + holder.inUseDeviceNumView.text = Html.fromHtml( + inUseText, Html.FROM_HTML_MODE_LEGACY, null, null + ) + } else { + holder.inUseDeviceNumView.text = Html.fromHtml(inUseText) + } + + val notUseText = String.format("未激活：%s", rowsBean.unalive) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + holder.notUseDeviceNumView.text = Html.fromHtml( + notUseText, Html.FROM_HTML_MODE_LEGACY, null, null + ) + } else { + holder.notUseDeviceNumView.text = Html.fromHtml(notUseText) + } //绑定事件 holder.itemView.setOnClickListener { diff --git a/app/src/main/java/com/casic/smarttube/adapter/OverviewGroupListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/OverviewGroupListAdapter.kt index d19a013..fca5514 100644 --- a/app/src/main/java/com/casic/smarttube/adapter/OverviewGroupListAdapter.kt +++ b/app/src/main/java/com/casic/smarttube/adapter/OverviewGroupListAdapter.kt @@ -1,6 +1,8 @@ package com.casic.smarttube.adapter import android.content.Context +import android.os.Build +import android.text.Html import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -58,8 +60,24 @@ }) } holder.totalDeviceNumView.text = String.format("设备总数：${rowsBean.totalDevice}") - holder.inUseDeviceNumView.text = String.format("已激活：${rowsBean.alive}") - holder.notUseDeviceNumView.text = String.format("未激活：${rowsBean.unalive}") + + val inUseText = String.format("已激活：%s", rowsBean.alive) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + holder.inUseDeviceNumView.text = Html.fromHtml( + inUseText, Html.FROM_HTML_MODE_LEGACY, null, null + ) + } else { + holder.inUseDeviceNumView.text = Html.fromHtml(inUseText) + } + + val notUseText = String.format("未激活：%s", rowsBean.unalive) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + holder.notUseDeviceNumView.text = Html.fromHtml( + notUseText, Html.FROM_HTML_MODE_LEGACY, null, null + ) + } else { + holder.notUseDeviceNumView.text = Html.fromHtml(notUseText) + } //绑定事件 holder.itemView.setOnClickListener { diff --git a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt index 3c2c370..650ba28 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt @@ -11,10 +11,7 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration -import com.amap.api.maps.AMap -import com.amap.api.maps.AMapOptions -import com.amap.api.maps.CameraUpdateFactory -import com.amap.api.maps.CoordinateConverter +import com.amap.api.maps.* import com.amap.api.maps.model.CameraPosition import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.Marker @@ -417,9 +414,20 @@ } } - //TODO 需要根据点击的Popup显示列表 deviceModels.forEach { - multiDevice.add(it.devcode) + val lat = it.latGaode.toString() + val lng = it.lngGaode.toString() + if (lat.isNotBlank() && lng.isNotBlank()) { + //返回true代表当前位置在大陆、港澳地区，反之不在 + val latitude = lat.toDouble() + val longitude = lng.toDouble() + val calculateLineDistance = AMapUtils.calculateLineDistance( + clickedLatLng, LatLng(latitude, longitude) + ) + if (calculateLineDistance < LocaleConstant.RADIUS_SIZE) { + multiDevice.add(it.devcode) + } + } } //查看聚合点，单独开页面导航过去 BottomActionSheet.Builder() diff --git a/app/src/main/java/com/casic/smarttube/adapter/OverviewGroupListAdapter.kt b/app/src/main/java/com/casic/smarttube/adapter/OverviewGroupListAdapter.kt index d19a013..fca5514 100644 --- a/app/src/main/java/com/casic/smarttube/adapter/OverviewGroupListAdapter.kt +++ b/app/src/main/java/com/casic/smarttube/adapter/OverviewGroupListAdapter.kt @@ -1,6 +1,8 @@ package com.casic.smarttube.adapter import android.content.Context +import android.os.Build +import android.text.Html import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -58,8 +60,24 @@ }) } holder.totalDeviceNumView.text = String.format("设备总数：${rowsBean.totalDevice}") - holder.inUseDeviceNumView.text = String.format("已激活：${rowsBean.alive}") - holder.notUseDeviceNumView.text = String.format("未激活：${rowsBean.unalive}") + + val inUseText = String.format("已激活：%s", rowsBean.alive) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + holder.inUseDeviceNumView.text = Html.fromHtml( + inUseText, Html.FROM_HTML_MODE_LEGACY, null, null + ) + } else { + holder.inUseDeviceNumView.text = Html.fromHtml(inUseText) + } + + val notUseText = String.format("未激活：%s", rowsBean.unalive) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + holder.notUseDeviceNumView.text = Html.fromHtml( + notUseText, Html.FROM_HTML_MODE_LEGACY, null, null + ) + } else { + holder.notUseDeviceNumView.text = Html.fromHtml(notUseText) + } //绑定事件 holder.itemView.setOnClickListener { diff --git a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt index 3c2c370..650ba28 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/HomePageFragment.kt @@ -11,10 +11,7 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration -import com.amap.api.maps.AMap -import com.amap.api.maps.AMapOptions -import com.amap.api.maps.CameraUpdateFactory -import com.amap.api.maps.CoordinateConverter +import com.amap.api.maps.* import com.amap.api.maps.model.CameraPosition import com.amap.api.maps.model.LatLng import com.amap.api.maps.model.Marker @@ -417,9 +414,20 @@ } } - //TODO 需要根据点击的Popup显示列表 deviceModels.forEach { - multiDevice.add(it.devcode) + val lat = it.latGaode.toString() + val lng = it.lngGaode.toString() + if (lat.isNotBlank() && lng.isNotBlank()) { + //返回true代表当前位置在大陆、港澳地区，反之不在 + val latitude = lat.toDouble() + val longitude = lng.toDouble() + val calculateLineDistance = AMapUtils.calculateLineDistance( + clickedLatLng, LatLng(latitude, longitude) + ) + if (calculateLineDistance < LocaleConstant.RADIUS_SIZE) { + multiDevice.add(it.devcode) + } + } } //查看聚合点，单独开页面导航过去 BottomActionSheet.Builder() diff --git a/app/src/main/res/layout/dialog_multi_select.xml b/app/src/main/res/layout/dialog_multi_select.xml index b67ced0..2fdf13a 100644 --- a/app/src/main/res/layout/dialog_multi_select.xml +++ b/app/src/main/res/layout/dialog_multi_select.xml @@ -33,7 +33,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" - android:padding="@dimen/dp_10" + android:paddingHorizontal="@dimen/dp_10" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />