Skip to content

fix: 解决power的dconfig配置初始化失败的问题 #682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fly602 merged 1 commit into from
Nov 16, 2024
Merged

fix: 解决power的dconfig配置初始化失败的问题 #682

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions session/power1/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"encoding/json"
"errors"
"fmt"
dutils "github.com/linuxdeepin/go-lib/utils"

"os"
"sync"
Expand All @@ -34,7 +35,6 @@ import (
"github.com/linuxdeepin/go-lib/dbusutil"
"github.com/linuxdeepin/go-lib/dbusutil/gsprop"
"github.com/linuxdeepin/go-lib/gettext"
dutils "github.com/linuxdeepin/go-lib/utils"
)

//go:generate dbusutil-gen -type Manager manager.go
Expand Down Expand Up @@ -627,22 +627,21 @@ func (m *Manager) initDsg() {
return
}

dsg := configManager.NewConfigManager(systemBus)
if !dutils.IsFileExist("/usr/share/dsg/configs/org.deepin.startdde/org.deepin.Display.json") {
logger.Warning(" [initDsg] dconfig file not exist : /usr/share/dsg/configs/org.deepin.startdde/org.deepin.Display.json.")
return
}
dsg := configManager.NewConfigManager(systemBus)

// display
displayConfigManagerPath, err := dsg.AcquireManager(0, DSettingsAppID, DSettingsDisplayName, "")
if err != nil {
logger.Warning(err)
return
}
} else {
// display
displayConfigManagerPath, err := dsg.AcquireManager(0, DSettingsAppID, DSettingsDisplayName, "")
if err != nil {
logger.Warning(err)
return
}

m.dsDisplayConfigManager, err = configManager.NewManager(systemBus, displayConfigManagerPath)
if err != nil || displayConfigManagerPath == "" {
logger.Warning(err)
m.dsDisplayConfigManager, err = configManager.NewManager(systemBus, displayConfigManagerPath)
if err != nil || displayConfigManagerPath == "" {
logger.Warning(err)
}
}

// power
Expand Down Expand Up @@ -676,15 +675,15 @@ func (m *Manager) initDsg() {
logger.Info("Set CustomShutdownWeekDays property", m.CustomShutdownWeekDays)
}
case dsettingShutdownCountdown:
m.shutdownCountdown = int(data.Value().(float64))
m.shutdownCountdown = int(data.Value().(int64))
case dsettingNextShutdownTime:
m.nextShutdownTime = int64(data.Value().(float64))
m.nextShutdownTime = int64(data.Value().(int64))
case dsettingShutdownRepetition:
if init {
m.ShutdownRepetition = int(data.Value().(float64))
m.ShutdownRepetition = int(data.Value().(int64))
return
}
if m.setPropShutdownRepetition(int(data.Value().(float64))) {
if m.setPropShutdownRepetition(int(data.Value().(int64))) {
logger.Info("Set ShutdownRepetition property", m.ShutdownRepetition)
}
case dsettingShutdownTime:
Expand Down