From 5ab16c2387f9ec57bdb568856fb67f8f6cc62e47 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 17 Mar 2026 15:15:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=87=8C=E5=90=AF=E7=94=A8=E7=8A=B6=E6=80=81=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E6=A0=87=E8=AF=86=E3=80=82=E8=AE=BE=E7=BD=AE=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E8=B7=9D=E7=A6=BB=E6=96=87=E5=AD=97=E7=9A=84=E7=BB=BF?= =?UTF-8?q?=E8=89=B2=E4=B8=8E=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E7=BB=BF=E8=89=B2=E5=8D=8F=E8=B0=83=E4=B8=80=E8=87=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- positions/build.properties | 4 ++-- .../studio/positions/views/PositionTaskListView.java | 10 +++++++--- positions/src/main/res/values/colors.xml | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/positions/build.properties b/positions/build.properties index 28cb15a..38ed51f 100644 --- a/positions/build.properties +++ b/positions/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Jan 24 21:01:09 HKT 2026 +#Tue Mar 17 07:11:43 GMT 2026 stageCount=13 libraryProject= baseVersion=15.12 publishVersion=15.12.12 -buildCount=0 +buildCount=6 baseBetaVersion=15.12.13 diff --git a/positions/src/main/java/cc/winboll/studio/positions/views/PositionTaskListView.java b/positions/src/main/java/cc/winboll/studio/positions/views/PositionTaskListView.java index b9661b3..d63a5aa 100644 --- a/positions/src/main/java/cc/winboll/studio/positions/views/PositionTaskListView.java +++ b/positions/src/main/java/cc/winboll/studio/positions/views/PositionTaskListView.java @@ -331,7 +331,11 @@ public class PositionTaskListView extends LinearLayout { String distanceCond = task.isGreaterThan() ? "大于" : "小于"; simpleHolder.tvSimpleDistanceCond.setText(String.format("条件：距离 %s %d 米", distanceCond, task.getDiscussDistance())); // 启用状态 - simpleHolder.tvSimpleIsEnable.setText(task.isEnable() ? "状态：已启用" : "状态：已禁用"); + simpleHolder.tvSimpleIsEnable.setText(task.isEnable() ? "状态：已启用" : "状态：已禁用"); + // 修改为从colors.xml读取颜色 + simpleHolder.tvSimpleIsEnable.setTextColor(task.isEnable() + ? getContext().getResources().getColor(R.color.colorEnableGreen) + : getContext().getResources().getColor(R.color.colorGrayText)); // isBingo红点（任务触发时显示，未触发时隐藏） simpleHolder.vBingoDot.setVisibility(task.isBingo() ? View.VISIBLE : View.GONE); } else if (holder instanceof TaskContentViewHolder) { @@ -380,7 +384,7 @@ public class PositionTaskListView extends LinearLayout { // 步骤3：刷新Adapter（局部刷新+范围通知，避免列表错乱） notifyItemRemoved(position); notifyItemRangeChanged(position, mAdapterData.size()); - + LogUtils.d(TAG, "Adapter已移除任务，刷新列表（位置索引=" + position + "）"); // 步骤4：通知外部（如Activity）任务已更新 @@ -457,7 +461,7 @@ public class PositionTaskListView extends LinearLayout { } }); } - + private String genSelectedTimeText(long timeMillis) { // 2. 格式化时间字符串（Java 7 用 SimpleDateFormat，需处理 ParseException） SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()); diff --git a/positions/src/main/res/values/colors.xml b/positions/src/main/res/values/colors.xml index 0084700..1aa1655 100644 --- a/positions/src/main/res/values/colors.xml +++ b/positions/src/main/res/values/colors.xml @@ -27,7 +27,7 @@ #F5F5F5 - #4CAF50 + #2E8B57 #FFC107 #333333 #999999