Merge remote-tracking branch 'origin/main'

ReChronoRain · Feb 16, 2024 · a2f62c6 · a2f62c6
2 parents 43c1882 + 59c0066
commit a2f62c6
Show file tree

Hide file tree

Showing 53 changed files with 151 additions and 205 deletions.
diff --git a/README.md b/README.md
@@ -1,14 +1,14 @@
-<div align="center">
+<p style="text-align:center;">
 
-<img width="" src="/imgs/icon.png" width=160 height=160 align="center">
+<img src="/imgs/icon.png" width="160" height="160" style="display: block; margin: 0 auto;" alt="icon">
 
 # HyperCeiler
 
 ### Make HyperOS/MIUI Great Again!
 
 简体中文&nbsp;&nbsp;|&nbsp;&nbsp;[English](/README_en-US.md) |&nbsp;&nbsp;[Português (Brasil)](/README_pt-BR.md)
 
-</div>
+</p>
 
 ## 支持的版本
 
@@ -31,67 +31,63 @@ HyperCeiler 已停止维护 Android 11-12 的 MIUI ROM，除系统框架、系
 <details>
     <summary>点击展开折叠的内容</summary>
 
-| 应用名                         | 包名                                |
-|:------------------------------|:-----------------------------------|
-| 系统框架                       | system                              |
-| 系统界面                       | com.android.systemui                |
-| 系统桌面                       | com.miui.home                       |
-| 系统更新                       | com.android.updater                 |
-| Joyose                        | com.xiaomi.joyose                   |
-| 小米设置                       | com.xiaomi.misettings               |
-| 安全服务 (手机管家、平板管家)    | com.miui.securitycenter              |
-| 笔记                           | com.miui.notes                     |
-| 壁纸                           | com.miui.miwallpaper               |
-| 传送门                         | com.miui.contentextension          |
-| 弹幕通知                       | com.xiaomi.barrage                  |
-| 百度输入法小米版                | com.baidu.input_mi                  |
-| 电话                           | com.android.incallui               |
-| 电话服务                       | com.android.phone                   |
-| 电量与性能                     | com.miui.powerkeeper                |
-| 短信                           | com.android.mms                    |
-| 截屏                           | com.miui.screenshot                |
-| 垃圾清理                       | com.miui.cleanmaster                |
-| 浏览器                         | com.android.browser                 |
-| 鲁班（MTB）                    | com.xiaomi.mtb                      |
-| 屏幕录制                       | com.miui.screenrecorder             |
-| 权限管理服务                    | com.lbe.security.miui               |
-| 设置                           | com.android.settings                |
-| 搜狗输入法小米版                | com.sohu.inputmethod.sogou.xiaomi    |
-| 天气                           | com.miui.weather2                   |
-| 互联互通服务 (投屏)             | com.milink.service                   |
-| 外部存储设备                    | com.android.externalstorage         |
-| 息屏与锁屏编辑 (万象息屏)        | com.miui.aod                         |
-| 文件管理                        | com.android.fileexplorer            |
-| 系统服务组件                    | com.miui.securityadd                 |
-| 下载管理                        | com.android.providers.downloads.ui  |
-| 下载管理程序                    | com.android.providers.downloads      |
-| 相册                           | com.miui.gallery                    |
-| 小米创作                        | com.miui.creation                   |
-| 小米互传                        | com.miui.mishare.connectivity       |
-| 小米相册 - 编辑                  | com.miui.mediaeditor                |
-| 小米云服务                       | com.miui.cloudservice               |
-| 小米智能卡                       | com.miui.tsmclient                  |
-| 讯飞输入法小米版                 | com.iflytek.inputmethod.miui         |
-| 应用包管理组件                   | com.miui.packageinstaller            |
-| 应用商店                        | com.xiaomi.market                   |
-| 智能助理                        | com.miui.personalassistant          |
-| 主题商店 (主题壁纸、壁纸与个性化)   | com.android.thememanager            |
-| com.miui.rom                   | com.miui.rom                        |
-| 系统安全组件                     | com.miui.guardprovider               |
-| 时钟                            | com.android.deskclock                |
-| 相机                            | com.android.camera                   |
-| 小爱翻译                         | com.xiaomi.aiasst.vision            |
-| 小爱建议                         | com.xiaomi.aireco                   |
-| 小爱视觉                         | com.xiaomi.scanner                  |
-| 小爱同学                         | com.miui.voiceassist                |
-| 音乐                             | com.miui.player                    |
-| 跨屏协同服务 (MIUI+ Beta 版)      | com.xiaomi.mirror                   |
-| NetworkBoost                    | com.xiaomi.NetworkBoost            |
-| NFC 服务                         | com.android.nfc                     |
-| 音质音效                          | com.miui.misound                   |
-| 备份                             | com.miui.backup                     |
-| 小米换机                          | com.miui.huanji                     |
-| MiTrustService                   | com.xiaomi.trustservice            |
+| 应用名                   | 包名                                 |
+|:----------------------|:-----------------------------------|
+| 系统框架                  | system                             |
+| 系统界面                  | com.android.systemui               |
+| 系统桌面                  | com.miui.home                      |
+| 系统更新                  | com.android.updater                |
+| Joyose                | com.xiaomi.joyose                  |
+| 小米设置                  | com.xiaomi.misettings              |
+| 安全服务 (手机管家、平板管家)      | com.miui.securitycenter            |
+| 笔记                    | com.miui.notes                     |
+| 壁纸                    | com.miui.miwallpaper               |
+| 传送门                   | com.miui.contentextension          |
+| 弹幕通知                  | com.xiaomi.barrage                 |
+| 百度输入法小米版              | com.baidu.input_mi                 |
+| 电话                    | com.android.incallui               |
+| 电话服务                  | com.android.phone                  |
+| 电量与性能                 | com.miui.powerkeeper               |
+| 短信                    | com.android.mms                    |
+| 截屏                    | com.miui.screenshot                |
+| 垃圾清理                  | com.miui.cleanmaster               |
+| 浏览器                   | com.android.browser                |
+| 鲁班（MTB）               | com.xiaomi.mtb                     |
+| 屏幕录制                  | com.miui.screenrecorder            |
+| 权限管理服务                | com.lbe.security.miui              |
+| 设置                    | com.android.settings               |
+| 搜狗输入法小米版              | com.sohu.inputmethod.sogou.xiaomi  |
+| 天气                    | com.miui.weather2                  |
+| 互联互通服务 (投屏)           | com.milink.service                 |
+| 外部存储设备                | com.android.externalstorage        |
+| 息屏与锁屏编辑 (万象息屏)        | com.miui.aod                       |
+| 文件管理                  | com.android.fileexplorer           |
+| 系统服务组件                | com.miui.securityadd               |
+| 下载管理                  | com.android.providers.downloads.ui |
+| 下载管理程序                | com.android.providers.downloads    |
+| 相册                    | com.miui.gallery                   |
+| 小米创作                  | com.miui.creation                  |
+| 小米互传                  | com.miui.mishare.connectivity      |
+| 小米相册 - 编辑             | com.miui.mediaeditor               |
+| 小米云服务                 | com.miui.cloudservice              |
+| 小米智能卡                 | com.miui.tsmclient                 |
+| 讯飞输入法小米版              | com.iflytek.inputmethod.miui       |
+| 应用包管理组件               | com.miui.packageinstaller          |
+| 应用商店                  | com.xiaomi.market                  |
+| 智能助理                  | com.miui.personalassistant         |
+| 主题商店 (主题壁纸、壁纸与个性化)    | com.android.thememanager           |
+| 系统安全组件                | com.miui.guardprovider             |
+| 相机                    | com.android.camera                 |
+| 小爱翻译                  | com.xiaomi.aiasst.vision           |
+| 小爱建议                  | com.xiaomi.aireco                  |
+| 小爱视觉                  | com.xiaomi.scanner                 |
+| 小爱同学                  | com.miui.voiceassist               |
+| NetworkBoost          | com.xiaomi.NetworkBoost            |
+| NFC 服务                | com.android.nfc                    |
+| 音质音效                  | com.miui.misound                   |
+| 备份                    | com.miui.backup                    |
+| 小米换机                  | com.miui.huanji                    |
+| MiTrustService        | com.xiaomi.trustservice            |
 
 </details>
 

