liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gui errdata

Browse Source
This commit is contained in:
wh_zcy 2023-06-06 15:09:00 +08:00
parent ee8c3927cf
commit dd41d45335
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/v2/service/connService.go
View File

@ -144,7 +144,6 @@ func (c *ConnServiceImpl) ReceiveMsg() (errdata *pb.ErrorData, msg *pb.UserMessa
msg = &pb.UserMessage{} msg = &pb.UserMessage{}
_, data, err := c.ws.ReadMessage() _, data, err := c.ws.ReadMessage()
if err != nil { if err != nil {
code = pb.ErrorCode_SystemError
logrus.Errorf("readMessage err:%v", err) logrus.Errorf("readMessage err:%v", err)
return return
} }
@ -165,10 +164,14 @@ func (c *ConnServiceImpl) handleNotify(msg *pb.UserMessage) (errdata *pb.ErrorDa
if msg.MainType == "notify" && msg.SubType == "errornotify" { if msg.MainType == "notify" && msg.SubType == "errornotify" {
rsp := &pb.NotifyErrorNotifyPush{} rsp := &pb.NotifyErrorNotifyPush{}
if !comm.ProtoUnmarshal(msg, rsp) { if !comm.ProtoUnmarshal(msg, rsp) {
code = pb.ErrorCode_PbError errdata = &pb.ErrorData{
Code: pb.ErrorCode_PbError,
}
return return
} }
code = rsp.Code errdata = &pb.ErrorData{
Code: rsp.Code,
}
return return
} }
return return

8
cmd/v2/service/pttService.go
View File

@ -78,7 +78,9 @@ func (p *PttServiceImpl) Login(sid, account string) (errdata *pb.ErrorData) {
Sid: sid, Sid: sid,
} }
if err := p.connService.SendMsg(head, req); err != nil { if err := p.connService.SendMsg(head, req); err != nil {
code = pb.ErrorCode_SystemError errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
}
logrus.WithField("err", err).Error("Login") logrus.WithField("err", err).Error("Login")
return return
} }
@ -112,7 +114,9 @@ func (p *PttServiceImpl) CreateRole(nickName string, gender, figure int32) (errd
Figure: figure, Figure: figure,
Gender: gender, Gender: gender,
}); err != nil { }); err != nil {
code = pb.ErrorCode_SystemError errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
}
logrus.WithField("err", err).Error("CreateRole") logrus.WithField("err", err).Error("CreateRole")
return return
} }

8
cmd/v2/ui/mainwindow.go
View File

@ -297,8 +297,8 @@ func (ui *MainWindowImpl) createLoginWin(sid, sname string) {
ui.tb.toolbar.Hide() ui.tb.toolbar.Hide()
// call after ui.createWindowContainer // call after ui.createWindowContainer
ui.connService.ListenerPush() ui.connService.ListenerPush()
if code := ui.pttService.Login(sid, account.Text); errdata != nil { if errdata := ui.pttService.Login(sid, account.Text); errdata != nil {
err := fmt.Errorf("login err: %v[%d]", code, int32(code)) err := fmt.Errorf("login err: %v[%d]", errdata, int32(errdata.Code))
dialog.ShowError(err, ui.w) dialog.ShowError(err, ui.w)
} else { } else {
ui.obs.AddListener(observer.EVENT_REQ_RSP, observer.Listener{ ui.obs.AddListener(observer.EVENT_REQ_RSP, observer.Listener{
@ -417,8 +417,8 @@ func (ui *MainWindowImpl) createRoleWindowPopUp() {
d := dialog.NewForm(common.FORM_TITLE_CREATEROLE, common.BUTTON_OK, common.BUTTON_CANCEL, items, func(b bool) { d := dialog.NewForm(common.FORM_TITLE_CREATEROLE, common.BUTTON_OK, common.BUTTON_CANCEL, items, func(b bool) {
if nickname.Text != "" { if nickname.Text != "" {
logrus.WithField("nickname", nickname.Text).Debug("submit crete role") logrus.WithField("nickname", nickname.Text).Debug("submit crete role")
if code := ui.pttService.CreateRole(nickname.Text, gender, cast.ToInt32(figure.Text)); errdata != nil { if errdata := ui.pttService.CreateRole(nickname.Text, gender, cast.ToInt32(figure.Text)); errdata != nil {
err := fmt.Errorf("login err: %v[%d]", code, int32(code)) err := fmt.Errorf("login err: %v[%d]", errdata, int32(errdata.Code))
dialog.ShowError(err, ui.w) dialog.ShowError(err, ui.w)
} else { } else {
user := ui.pttService.GetUser() user := ui.pttService.GetUser()