From 7e476894a7e952d70dfad9cd97d83bdc53e3bf97 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 3 Sep 2025 20:54:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=B5=E9=87=8F=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=A1=A8=E9=87=8C=E6=B7=BB=E5=8A=A0=E6=8D=A2=E8=A1=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=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/ClearRecordActivity.java | 19 +++++++++++-- .../studio/powerbell/utils/StringUtils.java | 9 ++++++ .../main/res/layout/activity_clearrecord.xml | 28 ++++++++++++++++--- 4 files changed, 51 insertions(+), 9 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 4d7e1f8..7a4c728 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sun Aug 31 06:21:48 CST 2025 +#Wed Sep 03 12:53:17 GMT 2025 stageCount=12 libraryProject= baseVersion=15.4 publishVersion=15.4.11 -buildCount=0 +buildCount=11 baseBetaVersion=15.4.12 diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/ClearRecordActivity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/ClearRecordActivity.java index 0ce0f16..d53e767 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/ClearRecordActivity.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/ClearRecordActivity.java @@ -16,6 +16,7 @@ import cc.winboll.studio.powerbell.receivers.ControlCenterServiceReceiver; import cc.winboll.studio.powerbell.utils.AppCacheUtils; import cc.winboll.studio.powerbell.utils.StringUtils; import java.util.ArrayList; +import android.widget.Switch; public class ClearRecordActivity extends Activity { @@ -24,6 +25,7 @@ public class ClearRecordActivity extends Activity { AToolbar mAToolbar; TextView mtvRecordText; App mApplication; + boolean mIsShowRecordWithEnter = false; @Override protected void onCreate(Bundle savedInstanceState) { @@ -47,7 +49,7 @@ public class ClearRecordActivity extends Activity { finish(); } }); - + // 设置滑动清理控件 // // 初始化发送拉动控件 @@ -79,7 +81,18 @@ public class ClearRecordActivity extends Activity { void initRecordText() { ArrayList listBatteryInfo = AppCacheUtils.getInstance(this).getArrayListBatteryInfo(); - String szRecordText = StringUtils.formatPCMListString(listBatteryInfo); - mtvRecordText.setText(szRecordText); + if (mIsShowRecordWithEnter) { + String szRecordText = StringUtils.formatPCMListStringWithEnter(listBatteryInfo); + mtvRecordText.setText(szRecordText); + } else { + String szRecordText = StringUtils.formatPCMListString(listBatteryInfo); + mtvRecordText.setText(szRecordText); + } } + + public void onShowRecordWithEnter(View view) { + Switch swShowRecordWithEnter = (Switch)view; + mIsShowRecordWithEnter = swShowRecordWithEnter.isChecked(); + initRecordText(); + } } diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/StringUtils.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/StringUtils.java index c192a33..52895e2 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/StringUtils.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/StringUtils.java @@ -37,6 +37,15 @@ public class StringUtils { } return sz; } + + public static String formatPCMListStringWithEnter(ArrayList arrayListBatteryInfo) { + String sz = ""; + for (int i = 0; i < arrayListBatteryInfo.size() - 1; i++) { + //LogUtils.d(TAG, "arrayListBatteryInfo.get(i).getBattetyValue() is "+ Integer.toString(arrayListBatteryInfo.get(i).getBattetyValue())); + sz = "\n" + arrayListBatteryInfo.get(i).getBattetyValue() + "%\n " + getTimespanDifference(arrayListBatteryInfo.get(i).getTimeStamp(), arrayListBatteryInfo.get(i + 1).getTimeStamp()) + " " + sz; + } + return sz; + } // 获取时间之间的时间跨度字符串。 // Get timespan string between times. diff --git a/powerbell/src/main/res/layout/activity_clearrecord.xml b/powerbell/src/main/res/layout/activity_clearrecord.xml index 6c42c49..eee16c7 100644 --- a/powerbell/src/main/res/layout/activity_clearrecord.xml +++ b/powerbell/src/main/res/layout/activity_clearrecord.xml @@ -47,12 +47,32 @@ android:layout_weight="1.0" android:background="@drawable/bg_frame"> - + android:gravity="center_horizontal"> + + + + + + Date: Wed, 3 Sep 2025 20:59:53 +0800 Subject: [PATCH 2/2] APK 15.4.12 release Publish. --- powerbell/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 7a4c728..643904b 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Sep 03 12:53:17 GMT 2025 -stageCount=12 +#Wed Sep 03 20:59:53 HKT 2025 +stageCount=13 libraryProject= baseVersion=15.4 -publishVersion=15.4.11 -buildCount=11 -baseBetaVersion=15.4.12 +publishVersion=15.4.12 +buildCount=0 +baseBetaVersion=15.4.13