5
5
"encoding/base64"
6
6
"encoding/hex"
7
7
"fmt"
8
- "io/ioutil"
9
8
"net"
10
9
"os"
11
10
"strconv"
@@ -41,7 +40,7 @@ const (
41
40
IT_SEND string = "Send"
42
41
IT_APPEND_RN string = "Append \\ r\\ n"
43
42
IT_AUTO_CLEAR string = "Auto clear"
44
- IT_SEND_HEX string = "Send hex "
43
+ IT_SEND_HEX string = "Send HEX "
45
44
IT_SEND_CIRC string = "Send circularly"
46
45
IT_LOAD_DATA string = "Load data"
47
46
IT_DATA_RECVED string = "Data received"
@@ -191,7 +190,7 @@ func (app *NetAssistantApp) update(recvStr string) {
191
190
}
192
191
193
192
if app .cbDisplayDate .GetActive () {
194
- recvStr = fmt .Sprintf ("[%s]: %s\n " , time .Now ().Format ("2006-01-02 15:04:05 " ), recvStr )
193
+ recvStr = fmt .Sprintf ("[%s]%s\n " , time .Now ().Format (time . DateTime + ".000000 " ), recvStr )
195
194
}
196
195
197
196
if app .cbReceive2File .GetActive () {
@@ -218,11 +217,11 @@ func (app *NetAssistantApp) handler(conn net.Conn) {
218
217
var buf [2048 ]byte
219
218
n , err := reader .Read (buf [:])
220
219
if err != nil {
221
- log .Info ("close connection:" , err )
220
+ log .Info ("connection closed :" , err )
222
221
_ , ok := conn .(* net.UDPConn )
223
222
if ! ok {
224
223
ss := conn .RemoteAddr ().String ()
225
- tips := fmt .Sprintf (`<span foreground="pink ">connection closed: %s </span>` , ss )
224
+ tips := fmt .Sprintf (`<span foreground="red ">connection closed: %s </span>` , ss )
226
225
glib .IdleAdd (func () {
227
226
app .labelStatus .SetMarkup (tips )
228
227
})
@@ -242,13 +241,13 @@ func (app *NetAssistantApp) handler(conn net.Conn) {
242
241
if app .cbHexDisplay .GetActive () {
243
242
for i := 0 ; i < len (recvStr ); i ++ {
244
243
log .Debug (i , recvStr [i ])
245
- list = append (list , fmt .Sprintf ("%X " , recvStr [i ]))
244
+ list = append (list , fmt .Sprintf ("%02X " , recvStr [i ]))
246
245
}
247
246
recvStr = strings .Join (list , " " )
248
247
}
249
248
250
249
if app .cbDisplayDate .GetActive () {
251
- recvStr = fmt .Sprintf ("[%s]: %s\n " , time .Now ().Format ("2006-01-02 15:04:05 " ), recvStr )
250
+ recvStr = fmt .Sprintf ("[%s]%s\n " , time .Now ().Format (time . DateTime + ".000000 " ), recvStr )
252
251
}
253
252
254
253
if app .cbReceive2File .GetActive () {
@@ -271,6 +270,7 @@ func (app *NetAssistantApp) onBtnCleanCount() {
271
270
app .sendCount = 0
272
271
app .labelReceveCount .SetText (getI18nText (IT_RECEVER_COUNT ))
273
272
app .labelSendCount .SetText (getI18nText (IT_SEND_COUNT ))
273
+ app .labelStatus .SetText ("" )
274
274
}
275
275
276
276
func (app * NetAssistantApp ) onCbReceive2File () {
@@ -290,7 +290,7 @@ func (app *NetAssistantApp) onBtnLoadData() {
290
290
res := dialog .Run ()
291
291
if res == int (gtk .RESPONSE_ACCEPT ) {
292
292
fileName := dialog .FileChooser .GetFilename ()
293
- data , err := ioutil .ReadFile (fileName )
293
+ data , err := os .ReadFile (fileName )
294
294
if err != nil {
295
295
log .Error (err )
296
296
} else {
@@ -608,7 +608,7 @@ func (app *NetAssistantApp) doActivate(application *gtk.Application) {
608
608
labelPort , _ := gtk .LabelNew (getI18nText (IT_PORT ))
609
609
labelPort .SetXAlign (0 )
610
610
app .entryPort , _ = gtk .EntryNew ()
611
- app .entryPort .SetText ("8003 " )
611
+ app .entryPort .SetText ("50023 " )
612
612
verticalBox .PackStart (labelPort , false , false , 0 )
613
613
verticalBox .PackStart (app .entryPort , false , false , 0 )
614
614
app .btnConnect , _ = gtk .ButtonNewWithLabel (getI18nText (IT_CONNECT ))
@@ -768,7 +768,7 @@ func init() {
768
768
}
769
769
770
770
func main () {
771
- const appID = "com.github.baloneo .netassistant"
771
+ const appID = "com.github.bytevoyager .netassistant"
772
772
application , err := gtk .ApplicationNew (appID , glib .APPLICATION_NON_UNIQUE )
773
773
774
774
if err != nil {
0 commit comments