From 29785be88df38eebf5408844cc246241dec4101f Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 7 May 2025 13:46:21 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cc/winboll/studio/timestamp/utils/TimeStampUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/timestamp/src/main/java/cc/winboll/studio/timestamp/utils/TimeStampUtil.java b/timestamp/src/main/java/cc/winboll/studio/timestamp/utils/TimeStampUtil.java index 0511ebb..188e445 100644 --- a/timestamp/src/main/java/cc/winboll/studio/timestamp/utils/TimeStampUtil.java +++ b/timestamp/src/main/java/cc/winboll/studio/timestamp/utils/TimeStampUtil.java @@ -39,7 +39,7 @@ public class TimeStampUtil { long currentMillis = mTimeStamp; Instant instant = Instant.ofEpochMilli(currentMillis); LocalDateTime ldt = LocalDateTime.ofInstant(instant, ZoneId.systemDefault()); - String szTimeStampFormatString = AppConfigsUtil.getInstance(mContext).getAppConfigsModel().getTimeStampCopyFormatString(); + String szTimeStampFormatString = AppConfigsUtil.getInstance(mContext).getAppConfigsModel().getTimeStampFormatString(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern(szTimeStampFormatString); String formattedDateTime = ldt.format(formatter); return formattedDateTime; From 6f3ce092caae65a2362321bff2483af67dc656a7 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 7 May 2025 13:47:26 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E7=89=88=E4=B8=8E=E9=98=B6=E6=AE=B5=E7=89=88=E7=9A=84=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- timestamp/build.properties | 4 ++-- .../studio/timestamp/receivers/ButtonClickReceiver.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/timestamp/build.properties b/timestamp/build.properties index 82a9221..7a449ac 100644 --- a/timestamp/build.properties +++ b/timestamp/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed May 07 13:33:12 HKT 2025 +#Wed May 07 05:44:36 GMT 2025 stageCount=12 libraryProject= baseVersion=15.0 publishVersion=15.0.11 -buildCount=0 +buildCount=4 baseBetaVersion=15.0.12 diff --git a/timestamp/src/main/java/cc/winboll/studio/timestamp/receivers/ButtonClickReceiver.java b/timestamp/src/main/java/cc/winboll/studio/timestamp/receivers/ButtonClickReceiver.java index 30e404b..2561c74 100644 --- a/timestamp/src/main/java/cc/winboll/studio/timestamp/receivers/ButtonClickReceiver.java +++ b/timestamp/src/main/java/cc/winboll/studio/timestamp/receivers/ButtonClickReceiver.java @@ -10,6 +10,7 @@ import android.content.Context; import android.content.Intent; import android.widget.Toast; import cc.winboll.studio.libappbase.LogUtils; +import cc.winboll.studio.timestamp.BuildConfig; import cc.winboll.studio.timestamp.MainService; import cc.winboll.studio.timestamp.utils.ClipboardUtil; import cc.winboll.studio.timestamp.utils.TimeStampUtil; @@ -18,7 +19,7 @@ public class ButtonClickReceiver extends BroadcastReceiver { public static final String TAG = "ButtonClickReceiver"; - public static final String BUTTON_COPYTIMESTAMP_ACTION = "cc.winboll.studio.timestamp.receivers.ButtonClickReceiver.BUTTON_COPYTIMESTAMP_ACTION"; + public static final String BUTTON_COPYTIMESTAMP_ACTION = ButtonClickReceiver.class.getName() + (BuildConfig.DEBUG ?".DEBUG_": ".") + "BUTTON_COPYTIMESTAMP_ACTION"; @Override public void onReceive(Context context, Intent intent) { From f49c8141a8e22a2732d88e4a7c5c71f089898c45 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 7 May 2025 13:48:06 +0800 Subject: [PATCH 03/17] APK 15.0.12 release Publish. --- timestamp/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/timestamp/build.properties b/timestamp/build.properties index 7a449ac..aa6a3d8 100644 --- a/timestamp/build.properties +++ b/timestamp/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed May 07 05:44:36 GMT 2025 -stageCount=12 +#Wed May 07 13:48:06 HKT 2025 +stageCount=13 libraryProject= baseVersion=15.0 -publishVersion=15.0.11 -buildCount=4 -baseBetaVersion=15.0.12 +publishVersion=15.0.12 +buildCount=0 +baseBetaVersion=15.0.13 From 21b548751389e49cbbf4a52d06e8bb7356bd8324 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 7 May 2025 13:58:56 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=88=B3=E5=88=9D=E5=A7=8B=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- timestamp/build.properties | 4 ++-- .../java/cc/winboll/studio/timestamp/utils/TimeStampUtil.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/timestamp/build.properties b/timestamp/build.properties index aa6a3d8..6b31e4e 100644 --- a/timestamp/build.properties +++ b/timestamp/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed May 07 13:48:06 HKT 2025 +#Wed May 07 05:56:29 GMT 2025 stageCount=13 libraryProject= baseVersion=15.0 publishVersion=15.0.12 -buildCount=0 +buildCount=2 baseBetaVersion=15.0.13 diff --git a/timestamp/src/main/java/cc/winboll/studio/timestamp/utils/TimeStampUtil.java b/timestamp/src/main/java/cc/winboll/studio/timestamp/utils/TimeStampUtil.java index 188e445..9a3af96 100644 --- a/timestamp/src/main/java/cc/winboll/studio/timestamp/utils/TimeStampUtil.java +++ b/timestamp/src/main/java/cc/winboll/studio/timestamp/utils/TimeStampUtil.java @@ -22,6 +22,7 @@ public class TimeStampUtil { TimeStampUtil(Context context) { mContext = context; + mTimeStamp = System.currentTimeMillis(); } public synchronized static TimeStampUtil getInstance(Context context) { From 4dadb15c0cf5f6d923551bd467e8283821bab48f Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 7 May 2025 13:59:38 +0800 Subject: [PATCH 05/17] APK 15.0.13 release Publish. --- timestamp/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/timestamp/build.properties b/timestamp/build.properties index 6b31e4e..ef5e835 100644 --- a/timestamp/build.properties +++ b/timestamp/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed May 07 05:56:29 GMT 2025 -stageCount=13 +#Wed May 07 13:59:38 HKT 2025 +stageCount=14 libraryProject= baseVersion=15.0 -publishVersion=15.0.12 -buildCount=2 -baseBetaVersion=15.0.13 +publishVersion=15.0.13 +buildCount=0 +baseBetaVersion=15.0.14 From 19b8251182699fc321899e461e170472cf2eb352 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 7 May 2025 13:59:51 +0800 Subject: [PATCH 06/17] APK 15.0.14 release Publish. --- timestamp/build.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/timestamp/build.properties b/timestamp/build.properties index ef5e835..7ad98f6 100644 --- a/timestamp/build.properties +++ b/timestamp/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed May 07 13:59:38 HKT 2025 -stageCount=14 +#Wed May 07 13:59:51 HKT 2025 +stageCount=15 libraryProject= baseVersion=15.0 -publishVersion=15.0.13 +publishVersion=15.0.14 buildCount=0 -baseBetaVersion=15.0.14 +baseBetaVersion=15.0.15 From f59f7676b7a69ecb7f16c01397a4527621e96487 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 7 May 2025 14:05:12 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=A0=8F=E6=98=BE=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- timestamp/build.properties | 4 ++-- .../main/java/cc/winboll/studio/timestamp/MainService.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/timestamp/build.properties b/timestamp/build.properties index 7ad98f6..0e4b4b5 100644 --- a/timestamp/build.properties +++ b/timestamp/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed May 07 13:59:51 HKT 2025 +#Wed May 07 06:03:43 GMT 2025 stageCount=15 libraryProject= baseVersion=15.0 publishVersion=15.0.14 -buildCount=0 +buildCount=1 baseBetaVersion=15.0.15 diff --git a/timestamp/src/main/java/cc/winboll/studio/timestamp/MainService.java b/timestamp/src/main/java/cc/winboll/studio/timestamp/MainService.java index f4b445a..5866f61 100644 --- a/timestamp/src/main/java/cc/winboll/studio/timestamp/MainService.java +++ b/timestamp/src/main/java/cc/winboll/studio/timestamp/MainService.java @@ -209,7 +209,7 @@ public class MainService extends Service { case MSG_UPDATE_TIMESTAMP: { String szTimeStampShowString = TimeStampUtil.getInstance(MainService.this).getTimeStampShowString(); - mNotificationHelper.sendForegroundNotification(MainService.this, "时间戳:\n" + szTimeStampShowString + "\n已拷贝到剪贴板。"); + mNotificationHelper.sendForegroundNotification(MainService.this, "时间戳:\n" + szTimeStampShowString + "\n已截取。"); LogUtils.d(TAG, "Hello, World! " + szTimeStampShowString); break; From 5ee9da19820f7ba50e36dd3fd97cc9058fcaa978 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 7 May 2025 14:05:50 +0800 Subject: [PATCH 08/17] APK 15.0.15 release Publish. --- timestamp/build.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/timestamp/build.properties b/timestamp/build.properties index 0e4b4b5..d3d3711 100644 --- a/timestamp/build.properties +++ b/timestamp/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed May 07 06:03:43 GMT 2025 -stageCount=15 +#Wed May 07 14:05:50 HKT 2025 +stageCount=16 libraryProject= baseVersion=15.0 -publishVersion=15.0.14 -buildCount=1 -baseBetaVersion=15.0.15 +publishVersion=15.0.15 +buildCount=0 +baseBetaVersion=15.0.16 From 9e8263ae8f5eb2d77839564946f9b7b650003776 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 7 May 2025 14:43:20 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E5=88=86=E5=BC=80=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=92=8C=E8=B0=83=E8=AF=95=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- timestamp/build.properties | 4 +-- timestamp/src/beta/AndroidManifest.xml | 5 ++- timestamp/src/main/AndroidManifest.xml | 4 +-- .../java/cc/winboll/studio/timestamp/App.java | 4 +++ .../timestamp/utils/NotificationHelper.java | 11 ++++-- .../drawable-v24/ic_launcher_foreground.xml | 34 ------------------ .../main/res/drawable/ic_launcher_beta.xml | 16 +++++++++ ...auncher.png => ic_launcher_foreground.png} | Bin .../main/res/drawable/ic_launcher_stage.xml | 11 ++++++ .../res/layout/custom_notification_layout.xml | 5 ++- .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 --- .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 --- .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3056 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 5024 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2096 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 2858 -> 0 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4569 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 7098 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 6464 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 10676 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 9250 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 15523 -> 0 bytes 22 files changed, 49 insertions(+), 55 deletions(-) delete mode 100644 timestamp/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 timestamp/src/main/res/drawable/ic_launcher_beta.xml rename timestamp/src/main/res/drawable/{ic_launcher.png => ic_launcher_foreground.png} (100%) create mode 100644 timestamp/src/main/res/drawable/ic_launcher_stage.xml delete mode 100644 timestamp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml delete mode 100644 timestamp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml delete mode 100644 timestamp/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 timestamp/src/main/res/mipmap-hdpi/ic_launcher_round.png delete mode 100644 timestamp/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 timestamp/src/main/res/mipmap-mdpi/ic_launcher_round.png delete mode 100644 timestamp/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 timestamp/src/main/res/mipmap-xhdpi/ic_launcher_round.png delete mode 100644 timestamp/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 timestamp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png delete mode 100644 timestamp/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 timestamp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/timestamp/build.properties b/timestamp/build.properties index d3d3711..0243dc6 100644 --- a/timestamp/build.properties +++ b/timestamp/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed May 07 14:05:50 HKT 2025 +#Wed May 07 06:42:28 GMT 2025 stageCount=16 libraryProject= baseVersion=15.0 publishVersion=15.0.15 -buildCount=0 +buildCount=11 baseBetaVersion=15.0.16 diff --git a/timestamp/src/beta/AndroidManifest.xml b/timestamp/src/beta/AndroidManifest.xml index ee78d9f..703315a 100644 --- a/timestamp/src/beta/AndroidManifest.xml +++ b/timestamp/src/beta/AndroidManifest.xml @@ -2,7 +2,10 @@ - + diff --git a/timestamp/src/main/AndroidManifest.xml b/timestamp/src/main/AndroidManifest.xml index 09b697c..fe35364 100644 --- a/timestamp/src/main/AndroidManifest.xml +++ b/timestamp/src/main/AndroidManifest.xml @@ -14,8 +14,8 @@ - - - - - - - - - - diff --git a/timestamp/src/main/res/drawable/ic_launcher_beta.xml b/timestamp/src/main/res/drawable/ic_launcher_beta.xml new file mode 100644 index 0000000..cfc25b3 --- /dev/null +++ b/timestamp/src/main/res/drawable/ic_launcher_beta.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/timestamp/src/main/res/drawable/ic_launcher.png b/timestamp/src/main/res/drawable/ic_launcher_foreground.png similarity index 100% rename from timestamp/src/main/res/drawable/ic_launcher.png rename to timestamp/src/main/res/drawable/ic_launcher_foreground.png diff --git a/timestamp/src/main/res/drawable/ic_launcher_stage.xml b/timestamp/src/main/res/drawable/ic_launcher_stage.xml new file mode 100644 index 0000000..e5ca10a --- /dev/null +++ b/timestamp/src/main/res/drawable/ic_launcher_stage.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/timestamp/src/main/res/layout/custom_notification_layout.xml b/timestamp/src/main/res/layout/custom_notification_layout.xml index 585b770..b8f8558 100644 --- a/timestamp/src/main/res/layout/custom_notification_layout.xml +++ b/timestamp/src/main/res/layout/custom_notification_layout.xml @@ -16,11 +16,10 @@ android:textSize="14sp" android:layout_weight="1.0"/> -