fix(display): Touch screen config becomes empty after

unplugging/replugging and canceling mapping dialog

- Fixes the issue where the touch screen configuration in the
control center becomes empty after unplugging/replugging the device
and clicking "Cancel" in the mapping dialog
- Optimized touch screen mapping management logic
- Added debug logs for tracking mapping updates and cleanup
- During early system startup, the window manager may not be fully
 ready. Add a 5-second cooldown period to ensure the touchscreen
 configuration dialog is shown after the window manager is stable

---

fix(display): 在插拔触控屏并取消映射对话框后，触摸屏配置为空

- 修复了在拔插触控屏设备后，若在映射对话框中点击“取消”，会导致控
 制中心内的触摸屏配置变为空的问题
- 优化触摸屏映射管理逻辑
- 增加调试日志，便于跟踪映射更新与清理过程
- 在系统启动早期，窗口管理器功能尚未完善，过早调用触摸屏配置对话
 框可能导致显示异常。新增 5 秒冷却期机制，确保窗口管理器就绪后再
 弹出对话框

PMS: BUG-275135
Log: 修复拔插触控屏，点击取消后，控制中心触控屏配置为空问题
Influence: 控制中心->设备->触控屏

Author: electricface

display1/manager.go

@@ -95,7 +95,8 @@ const (
 	defaultTemperatureManual     = 6500
 	defaultRotateScreenTimeDelay = 500
 
-	cmdTouchscreenDialogBin = "/usr/lib/deepin-daemon/dde-touchscreen-dialog"
+	touchscreenDialogCooldownSeconds = 5 // Seconds to wait for window manager ready
+	cmdTouchscreenDialogBin          = "/usr/lib/deepin-daemon/dde-touchscreen-dialog"
 )
 
 const (
@@ -200,8 +201,10 @@ type Manager struct {
 	TouchMap       map[string]string
 	touchscreenMap map[string]touchscreenMapValue
 	// touch.uuid -> touchScreenDialog cmd
-	touchScreenDialogMap   map[string]*exec.Cmd
-	touchScreenDialogMutex sync.RWMutex
+	touchScreenDialogMap        map[string]*exec.Cmd
+	touchScreenDialogMutex      sync.RWMutex
+	touchScreenDialogDelayTimer *time.Timer
+	touchScreenDialogReady      bool
 
 	CurrentCustomId        string
 	Primary                string
@@ -2428,6 +2431,18 @@ func (m *Manager) removeTouchscreenByDeviceNode(deviceNode string) {
 }
 
 func (m *Manager) initTouchscreens() {
+	// Start cooldown timer for touchscreen dialog
+	// Wait for window manager to be ready before showing dialogs
+	logger.Debugf("initTouchscreens: start %ds cooldown for touchscreen dialog", touchscreenDialogCooldownSeconds)
+	m.touchScreenDialogDelayTimer = time.AfterFunc(touchscreenDialogCooldownSeconds*time.Second, func() {
+		m.touchScreenDialogMutex.Lock()
+		m.touchScreenDialogReady = true
+		m.touchScreenDialogMutex.Unlock()
+		logger.Debug("initTouchscreens: cooldown ended, touchscreen dialog ready")
+		// Show dialogs for touchscreens without config
+		m.showTouchscreenDialogs()
+	})
+
 	_, err := m.dbusDaemon.ConnectNameOwnerChanged(func(name, oldOwner, newOwner string) {
 		if name == m.inputDevices.ServiceName_() && newOwner == "" {
 			m.setPropTouchscreens(nil)
@@ -2610,14 +2625,23 @@ func (m *Manager) updateTouchscreenMap(outputName string, touchUUID string, auto
 		logger.Warning(err)
 	}
 
+	logger.Debugf("updateTouchscreenMap: %s -> %s", touchUUID, outputName)
 	m.TouchMap[touchUUID] = outputName
-
 	err = m.emitPropChangedTouchMap(m.TouchMap)
 	if err != nil {
 		logger.Warning("failed to emit TouchMap PropChanged:", err)
 	}
 }
 
+func (m *Manager) pureUpdateTouchMap(outputName string, touchUUID string) {
+	logger.Debugf("pureUpdateTouchMap: %s -> %s", touchUUID, outputName)
+	m.PropsMu.Lock()
+	defer m.PropsMu.Unlock()
+
+	m.TouchMap[touchUUID] = outputName
+	m.emitPropChangedTouchMap(m.TouchMap)
+}
+
 func (m *Manager) associateTouch(monitor *Monitor, touchUUID string, auto bool) error {
 	m.PropsMu.Lock()
 	defer m.PropsMu.Unlock()
@@ -2859,6 +2883,7 @@ func (m *Manager) handleTouchscreenChanged() {
 				if err != nil {
 					logger.Warning("failed to map touchscreen:", err)
 				}
+				m.pureUpdateTouchMap(monitor.Name, touch.UUID)
 				continue
 			}
 		}
@@ -2919,6 +2944,39 @@ func (m *Manager) handleTouchscreenChanged() {
 			if err != nil {
 				logger.Warning("failed to map touchscreen:", err)
 			}
+			m.pureUpdateTouchMap(monitor.Name, touch.UUID)
+		}
+	}
+
+	m.cleanupStaleTouchMap()
+}
+
+// cleanupStaleTouchMap removes stale touchscreen mappings from TouchMap
+func (m *Manager) cleanupStaleTouchMap() {
+	m.PropsMu.Lock()
+	defer m.PropsMu.Unlock()
+
+	// Build set of currently existing touchscreen UUIDs
+	existingUUIDs := make(map[string]bool)
+	for _, touch := range m.Touchscreens {
+		existingUUIDs[touch.UUID] = true
+	}
+
+	// Check and remove UUIDs that no longer exist in TouchMap
+	updated := false
+	for touchUUID := range m.TouchMap {
+		if !existingUUIDs[touchUUID] {
+			logger.Debugf("remove stale touchscreen UUID from TouchMap: %s", touchUUID)
+			delete(m.TouchMap, touchUUID)
+			updated = true
+		}
+	}
+
+	// Emit property changed signal if any deletion occurred
+	if updated {
+		err := m.emitPropChangedTouchMap(m.TouchMap)
+		if err != nil {
+			logger.Warning("failed to emit TouchMap PropChanged:", err)
 		}
 	}
 }
@@ -2946,15 +3004,38 @@ func (m *Manager) initScreenRotation() {
 	}
 }
 
-// 检查当前连接的所有触控面板, 如果没有映射配置, 那么调用 OSD 弹窗.
+// showTouchscreenDialogs checks all connected touchscreens, if no mapping config exists, show OSD dialog.
 func (m *Manager) showTouchscreenDialogs() {
+	m.touchScreenDialogMutex.RLock()
+	ready := m.touchScreenDialogReady
+	m.touchScreenDialogMutex.RUnlock()
+
+	if !ready {
+		logger.Debug("showTouchscreenDialogs: skip, still in cooldown period")
+		return
+	}
+
+	m.doShowTouchscreenDialogs()
+}
+
+// doShowTouchscreenDialogs actually shows dialogs for touchscreens without config.
+func (m *Manager) doShowTouchscreenDialogs() {
+	// Collect touchscreens that need configuration
+	m.PropsMu.RLock()
+	var touchscreensNeedConfig []*Touchscreen
 	for _, touch := range m.Touchscreens {
 		if _, ok := m.touchscreenMap[touch.UUID]; !ok {
-			logger.Debug("cannot find touchscreen", touch.UUID, "'s configure, show OSD")
-			err := m.showTouchscreenDialog(touch.UUID)
-			if err != nil {
-				logger.Warning("shotTouchscreenOSD", err)
-			}
+			touchscreensNeedConfig = append(touchscreensNeedConfig, touch)
+		}
+	}
+	m.PropsMu.RUnlock()
+
+	// Show dialogs for touchscreens without config
+	for _, touch := range touchscreensNeedConfig {
+		logger.Debugf("cannot find touchscreen %s configuration, show touchscreen dialog", touch.UUID)
+		err := m.showTouchscreenDialog(touch.UUID)
+		if err != nil {
+			logger.Warning("failed to show touchscreen dialog", err)
 		}
 	}
 }