Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
ec3610dc6e
@ -104,9 +104,9 @@ func (c *ConnServiceImpl) ListenerPush() {
|
|||||||
DataTime: time.Now().Format(time.RFC3339),
|
DataTime: time.Now().Format(time.RFC3339),
|
||||||
Msg: msg,
|
Msg: msg,
|
||||||
}
|
}
|
||||||
logrus.WithFields(
|
// logrus.WithFields(
|
||||||
logrus.Fields{"MainType": msg.MainType, "SubType": msg.SubType},
|
// logrus.Fields{"MainType": msg.MainType, "SubType": msg.SubType},
|
||||||
).Debug(methodName)
|
// ).Debug(methodName)
|
||||||
|
|
||||||
renderRespPanel := func(p *model.PushModel) {
|
renderRespPanel := func(p *model.PushModel) {
|
||||||
c.obs.Notify(observer.EVENT_REQ_RSP, p.Msg)
|
c.obs.Notify(observer.EVENT_REQ_RSP, p.Msg)
|
||||||
|
@ -22,6 +22,8 @@ type PttService interface {
|
|||||||
GetUser() *UserInfo
|
GetUser() *UserInfo
|
||||||
SetUser(dbUser *pb.DBUser, dbUserExpand *pb.DBUserExpand)
|
SetUser(dbUser *pb.DBUser, dbUserExpand *pb.DBUserExpand)
|
||||||
SendToClient(mainType, subType string, rsp proto.Message) error
|
SendToClient(mainType, subType string, rsp proto.Message) error
|
||||||
|
|
||||||
|
Ping(sid, account string)
|
||||||
}
|
}
|
||||||
|
|
||||||
type PttServiceImpl struct {
|
type PttServiceImpl struct {
|
||||||
@ -85,6 +87,15 @@ func (p *PttServiceImpl) Login(sid, account string) (code pb.ErrorCode) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p *PttServiceImpl) Ping(sid, account string) {
|
||||||
|
head := &pb.UserMessage{MainType: string(comm.ModuleGate), SubType: "heartbeat"}
|
||||||
|
head.Sec = common.BuildSecStr(sid, account)
|
||||||
|
if err := p.connService.SendMsg(head, &pb.GatewayHeartbeatReq{}); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// create role
|
// create role
|
||||||
func (p *PttServiceImpl) CreateRole(nickName string, gender, figure int32) (code pb.ErrorCode) {
|
func (p *PttServiceImpl) CreateRole(nickName string, gender, figure int32) (code pb.ErrorCode) {
|
||||||
head := &pb.UserMessage{MainType: string(comm.ModuleUser), SubType: user.UserSubTypeCreate}
|
head := &pb.UserMessage{MainType: string(comm.ModuleUser), SubType: user.UserSubTypeCreate}
|
||||||
|
@ -10,6 +10,7 @@ import (
|
|||||||
"go_dreamfactory/modules/user"
|
"go_dreamfactory/modules/user"
|
||||||
"go_dreamfactory/pb"
|
"go_dreamfactory/pb"
|
||||||
"strings"
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
"fyne.io/fyne/v2"
|
"fyne.io/fyne/v2"
|
||||||
"fyne.io/fyne/v2/container"
|
"fyne.io/fyne/v2/container"
|
||||||
@ -312,6 +313,14 @@ func (ui *MainWindowImpl) createLoginWin(sid, sname string) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
timer := time.NewTimer(10 * time.Second)
|
||||||
|
for {
|
||||||
|
timer.Reset(10 * time.Second)
|
||||||
|
<-timer.C
|
||||||
|
ui.pttService.Ping(sid, account.Text)
|
||||||
|
}
|
||||||
|
}()
|
||||||
// reset main window title
|
// reset main window title
|
||||||
subTitle := fmt.Sprintf("%s[%s]", sname, sid)
|
subTitle := fmt.Sprintf("%s[%s]", sname, sid)
|
||||||
ui.w.SetTitle(fmt.Sprintf(common.APP_WIN_TITLE, subTitle, ui.app.Metadata().Version, ui.app.Metadata().Build, common.APP_NAME))
|
ui.w.SetTitle(fmt.Sprintf(common.APP_WIN_TITLE, subTitle, ui.app.Metadata().Version, ui.app.Metadata().Build, common.APP_NAME))
|
||||||
|
Loading…
Reference in New Issue
Block a user