diff --git a/README_en-US.md b/README_en-US.md
@@ -1,14 +1,14 @@
-<div align="center">
+<p style="text-align:center;">
 
-<img width="" src="/imgs/icon.png" width=160 height=160 align="center">
+<img src="/imgs/icon.png" width="160" height="160" style="display: block; margin: 0 auto;" alt="icon">
 
 # HyperCeiler
 
 ### Make HyperOS/MIUI Great Again!
 
 [简体中文](/README.md)&nbsp;&nbsp;|&nbsp;&nbsp;English |&nbsp;&nbsp;[Português (Brasil)](/README_pt-BR.md)
 
-</div>
+</p>
 
 ## Supported versions
 
@@ -76,16 +76,12 @@ HyperCeiler has stopped maintaining the MIUI ROM of Android 11-12, except for th
 | GetApps                    | com.xiaomi.market                  |
 | App vault                  | com.miui.personalassistant         |
 | Themes                     | com.android.thememanager           |
-| com.miui.rom               | com.miui.rom                       |
 | MIUI Security Components   | com.miui.guardprovider             |
-| Clock                      | com.android.deskclock              |
 | Camera                     | com.android.camera                 |
 | Mi AI Translate            | com.xiaomi.aiasst.vision           |
 | Mi AI Suggestions          | com.xiaomi.aireco                  |
 | Scanner                    | com.xiaomi.scanner                 |
 | Mi AI                      | com.miui.voiceassist               |
