From 72794dc6e5324a036f4b769147d888489d91b641 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 24 Dec 2025 12:19:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E5=9B=BE=E7=89=87=E5=83=8F?= =?UTF-8?q?=E7=B4=A0=E8=83=8C=E6=99=AF=E7=9A=84=E7=BB=98=E5=9B=BE=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- powerbell/build.properties | 4 +-- .../studio/powerbell/MainActivity.java | 26 +++++++++---------- .../BackgroundSettingsActivity.java | 4 +-- .../unittest/MainUnitTest2Activity.java | 4 +-- .../powerbell/views/BackgroundView.java | 1 + 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 796a519..22f86ac 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Dec 23 16:04:47 GMT 2025 +#Wed Dec 24 04:12:51 GMT 2025 stageCount=28 libraryProject= baseVersion=15.14 publishVersion=15.14.27 -buildCount=2 +buildCount=7 baseBetaVersion=15.14.28 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 81d2b71..a2d8c02 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/MainActivity.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/MainActivity.java @@ -271,7 +271,7 @@ public class MainActivity extends WinBoLLActivity implements MainContentView.OnV break; case MSG_LOAD_BACKGROUND: sMainActivity.reloadBackground(); - sMainActivity.setMainLayoutBackgroundColor(); + //sMainActivity.setMainLayoutBackgroundColor(); break; case MSG_UPDATE_SERVICE_SWITCH: sMainActivity.updateServiceSwitchUI(); @@ -409,18 +409,18 @@ public class MainActivity extends WinBoLLActivity implements MainContentView.OnV } } - private void setMainLayoutBackgroundColor() { - LogUtils.d(TAG, "setMainLayoutBackgroundColor()"); - if (isFinishing() || isDestroyed() || mMainContentView == null || mBgSourceUtils == null) { - LogUtils.e(TAG, "setMainLayoutBackgroundColor: 上下文无效，设置失败"); - return; - } - BackgroundBean currentBgBean = mBgSourceUtils.getCurrentBackgroundBean(); - if (currentBgBean != null) { - mMainContentView.mainLayout.setBackgroundColor(currentBgBean.getPixelColor()); - LogUtils.d(TAG, "setMainLayoutBackgroundColor: 主布局背景色设置完成 | color=" + currentBgBean.getPixelColor()); - } - } +// private void setMainLayoutBackgroundColor() { +// LogUtils.d(TAG, "setMainLayoutBackgroundColor()"); +// if (isFinishing() || isDestroyed() || mMainContentView == null || mBgSourceUtils == null) { +// LogUtils.e(TAG, "setMainLayoutBackgroundColor: 上下文无效，设置失败"); +// return; +// } +// BackgroundBean currentBgBean = mBgSourceUtils.getCurrentBackgroundBean(); +// if (currentBgBean != null) { +// mMainContentView.mainLayout.setBackgroundColor(currentBgBean.getPixelColor()); +// LogUtils.d(TAG, "setMainLayoutBackgroundColor: 主布局背景色设置完成 | color=" + currentBgBean.getPixelColor2()); +// } +// } private void updateServiceSwitchUI() { LogUtils.d(TAG, "updateServiceSwitchUI()"); diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundSettingsActivity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundSettingsActivity.java index d2423b4..c2b69a5 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundSettingsActivity.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundSettingsActivity.java @@ -404,7 +404,7 @@ public class BackgroundSettingsActivity extends WinBoLLActivity { mBgSourceUtils.loadSettings(); BackgroundBean previewBean = mBgSourceUtils.getPreviewBackgroundBean(); mBackgroundView.loadByBackgroundBean(previewBean, true); - mBackgroundView.setBackgroundColor(previewBean.getPixelColor()); + //mBackgroundView.setBackgroundColor(previewBean.getPixelColor()); LogUtils.d(TAG, "【双重刷新】第一重完成"); } catch (Exception e) { LogUtils.e(TAG, "【双重刷新】第一重异常：" + e.getMessage()); @@ -420,7 +420,7 @@ public class BackgroundSettingsActivity extends WinBoLLActivity { mBgSourceUtils.loadSettings(); BackgroundBean previewBean = mBgSourceUtils.getPreviewBackgroundBean(); mBackgroundView.loadByBackgroundBean(previewBean, true); - mBackgroundView.setBackgroundColor(previewBean.getPixelColor()); + //mBackgroundView.setBackgroundColor(previewBean.getPixelColor()); LogUtils.d(TAG, "【双重刷新】第二重完成"); } catch (Exception e) { LogUtils.e(TAG, "【双重刷新】第二重异常：" + e.getMessage()); diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/unittest/MainUnitTest2Activity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/unittest/MainUnitTest2Activity.java index 030f7b2..b6bb989 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/unittest/MainUnitTest2Activity.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/unittest/MainUnitTest2Activity.java @@ -243,7 +243,7 @@ public class MainUnitTest2Activity extends AppCompatActivity { // 第一重刷新 try { mMemoryCachedBackgroundView.loadByBackgroundBean(mPreviewBackgroundBean, true); - mMemoryCachedBackgroundView.setBackgroundColor(mPreviewBackgroundBean.getPixelColor()); + //mMemoryCachedBackgroundView.setBackgroundColor(mPreviewBackgroundBean.getPixelColor()); LogUtils.d(TAG, "doubleRefreshPreview：【双重刷新】第一重完成"); } catch (Exception e) { LogUtils.e(TAG, String.format("doubleRefreshPreview：【双重刷新】第一重异常 | %s", e.getMessage())); @@ -257,7 +257,7 @@ public class MainUnitTest2Activity extends AppCompatActivity { if (mMemoryCachedBackgroundView != null && !isFinishing()) { try { mMemoryCachedBackgroundView.loadByBackgroundBean(mPreviewBackgroundBean, true); - mMemoryCachedBackgroundView.setBackgroundColor(mPreviewBackgroundBean.getPixelColor()); + //mMemoryCachedBackgroundView.setBackgroundColor(mPreviewBackgroundBean.getPixelColor()); LogUtils.d(TAG, "doubleRefreshPreview：【双重刷新】第二重完成"); } catch (Exception e) { LogUtils.e(TAG, String.format("doubleRefreshPreview：【双重刷新】第二重异常 | %s", e.getMessage())); diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/views/BackgroundView.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/views/BackgroundView.java index 02d107e..939cac7 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/views/BackgroundView.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/views/BackgroundView.java @@ -149,6 +149,7 @@ public class BackgroundView extends RelativeLayout { } // 加载图片 loadImage(targetPath); + setBackgroundColor(bean.getPixelColor()); LogUtils.d(TAG, "=== loadByBackgroundBean 完成 ==="); }