diff --git a/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
index 15bc2f7..787270e 100644
--- a/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -1 +1 @@
-#Fri Nov 28 15:02:35 CST 2025
+#Fri Dec 26 18:05:45 CST 2025
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/AddAndEditFencesZoneBaseActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/AddAndEditFencesZoneBaseActivity.kt
index f5ac682..c9967d0 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/AddAndEditFencesZoneBaseActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/AddAndEditFencesZoneBaseActivity.kt
@@ -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,
diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/ActivityV2Fragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/ActivityV2Fragment.kt
index 042a89f..583eda2 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/ActivityV2Fragment.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/ActivityV2Fragment.kt
@@ -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)
}
//下拉刷新
diff --git a/app/src/main/java/com/abbidot/tracker/widget/FencesCircleView.kt b/app/src/main/java/com/abbidot/tracker/widget/FencesCircleView.kt
index edd7e6f..0878467 100644
--- a/app/src/main/java/com/abbidot/tracker/widget/FencesCircleView.kt
+++ b/app/src/main/java/com/abbidot/tracker/widget/FencesCircleView.kt
@@ -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()
}
diff --git a/app/src/main/java/com/abbidot/tracker/widget/FencesRectView.kt b/app/src/main/java/com/abbidot/tracker/widget/FencesRectView.kt
index f661a2a..312e221 100644
--- a/app/src/main/java/com/abbidot/tracker/widget/FencesRectView.kt
+++ b/app/src/main/java/com/abbidot/tracker/widget/FencesRectView.kt
@@ -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()
}
diff --git a/app/src/main/res/drawable/icon_sleep_time.xml b/app/src/main/res/drawable/icon_sleep_time.xml
index 7cb7436..113d697 100644
--- a/app/src/main/res/drawable/icon_sleep_time.xml
+++ b/app/src/main/res/drawable/icon_sleep_time.xml
@@ -8,19 +8,19 @@
android:pathData="M8,14.666C11.129,14.666 13.666,12.129 13.666,9C13.666,5.87 11.129,3.333 8,3.333C4.87,3.333 2.333,5.87 2.333,9C2.333,12.129 4.87,14.666 8,14.666Z"
android:strokeLineJoin="round"
android:fillColor="#00000000"
- android:strokeColor="#0F1719"/>
+ android:strokeColor="#ffffff"/>
diff --git a/app/src/main/res/drawable/shape8_gray_white_bg.xml b/app/src/main/res/drawable/shape8_gray_white_bg.xml
index 81f2fa2..aca7ea5 100644
--- a/app/src/main/res/drawable/shape8_gray_white_bg.xml
+++ b/app/src/main/res/drawable/shape8_gray_white_bg.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/app/src/main/res/layout/layout_sport_time.xml b/app/src/main/res/layout/layout_sport_time.xml
index 1d5d98d..4e1e151 100644
--- a/app/src/main/res/layout/layout_sport_time.xml
+++ b/app/src/main/res/layout/layout_sport_time.xml
@@ -19,7 +19,7 @@
android:layout_marginStart="@dimen/dp_4"
android:layout_toEndOf="@id/iv_sport_time_type"
android:text="@string/txt_resting_time"
- android:textColor="@color/select_color3"
+ android:textColor="@color/white"
android:textSize="@dimen/textSize12"
app:typeface="@string/roboto_regular_font" />
@@ -28,6 +28,7 @@
style="@style/my_TextView_style_v2"
android:layout_below="@id/iv_sport_time_type"
android:text="00:00:00"
+ android:textColor="@color/white"
android:textStyle="bold" />
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 32e0c04..71f1a8b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -718,11 +718,11 @@
per year)
Renews On:
Adding where they live can improve battery and provide extra safety
- Establish Power saving Zone
+ Establish WiFi Zone
Permanent residence saves power, enhances positioning.
Is this your pet\'s home?
Permanent Residence
- Choose Wi-Fi network, no password needed.
+ Choose Wi-Fi network
Later
What is your pet Measurement Units?
Your pet’s height