From 2856f187280667418e39141a0e67efcbb31a3177 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Tue, 27 Sep 2022 11:08:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E8=AF=95GUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/v2/FyneApp.toml           |  4 ++--
 cmd/v2/service/sshService.go  |  2 +-
 cmd/v2/ui/protocol.go         | 13 ++++++++++++-
 cmd/v2/ui/views/rtask_list.go |  2 +-
 modules/rtask/api_tasktest.go | 11 +++++++----
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/cmd/v2/FyneApp.toml b/cmd/v2/FyneApp.toml
index 07e5f7980..bbc3df470 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.0.8"
-  Build = 9
+  Version = "1.0.9"
+  Build = 10
diff --git a/cmd/v2/service/sshService.go b/cmd/v2/service/sshService.go
index 848f57bf6..2beefd12c 100644
--- a/cmd/v2/service/sshService.go
+++ b/cmd/v2/service/sshService.go
@@ -113,7 +113,7 @@ func (ss *SSHService) RunShell(shell string) {
 }
 
 //单个copy
-func (ss *SSHService) ScpCopy(localFilePath, remoteDir string) error {
+func (ss *SSHService) ScpCopy(localFilePath, remoteDir string) error {	
 	var (
 		err error
 	)
diff --git a/cmd/v2/ui/protocol.go b/cmd/v2/ui/protocol.go
index 2c14144ce..8508b899f 100644
--- a/cmd/v2/ui/protocol.go
+++ b/cmd/v2/ui/protocol.go
@@ -21,6 +21,7 @@ import (
 
 	"fyne.io/fyne/v2"
 	"github.com/sirupsen/logrus"
+	"github.com/spf13/cast"
 	"google.golang.org/protobuf/proto"
 )
 
@@ -187,7 +188,7 @@ var (
 			ff(comm.ModuleRtask, rtask.RtaskSubTypeApply),
 			ff(comm.ModuleRtask, rtask.RtaskSubTypeChoose),
 			ff(comm.ModuleRtask, rtask.RtaskSubTypeReward),
-			
+
 			ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleStart),
 			ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleFinish),
 			ff(comm.ModuleRtask, rtask.RtaskSubTypeGetrecord),
@@ -642,6 +643,16 @@ var (
 			MainType: string(comm.ModuleRtask),
 			SubType:  rtask.RtaskSubTypeList,
 			Enabled:  true,
+			Print: func(rsp proto.Message) string {
+				if in, ok := rsp.(*pb.UserMessage); ok {
+					out := &pb.RtasklistResp{}
+					if !comm.ProtoUnmarshal(in, out) {
+						return errors.New("unmarshal err").Error()
+					}
+					return strings.Join(cast.ToStringSlice(out.RtaskIds), ",")
+				}
+				return ""
+			},
 		},
 		ff(comm.ModuleRtask, rtask.RtaskSubTypeApply): {
 			NavLabel: "做任务",
diff --git a/cmd/v2/ui/views/rtask_list.go b/cmd/v2/ui/views/rtask_list.go
index 314082dfb..9883020a5 100644
--- a/cmd/v2/ui/views/rtask_list.go
+++ b/cmd/v2/ui/views/rtask_list.go
@@ -34,7 +34,7 @@ func (this *RtaskListView) CreateView(t *model.TestCase) fyne.CanvasObject {
 	this.form.AppendItem(widget.NewFormItem("", input))
 
 	res := widget.NewEntry()
-	res.PlaceHolder = "已完成任务列表"
+	res.PlaceHolder = "已完成任务列表 ,号分隔"
 	this.form.AppendItem(widget.NewFormItem("", res))
 
 	// task list button
diff --git a/modules/rtask/api_tasktest.go b/modules/rtask/api_tasktest.go
index 0d9cfc7f8..b43916ca1 100644
--- a/modules/rtask/api_tasktest.go
+++ b/modules/rtask/api_tasktest.go
@@ -31,13 +31,16 @@ func (this *apiComp) Rtest(session comm.IUserSession, req *pb.RtaskTestReq) (cod
 		}
 
 		rtaskIds := make([]int32, 0)
+		ids := strings.Split(req.RtaskIds, ",")
+		for _, id := range ids {
+			rtaskIds = append(rtaskIds, cast.ToInt32(id))
+		}
 
 		if v, ok := rtask.FrtaskIds[req.GroupId]; ok {
-			ids := strings.Split(req.RtaskIds, ",")
-			for _, id := range ids {
-				rtaskIds = append(rtaskIds, cast.ToInt32(id))
-			}
 			v.RtaskIds = rtaskIds
+		} else {
+			rtask.FrtaskIds = make(map[int32]*pb.FrtaskIds)
+			rtask.FrtaskIds[req.GroupId] = &pb.FrtaskIds{RtaskIds: rtaskIds}
 		}
 
 		update := map[string]interface{}{