From 05c72e823f9b66eed7ead275d48a2fe15c27ce89 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Sat, 7 Jan 2023 19:00:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/v2/FyneApp.toml              |  4 ++--
 cmd/v2/lib/storage/config.go     | 14 +++++++++++++-
 cmd/v2/lib/storage/storage_os.go |  6 +++---
 cmd/v2/ui/mainwindow.go          | 13 +++++++++----
 cmd/v2/ui/ui.go                  |  6 +++---
 5 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/cmd/v2/FyneApp.toml b/cmd/v2/FyneApp.toml
index ece785254..98ebc255e 100644
--- a/cmd/v2/FyneApp.toml
+++ b/cmd/v2/FyneApp.toml
@@ -4,5 +4,5 @@ Website = "http://legu.cc"
   Icon = "app.png"
   Name = "RobotGUI"
   ID = "cc.legu.app"
-  Version = "1.2.4"
-  Build = 32
+  Version = "1.2.6"
+  Build = 34
diff --git a/cmd/v2/lib/storage/config.go b/cmd/v2/lib/storage/config.go
index d811d7f34..e5e1f6788 100644
--- a/cmd/v2/lib/storage/config.go
+++ b/cmd/v2/lib/storage/config.go
@@ -1,7 +1,7 @@
 package storage
 
 //默认配置
-func newDefaultConfig() *Config {
+func NewDefaultConfig() *Config {
 	return &Config{
 		Pressure: PressureConfig{
 			TimeoutMs:   50,
@@ -10,6 +10,18 @@ func newDefaultConfig() *Config {
 		},
 		UserCount:  100,
 		UpgradeUrl: "http://10.0.0.9:8080/",
+		Servers: []*ServerConfig{
+			{
+				SId:  "df01",
+				Url:  "ws://119.3.89.14:9891/gateway",
+				Name: "外网",
+			},
+			{
+				SId:  "df01",
+				Url:  "ws://10.0.0.9:7891/gateway",
+				Name: "测试服",
+			},
+		},
 	}
 }
 
diff --git a/cmd/v2/lib/storage/storage_os.go b/cmd/v2/lib/storage/storage_os.go
index f363b41fd..4ba596075 100644
--- a/cmd/v2/lib/storage/storage_os.go
+++ b/cmd/v2/lib/storage/storage_os.go
@@ -49,11 +49,11 @@ func (s *OSStorage) LoadConfig() (*Config, error) {
 	configFile := configPath(s)
 	f, err := os.Open(configFile)
 	if os.IsNotExist(err) {
-		return newDefaultConfig(), nil
+		return NewDefaultConfig(), nil
 	}
 
 	if err != nil {
-		return newDefaultConfig(), fmt.Errorf("没有读到 URI:%w", err)
+		return NewDefaultConfig(), fmt.Errorf("没有读到 URI:%w", err)
 	}
 
 	defer f.Close()
@@ -61,7 +61,7 @@ func (s *OSStorage) LoadConfig() (*Config, error) {
 	config := &Config{}
 	err = json.NewDecoder(f).Decode(config)
 	if err != nil {
-		return newDefaultConfig(), err
+		return NewDefaultConfig(), err
 	}
 	return config, nil
 }
diff --git a/cmd/v2/ui/mainwindow.go b/cmd/v2/ui/mainwindow.go
index a10135256..7cc1d1c54 100644
--- a/cmd/v2/ui/mainwindow.go
+++ b/cmd/v2/ui/mainwindow.go
@@ -213,9 +213,14 @@ func (ui *MainWindowImpl) createChooseServerWindow(title string, ch chan string)
 	}
 
 	sGrid := container.NewGridWithColumns(2)
-	servers := ui.config.Servers
-	if len(servers) != 0 {
-		for _, s := range servers {
+
+	if len(ui.config.Servers) == 0 {
+		c := storage.NewDefaultConfig()
+		ui.config.Servers = append(ui.config.Servers, c.Servers...)
+	}
+
+	if len(ui.config.Servers) != 0 {
+		for _, s := range ui.config.Servers {
 			box := makeButton(s, w)
 			sGrid.Add(container.NewBorder(nil, nil, nil, widget.NewButtonWithIcon("", theme.DeleteIcon(), func() {
 				defer func() {
@@ -223,7 +228,7 @@ func (ui *MainWindowImpl) createChooseServerWindow(title string, ch chan string)
 					ui.parent.Show()
 				}()
 				txt := box.Text
-				for i, ss := range servers {
+				for i, ss := range ui.config.Servers {
 					if txt == ss.Name {
 						ui.config.Servers = append(ui.config.Servers[:i], ui.config.Servers[i+1:]...)
 						i--
diff --git a/cmd/v2/ui/ui.go b/cmd/v2/ui/ui.go
index 57ef7a3eb..171f3055b 100644
--- a/cmd/v2/ui/ui.go
+++ b/cmd/v2/ui/ui.go
@@ -41,14 +41,14 @@ func NewUI(app fyne.App,
 ) (*UIImpl, error) {
 	app.Settings().SetTheme(&theme.MyTheme{})
 
-	storage, err := storage.NewOSStorage()
+	iStorage, err := storage.NewOSStorage()
 	if err != nil {
 		logrus.Errorf("new storage err:%v", err)
 		return nil, err
 	}
 
 	// 加载配置
-	config, err := storage.LoadConfig()
+	config, err := iStorage.LoadConfig()
 	if err != nil {
 		logrus.Errorf("Load config err:%v", err)
 		return nil, err
@@ -61,7 +61,7 @@ func NewUI(app fyne.App,
 		connService:   connService,
 		pttService:    pttService,
 		obs:           obs,
-		storage:       storage,
+		storage:       iStorage,
 		config:        config,
 	}, nil
 }