|
@@ -124,7 +124,6 @@ func (c *Client) closeConnection() {
|
|
|
_ = c.conn.Close()
|
|
|
c.conn = nil
|
|
|
close(c.closeChan)
|
|
|
- c.SetId("")
|
|
|
c.isReg = false
|
|
|
if c.closeHandler != nil {
|
|
|
c.closeHandler(c.Id, c)
|
|
@@ -226,9 +225,6 @@ func (c *Client) SendGetAddress() error {
|
|
|
if !c.isReg {
|
|
|
c.SetId(gbinary.DecodeToString(receiveBuf))
|
|
|
c.isReg = true
|
|
|
- if c.regHandler != nil {
|
|
|
- c.regHandler(c.Id, c)
|
|
|
- }
|
|
|
break
|
|
|
}
|
|
|
_, err = c.srv.message.Decode(c.packetContext, receiveBuf)
|
|
@@ -237,6 +233,9 @@ func (c *Client) SendGetAddress() error {
|
|
|
return err
|
|
|
}
|
|
|
c.SetId(c.packetContext.GetDeviceId())
|
|
|
+ if c.regHandler != nil {
|
|
|
+ c.regHandler(c.Id, c)
|
|
|
+ }
|
|
|
return nil
|
|
|
}
|
|
|
}
|