From d9bc2c9e991b2fe925565dfd7d0ec667b64bb52f Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 17 八月 2023 16:01:02 +0800
Subject: [PATCH] 完成bom上报
---
gui/gui.go | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/gui/gui.go b/gui/gui.go
index 048655f..50080f0 100644
--- a/gui/gui.go
+++ b/gui/gui.go
@@ -1,15 +1,12 @@
package gui
import (
- "kingdee-dbapi/logger"
- "kingdee-dbapi/nsqclient"
"strings"
"kingdee-dbapi/config"
"kingdee-dbapi/kingdee"
- "kingdee-dbapi/report"
+ "kingdee-dbapi/logger"
"kingdee-dbapi/static"
- "kingdee-dbapi/webserver"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/app"
@@ -25,8 +22,9 @@
FullScreen bool
}
-func NewDisplay() *Display {
+func NewDisplay(dbConnectedChan chan bool) *Display {
a := app.New()
+
// 璁剧疆鍥炬爣
a.SetIcon(static.IconPng)
@@ -65,6 +63,7 @@
// //myWindow.Close()
//},
}
+
var submitBtn *widget.Button
submitBtn = widget.NewButtonWithIcon("鍚姩", theme.MailSendIcon(), func() {
config.Options.WebPort = strings.Trim(serverPort.Text, " ")
@@ -80,22 +79,13 @@
if err != nil {
logger.Error("db init error:%s", err.Error())
dialog.ShowError(err, w)
-
- if !config.Options.Debug {
- return
- }
}
form.Disable()
submitBtn.Text = "宸插惎鍔�"
submitBtn.Disable()
- report.StartReport()
-
- // 寮�鍚闃�
- go nsqclient.InitNsqConsumer(config.Options.QueryTopic, "sensor01", kingdee.QueryMsgHandle)
-
- go webserver.Serve(serverPort.Text)
+ dbConnectedChan <- true
})
content := container.New(layout.NewGridWrapLayout(fyne.NewSize(300, 200)), form)
--
Gitblit v1.8.0