Skip to content

Commit 14b01ee

Browse files
committed
opt codes
1 parent 5c2dfc3 commit 14b01ee

4 files changed

Lines changed: 31 additions & 34 deletions

File tree

.github/workflows/release_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147
echo "本次更新的贡献者们如下:"
148148
echo "$CONTRIBUTORS"
149149
echo
150-
echo "完整更新日志见:${{ env.PREV_TAG }}..${{ env.CUR_TAG }}"
150+
echo "完整更新日志见:${{ env.PREV_TAG }}...${{ github.sha }}"
151151
echo
152152
echo "注意事项:"
153153
echo "- 出现任何问题请将日志等级设置为 Debug 后携带日志及必要信息提交至 GitHub issue。"

app/src/main/java/com/sevtinge/hyperceiler/main/page/settings/helper/SupportVersionFragment.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public class SupportVersionFragment extends SettingsPreferenceFragment {
3030

3131
private static final String F_SUPPORT_HYPER_OS_VERSION = "1.0 / 2.0 / 2.0.100 / 2.0.200";
3232
private static final String F_SUPPORT_ANDROID_VERSION = "14(U, 34) / 15(V, 35)";
33-
private static final String N_SUPPORT_HYPER_OS_VERSION = "1.1 / 2.0.230";
34-
private static final String N_SUPPORT_ANDROID_VERSION = "16(B, 36)"; // 暂定名
33+
private static final String N_SUPPORT_HYPER_OS_VERSION = "1.1 / 2.0.230 / 3.0";
34+
private static final String N_SUPPORT_ANDROID_VERSION = "16(B, 36)";
3535

3636
Preference helpSupportVersion;
3737
LayoutPreference supportFullVersion;
@@ -65,17 +65,17 @@ public void initPrefs() {
6565
private String buildSummary() {
6666
StringBuilder sb = new StringBuilder();
6767
sb.append(getString(R.string.help_support_version_desc_1))
68-
.append("\n - HyperOS ").append(F_SUPPORT_HYPER_OS_VERSION)
69-
.append("\n - Android ").append(F_SUPPORT_ANDROID_VERSION);
68+
.append("\n HyperOS: ").append(F_SUPPORT_HYPER_OS_VERSION)
69+
.append("\n Android: ").append(F_SUPPORT_ANDROID_VERSION);
7070

7171
boolean hasNSupport = !N_SUPPORT_HYPER_OS_VERSION.isEmpty() || !N_SUPPORT_ANDROID_VERSION.isEmpty();
7272
if (hasNSupport) {
7373
sb.append("\n\n").append(getString(R.string.help_support_version_desc_2));
7474
if (!N_SUPPORT_HYPER_OS_VERSION.isEmpty()) {
75-
sb.append("\n\n - HyperOS ").append(N_SUPPORT_HYPER_OS_VERSION);
75+
sb.append("\nHyperOS: ").append(N_SUPPORT_HYPER_OS_VERSION);
7676
}
7777
if (!N_SUPPORT_ANDROID_VERSION.isEmpty()) {
78-
sb.append("\n - Android ").append(N_SUPPORT_ANDROID_VERSION);
78+
sb.append("\n Android: ").append(N_SUPPORT_ANDROID_VERSION);
7979
}
8080
}
8181
return sb.toString();

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/XposedInit.java

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -100,17 +100,37 @@ public void initZygote(StartupParam startupParam) throws Throwable {
100100

101101
@Override
102102
public void handleLoadPackage(XC_LoadPackage.LoadPackageParam lpparam) throws Throwable {
103-
if (isInSafeMode(lpparam.packageName)) return;
103+
String packageName = lpparam.packageName;
104+
105+
if (isInSafeMode(packageName)) return;
104106
if (mPrefsMap.getBoolean("allow_hook")) {
105107

106108
// load EzXHelper and set log tag
107109
EzXposed.initHandleLoadPackage(lpparam);
108110

109111
// load CorePatch
110112
new SystemFrameworkForCorePatch().handleLoadPackage(lpparam);
113+
114+
// load Module active hook
115+
if (ProjectApi.mAppModulePkg.equals(packageName)) {
116+
moduleActiveHook(lpparam);
117+
return;
118+
}
119+
120+
// load Module hook apps
121+
if (Objects.equals(packageName, "android"))
122+
logI(packageName, "androidVersion = " + getAndroidVersion() + ", hyperosVersion = " + getHyperOSVersion());
123+
else
124+
logI(packageName, "versionName = " + getPackageVersionName(lpparam) + ", versionCode = " + getPackageVersionCode(lpparam));
125+
126+
// load ResourcesTool
127+
if (mPrefsMap.getBoolean("module_settings_reshook_new")) {
128+
ResInjectTool.injectModuleRes();
129+
}
130+
131+
invokeInit(lpparam);
132+
androidCrashEventHook(lpparam);
111133
}
112-
// load Module hook apps
113-
init(lpparam);
114134
}
115135

116136
private void setXSharedPrefs() {
@@ -137,29 +157,6 @@ private void setXSharedPrefs() {
137157
}
138158
}
139159

140-
private void init(XC_LoadPackage.LoadPackageParam lpparam) {
141-
String packageName = lpparam.packageName;
142-
if (ProjectApi.mAppModulePkg.equals(packageName)) {
143-
moduleActiveHook(lpparam);
144-
return;
145-
}
146-
147-
if (!mPrefsMap.getBoolean("allow_hook")) return;
148-
149-
if (Objects.equals(packageName, "android"))
150-
logI(packageName, "androidVersion = " + getAndroidVersion() + ", hyperosVersion = " + getHyperOSVersion());
151-
else
152-
logI(packageName, "versionName = " + getPackageVersionName(lpparam) + ", versionCode = " + getPackageVersionCode(lpparam));
153-
154-
// load ResourcesTool
155-
if (mPrefsMap.getBoolean("module_settings_reshook_new")) {
156-
ResInjectTool.injectModuleRes();
157-
}
158-
159-
invokeInit(lpparam);
160-
androidCrashEventHook(lpparam);
161-
}
162-
163160
private void invokeInit(XC_LoadPackage.LoadPackageParam lpparam) {
164161
String mPkgName = lpparam.packageName;
165162
if (mPkgName == null) return;

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/hook/systemui/plugin/NewPluginHelperKt.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ object NewPluginHelperKt : BaseHook() {
281281
loader(classLoader)
282282
if (isDebug()) logI(TAG, lpparam.packageName, "$name is loaded success.")
283283
}.onFailure {
284-
logE(TAG, lpparam.packageName, "[$tag] $name is fail loaded, log: $it")
284+
logE(TAG, lpparam.packageName, "[$tag] $name is fail loaded, log: ${it.message}" )
285285
}
286286
}
287287
}

0 commit comments

Comments
 (0)