diff --git a/contacts/build.properties b/contacts/build.properties index 6ef5d9d..1eeee6c 100644 --- a/contacts/build.properties +++ b/contacts/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Apr 09 01:41:37 HKT 2026 +#Wed Apr 08 18:16:31 GMT 2026 stageCount=8 libraryProject= baseVersion=15.14 publishVersion=15.14.7 -buildCount=0 +buildCount=9 baseBetaVersion=15.14.8 diff --git a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java index a8539a0..35dd5bb 100644 --- a/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java +++ b/contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java @@ -22,6 +22,7 @@ import cc.winboll.studio.libappbase.ToastUtils; import java.text.SimpleDateFormat; import java.util.List; import java.util.Locale; +import cc.winboll.studio.contacts.dun.Rules; /** * @Author ZhanGSKen&豆包大模型 @@ -119,6 +120,14 @@ public class CallLogAdapter extends RecyclerView.Adapter 0 && newDunCount < mSettingsModel.getDunTotalCount()) { - mSettingsModel.setDunCurrentCount(newDunCount); - LogUtils.d(TAG, String.format("设置防御层数为 %d", newDunCount)); - } else { - mSettingsModel.setDunCurrentCount(mSettingsModel.getDunTotalCount()); - LogUtils.d(TAG, String.format("盾值不在[0,%d]区间,恢复防御最大值%d", mSettingsModel.getDunTotalCount(), mSettingsModel.getDunTotalCount())); - } + // 保证盾值在[1,DunTotalCount]之内其他值一律重置为 DunTotalCount。 + if (newDunCount > 0 && newDunCount < mSettingsModel.getDunTotalCount()) { + mSettingsModel.setDunCurrentCount(newDunCount); + LogUtils.d(TAG, String.format("设置防御层数为 %d", newDunCount)); + } else { + mSettingsModel.setDunCurrentCount(mSettingsModel.getDunTotalCount()); + LogUtils.d(TAG, String.format("盾值不在[0,%d]区间,恢复防御最大值%d", mSettingsModel.getDunTotalCount(), mSettingsModel.getDunTotalCount())); + } - saveDun(); - SettingsActivity.notifyDunInfoUpdate(); - } + saveDun(); + SettingsActivity.notifyDunInfoUpdate(); + } - // 返回校验结果 - LogUtils.d(TAG, String.format("返回校验结果 isConnect == %s", isConnect)); - // 一键更新所有 DunTemperatureView 实例的盾值 - DunTemperatureView.updateDunValue(mSettingsModel.getDunTotalCount(), mSettingsModel.getDunCurrentCount()); + // 一键更新所有 DunTemperatureView 实例的盾值 + DunTemperatureView.updateDunValue(mSettingsModel.getDunTotalCount(), mSettingsModel.getDunCurrentCount()); + } - return isConnect; - } + // 返回校验结果 + LogUtils.d(TAG, String.format("返回校验结果 isConnect == %s", isConnect)); + return isConnect; + } public void add(String szPhoneConnectRule, boolean isAllowConnection, boolean isEnable) { _PhoneConnectRuleModelList.add(new PhoneConnectRuleBean(szPhoneConnectRule, isAllowConnection, isEnable)); diff --git a/contacts/src/main/res/menu/toolbar_calllog_phonenumber.xml b/contacts/src/main/res/menu/toolbar_calllog_phonenumber.xml index 429c45f..2626dd9 100644 --- a/contacts/src/main/res/menu/toolbar_calllog_phonenumber.xml +++ b/contacts/src/main/res/menu/toolbar_calllog_phonenumber.xml @@ -5,6 +5,9 @@ +