-| Music                      | com.miui.player                    |
-| MIUI+                      | com.xiaomi.mirror                  |
 | NetworkBoost               | com.xiaomi.NetworkBoost            |
 | NFC Service                | com.android.nfc                    |
 | Earphones                  | com.miui.misound                   |

diff --git a/README_pt-BR.md b/README_pt-BR.md
@@ -1,14 +1,14 @@
-<div align="center">
+<p style="text-align:center;">
 
-<img width="" src="/imgs/icon.png" width=160 height=160 align="center">
+<img src="/imgs/icon.png" width="160" height="160" style="display: block; margin: 0 auto;" alt="icon">
 
 # HyperCeiler
 
 ### Torne o HyperOS/MIUI ótimo novamente!
 
 [简体中文](/README.md)&nbsp;&nbsp;|&nbsp;&nbsp;[English](/README_en-US.md) |&nbsp;&nbsp;Português (Brasil)
 
-</div>
+</p>
 
 ## Versões suportadas
 
@@ -76,16 +76,12 @@ O HyperCeiler deixou de ser mantido em ROM MIUI para o Android 11-12, exceto par
 | GetApps                                        | com.xiaomi.market                  |
 | Assistente                                     | com.miui.personalassistant         |
 | Temas                                          | com.android.thememanager           |
-| com.miui.rom                                   | com.miui.rom                       |
 | Componentes de segurança do HyperOS            | com.miui.guardprovider             |
-| Relógio                                        | com.android.deskclock              |
 | Câmera                                         | com.android.camera                 |
 | Mi AI Translate                                | com.xiaomi.aiasst.vision           |
 | AI Reco                                        | com.xiaomi.aireco                  |
 | Scanner                                        | com.xiaomi.scanner                 |
 | Mi AI                                          | com.miui.voiceassist               |
-| Música                                         | com.miui.player                    |
-| Serviços de interconectividade de dispositivos | com.xiaomi.mirror                  |
 | NetworkBoost                                   | com.xiaomi.NetworkBoost            |
 | Serviço NFC                                    | com.android.nfc                    |
 | Fones de ouvido                                | com.miui.misound                   |

diff --git a/app/build.gradle b/app/build.gradle
@@ -74,6 +74,7 @@ android {
             System.console()?.readLine('\n' + prompt + ': ')
     }
     def keyStoreFile = getString('storeFile', 'STORE_FILE', 'Store file')?.with(rootProject.&file)
