ui calculator

client/background.go

@@ -1,6 +1,7 @@
 package client
 
 import (
+	"fmt"
 	"time"
 
 	gerr "galaxy/error"
@@ -9,10 +10,11 @@ import (
 var (
 	checkConnectionInterval = 5 * time.Second
 	checkVersionInterval    = time.Hour
+	statePersistInterval    = time.Second
 )
 
 func (e *client) startBackground() {
-	if e.fullConnector == nil && e.updater == nil {
+	if e.conn == nil || e.updater == nil {
 		return
 	}
 
@@ -28,9 +30,11 @@ func (e *client) stopBackground() {
 func (e *client) backgroundLoop() {
 	checkConnTimer := time.NewTimer(checkConnectionInterval)
 	checkVersionTimer := time.NewTimer(checkVersionInterval)
+	persistStateTimer := time.NewTimer(statePersistInterval)
 	defer func() {
 		checkConnTimer.Stop()
 		checkVersionTimer.Stop()
+		persistStateTimer.Stop()
 	}()
 
 	for {
@@ -38,8 +42,8 @@ func (e *client) backgroundLoop() {
 		case <-e.backgroundStop:
 			return
 		case <-checkConnTimer.C:
-			if e.fullConnector != nil {
-				e.OnConnection(e.fullConnector.CheckConnection())
+			if e.conn != nil {
+				e.OnConnection(e.conn.CheckConnection())
 			}
 			checkConnTimer.Reset(checkConnectionInterval)
 		case <-checkVersionTimer.C:
@@ -49,15 +53,58 @@ func (e *client) backgroundLoop() {
 				}
 			}
 			checkVersionTimer.Reset(checkVersionInterval)
+		case <-persistStateTimer.C:
+			e.ensureStatePersist()
+			persistStateTimer.Reset(statePersistInterval)
 		}
 	}
 }
 
+func (e *client) ensureStatePersist() {
+	param := e.GetParams()
+	needSaving := false
+	e.stateMu.Lock()
+	if e.world != nil {
+		if param.CameraZoom > 0 && param.CameraZoom != e.state.CameraZoom {
+			e.state.CameraZoom = param.CameraZoom
+			needSaving = true
+		}
+		if param.CameraXWorldFp != e.state.CameraXFp {
+			e.state.CameraXFp = param.CameraXWorldFp
+			needSaving = true
+		}
+		if param.CameraYWorldFp != e.state.CameraYFp {
+			e.state.CameraYFp = param.CameraYWorldFp
+			needSaving = true
+		}
+	}
+	if e.mapSplitter != nil && e.mapSplitter.Offset != e.state.MapSplitterOffset {
+		e.state.MapSplitterOffset = e.mapSplitter.Offset
+		needSaving = true
+	}
+	if e.accInfo.Open != e.state.AccordionInfoOpen {
+		e.state.AccordionInfoOpen = e.accInfo.Open
+		needSaving = true
+	}
+	if e.accCalc.Open != e.state.AccordionCalcOpen {
+		e.state.AccordionCalcOpen = e.accCalc.Open
+		needSaving = true
+	}
+	if needSaving {
+		if err := e.s.SaveState(*e.state); err != nil {
+			e.handlerError(err)
+		}
+	}
+	e.stateMu.Unlock()
+}
+
 func (e *client) handlerError(err error) {
 	if err == nil {
 		return
 	}
 
+	fmt.Printf("ERROR: %s\n", err)
+
 	switch {
 	case gerr.IsConnection(err):
 		e.OnConnectionError(err)