From ec63f234fcf0560939d2a438c273129c04942e3d Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Thu, 8 Dec 2022 11:36:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B7=A5=E5=85=B7=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/v2/ui/perf_pb.go | 13 ++----------- cmd/v2/ui/perf_result.go | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/cmd/v2/ui/perf_pb.go b/cmd/v2/ui/perf_pb.go index 015525272..b46a909c5 100644 --- a/cmd/v2/ui/perf_pb.go +++ b/cmd/v2/ui/perf_pb.go @@ -97,14 +97,7 @@ func (app *perfPb) LazyInit(ptService service.PttService, obs observer.Observer) reqData []byte err error ) - // if data.Route == "user.login" { - // login, err = app.loginReq() - // if err != nil { - // logrus.Error(err) - // continue - // } - // reqData = login.req - // } else { + if login == nil { continue } @@ -123,9 +116,7 @@ func (app *perfPb) LazyInit(ptService service.PttService, obs observer.Observer) continue } } - } - // } handler.SetReq(reqData, false) assist := app.createAssistant(handler) @@ -137,7 +128,7 @@ func (app *perfPb) LazyInit(ptService service.PttService, obs observer.Observer) // time.Sleep(time.Second) } - logrus.Info("所有用户执行完毕...") + obs.Notify(observer.EVENT_FINISH, true) } diff --git a/cmd/v2/ui/perf_result.go b/cmd/v2/ui/perf_result.go index d2b1072f1..470d33020 100644 --- a/cmd/v2/ui/perf_result.go +++ b/cmd/v2/ui/perf_result.go @@ -25,7 +25,9 @@ type perfResult struct { resultList func() //结果列表 resetBtn *widget.Button + returnBtn *widget.Button report *widget.Card + layout *fyne.Container } func (app *perfResult) LazyInit(ptService service.PttService, obs observer.Observer) error { @@ -49,21 +51,24 @@ func (app *perfResult) LazyInit(ptService service.PttService, obs observer.Obser } // 返回 - returnBtn := widget.NewButtonWithIcon("返回", theme.NavigateBackIcon(), nil) - returnBtn.OnTapped = func() { + app.returnBtn = widget.NewButtonWithIcon("", theme.NavigateBackIcon(), nil) + app.returnBtn.Disable() + app.returnBtn.OnTapped = func() { defer openApp3(perfWin.tabs, common.TOOLBAR_PERF_CHOOSE) app.itemList.Reset() closeApp3(perfWin.tabs, common.TOOLBAR_PERF_RES) } + app.returnBtn.Text = "等待中..." //统计Panel app.report = widget.NewCard("测试报告", "登录/创角", container.NewVBox( // widget.NewLabel("结果:"), )) app.report.Hide() + //layout - c := container.NewBorder(app.report, container.NewHBox(layout.NewSpacer(), app.resetBtn, returnBtn), nil, nil, app.itemList.ItemList) - content.Objects = append(content.Objects, c) + app.layout = container.NewBorder(app.report, container.NewHBox(layout.NewSpacer(), app.resetBtn, app.returnBtn), nil, nil, app.itemList.ItemList) + content.Objects = append(content.Objects, app.layout) app.tabItem.Content = content app.listen() return nil @@ -76,12 +81,17 @@ func (app *perfResult) listen() { if !ok { return } + item := common.Item{ Text: fmt.Sprintf("协议名称:%s, 调用次数:%d, 总耗时:%vms, 平均耗时:%vms, 最大耗时:%vms, 最小耗时:%vms", res.Route, res.CallCount, res.ElapseTotal, res.AvgElapse, res.MaxElapse, res.MinElapse), Data: res, } app.itemList.AddItem(item) + app.returnBtn.Text = "返回" + app.returnBtn.Enable() + app.returnBtn.Refresh() + app.layout.Refresh() }, })