From e669bbb04b7f5ea39f20ee816f38c9d2de26da39 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 13 Dec 2025 20:23:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=E9=87=8D?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cc/winboll/studio/powerbell/App.java | 2 +- .../main/java/cc/winboll/studio/powerbell/MainActivity.java | 2 +- .../powerbell/activities/BackgroundSettingsActivity.java | 6 +++--- .../studio/powerbell/activities/ClearRecordActivity.java | 2 +- .../studio/powerbell/activities/PixelPickerActivity.java | 2 +- .../winboll/studio/powerbell/adapters/BatteryAdapter.java | 2 +- .../powerbell/dialogs/BackgroundPicturePreviewDialog.java | 4 ++-- .../studio/powerbell/fragments/MainViewFragment.java | 2 +- .../studio/powerbell/{model => models}/AppConfigBean.java | 2 +- .../studio/powerbell/{model => models}/BackgroundBean.java | 2 +- .../studio/powerbell/{model => models}/BatteryData.java | 2 +- .../studio/powerbell/{model => models}/BatteryInfoBean.java | 2 +- .../{model => models}/ControlCenterServiceBean.java | 2 +- .../powerbell/{model => models}/NotificationMessage.java | 2 +- .../powerbell/receivers/ControlCenterServiceReceiver.java | 2 +- .../studio/powerbell/services/ControlCenterService.java | 4 ++-- .../cc/winboll/studio/powerbell/utils/AppCacheUtils.java | 2 +- .../cc/winboll/studio/powerbell/utils/AppConfigUtils.java | 4 ++-- .../studio/powerbell/utils/BackgroundSourceUtils.java | 4 ++-- .../cc/winboll/studio/powerbell/utils/ImageCropUtils.java | 2 +- .../winboll/studio/powerbell/utils/NotificationUtils2.java | 2 +- .../java/cc/winboll/studio/powerbell/utils/StringUtils.java | 2 +- .../studio/powerbell/utils/{UriUtil.java => UriUtils.java} | 2 +- .../cc/winboll/studio/powerbell/views/BackgroundView.java | 2 +- 24 files changed, 30 insertions(+), 30 deletions(-) rename powerbell/src/main/java/cc/winboll/studio/powerbell/{model => models}/AppConfigBean.java (98%) rename powerbell/src/main/java/cc/winboll/studio/powerbell/{model => models}/BackgroundBean.java (99%) rename powerbell/src/main/java/cc/winboll/studio/powerbell/{model => models}/BatteryData.java (93%) rename powerbell/src/main/java/cc/winboll/studio/powerbell/{model => models}/BatteryInfoBean.java (97%) rename powerbell/src/main/java/cc/winboll/studio/powerbell/{model => models}/ControlCenterServiceBean.java (97%) rename powerbell/src/main/java/cc/winboll/studio/powerbell/{model => models}/NotificationMessage.java (93%) rename powerbell/src/main/java/cc/winboll/studio/powerbell/utils/{UriUtil.java => UriUtils.java} (99%) diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/App.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/App.java index f3ebe4f..fddf7b6 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/App.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/App.java @@ -8,7 +8,7 @@ import cc.winboll.studio.libaes.utils.WinBoLLActivityManager; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.ToastUtils; -import cc.winboll.studio.powerbell.model.BackgroundBean; +import cc.winboll.studio.powerbell.models.BackgroundBean; import cc.winboll.studio.powerbell.receivers.GlobalApplicationReceiver; import cc.winboll.studio.powerbell.utils.AppCacheUtils; import cc.winboll.studio.powerbell.utils.AppConfigUtils; 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 46bed47..807e871 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/MainActivity.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/MainActivity.java @@ -37,7 +37,7 @@ import cc.winboll.studio.powerbell.activities.ClearRecordActivity; import cc.winboll.studio.powerbell.activities.SettingsActivity; import cc.winboll.studio.powerbell.activities.WinBoLLActivity; import cc.winboll.studio.powerbell.fragments.MainViewFragment; -import cc.winboll.studio.powerbell.model.BackgroundBean; +import cc.winboll.studio.powerbell.models.BackgroundBean; import cc.winboll.studio.powerbell.services.ControlCenterService; import cc.winboll.studio.powerbell.unittest.MainUnitTestActivity; import cc.winboll.studio.powerbell.utils.AppConfigUtils; 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 d2445f3..38c2188 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 @@ -24,13 +24,13 @@ import cc.winboll.studio.powerbell.App; import cc.winboll.studio.powerbell.R; import cc.winboll.studio.powerbell.dialogs.BackgroundPicturePreviewDialog; import cc.winboll.studio.powerbell.dialogs.YesNoAlertDialog; -import cc.winboll.studio.powerbell.model.BackgroundBean; +import cc.winboll.studio.powerbell.models.BackgroundBean; import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils; import cc.winboll.studio.powerbell.utils.BitmapCacheUtils; import cc.winboll.studio.powerbell.utils.FileUtils; import cc.winboll.studio.powerbell.utils.ImageCropUtils; import cc.winboll.studio.powerbell.utils.PermissionUtils; -import cc.winboll.studio.powerbell.utils.UriUtil; +import cc.winboll.studio.powerbell.utils.UriUtils; import cc.winboll.studio.powerbell.views.BackgroundView; import java.io.BufferedOutputStream; import java.io.File; @@ -807,7 +807,7 @@ public class BackgroundSettingsActivity extends WinBoLLActivity { * 将 Uri 文件同步到预览 Bean */ boolean putUriFileToPreviewSource(Uri srcUriFile) { - String filePath = UriUtil.getFilePathFromUri(this, srcUriFile); + String filePath = UriUtils.getFilePathFromUri(this, srcUriFile); if (TextUtils.isEmpty(filePath)) { LogUtils.e(TAG, "putUriFileToPreviewSource: Uri解析路径为空"); return false; diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/ClearRecordActivity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/ClearRecordActivity.java index 08cc280..efe148b 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/ClearRecordActivity.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/ClearRecordActivity.java @@ -12,7 +12,7 @@ import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.ToastUtils; import cc.winboll.studio.powerbell.App; import cc.winboll.studio.powerbell.R; -import cc.winboll.studio.powerbell.model.BatteryInfoBean; +import cc.winboll.studio.powerbell.models.BatteryInfoBean; import cc.winboll.studio.powerbell.receivers.ControlCenterServiceReceiver; import cc.winboll.studio.powerbell.utils.AppCacheUtils; import cc.winboll.studio.powerbell.utils.StringUtils; diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java index 8ae5aef..73bcc60 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/activities/PixelPickerActivity.java @@ -26,7 +26,7 @@ import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.powerbell.R; import cc.winboll.studio.powerbell.activities.BackgroundSettingsActivity; import cc.winboll.studio.powerbell.activities.PixelPickerActivity; -import cc.winboll.studio.powerbell.model.BackgroundBean; +import cc.winboll.studio.powerbell.models.BackgroundBean; import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils; import java.io.File; import java.io.FileInputStream; diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/adapters/BatteryAdapter.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/adapters/BatteryAdapter.java index 9c8fe05..2f78874 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/adapters/BatteryAdapter.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/adapters/BatteryAdapter.java @@ -12,7 +12,7 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; import cc.winboll.studio.powerbell.R; import cc.winboll.studio.powerbell.adapters.BatteryAdapter; -import cc.winboll.studio.powerbell.model.BatteryData; +import cc.winboll.studio.powerbell.models.BatteryData; import java.util.ArrayList; import java.util.List; diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/dialogs/BackgroundPicturePreviewDialog.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/dialogs/BackgroundPicturePreviewDialog.java index 9867762..d7fd091 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/dialogs/BackgroundPicturePreviewDialog.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/dialogs/BackgroundPicturePreviewDialog.java @@ -12,7 +12,7 @@ import cc.winboll.studio.powerbell.MainActivity; import cc.winboll.studio.powerbell.R; import cc.winboll.studio.powerbell.activities.BackgroundSettingsActivity; import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils; -import cc.winboll.studio.powerbell.utils.UriUtil; +import cc.winboll.studio.powerbell.utils.UriUtils; import cc.winboll.studio.powerbell.views.BackgroundView; import java.io.File; @@ -85,7 +85,7 @@ public class BackgroundPicturePreviewDialog extends Dialog { mUriRecivedPicture = activity.getIntent().getParcelableExtra(Intent.EXTRA_STREAM); } //获取文件真实地址 - String szSrcImage = UriUtil.getFilePathFromUri(mContext, mUriRecivedPicture); + String szSrcImage = UriUtils.getFilePathFromUri(mContext, mUriRecivedPicture); if (TextUtils.isEmpty(szSrcImage)) { Toast.makeText(mContext, "接收到的文件为空。", Toast.LENGTH_SHORT).show(); dismiss(); diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/fragments/MainViewFragment.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/fragments/MainViewFragment.java index e2ef65e..7d586db 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/fragments/MainViewFragment.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/fragments/MainViewFragment.java @@ -20,7 +20,7 @@ import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.powerbell.App; import cc.winboll.studio.powerbell.R; import cc.winboll.studio.powerbell.activities.PixelPickerActivity; -import cc.winboll.studio.powerbell.model.BackgroundBean; +import cc.winboll.studio.powerbell.models.BackgroundBean; import cc.winboll.studio.powerbell.services.ControlCenterService; import cc.winboll.studio.powerbell.utils.AppConfigUtils; import cc.winboll.studio.powerbell.utils.BackgroundSourceUtils; diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/model/AppConfigBean.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/AppConfigBean.java similarity index 98% rename from powerbell/src/main/java/cc/winboll/studio/powerbell/model/AppConfigBean.java rename to powerbell/src/main/java/cc/winboll/studio/powerbell/models/AppConfigBean.java index 1176432..a6becc3 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/model/AppConfigBean.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/AppConfigBean.java @@ -1,4 +1,4 @@ -package cc.winboll.studio.powerbell.model; +package cc.winboll.studio.powerbell.models; /** * @Author ZhanGSKen diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/model/BackgroundBean.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/BackgroundBean.java similarity index 99% rename from powerbell/src/main/java/cc/winboll/studio/powerbell/model/BackgroundBean.java rename to powerbell/src/main/java/cc/winboll/studio/powerbell/models/BackgroundBean.java index 9814c44..57a5e42 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/model/BackgroundBean.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/BackgroundBean.java @@ -1,4 +1,4 @@ -package cc.winboll.studio.powerbell.model; +package cc.winboll.studio.powerbell.models; import android.util.JsonReader; import android.util.JsonWriter; diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/model/BatteryData.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/BatteryData.java similarity index 93% rename from powerbell/src/main/java/cc/winboll/studio/powerbell/model/BatteryData.java rename to powerbell/src/main/java/cc/winboll/studio/powerbell/models/BatteryData.java index 51b23dd..7960ac4 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/model/BatteryData.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/BatteryData.java @@ -1,4 +1,4 @@ -package cc.winboll.studio.powerbell.model; +package cc.winboll.studio.powerbell.models; /** * @Author ZhanGSKen diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/model/BatteryInfoBean.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/BatteryInfoBean.java similarity index 97% rename from powerbell/src/main/java/cc/winboll/studio/powerbell/model/BatteryInfoBean.java rename to powerbell/src/main/java/cc/winboll/studio/powerbell/models/BatteryInfoBean.java index e7f0fc0..0d5a9ce 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/model/BatteryInfoBean.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/BatteryInfoBean.java @@ -1,4 +1,4 @@ -package cc.winboll.studio.powerbell.model; +package cc.winboll.studio.powerbell.models; import android.util.JsonReader; import android.util.JsonWriter; diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/model/ControlCenterServiceBean.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/ControlCenterServiceBean.java similarity index 97% rename from powerbell/src/main/java/cc/winboll/studio/powerbell/model/ControlCenterServiceBean.java rename to powerbell/src/main/java/cc/winboll/studio/powerbell/models/ControlCenterServiceBean.java index 5f13632..a7adc31 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/model/ControlCenterServiceBean.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/ControlCenterServiceBean.java @@ -1,4 +1,4 @@ -package cc.winboll.studio.powerbell.model; +package cc.winboll.studio.powerbell.models; /** * @Author ZhanGSKen diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/model/NotificationMessage.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/NotificationMessage.java similarity index 93% rename from powerbell/src/main/java/cc/winboll/studio/powerbell/model/NotificationMessage.java rename to powerbell/src/main/java/cc/winboll/studio/powerbell/models/NotificationMessage.java index b95b8f4..122097e 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/model/NotificationMessage.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/models/NotificationMessage.java @@ -1,4 +1,4 @@ -package cc.winboll.studio.powerbell.model; +package cc.winboll.studio.powerbell.models; // 应用消息结构 // diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/receivers/ControlCenterServiceReceiver.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/receivers/ControlCenterServiceReceiver.java index 7338e89..0d94d76 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/receivers/ControlCenterServiceReceiver.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/receivers/ControlCenterServiceReceiver.java @@ -5,7 +5,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.powerbell.model.AppConfigBean; +import cc.winboll.studio.powerbell.models.AppConfigBean; import cc.winboll.studio.powerbell.services.ControlCenterService; import cc.winboll.studio.powerbell.utils.AppConfigUtils; import cc.winboll.studio.powerbell.utils.BatteryUtils; diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/services/ControlCenterService.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/services/ControlCenterService.java index 95b2a7f..1e28f3c 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/services/ControlCenterService.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/services/ControlCenterService.java @@ -23,8 +23,8 @@ 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.model.AppConfigBean; -import cc.winboll.studio.powerbell.model.NotificationMessage; +import cc.winboll.studio.powerbell.models.AppConfigBean; +import cc.winboll.studio.powerbell.models.NotificationMessage; import cc.winboll.studio.powerbell.handlers.ControlCenterServiceHandler; import cc.winboll.studio.powerbell.receivers.ControlCenterServiceReceiver; import cc.winboll.studio.powerbell.services.AssistantService; diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/AppCacheUtils.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/AppCacheUtils.java index 9531159..7749d4c 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/AppCacheUtils.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/AppCacheUtils.java @@ -2,7 +2,7 @@ package cc.winboll.studio.powerbell.utils; import android.content.Context; import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.powerbell.model.BatteryInfoBean; +import cc.winboll.studio.powerbell.models.BatteryInfoBean; import java.util.ArrayList; public class AppCacheUtils { diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/AppConfigUtils.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/AppConfigUtils.java index ccddf38..c336350 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/AppConfigUtils.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/AppConfigUtils.java @@ -5,8 +5,8 @@ import android.content.Context; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.powerbell.App; import cc.winboll.studio.powerbell.MainActivity; -import cc.winboll.studio.powerbell.model.AppConfigBean; -import cc.winboll.studio.powerbell.model.ControlCenterServiceBean; +import cc.winboll.studio.powerbell.models.AppConfigBean; +import cc.winboll.studio.powerbell.models.ControlCenterServiceBean; import cc.winboll.studio.powerbell.dialogs.YesNoAlertDialog; import cc.winboll.studio.powerbell.fragments.MainViewFragment; import cc.winboll.studio.powerbell.services.ControlCenterService; diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/BackgroundSourceUtils.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/BackgroundSourceUtils.java index 2a37e39..39e9b13 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/BackgroundSourceUtils.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/BackgroundSourceUtils.java @@ -11,7 +11,7 @@ import androidx.core.content.FileProvider; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.ToastUtils; import cc.winboll.studio.powerbell.BuildConfig; -import cc.winboll.studio.powerbell.model.BackgroundBean; +import cc.winboll.studio.powerbell.models.BackgroundBean; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; @@ -226,7 +226,7 @@ public class BackgroundSourceUtils { return true; } - Uri uri = UriUtil.getUriForFile(mContext, oldPreviewBackgroundBean.getBackgroundFilePath()); + Uri uri = UriUtils.getUriForFile(mContext, oldPreviewBackgroundBean.getBackgroundFilePath()); String fileSuffix = FileUtils.getFileSuffix(mContext, uri); String newCropFileName = UUID.randomUUID().toString() + System.currentTimeMillis(); mCropSourceFile = new File(fCropCacheDir, newCropFileName + "." + fileSuffix); diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/ImageCropUtils.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/ImageCropUtils.java index d1227b9..5e00ea2 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/ImageCropUtils.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/ImageCropUtils.java @@ -6,7 +6,7 @@ import android.net.Uri; import android.os.Build; import androidx.core.content.FileProvider; import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.powerbell.model.BackgroundBean; +import cc.winboll.studio.powerbell.models.BackgroundBean; import com.yalantis.ucrop.UCrop; import com.yalantis.ucrop.UCropActivity; import java.io.File; diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/NotificationUtils2.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/NotificationUtils2.java index 63ed9ee..c07278f 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/NotificationUtils2.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/NotificationUtils2.java @@ -21,7 +21,7 @@ import android.widget.RemoteViews; import androidx.annotation.RequiresApi; import cc.winboll.studio.powerbell.MainActivity; import cc.winboll.studio.powerbell.R; -import cc.winboll.studio.powerbell.model.NotificationMessage; +import cc.winboll.studio.powerbell.models.NotificationMessage; import cc.winboll.studio.powerbell.services.ControlCenterService; public class NotificationUtils2 { diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/StringUtils.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/StringUtils.java index 967b944..88d8bbf 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/StringUtils.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/StringUtils.java @@ -1,6 +1,6 @@ package cc.winboll.studio.powerbell.utils; -import cc.winboll.studio.powerbell.model.BatteryInfoBean; +import cc.winboll.studio.powerbell.models.BatteryInfoBean; import java.util.ArrayList; public class StringUtils { diff --git a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/UriUtil.java b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/UriUtils.java similarity index 99% rename from powerbell/src/main/java/cc/winboll/studio/powerbell/utils/UriUtil.java rename to powerbell/src/main/java/cc/winboll/studio/powerbell/utils/UriUtils.java index 43bb0a3..4db8dfb 100644 --- a/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/UriUtil.java +++ b/powerbell/src/main/java/cc/winboll/studio/powerbell/utils/UriUtils.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -public class UriUtil { +public class UriUtils { public static final String TAG = "UriUtil"; 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 058d7d7..08ad6ef 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 @@ -14,7 +14,7 @@ import android.widget.RelativeLayout; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.ToastUtils; import cc.winboll.studio.powerbell.App; -import cc.winboll.studio.powerbell.model.BackgroundBean; +import cc.winboll.studio.powerbell.models.BackgroundBean; import java.io.File; /**