ABBIDOT_APP/Abbidot_Android
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化字符串不统一问题

Browse Source
This commit is contained in:
yezhiqiu
2025-12-29 14:49:50 +08:00
parent 2bd26b81cb
commit 9a6df5bbc9
9 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/AddAndEditFencesZoneBaseActivity.kt
View File

@@ -604,12 +604,14 @@ open class AddAndEditFencesZoneBaseActivity :
fencesZoneCircleView.setColorAndImage(
mContext,
R.color.select_color2,
locationDrawableRes = R.drawable.icon_fences_zone_gps_green_svg
locationDrawableRes = R.drawable.icon_fences_zone_gps_green_svg,
disTextColorRes = R.color.white
)
fencesZoneRectView.setColorAndImage(
mContext,
R.color.select_color2,
locationDrawableRes = R.drawable.icon_fences_zone_gps_green_svg
locationDrawableRes = R.drawable.icon_fences_zone_gps_green_svg,
disTextColorRes = R.color.white
)
fencesZonePolygonView.setColorAndImage(
mContext,
@@ -620,12 +622,14 @@ open class AddAndEditFencesZoneBaseActivity :
fencesZoneCircleView.setColorAndImage(
mContext,
R.color.select_color,
locationDrawableRes = R.drawable.icon_fences_zone_gps_svg
locationDrawableRes = R.drawable.icon_fences_zone_gps_svg,
disTextColorRes = R.color.black
)
fencesZoneRectView.setColorAndImage(
mContext,
R.color.select_color,
locationDrawableRes = R.drawable.icon_fences_zone_gps_svg
locationDrawableRes = R.drawable.icon_fences_zone_gps_svg,
disTextColorRes = R.color.black
)
fencesZonePolygonView.setColorAndImage(
mContext,

3
app/src/main/java/com/abbidot/tracker/ui/fragment/data/ActivityV2Fragment.kt
View File

@@ -67,8 +67,11 @@ class ActivityV2Fragment :
ilSportActiveLayout.let {
it.root.background =
ContextCompat.getDrawable(mContext!!, R.drawable.shape8_gray_yellow_bg)
val tColor = ContextCompat.getColor(mContext!!, R.color.data_black_color)
it.ivSportTimeType.setImageResource(R.drawable.icon_active_time)
it.tvSportTimeTitle.text = getText(R.string.data_active_other_time)
it.tvSportTimeTitle.setTextColor(tColor)
it.tvSportTimeContent.setTextColor(tColor)
}
//下拉刷新

7
app/src/main/java/com/abbidot/tracker/widget/FencesCircleView.kt
View File

@@ -316,7 +316,8 @@ class FencesCircleView : View {
dashedColorRes: Int = 0,
fillBgColorRes: Int = 0,
locationDrawableRes: Int = 0,
zoomDrawableRes: Int = 0
zoomDrawableRes: Int = 0,
disTextColorRes: Int = 0
) {
var isRefresh = false
if (dashedColorRes > 0) {
@@ -337,6 +338,10 @@ class FencesCircleView : View {
mZoomBitmap = ImageUtil.getBitmapFromDrawableAndSvg(context, zoomDrawableRes)
isRefresh = true
}
if (disTextColorRes > 0) {
mTextPaint.color = ContextCompat.getColor(context, disTextColorRes)
isRefresh = true
}
if (isRefresh) invalidate()
}

6
app/src/main/java/com/abbidot/tracker/widget/FencesRectView.kt
View File

@@ -341,7 +341,7 @@ class FencesRectView : View {
locationDrawableRes: Int = 0,
zoomDrawableRes: Int = 0,
dotDrawableRes: Int = 0,
rotateDrawableRes: Int = 0
rotateDrawableRes: Int = 0,disTextColorRes: Int = 0
) {
var isRefresh = false
if (dashedColorRes > 0) {
@@ -371,6 +371,10 @@ class FencesRectView : View {
mDotBitmap = ImageUtil.getBitmapFromDrawableAndSvg(context, dotDrawableRes)
isRefresh = true
}
if (disTextColorRes > 0) {
mTextPaint.color = ContextCompat.getColor(context, disTextColorRes)
isRefresh = true
}
if (isRefresh) invalidate()
}