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 c0d6c18..8c10b6b 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 @@ -25,7 +25,6 @@ import androidx.core.content.FileProvider; import cc.winboll.studio.libaes.dialogs.YesNoAlertDialog; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.ToastUtils; -import cc.winboll.studio.powerbell.App; import cc.winboll.studio.powerbell.MainActivity; import cc.winboll.studio.powerbell.R; import cc.winboll.studio.powerbell.dialogs.BackgroundPicturePreviewDialog; @@ -48,16 +47,19 @@ import java.io.File; * @Author 豆包&ZhanGSKen */ public class BackgroundSettingsActivity extends WinBoLLActivity { - // ====================== 常量定义(按功能分类)====================== + // ====================== 常量定义(按功能分类排序)====================== public static final String TAG = "BackgroundSettingsActivity"; + // 系统版本常量 private static final int SDK_VERSION_TIRAMISU = 33; - // 请求码(按功能分组) + + // 请求码(按功能分组,从小到大排序) public static final int REQUEST_SELECT_PICTURE = 0; public static final int REQUEST_TAKE_PHOTO = 1; public static final int REQUEST_CROP_IMAGE = 2; private static final int REQUEST_PIXELPICKER = 1001; private static final int REQUEST_CAMERA_PERMISSION = 1004; + // Bitmap解析常量 private static final int BITMAP_MAX_SIZE = 2048; private static final int BITMAP_MAX_SAMPLE_SIZE = 16; @@ -66,9 +68,11 @@ public class BackgroundSettingsActivity extends WinBoLLActivity { // 工具类实例 private BackgroundSourceUtils mBgSourceUtils; private BitmapCacheUtils mBitmapCache; + // 视图组件 private Toolbar mToolbar; private BackgroundView mBackgroundView; + // 状态标记(volatile保证多线程可见性) private volatile boolean isCommitSettings = false; private volatile boolean isPreviewBackgroundChanged = false; @@ -92,16 +96,16 @@ public class BackgroundSettingsActivity extends WinBoLLActivity { // 初始化核心组件 initCoreComponents(); - // 初始化界面与事件 + // 初始化Toolbar与点击事件 initToolbar(); initClickListeners(); - LogUtils.d(TAG, "界面与事件绑定完成"); + LogUtils.d(TAG, "onCreate() 视图与事件绑定完成"); // 处理分享意图或初始化预览 handleIntentOrPreview(); - // 初始化预览环境并刷新 initPreviewEnvironment(); + LogUtils.d(TAG, "onCreate() 初始化完成"); } @@ -124,13 +128,14 @@ public class BackgroundSettingsActivity extends WinBoLLActivity { // 此时已获取真实宽高 int width = mBackgroundView.getWidth(); int height = mBackgroundView.getHeight(); + LogUtils.d(TAG, String.format("onPostCreate() 获取视图尺寸 | width=%d | height=%d", width, height)); if (width > 0 && height > 0) { AppConfigUtils appConfigUtils = AppConfigUtils.getInstance(BackgroundSettingsActivity.this); appConfigUtils.loadAppConfig(); appConfigUtils.mAppConfigBean.setDefaultFrameWidth(width); appConfigUtils.mAppConfigBean.setDefaultFrameHeight(height); appConfigUtils.saveAppConfig(); - LogUtils.d(TAG, String.format("保存默认相框尺寸 | width=%d | height=%d", width, height)); + LogUtils.d(TAG, "onPostCreate() 保存默认相框尺寸成功"); doubleRefreshPreview(); } } @@ -140,24 +145,27 @@ public class BackgroundSettingsActivity extends WinBoLLActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - LogUtils.d(TAG, String.format("onActivityResult() | requestCode=%d | resultCode=%d", requestCode, resultCode)); + LogUtils.d(TAG, String.format("onActivityResult() | requestCode=%d | resultCode=%d | data=%s", + requestCode, resultCode, data != null ? data.toString() : "null")); try { if (resultCode != RESULT_OK) { - LogUtils.d(TAG, "结果非RESULT_OK,执行取消逻辑"); + LogUtils.d(TAG, String.format("onActivityResult() 操作取消 | requestCode=%d", requestCode)); handleOperationCancelOrFail(); return; } handleActivityResult(requestCode, data); } catch (Exception e) { - LogUtils.e(TAG, String.format("onActivityResult() 异常 | requestCode=%d | 异常信息=%s", requestCode, e.getMessage())); + LogUtils.e(TAG, String.format("onActivityResult() 异常 | requestCode=%d | 异常信息=%s", + requestCode, e.getMessage())); ToastUtils.show("操作失败"); } } @Override public void finish() { - LogUtils.d(TAG, String.format("finish() | isCommitSettings=%b | isPreviewBackgroundChanged=%b", isCommitSettings, isPreviewBackgroundChanged)); + LogUtils.d(TAG, String.format("finish() | isCommitSettings=%b | isPreviewBackgroundChanged=%b", + isCommitSettings, isPreviewBackgroundChanged)); if (isCommitSettings) { super.finish(); } else { @@ -169,7 +177,8 @@ public class BackgroundSettingsActivity extends WinBoLLActivity { @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { super.onRequestPermissionsResult(requestCode, permissions, grantResults); - LogUtils.d(TAG, String.format("onRequestPermissionsResult() | requestCode=%d | 权限数量=%d", requestCode, permissions.length)); + LogUtils.d(TAG, String.format("onRequestPermissionsResult() | requestCode=%d | 权限数量=%d | 结果数量=%d", + requestCode, permissions.length, grantResults.length)); if (requestCode == REQUEST_CAMERA_PERMISSION) { handleCameraPermissionResult(grantResults); } @@ -883,7 +892,8 @@ public class BackgroundSettingsActivity extends WinBoLLActivity { * @param fileSize 文件大小 */ private void handleCropFailure(boolean isFileExist, boolean isFileReadable, long fileSize) { - LogUtils.e(TAG, String.format("handleCropFailure() | 裁剪失败,文件状态:存在=%b,可读=%b,大小=%d", isFileExist, isFileReadable, fileSize)); + LogUtils.e(TAG, String.format("handleCropFailure() | 裁剪失败,文件状态:存在=%b,可读=%b,大小=%d", + isFileExist, isFileReadable, fileSize)); handleOperationCancelOrFail(); } @@ -939,16 +949,17 @@ public class BackgroundSettingsActivity extends WinBoLLActivity { mBgSourceUtils.commitPreviewSourceToCurrent(); isCommitSettings = true; finish(); - //App.notifyMessage(TAG, "startActivity"); Intent mainIntent = new Intent(BackgroundSettingsActivity.this, MainActivity.class); mainIntent.putExtra(MainActivity.EXTRA_ISRELOAD_BACKGROUNDVIEW, true); startActivity(mainIntent); + LogUtils.d(TAG, "handleFinishConfirmation() | 确认设置,启动MainActivity并刷新背景"); } @Override public void onNo() { isCommitSettings = true; finish(); + LogUtils.d(TAG, "handleFinishConfirmation() | 取消设置,关闭页面"); } }); } else {