fix: 修复笔记本插拔外接电源时,屏幕自动变为待机状态

休眠盒盖状态未更新

Log:
pms: Bug-301633

Author: ECQZXC

session/power1/lid_switch.go

@@ -50,10 +50,20 @@ func (h *LidSwitchHandler) Start() error {
 }
 
 func (h *LidSwitchHandler) onLidClosed() {
+	m := h.manager
+	m.PropsMu.Lock()
+	m.lidSwitchState = lidSwitchStateClose
+	m.PropsMu.Unlock()
+	logger.Info("Lid Closed")
 	h.onLidDelayOperate(false)
 }
 
 func (h *LidSwitchHandler) onLidOpened() {
+	m := h.manager
+	m.PropsMu.Lock()
+	m.lidSwitchState = lidSwitchStateOpen
+	m.PropsMu.Unlock()
+	logger.Info("Lid Opened")
 	h.onLidDelayOperate(true)
 }
 
@@ -93,9 +103,6 @@ func (h *LidSwitchHandler) doLidStateChanged(state bool) {
 	// 合盖
 	if !state {
 		m.setPrepareSuspend(suspendStateLidClose)
-		m.PropsMu.Lock()
-		m.lidSwitchState = lidSwitchStateClose
-		m.PropsMu.Unlock()
 		m.claimOrReleaseAmbientLight()
 
 		var lidCloseAction int32
@@ -111,9 +118,6 @@ func (h *LidSwitchHandler) doLidStateChanged(state bool) {
 		}
 	} else { // 开盖
 		m.setPrepareSuspend(suspendStateLidOpen)
-		m.PropsMu.Lock()
-		m.lidSwitchState = lidSwitchStateOpen
-		m.PropsMu.Unlock()
 		m.claimOrReleaseAmbientLight()
 
 		err := h.stopAskUser()

session/power1/manager.go

@@ -529,6 +529,10 @@ func (m *Manager) listenEventToHandleIdleOff() error {
 }
 
 func (m *Manager) doLidClosedAction(action int32) {
+	if !m.sessionActive {
+		return
+	}
+
 	switch action {
 	case powerActionShutdown:
 		m.doShutdown()