From 437eca5b2481dcd90375146805a88162926a6188 Mon Sep 17 00:00:00 2001
From: fuleyi <fuleyi@uniontech.com>
Date: Fri, 15 Nov 2024 16:41:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3power=E7=9A=84dconfig?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=9D=E5=A7=8B=E5=8C=96=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

display的dconfig配置不存在，power的配置初始化流程没有继续运行
---
 session/power1/manager.go | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/session/power1/manager.go b/session/power1/manager.go
index fa07354b8..af27ce7e1 100644
--- a/session/power1/manager.go
+++ b/session/power1/manager.go
@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	dutils "github.com/linuxdeepin/go-lib/utils"
 
 	"os"
 	"sync"
@@ -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
@@ -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
@@ -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: