From 2ffdb26f694469d2254295ee574a65fb214032e9 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 24 Dec 2025 00:11:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8A=A0=E8=BD=BD=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96=EF=BC=8C=E6=AD=A3=E5=9C=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=93=AA=E4=B8=AA=E7=B1=BB=E5=9C=A8=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E5=83=8F=E7=B4=A0=E3=80=82=E3=80=82=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/MainActivity.java | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/powerbell/build.properties b/powerbell/build.properties index 7cf1e06..796a519 100644 --- a/powerbell/build.properties +++ b/powerbell/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Dec 23 21:02:16 HKT 2025 +#Tue Dec 23 16:04:47 GMT 2025 stageCount=28 libraryProject= baseVersion=15.14 publishVersion=15.14.27 -buildCount=0 +buildCount=2 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 d2d62e2..81d2b71 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/MainActivity.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/MainActivity.java @@ -45,7 +45,7 @@ public class MainActivity extends WinBoLLActivity implements MainContentView.OnV // ======================== 静态常量（置顶统一，抽离魔法值）======================== public static final String TAG = "MainActivity"; - private static final int REQUEST_READ_MEDIA_IMAGES = 1001; + private static final int REQUEST_BACKGROUND_SETTINGS_ACTIVITY = 1001; private static final long DELAY_LOAD_NON_CRITICAL = 500L; public static final int MSG_RELOAD_APPCONFIG = 0; public static final int MSG_CURRENTVALUEBATTERY = 1; @@ -110,10 +110,7 @@ public class MainActivity extends WinBoLLActivity implements MainContentView.OnV protected void onResume() { super.onResume(); LogUtils.d(TAG, "onResume()"); - if (sGlobalHandler != null) { - sGlobalHandler.sendEmptyMessage(MSG_LOAD_BACKGROUND); - sGlobalHandler.sendEmptyMessage(MSG_UPDATE_SERVICE_SWITCH); - } + if (mADsBannerView != null) { mADsBannerView.resumeADs(this); } @@ -167,7 +164,7 @@ public class MainActivity extends WinBoLLActivity implements MainContentView.OnV super.onActivityResult(requestCode, resultCode, data); LogUtils.d(TAG, "onActivityResult() | requestCode=" + requestCode + " | resultCode=" + resultCode + " | data=" + data); mPermissionUtils.handlePermissionRequest(this, requestCode, resultCode, data); - if (requestCode == REQUEST_READ_MEDIA_IMAGES && sGlobalHandler != null) { + if (requestCode == REQUEST_BACKGROUND_SETTINGS_ACTIVITY && sGlobalHandler != null) { sGlobalHandler.sendEmptyMessage(MSG_LOAD_BACKGROUND); } } @@ -207,7 +204,7 @@ public class MainActivity extends WinBoLLActivity implements MainContentView.OnV startActivity(new Intent(this, ClearRecordActivity.class)); break; case R.id.action_changepicture: - startActivityForResult(new Intent(this, BackgroundSettingsActivity.class), REQUEST_READ_MEDIA_IMAGES); + startActivityForResult(new Intent(this, BackgroundSettingsActivity.class), REQUEST_BACKGROUND_SETTINGS_ACTIVITY); break; case R.id.action_unittestactivity: startActivity(new Intent(this, MainUnitTestActivity.class)); @@ -406,7 +403,7 @@ public class MainActivity extends WinBoLLActivity implements MainContentView.OnV } BackgroundBean currentBgBean = mBgSourceUtils.getCurrentBackgroundBean(); if (currentBgBean != null) { - mMainContentView.backgroundView.loadByBackgroundBean(currentBgBean); + mMainContentView.backgroundView.loadByBackgroundBean(currentBgBean, true); } else { mMainContentView.backgroundView.setBackgroundResource(R.drawable.default_background); }