From 10ab7cc7b2cabb51cbd152c0574d5e0b542058ee Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Fri, 19 Aug 2022 17:13:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0gui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore           |  1 +
 cmd/v2/main.go       | 24 +++++++++++++++++++++---
 cmd/v2/package.bat   |  4 ----
 cmd/v2/ui/app_gen.go | 10 +++++-----
 cmd/v2/ui/ui.go      | 10 ++++++++--
 5 files changed, 35 insertions(+), 14 deletions(-)
 delete mode 100644 cmd/v2/package.bat

diff --git a/.gitignore b/.gitignore
index 9b0924393..782a02199 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ pb/proto
 cmd/luban/
 pb.bat
 cmd/v2/.cache.meta
+cmd/v2/my.db
diff --git a/cmd/v2/main.go b/cmd/v2/main.go
index 59a0cb173..c079523a1 100644
--- a/cmd/v2/main.go
+++ b/cmd/v2/main.go
@@ -8,6 +8,7 @@ import (
 	"go_dreamfactory/cmd/v2/theme"
 	"go_dreamfactory/cmd/v2/ui"
 	"io"
+	"log"
 	"os"
 
 	"fyne.io/fyne/v2"
@@ -28,6 +29,7 @@ var (
 
 //
 func init() {
+	_ = os.Setenv("FYNE_SCALE", "0.9")
 	var err error
 
 	if err = setupConfig(); err != nil {
@@ -62,9 +64,10 @@ func main() {
 	app := app.NewWithID("protocol-test-tool")
 	app.SetIcon(theme.ResourceIconPng)
 	appUI := ui.NewUI(app, configService, connService, pttService, obs)
+	// logLifecycle(app)
 
 	//创建enter
-	w := fyne.CurrentApp().NewWindow("")
+	w := fyne.CurrentApp().NewWindow("传送门")
 	w.SetContent(container.NewGridWithColumns(2,
 		widget.NewButton("工具", func() {
 			toolWindow := ui.NewToolWindow(appUI)
@@ -78,12 +81,27 @@ func main() {
 		})))
 	w.SetFixedSize(true)
 	w.Resize(fyne.NewSize(300, 100))
-	w.Show()
 	w.CenterOnScreen()
 	logrus.WithField("version", app.Metadata().Version).Info("app starting")
+	w.Show()
 	appUI.Run()
 }
 
+func logLifecycle(a fyne.App) {
+	a.Lifecycle().SetOnStarted(func() {
+		log.Println("Lifecycle: Started")
+	})
+	a.Lifecycle().SetOnStopped(func() {
+		log.Println("Lifecycle: Stopped")
+	})
+	a.Lifecycle().SetOnEnteredForeground(func() {
+		log.Println("Lifecycle: Entered Foreground")
+	})
+	a.Lifecycle().SetOnExitedForeground(func() {
+		log.Println("Lifecycle: Exited Foreground")
+	})
+}
+
 func setupPtt() (err error) {
 	pttService = service.NewPttService(connService)
 	return
@@ -121,7 +139,7 @@ func setupLogger() (err error) {
 	logrus.SetOutput(os.Stdout)
 
 	//设置output,默认为stderr,可以为任何io.Writer，比如文件*os.File
-	file, err := os.OpenFile("robot_v2.log", os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0666)
+	file, err := os.OpenFile("robot.log", os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0666)
 	writers := []io.Writer{
 		file,
 		os.Stdout}
diff --git a/cmd/v2/package.bat b/cmd/v2/package.bat
deleted file mode 100644
index 880676c07..000000000
--- a/cmd/v2/package.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-SET GOOS=windows
-SET GOARCH=amd64
-
-go build -o robot.exe
\ No newline at end of file
diff --git a/cmd/v2/ui/app_gen.go b/cmd/v2/ui/app_gen.go
index f0b3a06ef..1658251b2 100644
--- a/cmd/v2/ui/app_gen.go
+++ b/cmd/v2/ui/app_gen.go
@@ -37,17 +37,17 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
 	content.Objects = []fyne.CanvasObject{}
 
 	serverAddr := widget.NewEntry()
-	serverAddr.PlaceHolder = "服务器地址"
+	serverAddr.PlaceHolder = "服务器地址 例如: 10.0.1.11"
 
 	projectDir := widget.NewEntry()
-	projectDir.PlaceHolder = "项目目录"
+	projectDir.PlaceHolder = "项目目录 例如: E:\\projects\\workspace\\go_dreamfactory"
 
 	workDir := widget.NewEntry()
-	workDir.PlaceHolder = "LuBan目录"
+	workDir.PlaceHolder = "LuBan目录 例如: E:\\svn\\dreamworks\\client\\dreamworks\\ExcelFile"
 
 	// client
 	client := widget.NewEntry()
-	client.PlaceHolder = "配置Luban Client.exe路径"
+	client.PlaceHolder = "配置Luban Client.exe路径 例如: \\Luban.Client\\Luban.Client.exe"
 
 	//define
 	define := widget.NewEntry()
@@ -72,7 +72,7 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
 	genType.PlaceHolder = "生成类型"
 
 	if gt != nil {
-		serverAddr.Text = gt.ServerAddr //10.0.1.11
+		serverAddr.Text = gt.ServerAddr
 		projectDir.Text = gt.ProjectDir //"E:\\projects\\workspace\\go_dreamfactory"
 		workDir.Text = gt.WorkDir       // "E:\\svn\\dreamworks\\client\\dreamworks\\ExcelFile"
 		client.Text = gt.Client         //"\\Luban.Client\\Luban.Client.exe"
diff --git a/cmd/v2/ui/ui.go b/cmd/v2/ui/ui.go
index 52180f278..5580b2af4 100644
--- a/cmd/v2/ui/ui.go
+++ b/cmd/v2/ui/ui.go
@@ -3,11 +3,12 @@ package ui
 import (
 	"go_dreamfactory/cmd/v2/service"
 	"go_dreamfactory/cmd/v2/service/observer"
+	"go_dreamfactory/cmd/v2/theme"
+	"os"
 	"sync"
 
-	"go_dreamfactory/cmd/v2/theme"
-
 	"fyne.io/fyne/v2"
+	"github.com/BabySid/gobase"
 )
 
 type UI interface {
@@ -52,6 +53,11 @@ func (ui *UIImpl) AddWindow(name string, w fyne.Window) {
 }
 
 func (ui *UIImpl) Run() {
+	defer func() {
+		_ = os.Unsetenv("FYNE_SCALE")
+
+		gobase.Exit()
+	}()
 	ui.app.Run()
 }