Compare commits

...

6 Commits

4 changed files with 37 additions and 17 deletions

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Thu Dec 25 16:08:51 HKT 2025
stageCount=31
#Thu Dec 25 20:10:33 HKT 2025
stageCount=34
libraryProject=
baseVersion=15.14
publishVersion=15.14.30
publishVersion=15.14.33
buildCount=0
baseBetaVersion=15.14.31
baseBetaVersion=15.14.34

View File

@@ -28,9 +28,10 @@
<uses-permission android:name="android.permission.GET_PACKAGE_SIZE"/>
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
<!-- 外部存储权限 -->
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission
android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
<!-- 相机权限 -->
@@ -60,17 +61,17 @@
android:requestLegacyExternalStorage="true"
android:usesCleartextTraffic="true"
android:supportsRtl="true"
android:process=".main"
tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
<!-- 主活动 -->
<!-- 主活动(主进程) -->
<activity
android:process=".main"
android:name=".MainActivity"
android:label="@string/app_name"
android:exported="true"
android:launchMode="singleTask"/>
<!-- 活动别名(启动器) -->
<!-- 活动别名(启动器,主进程 -->
<activity-alias
android:name=".MainActivityEN1"
android:targetActivity=".MainActivity"
@@ -119,18 +120,21 @@
android:resource="@xml/shortcutsmaincn2"/>
</activity-alias>
<!-- 功能活动 -->
<!-- 功能活动(主进程) -->
<activity
android:process=".main"
android:name=".activities.CrashActivity"
android:exported="false"/>
<activity
android:process=".main"
android:name=".activities.ClearRecordActivity"
android:parentActivityName="cc.winboll.studio.powerbell.MainActivity"
android:launchMode="singleTask"
android:exported="false"/>
<activity
android:process=".main"
android:name=".activities.BackgroundSettingsActivity"
android:parentActivityName="cc.winboll.studio.powerbell.MainActivity"
android:exported="true"
@@ -147,44 +151,53 @@
</activity>
<activity
android:process=".main"
android:name=".activities.BatteryReporterActivity"
android:exported="false"/>
<activity
android:process=".main"
android:name=".activities.PixelPickerActivity"
android:exported="false"/>
<activity
android:process=".main"
android:name=".activities.BatteryReportActivity"
android:exported="false"/>
<activity
android:process=".main"
android:name=".unittest.MainUnitTestActivity"
android:exported="false"/>
<activity
android:process=".main"
android:name=".activities.ShortcutActionActivity"
android:exported="false"/>
<activity
android:process=".main"
android:name=".activities.SettingsActivity"
android:exported="false"/>
<activity
android:process=".main"
android:name="cc.winboll.studio.powerbell.unittest.MainUnitTest2Activity"
android:exported="false"/>
<!-- 第三方活动 -->
<!-- 第三方活动(主进程) -->
<activity
android:process=".main"
android:name="com.yalantis.ucrop.UCropActivity"
android:theme="@style/Theme.AppCompat.Light.NoActionBar"
android:exported="true"/>
<!-- 广播接收器 -->
<!-- 广播接收器(主进程) -->
<receiver
android:name=".receivers.MainReceiver"
android:enabled="true"
android:exported="true"
android:process=".main"
android:directBootAware="true">
<intent-filter android:priority="1000">
<action android:name="android.intent.action.BOOT_COMPLETED"/>
@@ -193,12 +206,13 @@
</intent-filter>
</receiver>
<!-- 服务 -->
<!-- 服务ControlCenterService主进程AssistantService独立进程 -->
<service
android:name=".services.ControlCenterService"
android:priority="1000"
android:enabled="true"
android:exported="false"
android:process=".main"
android:foregroundServiceType="dataSync">
<property
android:name="android.app.PROPERTY_SPECIAL_USE_FOREGROUND_SERVICE"
@@ -209,18 +223,20 @@
android:name=".services.AssistantService"
android:enabled="true"
android:exported="false"
android:process=".assistant">
android:process=".assistant"
android:foregroundServiceType="dataSync">
<property
android:name="android.app.PROPERTY_SPECIAL_USE_FOREGROUND_SERVICE"
android:value="辅助核心功能运行"/>
</service>
<!-- 内容提供者 -->
<!-- 内容提供者(主进程) -->
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
android:grantUriPermissions="true"
android:process=".main">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_provider"/>

View File

@@ -25,6 +25,7 @@ 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.MainActivity;
import cc.winboll.studio.powerbell.R;
import cc.winboll.studio.powerbell.dialogs.BackgroundPicturePreviewDialog;
import cc.winboll.studio.powerbell.dialogs.ColorPaletteDialog;
@@ -937,6 +938,7 @@ public class BackgroundSettingsActivity extends WinBoLLActivity {
mBgSourceUtils.commitPreviewSourceToCurrent();
isCommitSettings = true;
finish();
startActivity(new Intent(BackgroundSettingsActivity.this, MainActivity.class));
}
@Override

View File

@@ -9,6 +9,7 @@ import android.view.View;
import android.widget.Button;
import android.widget.Toast;
import cc.winboll.studio.libappbase.LogUtils;
import cc.winboll.studio.powerbell.App;
import cc.winboll.studio.powerbell.MainActivity;
import cc.winboll.studio.powerbell.R;
import cc.winboll.studio.powerbell.activities.BackgroundSettingsActivity;
@@ -135,6 +136,7 @@ public class BackgroundPicturePreviewDialog extends Dialog {
// 解析Uri为文件路径
String szSrcImage = UriUtils.getFilePathFromUri(mContext, mUriRecivedPicture);
App.notifyMessage(TAG, "szSrcImage : " + szSrcImage);
if (TextUtils.isEmpty(szSrcImage)) {
LogUtils.w(TAG, "【previewRecivedPicture】解析的文件路径为空");
Toast.makeText(mContext, TOAST_MSG_EMPTY_FILE, Toast.LENGTH_SHORT).show();