diff --git a/misc/dsg-configs/org.deepin.dde.daemon.power.json b/misc/dsg-configs/org.deepin.dde.daemon.power.json index 6b6af5423..ab1a6de19 100644 --- a/misc/dsg-configs/org.deepin.dde.daemon.power.json +++ b/misc/dsg-configs/org.deepin.dde.daemon.power.json @@ -723,6 +723,7 @@ "gnome-keyring-ssh.desktop", "gnome-keyring-pkcs11.desktop", "gnome-keyring-secrets.desktop", + "fcitx5-helper.desktop", "org.fcitx.Fcitx5.desktop", "xdg-user-dirs.desktop", "permission_manager_dbus_session_daemon.desktop", @@ -817,7 +818,11 @@ "upower.service", "usecd.service", "wpa_supplicant.service", - "wtmpdb-update-boot.service" + "wtmpdb-update-boot.service", + "ssh.service", + "udcp-guard.service", + "com.home.appstore.daemon.service", + "serial-getty@ttyAMA0.service" ], "serial": 0, "flags": [ diff --git a/session/power1/power_save_plan.go b/session/power1/power_save_plan.go index 2ca32a647..856f5dc89 100644 --- a/session/power1/power_save_plan.go +++ b/session/power1/power_save_plan.go @@ -707,7 +707,7 @@ func (psp *powerSavePlan) isThirdPartyAppRunning() (ret bool) { // 检查启动应用的desktop,是否在系统应用 systemApplicationsMap 中 // 只要有一个运行中的desktop不存在于 systemApplicationsMap 中,说明就有第三方应用运行 for _, app := range launchedApplications { - desktop := strings.ToLower(psp.getDesktopName(app)) + desktop := psp.getDesktopName(app) // 如果存在短idle黑名单应用在运行,则返回true -> 不进短idle if _, exists := shortIdleBlacklistApplicationsMap[desktop]; exists { logger.Info("Found shortIdle blacklist application running: ", app, desktop) @@ -716,6 +716,7 @@ func (psp *powerSavePlan) isThirdPartyAppRunning() (ret bool) { } if _, exists := systemApplicationsMap[desktop]; !exists { + desktop = strings.ToLower(desktop) // 如果不存在的应用的desktop包含deepin、dde、uos说明也是系统应用,这个应用应该加到系统应用列表中 if strings.Contains(desktop, "deepin") || strings.Contains(desktop, "dde") || strings.Contains(desktop, "uos") { logger.Warning("Need add systemApplicationsMap, Running app : ", app, desktop)