Studio/WinBoLL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复固定剪裁时的宽高比例不准确的BUG。

Browse Source
This commit is contained in:
ZhangShaojian
2025-12-14 19:56:36 +08:00
parent ddcd9a450e
commit 6d4381d78a
4 changed files with 113 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
powerbell/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Sun Dec 14 11:03:02 GMT 2025 #Sun Dec 14 11:54:37 GMT 2025
stageCount=6 stageCount=6
libraryProject= libraryProject=
baseVersion=15.14 baseVersion=15.14
publishVersion=15.14.5 publishVersion=15.14.5
buildCount=8 buildCount=11
baseBetaVersion=15.14.6 baseBetaVersion=15.14.6

5
powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundSettingsActivity.java
View File

@@ -767,11 +767,10 @@ public class BackgroundSettingsActivity extends WinBoLLActivity {
if (putUriFileToPreviewSource(selectedImage)) { if (putUriFileToPreviewSource(selectedImage)) {
LogUtils.d(TAG, "【选图同步】路径绑定完成"); LogUtils.d(TAG, "【选图同步】路径绑定完成");
LinearLayout ll_maincontent = findViewById(R.id.ll_maincontent);
ImageCropUtils.startImageCrop(BackgroundSettingsActivity.this, ImageCropUtils.startImageCrop(BackgroundSettingsActivity.this,
mBgSourceUtils.getPreviewBackgroundBean(), mBgSourceUtils.getPreviewBackgroundBean(),
ll_maincontent.getWidth(), mBackgroundView.getWidth(),
ll_maincontent.getHeight(), mBackgroundView.getHeight(),
false, false,
REQUEST_CROP_IMAGE REQUEST_CROP_IMAGE
); );

16
powerbell/src/main/java/cc/winboll/studio/powerbell/utils/ImageCropUtils.java
View File

@@ -68,6 +68,7 @@ public class ImageCropUtils {
// 3. 初始化 uCrop + 强制 PNG 配置（保留透明核心） // 3. 初始化 uCrop + 强制 PNG 配置（保留透明核心）
UCrop uCrop = UCrop.of(inputUri, outputUri); UCrop uCrop = UCrop.of(inputUri, outputUri);
uCrop.withAspectRatio(aspectX, aspectY);
UCrop.Options options = initCropOptions(activity, isFreeCrop, aspectX, aspectY); // 移除 isPng 参数 UCrop.Options options = initCropOptions(activity, isFreeCrop, aspectX, aspectY); // 移除 isPng 参数
// 4. 启动裁剪 // 4. 启动裁剪
@@ -116,6 +117,7 @@ public class ImageCropUtils {
// 3. 初始化 uCrop + 强制 PNG 配置 // 3. 初始化 uCrop + 强制 PNG 配置
UCrop uCrop = UCrop.of(inputUri, outputUri); UCrop uCrop = UCrop.of(inputUri, outputUri);
uCrop.withAspectRatio(aspectX, aspectY);
UCrop.Options options = initCropOptions(activity, isFreeCrop, aspectX, aspectY); // 移除 isPng 参数 UCrop.Options options = initCropOptions(activity, isFreeCrop, aspectX, aspectY); // 移除 isPng 参数
// 4. 启动裁剪 // 4. 启动裁剪
@@ -220,10 +222,20 @@ public class ImageCropUtils {
* 移除 isPng 参数，全程用 PNG 配置 * 移除 isPng 参数，全程用 PNG 配置
*/ */
private static UCrop.Options initCropOptions(Activity activity, boolean isFreeCrop, int aspectX, int aspectY) { private static UCrop.Options initCropOptions(Activity activity, boolean isFreeCrop, int aspectX, int aspectY) {
UCrop.Options options = new UCrop.Options(); UCrop.Options options = new UCrop.Options();
// 1. 裁剪模式配置 // 裁剪模式配置（自由裁剪/固定比例）
options.setFreeStyleCropEnabled(isFreeCrop); options.setFreeStyleCropEnabled(isFreeCrop); // 开启自由裁剪
// 裁剪配置（优化体验）
//options.setCompressionFormat(android.graphics.Bitmap.CompressFormat.JPEG); // 输出格式
//options.setCompressionQuality(100); // 图片质量
//options.setHideBottomControls(true); // 隐藏底部控制栏（简化界面）
//options.setToolbarTitle("图片裁剪"); // 工具栏标题
//options.setToolbarColor(activity.getResources().getColor(R.color.colorPrimary)); // 工具栏颜色（适配项目主题）
//options.setStatusBarColor(activity.getResources().getColor(R.color.colorPrimaryDark)); // 状态栏颜色
// 2. 核心：强制 PNG 保留透明（固定配置，无需判断原图格式） // 2. 核心：强制 PNG 保留透明（固定配置，无需判断原图格式）
options.setCompressionFormat(FORCE_COMPRESS_FORMAT); // 强制 PNG 压缩 options.setCompressionFormat(FORCE_COMPRESS_FORMAT); // 强制 PNG 压缩

198
powerbell/src/main/res/layout/activity_background_settings.xml
View File

@@ -13,131 +13,123 @@
android:gravity="center_vertical" android:gravity="center_vertical"
style="@style/DefaultAToolbar"/> style="@style/DefaultAToolbar"/>
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1.0" android:layout_weight="1.0">
android:id="@+id/ll_maincontent"
android:background="#FF91B620">
<RelativeLayout <cc.winboll.studio.powerbell.views.BackgroundView
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:id="@+id/background_view">
<cc.winboll.studio.powerbell.views.BackgroundView </cc.winboll.studio.powerbell.views.BackgroundView>
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" <LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="400dp">
<RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content">
android:id="@+id/background_view">
<cc.winboll.studio.libaes.views.AButton
android:layout_width="160dp"
android:layout_height="36dp"
android:text="Origin BG"
android:id="@+id/activitybackgroundpictureAButton5"
android:layout_alignParentLeft="true"
android:layout_margin="5dp"/>
<LinearLayout <cc.winboll.studio.libaes.views.AButton
android:orientation="vertical" android:layout_width="160dp"
android:layout_width="match_parent" android:layout_height="36dp"
android:layout_height="400dp"> android:text="Received BG"
android:id="@+id/activitybackgroundpictureAButton4"
android:layout_alignParentRight="true"
android:layout_margin="5dp"/>
<RelativeLayout </RelativeLayout>
android:layout_width="match_parent"
android:layout_height="wrap_content">
<cc.winboll.studio.libaes.views.AButton <LinearLayout
android:layout_width="160dp" android:orientation="horizontal"
android:layout_height="36dp" android:layout_width="match_parent"
android:text="Origin BG" android:layout_height="wrap_content"
android:id="@+id/activitybackgroundpictureAButton5" android:gravity="right">
android:layout_alignParentLeft="true"
android:layout_margin="5dp"/>
<cc.winboll.studio.libaes.views.AButton <cc.winboll.studio.libaes.views.AButton
android:layout_width="160dp" android:layout_width="50dp"
android:layout_height="36dp" android:layout_height="36dp"
android:text="Received BG" android:text="◎"
android:id="@+id/activitybackgroundpictureAButton4" android:layout_gravity="center_vertical"
android:layout_alignParentRight="true" android:layout_margin="5dp"
android:layout_margin="5dp"/> android:id="@+id/activitybackgroundpictureAButton1"/>
</RelativeLayout> <cc.winboll.studio.libaes.views.AButton
android:layout_width="50dp"
android:layout_height="36dp"
android:text="☑"
android:layout_gravity="center_vertical"
android:layout_margin="5dp"
android:id="@+id/activitybackgroundpictureAButton2"/>
<LinearLayout <cc.winboll.studio.libaes.views.AButton
android:orientation="horizontal" android:layout_width="50dp"
android:layout_width="match_parent" android:layout_height="36dp"
android:layout_height="wrap_content" android:text="♾"
android:gravity="right"> android:layout_gravity="center_vertical"
android:layout_margin="5dp"
android:id="@+id/activitybackgroundpictureAButton9"
android:onClick="onNetworkBackgroundDialog"/>
<cc.winboll.studio.libaes.views.AButton </LinearLayout>
android:layout_width="50dp"
android:layout_height="36dp"
android:text="◎"
android:layout_gravity="center_vertical"
android:layout_margin="5dp"
android:id="@+id/activitybackgroundpictureAButton1"/>
<cc.winboll.studio.libaes.views.AButton <LinearLayout
android:layout_width="50dp" android:orientation="horizontal"
android:layout_height="36dp" android:layout_width="match_parent"
android:text="☑" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:gravity="right">
android:layout_margin="5dp"
android:id="@+id/activitybackgroundpictureAButton2"/>
<cc.winboll.studio.libaes.views.AButton <cc.winboll.studio.libaes.views.AButton
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="36dp" android:layout_height="36dp"
android:text="♾" android:text="[+]"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_margin="5dp" android:layout_margin="5dp"
android:id="@+id/activitybackgroundpictureAButton9" android:id="@+id/activitybackgroundpictureAButton3"/>
android:onClick="onNetworkBackgroundDialog"/>
</LinearLayout> <cc.winboll.studio.libaes.views.AButton
android:layout_width="50dp"
android:layout_height="36dp"
android:text="[+~]"
android:layout_gravity="center_vertical"
android:layout_margin="5dp"
android:id="@+id/activitybackgroundpictureAButton6"/>
<LinearLayout <cc.winboll.studio.libaes.views.AButton
android:orientation="horizontal" android:layout_width="50dp"
android:layout_width="match_parent" android:layout_height="36dp"
android:layout_height="wrap_content" android:text="[◐]"
android:gravity="right"> android:layout_gravity="center_vertical"
android:layout_margin="5dp"
android:id="@+id/activitybackgroundpictureAButton7"/>
<cc.winboll.studio.libaes.views.AButton <cc.winboll.studio.libaes.views.AButton
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="36dp" android:layout_height="36dp"
android:text="[+]" android:text="[○]"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_margin="5dp" android:layout_margin="5dp"
android:id="@+id/activitybackgroundpictureAButton3"/> android:id="@+id/activitybackgroundpictureAButton8"/>
<cc.winboll.studio.libaes.views.AButton </LinearLayout>
android:layout_width="50dp"
android:layout_height="36dp"
android:text="[+~]"
android:layout_gravity="center_vertical"
android:layout_margin="5dp"
android:id="@+id/activitybackgroundpictureAButton6"/>
<cc.winboll.studio.libaes.views.AButton </LinearLayout>
android:layout_width="50dp"
android:layout_height="36dp"
android:text="[◐]"
android:layout_gravity="center_vertical"
android:layout_margin="5dp"
android:id="@+id/activitybackgroundpictureAButton7"/>
<cc.winboll.studio.libaes.views.AButton </RelativeLayout>
android:layout_width="50dp"
android:layout_height="36dp"
android:text="[○]"
android:layout_gravity="center_vertical"
android:layout_margin="5dp"
android:id="@+id/activitybackgroundpictureAButton8"/>
</LinearLayout>
</LinearLayout>
</cc.winboll.studio.powerbell.views.BackgroundView>
</RelativeLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>