From be9855b29d6371fb496978447c189114110f6cb9 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 13 Jan 2026 11:44:12 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E7=B1=BB=E5=BA=93=E4=B8=8E=E5=BA=94=E7=94=A8=E4=BB=8B=E7=BB=8D?= =?UTF-8?q?=E9=A1=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbell/build.gradle | 21 +++-- powerbell/build.properties | 12 +-- powerbell/src/main/AndroidManifest.xml | 7 +- .../studio/powerbell/MainActivity.java | 3 +- .../powerbell/activities/AboutActivity.java | 81 +++++++++++++++++++ .../src/main/res/layout/activity_about.xml | 23 ++++++ 6 files changed, 125 insertions(+), 22 deletions(-) create mode 100644 powerbell/src/main/java/cc/winboll/studio/powerbell/activities/AboutActivity.java create mode 100644 powerbell/src/main/res/layout/activity_about.xml diff --git a/powerbell/build.gradle b/powerbell/build.gradle index 55533e4..237b3c6 100644 --- a/powerbell/build.gradle +++ b/powerbell/build.gradle @@ -18,22 +18,19 @@ def genVersionName(def versionName){ } android { - - // 关键：改为你已安装的 SDK 32（≥ targetSdkVersion 30，兼容已安装环境） - compileSdkVersion 32 - - // 直接使用已安装的构建工具 33.0.3（无需修改） - buildToolsVersion "33.0.3" + // 适配MIUI12 + compileSdkVersion 30 + buildToolsVersion "30.0.3" defaultConfig { applicationId "cc.winboll.studio.powerbell" - minSdkVersion 23 + minSdkVersion 21 targetSdkVersion 30 versionCode 7 // versionName 更新后需要手动设置 // .winboll/winbollBuildProps.properties 文件的 stageCount=0 // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" - versionName "15.14" + versionName "15.15" if(true) { versionName = genVersionName("${versionName}") } @@ -83,12 +80,12 @@ dependencies { //api 'androidx.fragment:fragment:1.1.0' // WinBoLL库 nexus.winboll.cc 地址 - api 'cc.winboll.studio:libaes:15.12.13' - api 'cc.winboll.studio:libappbase:15.14.2' + api 'cc.winboll.studio:libaes:15.15.2' + api 'cc.winboll.studio:libappbase:15.15.4' // WinBoLL备用库 jitpack.io 地址 - //api 'com.github.ZhanGSKen:AES:aes-v15.12.9' - //api 'com.github.ZhanGSKen:APPBase:appbase-v15.14.1' + //api 'com.github.ZhanGSKen:AES:aes-v15.15.2' + //api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.4' //api fileTree(dir: 'libs', include: ['*.aar']) api fileTree(dir: 'libs', include: ['*.jar']) diff --git a/powerbell/build.properties b/powerbell/build.properties index 0397356..3649464 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Jan 07 18:09:34 HKT 2026 -stageCount=50 +#Tue Jan 13 03:42:50 GMT 2026 +stageCount=0 libraryProject= -baseVersion=15.14 -publishVersion=15.14.49 -buildCount=0 -baseBetaVersion=15.14.50 +baseVersion=15.15 +publishVersion=15.15.0 +buildCount=2 +baseBetaVersion=15.15.1 diff --git a/powerbell/src/main/AndroidManifest.xml b/powerbell/src/main/AndroidManifest.xml index 4d60df8..62581a7 100644 --- a/powerbell/src/main/AndroidManifest.xml +++ b/powerbell/src/main/AndroidManifest.xml @@ -301,7 +301,8 @@ android:process=":main" android:stopWithTask="false"/> - + + - + \ No newline at end of file diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/MainActivity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/MainActivity.java index 0ad0bc2..b482573 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/MainActivity.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/MainActivity.java @@ -13,13 +13,13 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewStub; import androidx.appcompat.widget.Toolbar; -import cc.winboll.studio.libaes.activitys.AboutActivity; import cc.winboll.studio.libaes.models.APPInfo; import cc.winboll.studio.libaes.utils.AESThemeUtil; import cc.winboll.studio.libaes.utils.DevelopUtils; import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; import cc.winboll.studio.libaes.views.ADsBannerView; import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.powerbell.activities.AboutActivity; import cc.winboll.studio.powerbell.activities.BackgroundSettingsActivity; import cc.winboll.studio.powerbell.activities.BatteryReportActivity; import cc.winboll.studio.powerbell.activities.ClearRecordActivity; @@ -550,7 +550,6 @@ public class MainActivity extends WinBoLLActivity implements MainContentView.OnV LogUtils.d(TAG, "startAboutActivity() 调用"); Intent aboutIntent = new Intent(getApplicationContext(), AboutActivity.class); APPInfo appInfo = genDefaultAppInfo(); - aboutIntent.putExtra(AboutActivity.EXTRA_APPINFO, appInfo); WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), aboutIntent, AboutActivity.class); LogUtils.d(TAG, "startAboutActivity: 关于页面已启动"); } diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/AboutActivity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/AboutActivity.java new file mode 100644 index 0000000..21e1fa6 --- /dev/null +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/AboutActivity.java @@ -0,0 +1,81 @@ +package cc.winboll.studio.powerbell.activities; + +import android.app.Activity; +import android.os.Bundle; +import android.view.View; +import androidx.appcompat.widget.Toolbar; +import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.models.APPInfo; +import cc.winboll.studio.libappbase.views.AboutView; +import cc.winboll.studio.powerbell.R; + +/** + * @Author 豆包&ZhanGSKen + * @Date 2026/01/13 11:25 + * @Describe 应用介绍窗口 + */ +public class AboutActivity extends WinBoLLActivity { + + public static final String TAG = "AboutActivity"; + private Toolbar mToolbar; + @Override + public Activity getActivity() { + return this; + } + + @Override + public String getTag() { + return TAG; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_about); + + // 设置工具栏 + initToolbar(); + + AboutView aboutView = findViewById(R.id.aboutview); + aboutView.setAPPInfo(genDefaultAppInfo()); + } + + private void initToolbar() { + LogUtils.d(TAG, "initToolbar() 开始初始化"); + mToolbar = findViewById(R.id.toolbar); + if (mToolbar == null) { + LogUtils.e(TAG, "initToolbar() | Toolbar未找到"); + return; + } + setSupportActionBar(mToolbar); + mToolbar.setSubtitle(getTag()); + mToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + mToolbar.setNavigationOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + LogUtils.d(TAG, "导航栏 点击返回按钮"); + finish(); + } + }); + LogUtils.d(TAG, "initToolbar() 配置完成"); + } + + private APPInfo genDefaultAppInfo() { + LogUtils.d(TAG, "genDefaultAppInfo() 调用"); + String branchName = "powerbell"; + APPInfo appInfo = new APPInfo(); + appInfo.setAppName(getString(R.string.app_name)); + appInfo.setAppIcon(R.drawable.ic_winboll); + appInfo.setAppDescription(getString(R.string.app_description)); + appInfo.setAppGitName("PowerBell"); + appInfo.setAppGitOwner("Studio"); + appInfo.setAppGitAPPBranch(branchName); + appInfo.setAppGitAPPSubProjectFolder(branchName); + appInfo.setAppHomePage("https://www.winboll.cc/apks/index.php?project=PowerBell"); + appInfo.setAppAPKName("PowerBell"); + appInfo.setAppAPKFolderName("PowerBell"); + LogUtils.d(TAG, "genDefaultAppInfo: 应用信息已生成"); + return appInfo; + } +} diff --git a/powerbell/src/main/res/layout/activity_about.xml b/powerbell/src/main/res/layout/activity_about.xml new file mode 100644 index 0000000..3f84f0a --- /dev/null +++ b/powerbell/src/main/res/layout/activity_about.xml @@ -0,0 +1,23 @@ + + + + + + + + + From 53fb1ac835b095ac9f6afbce09282a80bcf7cd20 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 13 Jan 2026 11:47:03 +0800 Subject: [PATCH 02/31] APK 15.15.0 release Publish. --- powerbell/build.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 3649464..00cc607 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Jan 13 03:42:50 GMT 2026 -stageCount=0 +#Tue Jan 13 11:47:03 HKT 2026 +stageCount=1 libraryProject= baseVersion=15.15 publishVersion=15.15.0 -buildCount=2 +buildCount=0 baseBetaVersion=15.15.1 From f53113d0df04fc93e228f95aece36c29c6c03e52 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 19 Jan 2026 20:01:28 +0800 Subject: [PATCH 03/31] =?UTF-8?q?TTS=E8=B4=B4=E5=BF=83=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=BD=93=E5=89=8D=E7=94=B5=E9=87=8F=E8=AF=AD?= =?UTF-8?q?=E9=9F=B3=E6=8F=90=E9=86=92=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbell/build.properties | 4 +- .../activities/SettingsActivity.java | 28 +++++++++- .../models/ThoughtfulServiceBean.java | 54 +++++++++++++++++-- .../powerbell/services/ThoughtfulService.java | 23 ++++++-- .../src/main/res/layout/activity_settings.xml | 16 ++++++ 5 files changed, 115 insertions(+), 10 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 00cc607..c1a1c73 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Jan 13 11:47:03 HKT 2026 +#Mon Jan 19 11:57:03 GMT 2026 stageCount=1 libraryProject= baseVersion=15.15 publishVersion=15.15.0 -buildCount=0 +buildCount=5 baseBetaVersion=15.15.1 diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/SettingsActivity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/SettingsActivity.java index e6c02e1..f94fc2f 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/SettingsActivity.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/SettingsActivity.java @@ -56,13 +56,17 @@ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivit // 初始化工具栏 initToolbar(); - + ThoughtfulServiceBean thoughtfulServiceBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); if (thoughtfulServiceBean == null) { thoughtfulServiceBean = new ThoughtfulServiceBean(); } + // 原有2个复选框赋值 ((CheckBox)findViewById(R.id.activitysettingsCheckBox1)).setChecked(thoughtfulServiceBean.isEnableUsePowerTts()); ((CheckBox)findViewById(R.id.activitysettingsCheckBox2)).setChecked(thoughtfulServiceBean.isEnableChargeTts()); + // 新增2个复选框赋值 + ((CheckBox)findViewById(R.id.activitysettingsCheckBox3)).setChecked(thoughtfulServiceBean.isEnableUseageTtsWithBattary()); + ((CheckBox)findViewById(R.id.activitysettingsCheckBox4)).setChecked(thoughtfulServiceBean.isEnableChargeTtsWithBattary()); LogUtils.d(TAG, "【onCreate】SettingsActivity 初始化完成"); } @@ -94,6 +98,7 @@ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivit canDrawOverlays(); } + // 原有方法 public void onEnableChargeTts(View view) { ThoughtfulServiceBean thoughtfulServiceBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); if (thoughtfulServiceBean == null) { @@ -103,6 +108,7 @@ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivit ThoughtfulServiceBean.saveBean(this, thoughtfulServiceBean); } + // 原有方法 public void onEnableUsePowerTts(View view) { ThoughtfulServiceBean thoughtfulServiceBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); if (thoughtfulServiceBean == null) { @@ -112,6 +118,26 @@ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivit ThoughtfulServiceBean.saveBean(this, thoughtfulServiceBean); } + // 新增：用电TTS加入电量提醒 + public void onEnableUseageTtsWithBattary(View view) { + ThoughtfulServiceBean thoughtfulServiceBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); + if (thoughtfulServiceBean == null) { + thoughtfulServiceBean = new ThoughtfulServiceBean(); + } + thoughtfulServiceBean.setIsEnableUseageTtsWithBattary(((CheckBox)view).isChecked()); + ThoughtfulServiceBean.saveBean(this, thoughtfulServiceBean); + } + + // 新增：充电TTS加入电量提醒 + public void onEnableChargeTtsWithBattary(View view) { + ThoughtfulServiceBean thoughtfulServiceBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); + if (thoughtfulServiceBean == null) { + thoughtfulServiceBean = new ThoughtfulServiceBean(); + } + thoughtfulServiceBean.setIsEnableChargeTtsWithBattary(((CheckBox)view).isChecked()); + ThoughtfulServiceBean.saveBean(this, thoughtfulServiceBean); + } + /** * 悬浮窗权限检查与请求 */ diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/models/ThoughtfulServiceBean.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/ThoughtfulServiceBean.java index 7332325..b9f555e 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/models/ThoughtfulServiceBean.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/ThoughtfulServiceBean.java @@ -24,10 +24,15 @@ public class ThoughtfulServiceBean extends BaseBean implements Parcelable, Seria // JSON序列化字段常量 杜绝硬编码 public static final String JSON_FIELD_IS_ENABLE_CHARGE_TTS = "isEnableChargeTts"; public static final String JSON_FIELD_IS_ENABLE_USE_POWER_TTS = "isEnableUsePowerTts"; + // 新增字段JSON常量 + public static final String JSON_FIELD_IS_ENABLE_USAGE_TTS_WITH_BATTERY = "isEnableUseageTtsWithBattary"; + public static final String JSON_FIELD_IS_ENABLE_CHARGE_TTS_WITH_BATTERY = "isEnableChargeTtsWithBattary"; // ====================== 核心成员变量 - 私有封装 ====================== private boolean isEnableChargeTts = false; // 是否启用 充电TTS贴心语音服务 private boolean isEnableUsePowerTts = false; // 是否启用 用电TTS贴心语音服务 + private boolean isEnableUseageTtsWithBattary = false; // 用电TTS加入电量提醒 + private boolean isEnableChargeTtsWithBattary = false;// 充电TTS加入电量提醒 // ====================== Parcelable 静态创建器 (API30标准写法 必须public static final) ====================== public static final Creator CREATOR = new Creator() { @@ -55,11 +60,17 @@ public class ThoughtfulServiceBean extends BaseBean implements Parcelable, Seria * 全参构造 - 手动配置所有服务状态 * @param isEnableChargeTts 充电TTS服务开关 * @param isEnableUsePowerTts 用电TTS服务开关 + * @param isEnableUseageTtsWithBattary 用电TTS加电量提醒开关 + * @param isEnableChargeTtsWithBattary 充电TTS加电量提醒开关 */ - public ThoughtfulServiceBean(boolean isEnableChargeTts, boolean isEnableUsePowerTts) { + public ThoughtfulServiceBean(boolean isEnableChargeTts, boolean isEnableUsePowerTts, + boolean isEnableUseageTtsWithBattary, boolean isEnableChargeTtsWithBattary) { this.isEnableChargeTts = isEnableChargeTts; this.isEnableUsePowerTts = isEnableUsePowerTts; - LogUtils.d(TAG, "ThoughtfulServiceBean: 全参构造 | isEnableChargeTts=" + isEnableChargeTts + " | isEnableUsePowerTts=" + isEnableUsePowerTts); + this.isEnableUseageTtsWithBattary = isEnableUseageTtsWithBattary; + this.isEnableChargeTtsWithBattary = isEnableChargeTtsWithBattary; + LogUtils.d(TAG, "ThoughtfulServiceBean: 全参构造 | 充电TTS=" + isEnableChargeTts + " | 用电TTS=" + isEnableUsePowerTts + + " | 用电TTS加电量=" + isEnableUseageTtsWithBattary + " | 充电TTS加电量=" + isEnableChargeTtsWithBattary); } /** @@ -68,7 +79,11 @@ public class ThoughtfulServiceBean extends BaseBean implements Parcelable, Seria private ThoughtfulServiceBean(Parcel in) { this.isEnableChargeTts = in.readByte() != 0; this.isEnableUsePowerTts = in.readByte() != 0; - LogUtils.d(TAG, "ThoughtfulServiceBean: Parcel构造解析完成 | isEnableChargeTts=" + isEnableChargeTts + " | isEnableUsePowerTts=" + isEnableUsePowerTts); + // 新增字段反序列化 + this.isEnableUseageTtsWithBattary = in.readByte() != 0; + this.isEnableChargeTtsWithBattary = in.readByte() != 0; + LogUtils.d(TAG, "ThoughtfulServiceBean: Parcel构造解析完成 | 充电TTS=" + isEnableChargeTts + " | 用电TTS=" + isEnableUsePowerTts + + " | 用电TTS加电量=" + isEnableUseageTtsWithBattary + " | 充电TTS加电量=" + isEnableChargeTtsWithBattary); } // ====================== Getter/Setter 方法区 (封装成员变量 统一访问) ====================== @@ -90,6 +105,26 @@ public class ThoughtfulServiceBean extends BaseBean implements Parcelable, Seria this.isEnableUsePowerTts = isEnableUsePowerTts; } + // 新增 用电TTS加入电量提醒 Getter/Setter + public boolean isEnableUseageTtsWithBattary() { + return isEnableUseageTtsWithBattary; + } + + public void setIsEnableUseageTtsWithBattary(boolean isEnableUseageTtsWithBattary) { + LogUtils.d(TAG, "setIsEnableUseageTtsWithBattary: 旧值=" + this.isEnableUseageTtsWithBattary + " ｜ 新值=" + isEnableUseageTtsWithBattary); + this.isEnableUseageTtsWithBattary = isEnableUseageTtsWithBattary; + } + + // 新增 充电TTS加入电量提醒 Getter/Setter + public boolean isEnableChargeTtsWithBattary() { + return isEnableChargeTtsWithBattary; + } + + public void setIsEnableChargeTtsWithBattary(boolean isEnableChargeTtsWithBattary) { + LogUtils.d(TAG, "setIsEnableChargeTtsWithBattary: 旧值=" + this.isEnableChargeTtsWithBattary + " ｜ 新值=" + isEnableChargeTtsWithBattary); + this.isEnableChargeTtsWithBattary = isEnableChargeTtsWithBattary; + } + // ====================== 重写父类 BaseBean 核心方法 (JSON序列化/反序列化 业务核心) ====================== @Override public String getName() { @@ -106,6 +141,9 @@ public class ThoughtfulServiceBean extends BaseBean implements Parcelable, Seria super.writeThisToJsonWriter(jsonWriter); jsonWriter.name(JSON_FIELD_IS_ENABLE_CHARGE_TTS).value(this.isEnableChargeTts); jsonWriter.name(JSON_FIELD_IS_ENABLE_USE_POWER_TTS).value(this.isEnableUsePowerTts); + // 新增字段JSON序列化 + jsonWriter.name(JSON_FIELD_IS_ENABLE_USAGE_TTS_WITH_BATTERY).value(this.isEnableUseageTtsWithBattary); + jsonWriter.name(JSON_FIELD_IS_ENABLE_CHARGE_TTS_WITH_BATTERY).value(this.isEnableChargeTtsWithBattary); LogUtils.d(TAG, "writeThisToJsonWriter: JSON序列化完成，所有TTS服务状态已写入"); } @@ -124,6 +162,13 @@ public class ThoughtfulServiceBean extends BaseBean implements Parcelable, Seria break; case JSON_FIELD_IS_ENABLE_USE_POWER_TTS: bean.setIsEnableUsePowerTts(jsonReader.nextBoolean()); + break; + // 新增字段反序列化 + case JSON_FIELD_IS_ENABLE_USAGE_TTS_WITH_BATTERY: + bean.setIsEnableUseageTtsWithBattary(jsonReader.nextBoolean()); + break; + case JSON_FIELD_IS_ENABLE_CHARGE_TTS_WITH_BATTERY: + bean.setIsEnableChargeTtsWithBattary(jsonReader.nextBoolean()); break; default: jsonReader.skipValue(); @@ -149,6 +194,9 @@ public class ThoughtfulServiceBean extends BaseBean implements Parcelable, Seria public void writeToParcel(Parcel dest, int flags) { dest.writeByte((byte) (isEnableChargeTts ? 1 : 0)); dest.writeByte((byte) (isEnableUsePowerTts ? 1 : 0)); + // 新增字段Parcel序列化 + dest.writeByte((byte) (isEnableUseageTtsWithBattary ? 1 : 0)); + dest.writeByte((byte) (isEnableChargeTtsWithBattary ? 1 : 0)); LogUtils.d(TAG, "writeToParcel: Parcel序列化完成，所有TTS服务状态已写入"); } diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/services/ThoughtfulService.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/services/ThoughtfulService.java index 5a257ef..f05d61f 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/services/ThoughtfulService.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/services/ThoughtfulService.java @@ -5,6 +5,7 @@ import android.content.Context; import android.content.Intent; import android.os.IBinder; import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.powerbell.App; import cc.winboll.studio.powerbell.models.AppConfigBean; import cc.winboll.studio.powerbell.models.ThoughtfulServiceBean; import cc.winboll.studio.powerbell.utils.AppConfigUtils; @@ -31,7 +32,7 @@ public class ThoughtfulService extends Service { */ public enum ServiceType { CHARGE_STATE, //充电状态服务 - DISCHARGE_STATE //放电状态服务 + DISCHARGE_STATE, //放电状态服务 } // ====================================== 对外公开静态启动函数【新增核心】入参Context + 枚举 ====================================== @@ -95,7 +96,7 @@ public class ThoughtfulService extends Service { case DISCHARGE_STATE: // 执行【放电状态】对应的业务任务 executeDischargeStateTask(); - break; + break; default: LogUtils.d(TAG, "【onStartCommand】未知的服务类型，不执行任何任务"); break; @@ -129,10 +130,16 @@ public class ThoughtfulService extends Service { return; } + ThoughtfulServiceBean thoughtfulServiceBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); + if (thoughtfulServiceBean == null) { + thoughtfulServiceBean = new ThoughtfulServiceBean(); + } + if (latestConfig.isEnableChargeReminder()) { int nChargeReminderValue = latestConfig.getChargeReminderValue(); + String szCurrentBattery = thoughtfulServiceBean.isEnableChargeTtsWithBattary()? String.format("现在电量为百分之%d。", App.sQuantityOfElectricity) : ""; String szRemind = String.format("限量充电提醒已启用，限量值为百分之%d。", nChargeReminderValue); - szRemind = szRemind + szRemind + szRemind; + szRemind = szCurrentBattery + szRemind + szRemind + szRemind; TTSPlayService.startPlayTTS(this, szRemind); } } @@ -151,14 +158,22 @@ public class ThoughtfulService extends Service { LogUtils.e(TAG, "handleNotifyAppConfigUpdate() 终止 | 最新配置为空"); return; } + + ThoughtfulServiceBean thoughtfulServiceBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); + if (thoughtfulServiceBean == null) { + thoughtfulServiceBean = new ThoughtfulServiceBean(); + } if (latestConfig.isEnableUsageReminder()) { int nUsageReminderValue = latestConfig.getUsageReminderValue(); - String szRemind = String.format("电量不足提醒已启用，低电值为百分之%d。", nUsageReminderValue); + String szCurrentBattery = thoughtfulServiceBean.isEnableUseageTtsWithBattary()? String.format("现在电量为百分之%d。", App.sQuantityOfElectricity) : ""; + String szRemind = szCurrentBattery + String.format("电量不足提醒已启用，低电值为百分之%d。", nUsageReminderValue); + //szRemind = szRemind + szRemind + szRemind; TTSPlayService.startPlayTTS(this, szRemind); } } + } diff --git a/powerbell/src/main/res/layout/activity_settings.xml b/powerbell/src/main/res/layout/activity_settings.xml index 0b693e7..e571682 100644 --- a/powerbell/src/main/res/layout/activity_settings.xml +++ b/powerbell/src/main/res/layout/activity_settings.xml @@ -61,6 +61,14 @@ android:text="用电提醒启用时的TTS贴心服务" android:onClick="onEnableUsePowerTts" android:id="@+id/activitysettingsCheckBox1"/> + + + + + + From 45400314af447665de49151744bf7dd70ce8d5f8 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 19 Jan 2026 20:04:16 +0800 Subject: [PATCH 04/31] APK 15.15.1 release Publish. --- powerbell/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index c1a1c73..f61d3c9 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Jan 19 11:57:03 GMT 2026 -stageCount=1 +#Mon Jan 19 20:04:16 HKT 2026 +stageCount=2 libraryProject= baseVersion=15.15 -publishVersion=15.15.0 -buildCount=5 -baseBetaVersion=15.15.1 +publishVersion=15.15.1 +buildCount=0 +baseBetaVersion=15.15.2 From 8229ab099a0dbd6d76d4ea0babcabb25f6033420 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 19 Jan 2026 20:38:46 +0800 Subject: [PATCH 05/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=AA=97=E5=8F=A3=E7=9A=84TTS=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E9=80=89=E9=A1=B9=E5=8D=A1=E7=9A=84=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbell/build.properties | 4 +- .../activities/SettingsActivity.java | 231 ++++++++++++------ .../src/main/res/layout/activity_settings.xml | 62 ++++- 3 files changed, 203 insertions(+), 94 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index f61d3c9..76547f9 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Jan 19 20:04:16 HKT 2026 +#Mon Jan 19 12:37:49 GMT 2026 stageCount=2 libraryProject= baseVersion=15.15 publishVersion=15.15.1 -buildCount=0 +buildCount=1 baseBetaVersion=15.15.2 diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/SettingsActivity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/SettingsActivity.java index f94fc2f..677e48d 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/SettingsActivity.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/SettingsActivity.java @@ -23,20 +23,24 @@ import java.lang.reflect.Field; /** * 应用设置窗口，提供应用配置项的统一入口 * 适配 API30，基于 Java7 开发 - * @Author ZhanGSKen&豆包大模型 - * @Date 2025/11/27 14:26 - * @Describe 应用设置窗口 + * @Author 豆包&ZhanGSKen + * @Date 2025年11月27日14时26分00秒 + * @LastEditTime 2026年01月19日22时18分00秒 + * @Describe 应用设置窗口（主开关联动子开关启用/禁用，主开关关闭则子开关禁用并取消勾选） */ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivity { - // ======================== 静态常量 ========================= + // ======================== 静态常量区 ========================= public static final String TAG = "SettingsActivity"; - // 权限请求常量（为后续读取媒体图片权限预留） private static final int REQUEST_READ_MEDIA_IMAGES = 1001; - // ======================== 成员变量 ========================= - private Toolbar mToolbar; // 顶部工具栏 + // ======================== 成员属性区 ========================= + private Toolbar mToolbar; + private CheckBox cbUsePowerTts; // 用电TTS（主开关） + private CheckBox cbChargeTts; // 充电TTS（主开关） + private CheckBox cbUseageTtsBattary; // 用电TTS带电量提醒（子开关） + private CheckBox cbChargeTtsBattary; // 充电TTS带电量提醒（子开关） - // ======================== 接口实现方法 ========================= + // ======================== 接口实现区 ========================= @Override public Activity getActivity() { return this; @@ -47,122 +51,191 @@ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivit return TAG; } - // ======================== 生命周期方法 ========================= + // ======================== 生命周期区 ========================= @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_settings); - LogUtils.d(TAG, "【onCreate】SettingsActivity 初始化开始"); + LogUtils.d(TAG, "onCreate: 应用设置页面初始化开始"); - // 初始化工具栏 initToolbar(); + initTtsCheckBoxes(); + initTtsCheckBoxStatus(); - ThoughtfulServiceBean thoughtfulServiceBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); - if (thoughtfulServiceBean == null) { - thoughtfulServiceBean = new ThoughtfulServiceBean(); - } - // 原有2个复选框赋值 - ((CheckBox)findViewById(R.id.activitysettingsCheckBox1)).setChecked(thoughtfulServiceBean.isEnableUsePowerTts()); - ((CheckBox)findViewById(R.id.activitysettingsCheckBox2)).setChecked(thoughtfulServiceBean.isEnableChargeTts()); - // 新增2个复选框赋值 - ((CheckBox)findViewById(R.id.activitysettingsCheckBox3)).setChecked(thoughtfulServiceBean.isEnableUseageTtsWithBattary()); - ((CheckBox)findViewById(R.id.activitysettingsCheckBox4)).setChecked(thoughtfulServiceBean.isEnableChargeTtsWithBattary()); - - LogUtils.d(TAG, "【onCreate】SettingsActivity 初始化完成"); + LogUtils.d(TAG, "onCreate: 应用设置页面初始化完成"); } - // ======================== UI初始化方法 ========================= + // ======================== UI初始化区 ========================= /** - * 初始化顶部工具栏，设置导航返回与样式 + * 初始化顶部工具栏 */ private void initToolbar() { + LogUtils.d(TAG, "initToolbar: 工具栏初始化开始"); mToolbar = findViewById(R.id.toolbar); setSupportActionBar(mToolbar); - // 设置工具栏副标题与标题样式 mToolbar.setSubtitle(getTag()); mToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText); - // 显示返回按钮 getSupportActionBar().setDisplayHomeAsUpEnabled(true); - // 绑定导航点击事件 + mToolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - LogUtils.d(TAG, "【导航栏】点击返回"); + LogUtils.d(TAG, "initToolbar-navigationOnClick: 点击导航返回按钮"); finish(); } }); - LogUtils.d(TAG, "【initToolbar】工具栏初始化完成"); + LogUtils.d(TAG, "initToolbar: 工具栏初始化完成"); } - public void onCheckTTSDrawOverlaysPermission(View view) { - canDrawOverlays(); - } + /** + * 绑定TTS相关复选框控件 + */ + private void initTtsCheckBoxes() { + LogUtils.d(TAG, "initTtsCheckBoxes: TTS复选框绑定开始"); + cbUsePowerTts = findViewById(R.id.activitysettingsCheckBox1); + cbChargeTts = findViewById(R.id.activitysettingsCheckBox2); + cbUseageTtsBattary = findViewById(R.id.activitysettingsCheckBox3); + cbChargeTtsBattary = findViewById(R.id.activitysettingsCheckBox4); + LogUtils.d(TAG, "initTtsCheckBoxes: TTS复选框绑定完成"); + } - // 原有方法 - public void onEnableChargeTts(View view) { - ThoughtfulServiceBean thoughtfulServiceBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); - if (thoughtfulServiceBean == null) { - thoughtfulServiceBean = new ThoughtfulServiceBean(); - } - thoughtfulServiceBean.setIsEnableChargeTts(((CheckBox)view).isChecked()); - ThoughtfulServiceBean.saveBean(this, thoughtfulServiceBean); - } + /** + * 初始化TTS复选框初始状态 + */ + private void initTtsCheckBoxStatus() { + LogUtils.d(TAG, "initTtsCheckBoxStatus: TTS复选框状态初始化开始"); + ThoughtfulServiceBean bean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); + if (bean == null) { + LogUtils.d(TAG, "initTtsCheckBoxStatus: 未读取到配置Bean，创建新实例"); + bean = new ThoughtfulServiceBean(); + } - // 原有方法 - public void onEnableUsePowerTts(View view) { - ThoughtfulServiceBean thoughtfulServiceBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); - if (thoughtfulServiceBean == null) { - thoughtfulServiceBean = new ThoughtfulServiceBean(); - } - thoughtfulServiceBean.setIsEnableUsePowerTts(((CheckBox)view).isChecked()); - ThoughtfulServiceBean.saveBean(this, thoughtfulServiceBean); - } + boolean useMainOpen = bean.isEnableUsePowerTts(); + boolean chargeMainOpen = bean.isEnableChargeTts(); + cbUsePowerTts.setChecked(useMainOpen); + cbChargeTts.setChecked(chargeMainOpen); + cbUseageTtsBattary.setChecked(bean.isEnableUseageTtsWithBattary()); + cbChargeTtsBattary.setChecked(bean.isEnableChargeTtsWithBattary()); + cbUseageTtsBattary.setEnabled(useMainOpen); + cbChargeTtsBattary.setEnabled(chargeMainOpen); - // 新增：用电TTS加入电量提醒 - public void onEnableUseageTtsWithBattary(View view) { - ThoughtfulServiceBean thoughtfulServiceBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); - if (thoughtfulServiceBean == null) { - thoughtfulServiceBean = new ThoughtfulServiceBean(); - } - thoughtfulServiceBean.setIsEnableUseageTtsWithBattary(((CheckBox)view).isChecked()); - ThoughtfulServiceBean.saveBean(this, thoughtfulServiceBean); - } + LogUtils.d(TAG, "initTtsCheckBoxStatus: 主开关状态-用电TTS：" + useMainOpen + " 充电TTS：" + chargeMainOpen); + LogUtils.d(TAG, "initTtsCheckBoxStatus: TTS复选框状态初始化完成"); + } - // 新增：充电TTS加入电量提醒 - public void onEnableChargeTtsWithBattary(View view) { - ThoughtfulServiceBean thoughtfulServiceBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); - if (thoughtfulServiceBean == null) { - thoughtfulServiceBean = new ThoughtfulServiceBean(); - } - thoughtfulServiceBean.setIsEnableChargeTtsWithBattary(((CheckBox)view).isChecked()); - ThoughtfulServiceBean.saveBean(this, thoughtfulServiceBean); - } + // ======================== 事件响应区 ========================= + /** + * 悬浮窗权限检查入口 + */ + public void onCheckTTSDrawOverlaysPermission(View view) { + LogUtils.d(TAG, "onCheckTTSDrawOverlaysPermission: 触发悬浮窗权限检查"); + canDrawOverlays(); + } - /** + /** + * 用电TTS主开关点击事件 + */ + public void onEnableUsePowerTts(View view) { + boolean isChecked = cbUsePowerTts.isChecked(); + LogUtils.d(TAG, "onEnableUsePowerTts: 用电TTS主开关点击，切换后状态=" + isChecked); + cbUsePowerTts.setChecked(isChecked); + // 主开关联动子开关 + cbUseageTtsBattary.setEnabled(isChecked); +// if (!isChecked) { +// cbUseageTtsBattary.setChecked(false); +// } + // 保存配置 + ThoughtfulServiceBean bean = getThoughtfulServiceBean(); + bean.setIsEnableUsePowerTts(isChecked); + ThoughtfulServiceBean.saveBean(this, bean); + LogUtils.d(TAG, "onEnableUsePowerTts: 用电TTS状态保存完成"); + } + + /** + * 充电TTS主开关点击事件 + */ + public void onEnableChargeTts(View view) { + boolean isChecked = cbChargeTts.isChecked(); + LogUtils.d(TAG, "onEnableChargeTts: 充电TTS主开关点击，切换后状态=" + isChecked); + cbChargeTts.setChecked(isChecked); + // 主开关联动子开关 + cbChargeTtsBattary.setEnabled(isChecked); +// if (!isChecked) { +// cbChargeTtsBattary.setChecked(false); +// } + // 保存配置 + ThoughtfulServiceBean bean = getThoughtfulServiceBean(); + bean.setIsEnableChargeTts(isChecked); + ThoughtfulServiceBean.saveBean(this, bean); + LogUtils.d(TAG, "onEnableChargeTts: 充电TTS状态保存完成"); + } + + /** + * 用电TTS带电量提醒子开关点击事件 + */ + public void onEnableUseageTtsWithBattary(View view) { + boolean isChecked = cbUseageTtsBattary.isChecked(); + LogUtils.d(TAG, "onEnableUseageTtsWithBattary: 用电TTS电量提醒开关点击，切换后状态=" + isChecked); + cbUseageTtsBattary.setChecked(isChecked); + ThoughtfulServiceBean bean = getThoughtfulServiceBean(); + bean.setIsEnableUseageTtsWithBattary(isChecked); + ThoughtfulServiceBean.saveBean(this, bean); + LogUtils.d(TAG, "onEnableUseageTtsWithBattary: 用电TTS电量提醒状态保存完成"); + } + + /** + * 充电TTS带电量提醒子开关点击事件 + */ + public void onEnableChargeTtsWithBattary(View view) { + boolean isChecked = cbChargeTtsBattary.isChecked(); + LogUtils.d(TAG, "onEnableChargeTtsWithBattary: 充电TTS电量提醒开关点击，切换后状态=" + isChecked); + cbChargeTtsBattary.setChecked(isChecked); + ThoughtfulServiceBean bean = getThoughtfulServiceBean(); + bean.setIsEnableChargeTtsWithBattary(isChecked); + ThoughtfulServiceBean.saveBean(this, bean); + LogUtils.d(TAG, "onEnableChargeTtsWithBattary: 充电TTS电量提醒状态保存完成"); + } + + // ======================== 工具方法区 ========================= + /** + * 获取配置Bean实例，避免重复代码 + */ + private ThoughtfulServiceBean getThoughtfulServiceBean() { + LogUtils.d(TAG, "getThoughtfulServiceBean: 获取配置Bean"); + ThoughtfulServiceBean bean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); + if (bean == null) { + LogUtils.d(TAG, "getThoughtfulServiceBean: 配置Bean为空，创建新实例"); + bean = new ThoughtfulServiceBean(); + } + return bean; + } + + /** * 悬浮窗权限检查与请求 */ - void canDrawOverlays() { - LogUtils.d(TAG, "onCanDrawOverlays: 检查悬浮窗权限"); - // API6.0+校验权限 + void canDrawOverlays() { + LogUtils.d(TAG, "canDrawOverlays: 悬浮窗权限检查开始"); if (Build.VERSION.SDK_INT >= 23 && !Settings.canDrawOverlays(this)) { - LogUtils.d(TAG, "onCanDrawOverlays: 未开启悬浮窗权限，发起请求"); + LogUtils.d(TAG, "canDrawOverlays: 未开启悬浮窗权限，发起请求"); showDrawOverlayRequestDialog(); } else { + LogUtils.d(TAG, "canDrawOverlays: 悬浮窗权限已开启"); ToastUtils.show("悬浮窗权限已开启"); } } - /** * 显示悬浮窗权限请求对话框 */ private void showDrawOverlayRequestDialog() { + LogUtils.d(TAG, "showDrawOverlayRequestDialog: 显示悬浮窗权限请求弹窗"); AlertDialog dialog = new AlertDialog.Builder(this) .setTitle("权限请求") .setMessage("为保证通话监听功能正常，需开启悬浮窗权限") .setPositiveButton("去设置", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { + LogUtils.d(TAG, "showDrawOverlayRequestDialog-去设置: 点击跳转权限页面"); dialog.dismiss(); jumpToDrawOverlaySettings(); } @@ -170,12 +243,12 @@ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivit .setNegativeButton("稍后", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { + LogUtils.d(TAG, "showDrawOverlayRequestDialog-稍后: 点击取消请求"); dialog.dismiss(); } }) .create(); - // 解决对话框焦点问题 if (dialog.getWindow() != null) { dialog.getWindow().setFlags( WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE, @@ -188,23 +261,21 @@ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivit * 跳转悬浮窗权限设置页面（反射适配低版本） */ private void jumpToDrawOverlaySettings() { - LogUtils.d(TAG, "jumpToDrawOverlaySettings: 跳转悬浮窗权限设置"); + LogUtils.d(TAG, "jumpToDrawOverlaySettings: 跳转悬浮窗权限设置页面"); try { - // 反射获取设置页面Action（避免高版本API依赖） Class settingsClazz = Settings.class; Field actionField = settingsClazz.getDeclaredField("ACTION_MANAGE_OVERLAY_PERMISSION"); String action = (String) actionField.get(null); - // 跳转当前应用权限设置页 Intent intent = new Intent(action); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.setData(Uri.parse("package:" + getPackageName())); startActivity(intent); + LogUtils.d(TAG, "jumpToDrawOverlaySettings: 跳转权限页面意图已发送"); } catch (Exception e) { LogUtils.e(TAG, "jumpToDrawOverlaySettings: 跳转权限设置失败", e); Toast.makeText(this, "请手动在设置中开启悬浮窗权限", Toast.LENGTH_LONG).show(); } } - } diff --git a/powerbell/src/main/res/layout/activity_settings.xml b/powerbell/src/main/res/layout/activity_settings.xml index e571682..4380fff 100644 --- a/powerbell/src/main/res/layout/activity_settings.xml +++ b/powerbell/src/main/res/layout/activity_settings.xml @@ -61,14 +61,33 @@ android:text="用电提醒启用时的TTS贴心服务" android:onClick="onEnableUsePowerTts" android:id="@+id/activitysettingsCheckBox1"/> - - + android:gravity="center_vertical"> + + + + + + + + - - + android:gravity="center_vertical"> + + + + + + + + From 49a35829d291e08f946376eac8e8cb91c0a9ea05 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 19 Jan 2026 20:40:18 +0800 Subject: [PATCH 06/31] APK 15.15.2 release Publish. --- powerbell/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 76547f9..50401c1 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Jan 19 12:37:49 GMT 2026 -stageCount=2 +#Mon Jan 19 20:40:18 HKT 2026 +stageCount=3 libraryProject= baseVersion=15.15 -publishVersion=15.15.1 -buildCount=1 -baseBetaVersion=15.15.2 +publishVersion=15.15.2 +buildCount=0 +baseBetaVersion=15.15.3 From 21c02db5772f578a775ceed00b3fc47828876339 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 20 Jan 2026 20:58:24 +0800 Subject: [PATCH 07/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E7=B1=BB=E5=BA=93=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E7=AD=BE=E5=90=8D=E6=A0=A1=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbell/build.gradle | 2 +- powerbell/build.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/powerbell/build.gradle b/powerbell/build.gradle index 237b3c6..abc9e90 100644 --- a/powerbell/build.gradle +++ b/powerbell/build.gradle @@ -81,7 +81,7 @@ dependencies { // WinBoLL库 nexus.winboll.cc 地址 api 'cc.winboll.studio:libaes:15.15.2' - api 'cc.winboll.studio:libappbase:15.15.4' + api 'cc.winboll.studio:libappbase:15.15.5' // WinBoLL备用库 jitpack.io 地址 //api 'com.github.ZhanGSKen:AES:aes-v15.15.2' diff --git a/powerbell/build.properties b/powerbell/build.properties index 50401c1..4228fa0 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Jan 19 20:40:18 HKT 2026 +#Tue Jan 20 12:57:09 GMT 2026 stageCount=3 libraryProject= baseVersion=15.15 publishVersion=15.15.2 -buildCount=0 +buildCount=1 baseBetaVersion=15.15.3 From af8b57b73563b55b0d863f6bca49cb7481df7fe8 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 20 Jan 2026 21:00:50 +0800 Subject: [PATCH 08/31] APK 15.15.3 release Publish. --- powerbell/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 4228fa0..f9d3c7d 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Jan 20 12:57:09 GMT 2026 -stageCount=3 +#Tue Jan 20 21:00:50 HKT 2026 +stageCount=4 libraryProject= baseVersion=15.15 -publishVersion=15.15.2 -buildCount=1 -baseBetaVersion=15.15.3 +publishVersion=15.15.3 +buildCount=0 +baseBetaVersion=15.15.4 From 6b46180da7c38a01c1fa26125f5eb67ebd8cd570 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 20 Jan 2026 21:19:53 +0800 Subject: [PATCH 09/31] =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=8C=87=E7=BA=B9?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbell/build.gradle | 2 +- powerbell/build.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/powerbell/build.gradle b/powerbell/build.gradle index abc9e90..878d32b 100644 --- a/powerbell/build.gradle +++ b/powerbell/build.gradle @@ -81,7 +81,7 @@ dependencies { // WinBoLL库 nexus.winboll.cc 地址 api 'cc.winboll.studio:libaes:15.15.2' - api 'cc.winboll.studio:libappbase:15.15.5' + api 'cc.winboll.studio:libappbase:15.15.6' // WinBoLL备用库 jitpack.io 地址 //api 'com.github.ZhanGSKen:AES:aes-v15.15.2' diff --git a/powerbell/build.properties b/powerbell/build.properties index f9d3c7d..bcd5785 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Jan 20 21:00:50 HKT 2026 +#Tue Jan 20 13:19:22 GMT 2026 stageCount=4 libraryProject= baseVersion=15.15 publishVersion=15.15.3 -buildCount=0 +buildCount=1 baseBetaVersion=15.15.4 From cd04458c62ecd5021c988d2ab118689ea1d2db7f Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 20 Jan 2026 21:21:19 +0800 Subject: [PATCH 10/31] APK 15.15.4 release Publish. --- powerbell/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index bcd5785..ecb8f12 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Jan 20 13:19:22 GMT 2026 -stageCount=4 +#Tue Jan 20 21:21:19 HKT 2026 +stageCount=5 libraryProject= baseVersion=15.15 -publishVersion=15.15.3 -buildCount=1 -baseBetaVersion=15.15.4 +publishVersion=15.15.4 +buildCount=0 +baseBetaVersion=15.15.5 From ab566f76ff4cd68a58684b1c436d709298d57669 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 23 Jan 2026 03:15:06 +0800 Subject: [PATCH 11/31] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E7=AD=BE=E5=90=8D=E8=81=94=E7=BD=91=E6=A0=A1=E9=AA=8C=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbell/build.gradle | 2 +- powerbell/build.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/powerbell/build.gradle b/powerbell/build.gradle index 878d32b..313aa9a 100644 --- a/powerbell/build.gradle +++ b/powerbell/build.gradle @@ -81,7 +81,7 @@ dependencies { // WinBoLL库 nexus.winboll.cc 地址 api 'cc.winboll.studio:libaes:15.15.2' - api 'cc.winboll.studio:libappbase:15.15.6' + api 'cc.winboll.studio:libappbase:15.15.7' // WinBoLL备用库 jitpack.io 地址 //api 'com.github.ZhanGSKen:AES:aes-v15.15.2' diff --git a/powerbell/build.properties b/powerbell/build.properties index ecb8f12..bf0652d 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Jan 20 21:21:19 HKT 2026 +#Thu Jan 22 19:14:02 GMT 2026 stageCount=5 libraryProject= baseVersion=15.15 publishVersion=15.15.4 -buildCount=0 +buildCount=1 baseBetaVersion=15.15.5 From 6d425cab5c1c50c7585da1064ecfc65161d6e5d5 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 23 Jan 2026 03:18:09 +0800 Subject: [PATCH 12/31] APK 15.15.5 release Publish. --- powerbell/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index bf0652d..7722d87 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jan 22 19:14:02 GMT 2026 -stageCount=5 +#Fri Jan 23 03:18:09 HKT 2026 +stageCount=6 libraryProject= baseVersion=15.15 -publishVersion=15.15.4 -buildCount=1 -baseBetaVersion=15.15.5 +publishVersion=15.15.5 +buildCount=0 +baseBetaVersion=15.15.6 From d6637e1c17224be938f149d075051ffb9d9b87fa Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 24 Jan 2026 12:41:51 +0800 Subject: [PATCH 13/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E7=B1=BB=E5=BA=93=EF=BC=8C=E6=96=B0=E7=B1=BB=E5=BA=93=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E9=AA=8C=E8=AF=81=E6=A8=A1=E5=9D=97=E6=9C=89=E6=94=B9?= =?UTF-8?q?=E8=BF=9B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbell/build.gradle | 2 +- powerbell/build.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/powerbell/build.gradle b/powerbell/build.gradle index 313aa9a..b0161d1 100644 --- a/powerbell/build.gradle +++ b/powerbell/build.gradle @@ -81,7 +81,7 @@ dependencies { // WinBoLL库 nexus.winboll.cc 地址 api 'cc.winboll.studio:libaes:15.15.2' - api 'cc.winboll.studio:libappbase:15.15.7' + api 'cc.winboll.studio:libappbase:15.15.9' // WinBoLL备用库 jitpack.io 地址 //api 'com.github.ZhanGSKen:AES:aes-v15.15.2' diff --git a/powerbell/build.properties b/powerbell/build.properties index 7722d87..1f80191 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Jan 23 03:18:09 HKT 2026 +#Sat Jan 24 04:35:50 GMT 2026 stageCount=6 libraryProject= baseVersion=15.15 publishVersion=15.15.5 -buildCount=0 +buildCount=1 baseBetaVersion=15.15.6 From aae17b6cd2b7bb690e47640bfed42a213ee4ab39 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 24 Jan 2026 12:44:08 +0800 Subject: [PATCH 14/31] APK 15.15.6 release Publish. --- powerbell/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 1f80191..d6a0a58 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Jan 24 04:35:50 GMT 2026 -stageCount=6 +#Sat Jan 24 12:44:08 HKT 2026 +stageCount=7 libraryProject= baseVersion=15.15 -publishVersion=15.15.5 -buildCount=1 -baseBetaVersion=15.15.6 +publishVersion=15.15.6 +buildCount=0 +baseBetaVersion=15.15.7 From 64a53058cc2360e03484f283e3bc84c039d1cddf Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 24 Jan 2026 20:38:52 +0800 Subject: [PATCH 15/31] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E7=AD=BE?= =?UTF-8?q?=E5=90=8D=E8=AF=81=E4=B9=A6=E4=BF=AE=E6=94=B9=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E8=AF=81=E4=B9=A6=E8=AF=86=E5=88=AB=E8=83=BD=E5=8A=9B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbell/build.gradle | 2 +- powerbell/build.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/powerbell/build.gradle b/powerbell/build.gradle index b0161d1..df9c894 100644 --- a/powerbell/build.gradle +++ b/powerbell/build.gradle @@ -81,7 +81,7 @@ dependencies { // WinBoLL库 nexus.winboll.cc 地址 api 'cc.winboll.studio:libaes:15.15.2' - api 'cc.winboll.studio:libappbase:15.15.9' + api 'cc.winboll.studio:libappbase:15.15.11' // WinBoLL备用库 jitpack.io 地址 //api 'com.github.ZhanGSKen:AES:aes-v15.15.2' diff --git a/powerbell/build.properties b/powerbell/build.properties index d6a0a58..7beda65 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Jan 24 12:44:08 HKT 2026 +#Sat Jan 24 12:37:29 GMT 2026 stageCount=7 libraryProject= baseVersion=15.15 publishVersion=15.15.6 -buildCount=0 +buildCount=4 baseBetaVersion=15.15.7 From 81b758ddc5a31a9842dd766cddb26b4bcdbd3c3f Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 24 Jan 2026 20:41:05 +0800 Subject: [PATCH 16/31] APK 15.15.7 release Publish. --- powerbell/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 7beda65..4efa800 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Jan 24 12:37:29 GMT 2026 -stageCount=7 +#Sat Jan 24 20:41:05 HKT 2026 +stageCount=8 libraryProject= baseVersion=15.15 -publishVersion=15.15.6 -buildCount=4 -baseBetaVersion=15.15.7 +publishVersion=15.15.7 +buildCount=0 +baseBetaVersion=15.15.8 From cf857c1359b99e387bafa6a74360a7a2a2390cd3 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 4 Feb 2026 11:04:13 +0800 Subject: [PATCH 17/31] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E5=8F=AB=E8=B1=86?= =?UTF-8?q?=E5=8C=85=E4=BF=AE=E5=A4=8D=E6=AF=8F=E5=A4=A910=E5=8D=8A?= =?UTF-8?q?=E5=B7=A6=E5=8F=B3=E4=BC=9A=E6=97=A0=E7=AB=AF=E7=AB=AF=E8=B0=83?= =?UTF-8?q?=E7=94=A8TTS=E6=9C=8D=E5=8A=A1=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbell/build.properties | 4 +- .../ControlCenterServiceReceiver.java | 190 +++++------ .../powerbell/services/ThoughtfulService.java | 296 ++++++++++-------- 3 files changed, 242 insertions(+), 248 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 4efa800..1414aa2 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Jan 24 20:41:05 HKT 2026 +#Wed Feb 04 02:57:22 GMT 2026 stageCount=8 libraryProject= baseVersion=15.15 publishVersion=15.15.7 -buildCount=0 +buildCount=1 baseBetaVersion=15.15.8 diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/receivers/ControlCenterServiceReceiver.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/receivers/ControlCenterServiceReceiver.java index 468d317..4fa10d8 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/receivers/ControlCenterServiceReceiver.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/receivers/ControlCenterServiceReceiver.java @@ -24,56 +24,55 @@ import cc.winboll.studio.powerbell.services.ThoughtfulService; * @Describe 统一处理系统与应用内广播，同步电池状态与配置，保障多线程数据一致性 */ public class ControlCenterServiceReceiver extends BroadcastReceiver { - // ====================== 静态常量区（置顶归类，消除魔法值） ====================== + // ====================== 静态常量区 ====================== public static final String TAG = "ControlCenterServiceReceiver"; - // 广播Action常量（带包名前缀防冲突） public static final String ACTION_UPDATE_FOREGROUND_NOTIFICATION = "cc.winboll.studio.powerbell.action.ACTION_UPDATE_FOREGROUND_NOTIFICATION"; public static final String ACTION_APPCONFIG_CHANGED = "cc.winboll.studio.powerbell.action.ACTION_APPCONFIG_CHANGED"; public static final String EXTRA_APP_CONFIG_BEAN = "extra_app_config_bean"; - // 广播优先级与电量范围常量 private static final int BROADCAST_PRIORITY = IntentFilter.SYSTEM_HIGH_PRIORITY - 10; private static final int BATTERY_LEVEL_MIN = 0; private static final int BATTERY_LEVEL_MAX = 100; - private static final int INVALID_BATTERY = -1; // 无效电量标识 + private static final int INVALID_BATTERY = -1; - // ====================== 静态状态标记（volatile保证多线程可见性） ====================== - private static volatile int sLastBatteryLevel = INVALID_BATTERY; // 上次电量（多线程可见） - private static volatile boolean sIsCharging = false; // 上次充电状态（多线程可见） + // ====================== 静态状态（防抖动 + 防重复播报） ====================== + private static volatile int sLastBatteryLevel = INVALID_BATTERY; + private static volatile boolean sIsCharging = false; - // ====================== 成员变量区（弱引用防泄漏，按功能分层） ====================== + // 【新增】防重复触发：3秒内只允许一次播报（关键修复） + private static final long MIN_TRIGGER_INTERVAL = 3000; + private static long sLastTriggerTime = 0; + + // ====================== 成员变量 ====================== private WeakReference mwrControlCenterService; - private boolean isRegistered = false; // 标记广播注册状态，避免冗余操作 + private boolean isRegistered = false; - // ====================== 构造方法（初始化弱引用，避免服务强引用泄漏） ====================== + // ====================== 构造 ====================== public ControlCenterServiceReceiver(ControlCenterService service) { - LogUtils.d(TAG, String.format("ControlCenterServiceReceiver() 构造 | 服务实例：%s", + LogUtils.d(TAG, String.format("ControlCenterServiceReceiver() 构造 | 服务：%s", service != null ? service.getClass().getSimpleName() : "null")); - this.mwrControlCenterService = new WeakReference(service); + this.mwrControlCenterService = new WeakReference<>(service); } - // ====================== 广播核心接收逻辑（入口方法，分Action分发处理） ====================== + // ====================== 广播入口 ====================== @Override public void onReceive(Context context, Intent intent) { String action = intent != null ? intent.getAction() : "null"; - LogUtils.d(TAG, String.format("onReceive() 执行 | 接收广播 Action：%s", action)); + LogUtils.d(TAG, String.format("onReceive() | Action=%s", action)); - // 基础参数校验 if (context == null || intent == null || action == null) { - LogUtils.e(TAG, "onReceive() 终止 | 参数无效（context=" + context + " | intent=" + intent + "）"); + LogUtils.e(TAG, "onReceive() 终止：参数无效"); return; } - // 弱引用获取服务，双重校验服务有效性 ControlCenterService service = mwrControlCenterService != null ? mwrControlCenterService.get() : null; if (service == null || service.isDestroyed()) { - LogUtils.e(TAG, "onReceive() 终止 | 服务已销毁或为空，执行注销"); + LogUtils.e(TAG, "onReceive() 终止：服务已销毁"); unregisterAction(context); return; } - // 分Action处理业务逻辑 switch (action) { case Intent.ACTION_BATTERY_CHANGED: handleBatteryStateChanged(service, intent); @@ -82,192 +81,145 @@ public class ControlCenterServiceReceiver extends BroadcastReceiver { handleUpdateForegroundNotification(service); break; case ACTION_APPCONFIG_CHANGED: - LogUtils.d(TAG, "onReceive() 分发 | 处理配置更新广播"); handleNotifyAppConfigUpdate(service); break; default: - LogUtils.w(TAG, String.format("onReceive() 警告 | 未知Action=%s", action)); + LogUtils.w(TAG, "未知Action：" + action); } - - LogUtils.d(TAG, "onReceive() 完成 | 广播处理结束"); } - // ====================== 业务处理方法（按功能拆分，强化容错与日志） ====================== - /** - * 处理电池状态变化广播 - * @param service 控制中心服务实例 - * @param intent 电池状态广播意图 - */ + // ====================== 电池状态（核心修复区） ====================== private void handleBatteryStateChanged(ControlCenterService service, Intent intent) { - LogUtils.d(TAG, "handleBatteryStateChanged() 执行 | 解析电池状态"); + LogUtils.d(TAG, "handleBatteryStateChanged() 解析电池状态"); try { - // 1. 解析并校验当前电池状态 boolean currentCharging = BatteryUtils.isCharging(intent); int currentBatteryLevel = BatteryUtils.getCurrentBatteryLevel(intent); currentBatteryLevel = Math.min(Math.max(currentBatteryLevel, BATTERY_LEVEL_MIN), BATTERY_LEVEL_MAX); - LogUtils.d(TAG, String.format("handleBatteryStateChanged() 解析 | 充电=%b | 电量=%d%%", currentCharging, currentBatteryLevel)); - // 2. 状态无变化则跳过，减少无效运算 + LogUtils.d(TAG, String.format("当前：充电=%b | 电量=%d%%", currentCharging, currentBatteryLevel)); + + // ================ 【关键修复1】状态没变直接跳过 ================ if (currentCharging == sIsCharging && currentBatteryLevel == sLastBatteryLevel) { - LogUtils.d(TAG, "handleBatteryStateChanged() 跳过 | 电池状态无变化"); + LogUtils.d(TAG, "状态无变化，跳过"); return; } - - // 在插拔充电线时，执行贴心服务 - if(currentCharging != sIsCharging && sLastBatteryLevel != INVALID_BATTERY) { - //App.notifyMessage(TAG, String.format("sLastBatteryLevel %d", sLastBatteryLevel)); - if(currentCharging) { - ThoughtfulService.startServiceWithType(service, ThoughtfulService.ServiceType.CHARGE_STATE); - } else { - ThoughtfulService.startServiceWithType(service, ThoughtfulService.ServiceType.DISCHARGE_STATE); - } - } - // 3. 更新静态缓存状态，保证多线程可见 + // ================ 【关键修复2】只有 真正插拔充电 才播报 ================ + boolean isRealPlugSwitch = (currentCharging != sIsCharging); + boolean isBatteryValid = (sLastBatteryLevel != INVALID_BATTERY); + + // ================ 【关键修复3】防抖动：3秒内不重复触发 ================ + long now = System.currentTimeMillis(); + boolean canTrigger = (now - sLastTriggerTime >= MIN_TRIGGER_INTERVAL); + + if (isRealPlugSwitch && isBatteryValid && canTrigger) { + LogUtils.d(TAG, "检测到充电状态切换 → 执行TTS提醒"); + + // 更新触发时间 + sLastTriggerTime = now; + + // 执行播报 + if (currentCharging) { + ThoughtfulService.startServiceWithType(service, ThoughtfulService.ServiceType.CHARGE_STATE); + } else { + ThoughtfulService.startServiceWithType(service, ThoughtfulService.ServiceType.DISCHARGE_STATE); + } + } + + // 更新缓存 sIsCharging = currentCharging; sLastBatteryLevel = currentBatteryLevel; - // 4. 同步缓存状态到配置 + // 同步配置 handleNotifyAppConfigUpdate(service); - LogUtils.d(TAG, String.format("handleBatteryStateChanged() 完成 | 缓存电量=%d%% | 缓存充电状态=%b", - sLastBatteryLevel, sIsCharging)); } catch (Exception e) { - LogUtils.e(TAG, "handleBatteryStateChanged() 失败", e); + LogUtils.e(TAG, "handleBatteryStateChanged 异常", e); } } - /** - * 处理配置变更通知，同步缓存状态到配置 - * @param service 控制中心服务实例 - */ + // ====================== 配置同步 ====================== private void handleNotifyAppConfigUpdate(ControlCenterService service) { - LogUtils.d(TAG, "handleNotifyAppConfigUpdate() 执行 | 同步缓存状态到配置"); + LogUtils.d(TAG, "handleNotifyAppConfigUpdate() 同步配置"); try { - // 加载最新配置 AppConfigBean latestConfig = AppConfigUtils.getInstance(service).loadAppConfig(); if (latestConfig == null) { - LogUtils.e(TAG, "handleNotifyAppConfigUpdate() 终止 | 最新配置为空"); + LogUtils.e(TAG, "配置为空，终止"); return; } - LogUtils.d(TAG, String.format("handleNotifyAppConfigUpdate() 加载 | 充电阈值=%d | 耗电阈值=%d", - latestConfig.getChargeReminderValue(), latestConfig.getUsageReminderValue())); - // 同步缓存的电池状态到配置 App.sQuantityOfElectricity = sLastBatteryLevel; latestConfig.setIsCharging(sIsCharging); service.notifyAppConfigUpdate(latestConfig); - LogUtils.d(TAG, String.format("handleNotifyAppConfigUpdate() 完成 | 缓存电量=%d%% | 充电状态=%b", - sLastBatteryLevel, sIsCharging)); } catch (Exception e) { - LogUtils.e(TAG, "handleNotifyAppConfigUpdate() 失败", e); + LogUtils.e(TAG, "handleNotifyAppConfigUpdate 异常", e); } } - /** - * 处理前台服务通知更新 - * @param service 控制中心服务实例 - */ + // ====================== 通知更新 ====================== private void handleUpdateForegroundNotification(ControlCenterService service) { - LogUtils.d(TAG, "handleUpdateForegroundNotification() 执行 | 更新前台通知"); + LogUtils.d(TAG, "handleUpdateForegroundNotification() 更新通知"); try { NotificationManagerUtils notifyUtils = service.getNotificationManager(); NotificationMessage notifyMsg = service.getForegroundNotifyMsg(); - // 非空校验，避免空指针 if (notifyUtils == null || notifyMsg == null) { - LogUtils.e(TAG, String.format("handleUpdateForegroundNotification() 终止 | 通知工具类或消息为空（notifyUtils=%s | notifyMsg=%s）", - notifyUtils, notifyMsg)); + LogUtils.e(TAG, "通知工具或消息为空"); return; } - notifyUtils.updateForegroundServiceNotify(notifyMsg); - LogUtils.d(TAG, String.format("handleUpdateForegroundNotification() 完成 | 标题=%s", notifyMsg.getTitle())); } catch (Exception e) { - LogUtils.e(TAG, "handleUpdateForegroundNotification() 失败", e); + LogUtils.e(TAG, "更新通知异常", e); } } - // ====================== 广播注册/注销（强化容错，避免重复操作） ====================== - /** - * 注册广播接收器 - * @param context 上下文 - */ + // ====================== 注册/注销 ====================== public void registerAction(Context context) { - LogUtils.d(TAG, "registerAction() 执行 | 注册广播接收器"); - if (context == null || isRegistered) { - LogUtils.e(TAG, "registerAction() 失败 | 上下文为空或已注册"); - return; - } - + if (context == null || isRegistered) return; try { IntentFilter filter = new IntentFilter(); filter.addAction(Intent.ACTION_BATTERY_CHANGED); filter.addAction(ACTION_UPDATE_FOREGROUND_NOTIFICATION); filter.addAction(ACTION_APPCONFIG_CHANGED); filter.setPriority(BROADCAST_PRIORITY); - context.registerReceiver(this, filter); isRegistered = true; - LogUtils.d(TAG, String.format("registerAction() 完成 | 优先级=%d", BROADCAST_PRIORITY)); + LogUtils.d(TAG, "广播注册完成"); } catch (Exception e) { - LogUtils.e(TAG, "registerAction() 失败", e); + LogUtils.e(TAG, "注册异常", e); } } - /** - * 注销广播接收器 - * @param context 上下文 - */ public void unregisterAction(Context context) { - LogUtils.d(TAG, "unregisterAction() 执行 | 注销广播接收器"); - if (context == null || !isRegistered) { - LogUtils.e(TAG, "unregisterAction() 失败 | 上下文为空或未注册"); - return; - } - + if (context == null || !isRegistered) return; try { context.unregisterReceiver(this); isRegistered = false; - LogUtils.d(TAG, "unregisterAction() 完成 | 广播注销成功"); - } catch (IllegalArgumentException e) { - LogUtils.w(TAG, "unregisterAction() 警告 | 广播未注册，跳过注销"); + LogUtils.d(TAG, "广播已注销"); } catch (Exception e) { - LogUtils.e(TAG, "unregisterAction() 失败", e); + LogUtils.w(TAG, "注销异常", e); } } - // ====================== 资源释放与Getter方法（按需开放，防泄漏） ====================== - /** - * 主动释放资源，避免内存泄漏 - */ + // ====================== 释放 ====================== public void release() { - LogUtils.d(TAG, "release() 执行 | 释放广播接收器资源"); - // 清空弱引用，帮助GC回收 + LogUtils.d(TAG, "release() 释放资源"); if (mwrControlCenterService != null) { mwrControlCenterService.clear(); mwrControlCenterService = null; - LogUtils.d(TAG, "release() 步骤 | 弱引用已清空"); } - // 重置静态状态缓存 - sLastBatteryLevel = -1; + // 重置静态状态 + sLastBatteryLevel = INVALID_BATTERY; sIsCharging = false; - LogUtils.d(TAG, "release() 完成 | 静态状态缓存已重置"); + sLastTriggerTime = 0; // 【新增】重置防抖时间 } - /** - * 获取上次记录的电池电量 - * @return 电量值（0-100），未初始化返回-1 - */ + // ====================== Getter ====================== public static int getLastBatteryLevel() { return sLastBatteryLevel; } - /** - * 获取上次记录的充电状态 - * @return true=充电中，false=未充电 - */ public static boolean isLastCharging() { return sIsCharging; } diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/services/ThoughtfulService.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/services/ThoughtfulService.java index f05d61f..4a3343d 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/services/ThoughtfulService.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/services/ThoughtfulService.java @@ -19,161 +19,203 @@ import cc.winboll.studio.powerbell.utils.AppConfigUtils; */ public class ThoughtfulService extends Service { - // ====================================== 常量区 - 置顶排序 ====================================== + // ====================================== 常量区 ====================================== public static final String TAG = "ThoughtfulService"; - /** Intent传递 服务类型 的Key值 */ public static final String EXTRA_SERVICE_TYPE = "EXTRA_SERVICE_TYPE"; - // ====================================== 枚举类 - 服务类型 充电/放电状态 ====================================== - /** - * 服务执行类型枚举 - * CHARGE_STATE : 充电状态服务 - * DISCHARGE_STATE : 放电(耗电)状态服务 - */ + // 防止重复播报的标志（静态，全局唯一） + private static boolean sIsPlaying = false; + + // ====================================== 枚举 ====================================== public enum ServiceType { - CHARGE_STATE, //充电状态服务 - DISCHARGE_STATE, //放电状态服务 + CHARGE_STATE, + DISCHARGE_STATE } - // ====================================== 对外公开静态启动函数【新增核心】入参Context + 枚举 ====================================== - /** - * 公开静态方法：传入上下文+服务类型枚举，一键构建意图并启动当前服务 - * @param context 上下文对象 - * @param serviceType 服务类型枚举【充电/放电】 - */ + // ====================================== 外部启动入口（加固） ====================================== public static void startServiceWithType(Context context, ServiceType serviceType) { - LogUtils.d(TAG, "【startServiceWithType】静态启动方法调用 | Context=" + context + " | ServiceType=" + (serviceType == null ? "null" : serviceType.name())); - - ThoughtfulServiceBean thoughtfulServiceBean = ThoughtfulServiceBean.loadBean(context, ThoughtfulServiceBean.class); - if (thoughtfulServiceBean == null) { - thoughtfulServiceBean = new ThoughtfulServiceBean(); - } - - // 对应TTS服务提醒没有启用，就退出 - if((serviceType == ServiceType.CHARGE_STATE && !thoughtfulServiceBean.isEnableChargeTts()) - ||(serviceType == ServiceType.DISCHARGE_STATE && !thoughtfulServiceBean.isEnableUsePowerTts())){ - return; - } - - - // 判空健壮性校验 - if (context != null && serviceType != null) { - // 构建意图 + 封装枚举参数 - Intent intent = new Intent(context, ThoughtfulService.class); - intent.putExtra(EXTRA_SERVICE_TYPE, serviceType); - // 启动服务 - context.startService(intent); - LogUtils.d(TAG, "【startServiceWithType】服务启动成功，执行[" + serviceType.name() + "]任务"); - } else { - LogUtils.d(TAG, "【startServiceWithType】上下文为空 或 服务类型枚举为空，跳过启动服务"); + LogUtils.d(TAG, "【startServiceWithType】调用 | type=" + (serviceType == null ? "null" : serviceType.name())); + + if (context == null || serviceType == null) { + LogUtils.d(TAG, "【startServiceWithType】空参数，直接返回"); + return; } + + // 1. 预先读取配置，不满足直接不启动服务（最关键拦截） + ThoughtfulServiceBean ttsBean = ThoughtfulServiceBean.loadBean(context, ThoughtfulServiceBean.class); + if (ttsBean == null) { + ttsBean = new ThoughtfulServiceBean(); + } + + // 充电TTS未开 → 不启动 + if (serviceType == ServiceType.CHARGE_STATE && !ttsBean.isEnableChargeTts()) { + LogUtils.d(TAG, "【startServiceWithType】充电TTS未启用，不启动服务"); + return; + } + + // 用电TTS未开 → 不启动 + if (serviceType == ServiceType.DISCHARGE_STATE && !ttsBean.isEnableUsePowerTts()) { + LogUtils.d(TAG, "【startServiceWithType】用电TTS未启用，不启动服务"); + return; + } + + // 2. 防止重复启动导致叠加播报 + if (sIsPlaying) { + LogUtils.d(TAG, "【startServiceWithType】已有播报任务，跳过本次启动"); + return; + } + + // 3. 真正启动 + Intent intent = new Intent(context, ThoughtfulService.class); + intent.putExtra(EXTRA_SERVICE_TYPE, serviceType); + context.startService(intent); + LogUtils.d(TAG, "【startServiceWithType】服务启动成功"); } - // ====================================== 生命周期方法 - 绑定服务 (原逻辑保留) ====================================== + // ====================================== 生命周期 ====================================== @Override public IBinder onBind(Intent intent) { - LogUtils.d(TAG, "【onBind】服务绑定方法调用，入参Intent：" + intent); return null; } - // ====================================== 生命周期方法 - 启动服务【核心逻辑】接收枚举+分支执行任务 ====================================== @Override public int onStartCommand(Intent intent, int flags, int startId) { - LogUtils.d(TAG, "【onStartCommand】服务启动方法调用 | intent=" + intent + " | flags=" + flags + " | startId=" + startId); - // 判断意图非空，解析服务类型参数 - if (intent != null) { - LogUtils.d(TAG, "【onStartCommand】Intent不为空，开始解析服务类型枚举参数"); - // 获取传递的服务类型枚举 - ServiceType serviceType = (ServiceType) intent.getSerializableExtra(EXTRA_SERVICE_TYPE); - // 根据服务类型，执行对应任务 - if (serviceType != null) { - LogUtils.d(TAG, "【onStartCommand】解析到服务类型：" + serviceType.name()); - switch (serviceType) { - case CHARGE_STATE: - // 执行【充电状态】对应的业务任务 - executeChargeStateTask(); - break; - case DISCHARGE_STATE: - // 执行【放电状态】对应的业务任务 - executeDischargeStateTask(); - break; - default: - LogUtils.d(TAG, "【onStartCommand】未知的服务类型，不执行任何任务"); - break; - } - } else { - LogUtils.d(TAG, "【onStartCommand】未解析到有效服务类型参数，参数为空"); - } - } else { - LogUtils.d(TAG, "【onStartCommand】启动服务的Intent为空，直接返回"); + LogUtils.d(TAG, "【onStartCommand】进入"); + + if (intent == null) { + LogUtils.d(TAG, "【onStartCommand】intent = null，停止"); + stopSelf(); + return START_NOT_STICKY; } - // 返回默认策略，与原生逻辑一致 - int result = super.onStartCommand(intent, flags, startId); - LogUtils.d(TAG, "【onStartCommand】服务执行完成，返回值：" + result); - return result; + // 再次防止重复播报（双重保险） + if (sIsPlaying) { + LogUtils.d(TAG, "【onStartCommand】已有播报，直接停止服务"); + stopSelf(); + return START_NOT_STICKY; + } + + // 解析类型 + ServiceType type = (ServiceType) intent.getSerializableExtra(EXTRA_SERVICE_TYPE); + if (type == null) { + LogUtils.d(TAG, "【onStartCommand】type = null，停止"); + stopSelf(); + return START_NOT_STICKY; + } + + // 二次校验开关（防止外部绕过 startServiceWithType 直接启动） + ThoughtfulServiceBean ttsBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); + if (ttsBean == null) ttsBean = new ThoughtfulServiceBean(); + + boolean allowPlay = false; + if (type == ServiceType.CHARGE_STATE && ttsBean.isEnableChargeTts()) { + allowPlay = true; + } + if (type == ServiceType.DISCHARGE_STATE && ttsBean.isEnableUsePowerTts()) { + allowPlay = true; + } + + if (!allowPlay) { + LogUtils.d(TAG, "【onStartCommand】TTS开关已关闭，不执行播报"); + stopSelf(); + return START_NOT_STICKY; + } + + // 执行任务 + if (type == ServiceType.CHARGE_STATE) { + executeChargeStateTask(); + } else if (type == ServiceType.DISCHARGE_STATE) { + executeDischargeStateTask(); + } + + return START_NOT_STICKY; // 重要：执行完自动销毁，不保留服务 } - // ====================================== 私有业务方法 充电/放电 分任务执行 ====================================== - /** - * 执行【充电状态】的业务任务 - * 可在此方法内编写 充电时的逻辑（语音提醒/电量监控/弹窗等） - */ + // ====================================== 充电任务 ====================================== private void executeChargeStateTask() { - LogUtils.d(TAG, "【executeChargeStateTask】执行【充电状态】业务任务 >>> "); - //ToastUtils.show("【executeChargeStateTask】执行【充电状态】业务任务 >>> "); - // TODO 此处添加充电状态需要执行的业务逻辑代码 - // 加载最新配置 - AppConfigBean latestConfig = AppConfigUtils.getInstance(this).loadAppConfig(); - if (latestConfig == null) { - LogUtils.e(TAG, "handleNotifyAppConfigUpdate() 终止 | 最新配置为空"); - return; - } - - ThoughtfulServiceBean thoughtfulServiceBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); - if (thoughtfulServiceBean == null) { - thoughtfulServiceBean = new ThoughtfulServiceBean(); - } - - if (latestConfig.isEnableChargeReminder()) { - int nChargeReminderValue = latestConfig.getChargeReminderValue(); - String szCurrentBattery = thoughtfulServiceBean.isEnableChargeTtsWithBattary()? String.format("现在电量为百分之%d。", App.sQuantityOfElectricity) : ""; - String szRemind = String.format("限量充电提醒已启用，限量值为百分之%d。", nChargeReminderValue); - szRemind = szCurrentBattery + szRemind + szRemind + szRemind; - TTSPlayService.startPlayTTS(this, szRemind); - } + LogUtils.d(TAG, "【executeChargeStateTask】执行充电任务"); + + sIsPlaying = true; // 锁定播报 + + try { + AppConfigBean config = AppConfigUtils.getInstance(this).loadAppConfig(); + if (config == null) { + LogUtils.e(TAG, "配置为空，停止"); + return; + } + + ThoughtfulServiceBean ttsBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); + if (ttsBean == null) ttsBean = new ThoughtfulServiceBean(); + + // 主提醒开关未开 → 直接不播 + if (!config.isEnableChargeReminder()) { + LogUtils.d(TAG, "充电提醒总开关关闭，不播报"); + return; + } + + int limit = config.getChargeReminderValue(); + int battery = App.sQuantityOfElectricity; + + // 电量无效值 → 不拼接电量 + String batteryStr = ""; + if (battery >= 0 && battery <= 100 && ttsBean.isEnableChargeTtsWithBattary()) { + batteryStr = String.format("当前电量百分之%d。", battery); + } + + String text = batteryStr + String.format("限量充电提醒已启用，限值百分之%d。", limit); + TTSPlayService.startPlayTTS(this, text); + LogUtils.d(TAG, "充电TTS已下发：" + text); + + } finally { + sIsPlaying = false; // 释放锁 + stopSelf(); + } } - /** - * 执行【放电(耗电)状态】的业务任务 - * 可在此方法内编写 放电时的逻辑（语音提醒/电量监控/弹窗等） - */ + // ====================================== 放电任务 ====================================== private void executeDischargeStateTask() { - LogUtils.d(TAG, "【executeDischargeStateTask】执行【放电状态】业务任务 >>> "); - //ToastUtils.show("【executeDischargeStateTask】执行【放电状态】业务任务 >>> "); - // TODO 此处添加放电状态需要执行的业务逻辑代码 - // 加载最新配置 - AppConfigBean latestConfig = AppConfigUtils.getInstance(this).loadAppConfig(); - if (latestConfig == null) { - LogUtils.e(TAG, "handleNotifyAppConfigUpdate() 终止 | 最新配置为空"); - return; - } - - ThoughtfulServiceBean thoughtfulServiceBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); - if (thoughtfulServiceBean == null) { - thoughtfulServiceBean = new ThoughtfulServiceBean(); - } + LogUtils.d(TAG, "【executeDischargeStateTask】执行放电任务"); - if (latestConfig.isEnableUsageReminder()) { - int nUsageReminderValue = latestConfig.getUsageReminderValue(); - String szCurrentBattery = thoughtfulServiceBean.isEnableUseageTtsWithBattary()? String.format("现在电量为百分之%d。", App.sQuantityOfElectricity) : ""; - String szRemind = szCurrentBattery + String.format("电量不足提醒已启用，低电值为百分之%d。", nUsageReminderValue); + sIsPlaying = true; - //szRemind = szRemind + szRemind + szRemind; - TTSPlayService.startPlayTTS(this, szRemind); - } + try { + AppConfigBean config = AppConfigUtils.getInstance(this).loadAppConfig(); + if (config == null) { + LogUtils.e(TAG, "配置为空，停止"); + return; + } + + ThoughtfulServiceBean ttsBean = ThoughtfulServiceBean.loadBean(this, ThoughtfulServiceBean.class); + if (ttsBean == null) ttsBean = new ThoughtfulServiceBean(); + + // 主提醒开关未开 → 不播 + if (!config.isEnableUsageReminder()) { + LogUtils.d(TAG, "低电提醒总开关关闭，不播报"); + return; + } + + int limit = config.getUsageReminderValue(); + int battery = App.sQuantityOfElectricity; + + String batteryStr = ""; + if (battery >= 0 && battery <= 100 && ttsBean.isEnableUseageTtsWithBattary()) { + batteryStr = String.format("当前电量百分之%d。", battery); + } + + String text = batteryStr + String.format("低电量提醒已启用，限值百分之%d。", limit); + TTSPlayService.startPlayTTS(this, text); + LogUtils.d(TAG, "放电TTS已下发：" + text); + + } finally { + sIsPlaying = false; + stopSelf(); + } } - + @Override + public void onDestroy() { + super.onDestroy(); + LogUtils.d(TAG, "【onDestroy】服务已销毁"); + } } From 4b196acfce5be897ed012713b5b066f53b527c18 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 4 Feb 2026 11:07:22 +0800 Subject: [PATCH 18/31] APK 15.15.8 release Publish. --- powerbell/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 1414aa2..2b963ef 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Feb 04 02:57:22 GMT 2026 -stageCount=8 +#Wed Feb 04 11:07:22 HKT 2026 +stageCount=9 libraryProject= baseVersion=15.15 -publishVersion=15.15.7 -buildCount=1 -baseBetaVersion=15.15.8 +publishVersion=15.15.8 +buildCount=0 +baseBetaVersion=15.15.9 From bc730dffc85b3aeb618ed94bdd0e868c16af583e Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 28 Feb 2026 20:17:15 +0800 Subject: [PATCH 19/31] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E2=80=9C=E7=94=B5=E9=87=8F=E9=80=9A=E7=9F=A5?= =?UTF-8?q?TTS=E8=AF=AD=E9=9F=B3=E6=92=AD=E6=94=BE=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E2=80=9D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbell/build.properties | 4 +- .../activities/SettingsActivity.java | 27 ++++--- .../models/ThoughtfulServiceBean.java | 78 +++++++++---------- .../src/main/res/layout/activity_settings.xml | 8 ++ 4 files changed, 61 insertions(+), 56 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 2b963ef..be3f803 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Feb 04 11:07:22 HKT 2026 +#Sat Feb 28 12:14:20 GMT 2026 stageCount=9 libraryProject= baseVersion=15.15 publishVersion=15.15.8 -buildCount=0 +buildCount=3 baseBetaVersion=15.15.9 diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/SettingsActivity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/SettingsActivity.java index 677e48d..fca94e6 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/SettingsActivity.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/SettingsActivity.java @@ -25,7 +25,7 @@ import java.lang.reflect.Field; * 适配 API30，基于 Java7 开发 * @Author 豆包&ZhanGSKen * @Date 2025年11月27日14时26分00秒 - * @LastEditTime 2026年01月19日22时18分00秒 + * @LastEditTime 2026-02-28 * @Describe 应用设置窗口（主开关联动子开关启用/禁用，主开关关闭则子开关禁用并取消勾选） */ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivity { @@ -39,6 +39,7 @@ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivit private CheckBox cbChargeTts; // 充电TTS（主开关） private CheckBox cbUseageTtsBattary; // 用电TTS带电量提醒（子开关） private CheckBox cbChargeTtsBattary; // 充电TTS带电量提醒（子开关） + private CheckBox cbTtsWhenNotifyBattery; // 👉 新增：通知电量时同时播放TTS // ======================== 接口实现区 ========================= @Override @@ -96,6 +97,7 @@ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivit cbChargeTts = findViewById(R.id.activitysettingsCheckBox2); cbUseageTtsBattary = findViewById(R.id.activitysettingsCheckBox3); cbChargeTtsBattary = findViewById(R.id.activitysettingsCheckBox4); + cbTtsWhenNotifyBattery = findViewById(R.id.activitysettingsCheckBox5); // 👉 新增绑定 LogUtils.d(TAG, "initTtsCheckBoxes: TTS复选框绑定完成"); } @@ -116,6 +118,7 @@ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivit cbChargeTts.setChecked(chargeMainOpen); cbUseageTtsBattary.setChecked(bean.isEnableUseageTtsWithBattary()); cbChargeTtsBattary.setChecked(bean.isEnableChargeTtsWithBattary()); + cbTtsWhenNotifyBattery.setChecked(bean.isEnableTtsWhenNotifyBattery()); // 👉 新增赋值 cbUseageTtsBattary.setEnabled(useMainOpen); cbChargeTtsBattary.setEnabled(chargeMainOpen); @@ -138,12 +141,8 @@ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivit public void onEnableUsePowerTts(View view) { boolean isChecked = cbUsePowerTts.isChecked(); LogUtils.d(TAG, "onEnableUsePowerTts: 用电TTS主开关点击，切换后状态=" + isChecked); - cbUsePowerTts.setChecked(isChecked); // 主开关联动子开关 cbUseageTtsBattary.setEnabled(isChecked); -// if (!isChecked) { -// cbUseageTtsBattary.setChecked(false); -// } // 保存配置 ThoughtfulServiceBean bean = getThoughtfulServiceBean(); bean.setIsEnableUsePowerTts(isChecked); @@ -157,12 +156,8 @@ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivit public void onEnableChargeTts(View view) { boolean isChecked = cbChargeTts.isChecked(); LogUtils.d(TAG, "onEnableChargeTts: 充电TTS主开关点击，切换后状态=" + isChecked); - cbChargeTts.setChecked(isChecked); // 主开关联动子开关 cbChargeTtsBattary.setEnabled(isChecked); -// if (!isChecked) { -// cbChargeTtsBattary.setChecked(false); -// } // 保存配置 ThoughtfulServiceBean bean = getThoughtfulServiceBean(); bean.setIsEnableChargeTts(isChecked); @@ -176,7 +171,6 @@ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivit public void onEnableUseageTtsWithBattary(View view) { boolean isChecked = cbUseageTtsBattary.isChecked(); LogUtils.d(TAG, "onEnableUseageTtsWithBattary: 用电TTS电量提醒开关点击，切换后状态=" + isChecked); - cbUseageTtsBattary.setChecked(isChecked); ThoughtfulServiceBean bean = getThoughtfulServiceBean(); bean.setIsEnableUseageTtsWithBattary(isChecked); ThoughtfulServiceBean.saveBean(this, bean); @@ -189,13 +183,24 @@ public class SettingsActivity extends WinBoLLActivity implements IWinBoLLActivit public void onEnableChargeTtsWithBattary(View view) { boolean isChecked = cbChargeTtsBattary.isChecked(); LogUtils.d(TAG, "onEnableChargeTtsWithBattary: 充电TTS电量提醒开关点击，切换后状态=" + isChecked); - cbChargeTtsBattary.setChecked(isChecked); ThoughtfulServiceBean bean = getThoughtfulServiceBean(); bean.setIsEnableChargeTtsWithBattary(isChecked); ThoughtfulServiceBean.saveBean(this, bean); LogUtils.d(TAG, "onEnableChargeTtsWithBattary: 充电TTS电量提醒状态保存完成"); } + /** + * 👉 新增：允许通知电量消息时同时播放TTS语音 + */ + public void onEnableTtsWhenNotifyBattery(View view) { + boolean isChecked = cbTtsWhenNotifyBattery.isChecked(); + LogUtils.d(TAG, "onEnableTtsWhenNotifyBattery: 通知电量时播TTS开关状态=" + isChecked); + ThoughtfulServiceBean bean = getThoughtfulServiceBean(); + bean.setIsEnableTtsWhenNotifyBattery(isChecked); + ThoughtfulServiceBean.saveBean(this, bean); + LogUtils.d(TAG, "onEnableTtsWhenNotifyBattery: 保存完成"); + } + // ======================== 工具方法区 ========================= /** * 获取配置Bean实例，避免重复代码 diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/models/ThoughtfulServiceBean.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/ThoughtfulServiceBean.java index b9f555e..0531a34 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/models/ThoughtfulServiceBean.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/ThoughtfulServiceBean.java @@ -24,17 +24,19 @@ public class ThoughtfulServiceBean extends BaseBean implements Parcelable, Seria // JSON序列化字段常量 杜绝硬编码 public static final String JSON_FIELD_IS_ENABLE_CHARGE_TTS = "isEnableChargeTts"; public static final String JSON_FIELD_IS_ENABLE_USE_POWER_TTS = "isEnableUsePowerTts"; - // 新增字段JSON常量 public static final String JSON_FIELD_IS_ENABLE_USAGE_TTS_WITH_BATTERY = "isEnableUseageTtsWithBattary"; public static final String JSON_FIELD_IS_ENABLE_CHARGE_TTS_WITH_BATTERY = "isEnableChargeTtsWithBattary"; + // 👉 新增：通知电量消息时同时播放TTS + public static final String JSON_FIELD_IS_ENABLE_TTS_WHEN_NOTIFY_BATTERY = "isEnableTtsWhenNotifyBattery"; // ====================== 核心成员变量 - 私有封装 ====================== - private boolean isEnableChargeTts = false; // 是否启用 充电TTS贴心语音服务 - private boolean isEnableUsePowerTts = false; // 是否启用 用电TTS贴心语音服务 - private boolean isEnableUseageTtsWithBattary = false; // 用电TTS加入电量提醒 - private boolean isEnableChargeTtsWithBattary = false;// 充电TTS加入电量提醒 + private boolean isEnableChargeTts = false; // 是否启用 充电TTS贴心语音服务 + private boolean isEnableUsePowerTts = false; // 是否启用 用电TTS贴心语音服务 + private boolean isEnableUseageTtsWithBattary = false; // 用电TTS加入电量提醒 + private boolean isEnableChargeTtsWithBattary = false; // 充电TTS加入电量提醒 + private boolean isEnableTtsWhenNotifyBattery = false; // 👉 允许通知电量消息时同时播放TTS语音 - // ====================== Parcelable 静态创建器 (API30标准写法 必须public static final) ====================== + // ====================== Parcelable 静态创建器 ====================== public static final Creator CREATOR = new Creator() { @Override public ThoughtfulServiceBean createFromParcel(Parcel source) { @@ -48,45 +50,34 @@ public class ThoughtfulServiceBean extends BaseBean implements Parcelable, Seria } }; - // ====================== 构造方法区 (无参+有参+Parcel构造 全覆盖) ====================== - /** - * 无参构造 - JSON解析/反射实例化 必备 - */ + // ====================== 构造方法区 ====================== public ThoughtfulServiceBean() { LogUtils.d(TAG, "ThoughtfulServiceBean: 无参构造，初始化默认禁用所有TTS服务"); } - /** - * 全参构造 - 手动配置所有服务状态 - * @param isEnableChargeTts 充电TTS服务开关 - * @param isEnableUsePowerTts 用电TTS服务开关 - * @param isEnableUseageTtsWithBattary 用电TTS加电量提醒开关 - * @param isEnableChargeTtsWithBattary 充电TTS加电量提醒开关 - */ public ThoughtfulServiceBean(boolean isEnableChargeTts, boolean isEnableUsePowerTts, - boolean isEnableUseageTtsWithBattary, boolean isEnableChargeTtsWithBattary) { + boolean isEnableUseageTtsWithBattary, boolean isEnableChargeTtsWithBattary, + boolean isEnableTtsWhenNotifyBattery) { this.isEnableChargeTts = isEnableChargeTts; this.isEnableUsePowerTts = isEnableUsePowerTts; this.isEnableUseageTtsWithBattary = isEnableUseageTtsWithBattary; this.isEnableChargeTtsWithBattary = isEnableChargeTtsWithBattary; + this.isEnableTtsWhenNotifyBattery = isEnableTtsWhenNotifyBattery; LogUtils.d(TAG, "ThoughtfulServiceBean: 全参构造 | 充电TTS=" + isEnableChargeTts + " | 用电TTS=" + isEnableUsePowerTts - + " | 用电TTS加电量=" + isEnableUseageTtsWithBattary + " | 充电TTS加电量=" + isEnableChargeTtsWithBattary); + + " | 用电TTS加电量=" + isEnableUseageTtsWithBattary + " | 充电TTS加电量=" + isEnableChargeTtsWithBattary + + " | 通知电量时播TTS=" + isEnableTtsWhenNotifyBattery); } - /** - * Parcel反序列化构造 - Parcelable必备 私有私有化 - */ private ThoughtfulServiceBean(Parcel in) { this.isEnableChargeTts = in.readByte() != 0; this.isEnableUsePowerTts = in.readByte() != 0; - // 新增字段反序列化 this.isEnableUseageTtsWithBattary = in.readByte() != 0; this.isEnableChargeTtsWithBattary = in.readByte() != 0; - LogUtils.d(TAG, "ThoughtfulServiceBean: Parcel构造解析完成 | 充电TTS=" + isEnableChargeTts + " | 用电TTS=" + isEnableUsePowerTts - + " | 用电TTS加电量=" + isEnableUseageTtsWithBattary + " | 充电TTS加电量=" + isEnableChargeTtsWithBattary); + this.isEnableTtsWhenNotifyBattery = in.readByte() != 0; // 👉 新增反序列化 + LogUtils.d(TAG, "ThoughtfulServiceBean: Parcel构造解析完成"); } - // ====================== Getter/Setter 方法区 (封装成员变量 统一访问) ====================== + // ====================== Getter/Setter 方法区 ====================== public boolean isEnableChargeTts() { return isEnableChargeTts; } @@ -105,7 +96,6 @@ public class ThoughtfulServiceBean extends BaseBean implements Parcelable, Seria this.isEnableUsePowerTts = isEnableUsePowerTts; } - // 新增 用电TTS加入电量提醒 Getter/Setter public boolean isEnableUseageTtsWithBattary() { return isEnableUseageTtsWithBattary; } @@ -115,7 +105,6 @@ public class ThoughtfulServiceBean extends BaseBean implements Parcelable, Seria this.isEnableUseageTtsWithBattary = isEnableUseageTtsWithBattary; } - // 新增 充电TTS加入电量提醒 Getter/Setter public boolean isEnableChargeTtsWithBattary() { return isEnableChargeTtsWithBattary; } @@ -125,7 +114,17 @@ public class ThoughtfulServiceBean extends BaseBean implements Parcelable, Seria this.isEnableChargeTtsWithBattary = isEnableChargeTtsWithBattary; } - // ====================== 重写父类 BaseBean 核心方法 (JSON序列化/反序列化 业务核心) ====================== + // 👉 新增：通知电量时播放TTS + public boolean isEnableTtsWhenNotifyBattery() { + return isEnableTtsWhenNotifyBattery; + } + + public void setIsEnableTtsWhenNotifyBattery(boolean isEnableTtsWhenNotifyBattery) { + LogUtils.d(TAG, "setIsEnableTtsWhenNotifyBattery: 旧值=" + this.isEnableTtsWhenNotifyBattery + " ｜ 新值=" + isEnableTtsWhenNotifyBattery); + this.isEnableTtsWhenNotifyBattery = isEnableTtsWhenNotifyBattery; + } + + // ====================== 重写父类 BaseBean 核心方法 ====================== @Override public String getName() { String className = ThoughtfulServiceBean.class.getName(); @@ -133,23 +132,17 @@ public class ThoughtfulServiceBean extends BaseBean implements Parcelable, Seria return className; } - /** - * JSON序列化 - 写入所有字段 适配持久化/网络传输 - */ @Override public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException { super.writeThisToJsonWriter(jsonWriter); jsonWriter.name(JSON_FIELD_IS_ENABLE_CHARGE_TTS).value(this.isEnableChargeTts); jsonWriter.name(JSON_FIELD_IS_ENABLE_USE_POWER_TTS).value(this.isEnableUsePowerTts); - // 新增字段JSON序列化 jsonWriter.name(JSON_FIELD_IS_ENABLE_USAGE_TTS_WITH_BATTERY).value(this.isEnableUseageTtsWithBattary); jsonWriter.name(JSON_FIELD_IS_ENABLE_CHARGE_TTS_WITH_BATTERY).value(this.isEnableChargeTtsWithBattary); + jsonWriter.name(JSON_FIELD_IS_ENABLE_TTS_WHEN_NOTIFY_BATTERY).value(this.isEnableTtsWhenNotifyBattery); // 👉 新增JSON写入 LogUtils.d(TAG, "writeThisToJsonWriter: JSON序列化完成，所有TTS服务状态已写入"); } - /** - * JSON反序列化 - 读取字段生成实体 适配数据恢复 - */ @Override public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException { ThoughtfulServiceBean bean = new ThoughtfulServiceBean(); @@ -163,13 +156,15 @@ public class ThoughtfulServiceBean extends BaseBean implements Parcelable, Seria case JSON_FIELD_IS_ENABLE_USE_POWER_TTS: bean.setIsEnableUsePowerTts(jsonReader.nextBoolean()); break; - // 新增字段反序列化 case JSON_FIELD_IS_ENABLE_USAGE_TTS_WITH_BATTERY: bean.setIsEnableUseageTtsWithBattary(jsonReader.nextBoolean()); break; case JSON_FIELD_IS_ENABLE_CHARGE_TTS_WITH_BATTERY: bean.setIsEnableChargeTtsWithBattary(jsonReader.nextBoolean()); break; + case JSON_FIELD_IS_ENABLE_TTS_WHEN_NOTIFY_BATTERY: + bean.setIsEnableTtsWhenNotifyBattery(jsonReader.nextBoolean()); // 👉 新增JSON读取 + break; default: jsonReader.skipValue(); LogUtils.w(TAG, "readBeanFromJsonReader: 跳过未知JSON字段 = " + fieldName); @@ -181,22 +176,19 @@ public class ThoughtfulServiceBean extends BaseBean implements Parcelable, Seria return bean; } - // ====================== 实现 Parcelable 接口方法 (组件间Intent传递必备 API30/Java7完美适配) ====================== + // ====================== Parcelable 接口方法 ====================== @Override public int describeContents() { - return 0; // 无文件描述符等特殊内容，固定返回0即可 + return 0; } - /** - * Parcel序列化 - boolean用byte存储(Java7/API30标准写法 避免兼容性问题) - */ @Override public void writeToParcel(Parcel dest, int flags) { dest.writeByte((byte) (isEnableChargeTts ? 1 : 0)); dest.writeByte((byte) (isEnableUsePowerTts ? 1 : 0)); - // 新增字段Parcel序列化 dest.writeByte((byte) (isEnableUseageTtsWithBattary ? 1 : 0)); dest.writeByte((byte) (isEnableChargeTtsWithBattary ? 1 : 0)); + dest.writeByte((byte) (isEnableTtsWhenNotifyBattery ? 1 : 0)); // 👉 新增Parcel写入 LogUtils.d(TAG, "writeToParcel: Parcel序列化完成，所有TTS服务状态已写入"); } diff --git a/powerbell/src/main/res/layout/activity_settings.xml b/powerbell/src/main/res/layout/activity_settings.xml index 4380fff..029bdac 100644 --- a/powerbell/src/main/res/layout/activity_settings.xml +++ b/powerbell/src/main/res/layout/activity_settings.xml @@ -123,6 +123,14 @@ + + + Date: Sat, 28 Feb 2026 21:15:22 +0800 Subject: [PATCH 20/31] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E6=92=AD=E6=94=BE=E6=A8=A1=E5=9D=97=E5=AE=9E=E7=8E=B0=E9=83=A8?= =?UTF-8?q?=E5=88=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbell/build.properties | 4 +- .../handlers/ControlCenterServiceHandler.java | 2 + .../powerbell/threads/RemindThread.java | 4 + .../powerbell/threads/TTSRemindThread.java | 122 ++++++++++++++++++ 4 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 powerbell/src/main/java/cc/winboll/studio/powerbell/threads/TTSRemindThread.java diff --git a/powerbell/build.properties b/powerbell/build.properties index be3f803..a934daf 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Feb 28 12:14:20 GMT 2026 +#Sat Feb 28 13:13:09 GMT 2026 stageCount=9 libraryProject= baseVersion=15.15 publishVersion=15.15.8 -buildCount=3 +buildCount=11 baseBetaVersion=15.15.9 diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/handlers/ControlCenterServiceHandler.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/handlers/ControlCenterServiceHandler.java index 3c33ce1..eb349d4 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/handlers/ControlCenterServiceHandler.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/handlers/ControlCenterServiceHandler.java @@ -4,7 +4,9 @@ import android.os.Handler; import android.os.Message; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.powerbell.models.NotificationMessage; +import cc.winboll.studio.powerbell.models.ThoughtfulServiceBean; import cc.winboll.studio.powerbell.services.ControlCenterService; +import cc.winboll.studio.powerbell.threads.TTSRemindThread; import java.lang.ref.WeakReference; /** diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/threads/RemindThread.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/threads/RemindThread.java index ad05f6f..07a448a 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/threads/RemindThread.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/threads/RemindThread.java @@ -188,6 +188,9 @@ public class RemindThread extends Thread { LogUtils.d(TAG, String.format("未有合适类型提醒，退出提醒线程 | threadId=%d", getId())); break; } + + // 启动电量通知 TTS 语音提醒线程 + TTSRemindThread.start(this.mContext, App.sQuantityOfElectricity, isCharging); // 安全休眠，保留中断标记 safeSleepInternal(sleepTime); @@ -280,6 +283,7 @@ public class RemindThread extends Thread { */ private void cleanThreadStateInternal() { LogUtils.d(TAG, String.format("cleanThreadStateInternal() 调用 | threadId=%d", getId())); + TTSRemindThread.stopTTS(); isReminding = false; isExist = true; // 中断当前线程（如果存活） diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/threads/TTSRemindThread.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/threads/TTSRemindThread.java new file mode 100644 index 0000000..fdc8a60 --- /dev/null +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/threads/TTSRemindThread.java @@ -0,0 +1,122 @@ +package cc.winboll.studio.powerbell.threads; + +import android.content.Context; +import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.libappbase.ToastUtils; +import cc.winboll.studio.powerbell.models.ThoughtfulServiceBean; +import cc.winboll.studio.powerbell.services.TTSPlayService; + +/** + * @Author 豆包&ZhanGSKen + * @Date 2026/02/28 20:41 + * @Describe TTS 语音通知线程（单例 + 继承 Thread） + */ +public class TTSRemindThread extends Thread { + + public static final String TAG = "TTSRemindThread"; + + // 单例实例 + private static TTSRemindThread sInstance; + + // 运行标志 + private volatile boolean mIsRunning = false; + private volatile int mBattery; + private volatile boolean mIsCharging; + + private Context mContext; + + /** + * 私有构造，单例禁用外部 new + */ + private TTSRemindThread(Context context) { + this.mContext = context.getApplicationContext(); + } + + /** + * 获取单例（DCL 双重校验） + */ + public static TTSRemindThread getInstance(Context context) { + if (sInstance == null) { + synchronized (TTSRemindThread.class) { + if (sInstance == null) { + sInstance = new TTSRemindThread(context); + } + } + } + return sInstance; + } + + /** + * 对外静态启动入口 + */ + public static void start(Context context, int battery, boolean isCharging) { + TTSRemindThread instance = getInstance(context); + instance.mBattery = battery; + instance.mIsCharging = isCharging; + if (!instance.mIsRunning) { + LogUtils.d(TAG, "start() TTS 提醒线程启动"); + instance.mIsRunning = true; + instance.start(); // 启动线程 + } + } + + /** + * 对外静态停止入口 + */ + public static void stopTTS() { + if (sInstance != null) { + LogUtils.d(TAG, "stopTTS() TTS 提醒线程停止"); + sInstance.mIsRunning = false; + sInstance = null; + } + } + + /** + * 线程主逻辑 + */ + @Override + public void run() { + super.run(); + LogUtils.d(TAG, "run() TTS 线程已开始循环"); + + while (mIsRunning) { + try { + // ====================== + // 在这里写你的循环 TTS 逻辑 + // ====================== + + // TTS 语音通知模块 + // 读取 TTS 语音通知配置 + ThoughtfulServiceBean ttsBean = ThoughtfulServiceBean.loadBean(mContext, ThoughtfulServiceBean.class); + if (ttsBean == null) { + ttsBean = new ThoughtfulServiceBean(); + } + if (ttsBean.isEnableTtsWhenNotifyBattery()) { + //ToastUtils.show("Test"); + // 启动 + ToastUtils.show(String.format("mIsCharging %s, mBattery %d", mIsCharging, mBattery)); + String text = mIsCharging ?"充电": "用电"; + text += String.format("已达预定值百分之%d", mBattery); + TTSPlayService.startPlayTTS(mContext, text); + } + + // 防止死循环疯狂跑，加一点休眠 + sleep(5000); + } catch (InterruptedException e) { + LogUtils.e(TAG, "TTS 线程被中断", e); + break; + } + } + + mIsRunning = false; + LogUtils.d(TAG, "run() TTS 线程已退出"); + } + + /** + * 是否正在运行 + */ + public boolean isRunning() { + return mIsRunning; + } +} + From 59094217da3b8ab044c8fdf3ef343089400364ab Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 28 Feb 2026 21:19:52 +0800 Subject: [PATCH 21/31] APK 15.15.9 release Publish. --- powerbell/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index a934daf..dc2f562 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Feb 28 13:13:09 GMT 2026 -stageCount=9 +#Sat Feb 28 21:19:52 HKT 2026 +stageCount=10 libraryProject= baseVersion=15.15 -publishVersion=15.15.8 -buildCount=11 -baseBetaVersion=15.15.9 +publishVersion=15.15.9 +buildCount=0 +baseBetaVersion=15.15.10 From c030de64b826f93d92be27dea04662ec5fd7a41e Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 1 Mar 2026 00:22:21 +0800 Subject: [PATCH 22/31] =?UTF-8?q?=E9=9A=90=E8=97=8FTTS=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbell/build.properties | 4 ++-- .../cc/winboll/studio/powerbell/threads/TTSRemindThread.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index dc2f562..ad6ad33 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Feb 28 21:19:52 HKT 2026 +#Sat Feb 28 16:15:56 GMT 2026 stageCount=10 libraryProject= baseVersion=15.15 publishVersion=15.15.9 -buildCount=0 +buildCount=2 baseBetaVersion=15.15.10 diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/threads/TTSRemindThread.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/threads/TTSRemindThread.java index fdc8a60..afdc6a6 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/threads/TTSRemindThread.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/threads/TTSRemindThread.java @@ -94,7 +94,7 @@ public class TTSRemindThread extends Thread { if (ttsBean.isEnableTtsWhenNotifyBattery()) { //ToastUtils.show("Test"); // 启动 - ToastUtils.show(String.format("mIsCharging %s, mBattery %d", mIsCharging, mBattery)); + //ToastUtils.show(String.format("mIsCharging %s, mBattery %d", mIsCharging, mBattery)); String text = mIsCharging ?"充电": "用电"; text += String.format("已达预定值百分之%d", mBattery); TTSPlayService.startPlayTTS(mContext, text); From c4f5f180893f0450a16d388a60d11110074b50ba Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sun, 1 Mar 2026 00:24:19 +0800 Subject: [PATCH 23/31] APK 15.15.10 release Publish. --- powerbell/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index ad6ad33..26b2a24 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Feb 28 16:15:56 GMT 2026 -stageCount=10 +#Sun Mar 01 00:24:19 HKT 2026 +stageCount=11 libraryProject= baseVersion=15.15 -publishVersion=15.15.9 -buildCount=2 -baseBetaVersion=15.15.10 +publishVersion=15.15.10 +buildCount=0 +baseBetaVersion=15.15.11 From feae9f4e1456012e437d91c8a1bf5c7c7f7278db Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 2 Mar 2026 23:40:50 +0800 Subject: [PATCH 24/31] =?UTF-8?q?=E4=BF=AE=E6=AD=A3TTS=E7=94=B5=E9=87=8F?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E8=AF=AD=E9=9F=B3=E6=8F=8F=E8=BF=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbell/build.properties | 4 ++-- .../cc/winboll/studio/powerbell/threads/TTSRemindThread.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 26b2a24..db01707 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Mar 01 00:24:19 HKT 2026 +#Mon Mar 02 15:39:16 GMT 2026 stageCount=11 libraryProject= baseVersion=15.15 publishVersion=15.15.10 -buildCount=0 +buildCount=4 baseBetaVersion=15.15.11 diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/threads/TTSRemindThread.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/threads/TTSRemindThread.java index afdc6a6..714e0bb 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/threads/TTSRemindThread.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/threads/TTSRemindThread.java @@ -96,12 +96,12 @@ public class TTSRemindThread extends Thread { // 启动 //ToastUtils.show(String.format("mIsCharging %s, mBattery %d", mIsCharging, mBattery)); String text = mIsCharging ?"充电": "用电"; - text += String.format("已达预定值百分之%d", mBattery); + text += String.format("已达预定值，现在电量为百分之%d", mBattery); TTSPlayService.startPlayTTS(mContext, text); } // 防止死循环疯狂跑，加一点休眠 - sleep(5000); + sleep(6000); } catch (InterruptedException e) { LogUtils.e(TAG, "TTS 线程被中断", e); break; From f4c16dd332c35216462422525c629ff733f1e35b Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 2 Mar 2026 23:42:54 +0800 Subject: [PATCH 25/31] APK 15.15.11 release Publish. --- powerbell/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index db01707..1767a24 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 02 15:39:16 GMT 2026 -stageCount=11 +#Mon Mar 02 23:42:54 HKT 2026 +stageCount=12 libraryProject= baseVersion=15.15 -publishVersion=15.15.10 -buildCount=4 -baseBetaVersion=15.15.11 +publishVersion=15.15.11 +buildCount=0 +baseBetaVersion=15.15.12 From a21a2ba4a5e9100cc340a11f064844eaae07f798 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 10 Mar 2026 20:00:43 +0800 Subject: [PATCH 26/31] APK 15.15.12 release Publish. --- powerbell/build.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 1767a24..a2874f6 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 02 23:42:54 HKT 2026 -stageCount=12 +#Tue Mar 10 20:00:43 HKT 2026 +stageCount=13 libraryProject= baseVersion=15.15 -publishVersion=15.15.11 +publishVersion=15.15.12 buildCount=0 -baseBetaVersion=15.15.12 +baseBetaVersion=15.15.13 From 4e1d72a02b9b3b942823d506b03fc9e3c3a52a10 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 10 Mar 2026 20:02:12 +0800 Subject: [PATCH 27/31] APK 15.15.13 release Publish. --- powerbell/build.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index a2874f6..8498ad2 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Mar 10 20:00:43 HKT 2026 -stageCount=13 +#Tue Mar 10 20:02:12 HKT 2026 +stageCount=14 libraryProject= baseVersion=15.15 -publishVersion=15.15.12 +publishVersion=15.15.13 buildCount=0 -baseBetaVersion=15.15.13 +baseBetaVersion=15.15.14 From e85fa2481a4ace40f7a244e957aceed8ced7fa99 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 10 Mar 2026 20:03:39 +0800 Subject: [PATCH 28/31] APK 15.15.14 release Publish. --- powerbell/build.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 8498ad2..84906d9 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Mar 10 20:02:12 HKT 2026 -stageCount=14 +#Tue Mar 10 20:03:39 HKT 2026 +stageCount=15 libraryProject= baseVersion=15.15 -publishVersion=15.15.13 +publishVersion=15.15.14 buildCount=0 -baseBetaVersion=15.15.14 +baseBetaVersion=15.15.15 From 29c024273da34c6f23e63f3bf4071bc8631ba03c Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 10 Mar 2026 20:04:26 +0800 Subject: [PATCH 29/31] APK 15.15.15 release Publish. --- powerbell/build.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 84906d9..29f6934 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Mar 10 20:03:39 HKT 2026 -stageCount=15 +#Tue Mar 10 20:04:26 HKT 2026 +stageCount=16 libraryProject= baseVersion=15.15 -publishVersion=15.15.14 +publishVersion=15.15.15 buildCount=0 -baseBetaVersion=15.15.15 +baseBetaVersion=15.15.16 From 8cc466dc3b4ca9fc17746bf0523e5a7d9098c961 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 11 Mar 2026 04:19:28 +0800 Subject: [PATCH 30/31] =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbell/build.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 29f6934..5971784 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Mar 10 20:04:26 HKT 2026 +#Tue Mar 10 20:18:37 GMT 2026 stageCount=16 libraryProject= baseVersion=15.15 publishVersion=15.15.15 -buildCount=0 +buildCount=1 baseBetaVersion=15.15.16 From 7db4c90e11ba8ca3f6d8f444eb3af8e531003131 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 11 Mar 2026 04:24:14 +0800 Subject: [PATCH 31/31] APK 15.15.16 release Publish. --- powerbell/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 5971784..bf6afbd 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Mar 10 20:18:37 GMT 2026 -stageCount=16 +#Wed Mar 11 04:24:14 HKT 2026 +stageCount=17 libraryProject= baseVersion=15.15 -publishVersion=15.15.15 -buildCount=1 -baseBetaVersion=15.15.16 +publishVersion=15.15.16 +buildCount=0 +baseBetaVersion=15.15.17