+    def gitRevision = getGitRevision()
 
     signingConfigs {
         hyperceiler {
@@ -113,14 +114,14 @@ android {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            versionNameSuffix "_" + DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDateTime.now()) + "_" + getGitRevision()
+            versionNameSuffix "_" + DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDateTime.now()) + "_" + gitRevision
             buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
             if (keyStoreFile != null) {
                 signingConfig signingConfigs.hyperceiler
             }
         }
         debug {
-            versionNameSuffix "_" + DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDateTime.now()) + "_" + getGitRevision()
+            versionNameSuffix "_" + DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDateTime.now()) + "_" + gitRevision
             buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
             if (keyStoreFile != null) {
                 signingConfig signingConfigs.hyperceiler

diff --git a/app/src/main/java/com/sevtinge/hyperceiler/data/adapter/NavigationPagerAdapter.java b/app/src/main/java/com/sevtinge/hyperceiler/data/adapter/NavigationPagerAdapter.java
@@ -23,7 +23,6 @@
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import java.util.List;

diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemUI.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/SystemUI.java
@@ -18,7 +18,7 @@
  */
 package com.sevtinge.hyperceiler.module.app;
 
-import static com.sevtinge.hyperceiler.utils.api.LinQiqiApisKt.isNewNetworkStyle;
+import static com.sevtinge.hyperceiler.utils.api.NekoQiqiApisKt.isNewNetworkStyle;
 import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isAndroidVersion;
 import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreAndroidVersion;
 import static com.sevtinge.hyperceiler.utils.devicesdk.SystemSDKKt.isMoreHyperOSVersion;

diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/base/BaseModule.java b/app/src/main/java/com/sevtinge/hyperceiler/module/base/BaseModule.java
@@ -54,15 +54,13 @@ public void init(LoadPackageParam lpparam) {
         try {
             if (!ProjectApi.mAppModulePkg.equals(lpparam.packageName)) {
                 Handler handler = new Handler();
-                ContextUtils.getWaitContext(context -> {
-                        handler.post(
-                            () -> {
-                                if (context != null) {
-                                    ResourcesTool.loadModuleRes(context);
-                                }
-                            }
-                        );
+                ContextUtils.getWaitContext(context -> handler.post(
+                    () -> {
+                        if (context != null) {
+                            ResourcesTool.loadModuleRes(context);
+                        }
                     }
+                )
                     , "android".equals(lpparam.packageName));
             }
         } catch (Throwable e) {

diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/base/BaseXposedInit.java b/app/src/main/java/com/sevtinge/hyperceiler/module/base/BaseXposedInit.java
@@ -28,6 +28,8 @@
 import static com.sevtinge.hyperceiler.utils.log.LogManager.logLevelDesc;
 import static com.sevtinge.hyperceiler.utils.log.XposedLogUtils.logI;
 
+import android.annotation.SuppressLint;
+
 import com.sevtinge.hyperceiler.module.app.AiAsst;
 import com.sevtinge.hyperceiler.module.app.Aod;
 import com.sevtinge.hyperceiler.module.app.Backup;
@@ -101,6 +103,7 @@ public abstract class BaseXposedInit implements IXposedHookLoadPackage, IXposedH
 
     public static boolean isSafeModeOn = false;
 
+    @SuppressLint("StaticFieldLeak")
     public static ResourcesTool mResHook;
     public static String mModulePath = null;
     public static PrefsMap<String, Object> mPrefsMap = new PrefsMap<>();

diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/base/tool/XposedTool.java b/app/src/main/java/com/sevtinge/hyperceiler/module/base/tool/XposedTool.java
@@ -18,6 +18,7 @@
  */
 package com.sevtinge.hyperceiler.module.base.tool;
 
+import android.annotation.SuppressLint;
 import android.app.Application;
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -55,6 +56,7 @@ public class XposedTool extends XposedLogUtils {
     public static WeakReference<TextView> mPct;
 
     // public  Context mModuleContext = null;
+    @SuppressLint("StaticFieldLeak")
     public static final ResourcesTool mResHook = XposedInit.mResHook;
 
     public static void setTextView(TextView textView) {
@@ -87,12 +89,8 @@ public static Context findContext(@ContextUtils.Duration int flag) {
                     if ((context = currentApplication()) == null)
                         context = getSystemContext();
                 }
-                case 1 -> {
-                    context = currentApplication();
-                }
-                case 2 -> {
-                    context = getSystemContext();
-                }
+                case 1 -> context = currentApplication();
+                case 2 -> context = getSystemContext();
                 default -> {
                 }
             }
@@ -149,8 +147,7 @@ public static String getPackageVersionName(XC_LoadPackage.LoadPackageParam lppar
             Object parser = parserCls.newInstance();
             File apkPath = new File(lpparam.appInfo.sourceDir);
             Object pkg = XposedHelpers.callMethod(parser, "parsePackage", apkPath, 0);
-            String versionName = (String) XposedHelpers.getObjectField(pkg, "mVersionName");
-            return versionName;
+            return (String) XposedHelpers.getObjectField(pkg, "mVersionName");
         } catch (Throwable e) {
             return "";
         }
@@ -162,8 +159,7 @@ public static int getPackageVersionCode(XC_LoadPackage.LoadPackageParam lpparam)
             Object parser = parserCls.newInstance();
             File apkPath = new File(lpparam.appInfo.sourceDir);
             Object pkg = XposedHelpers.callMethod(parser, "parsePackage", apkPath, 0);
-            int versionCode = XposedHelpers.getIntField(pkg, "mVersionCode");
-            return versionCode;
+            return XposedHelpers.getIntField(pkg, "mVersionCode");
         } catch (Throwable e) {
             return -1;
         }

diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/camera/CustomWatermark.java b/app/src/main/java/com/sevtinge/hyperceiler/module/hook/camera/CustomWatermark.java
@@ -31,7 +31,6 @@
 import org.luckypray.dexkit.result.MethodDataList;
 
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 
 public class CustomWatermark extends BaseHook {
     @Override