From b068bae5b3eeb33397c097cb53abba592c34c9f1 Mon Sep 17 00:00:00 2001
From: lihua <531456470@qq.com>
Date: Wed, 27 Nov 2019 11:22:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LoRaMoteConf.json |  4 ++--
 LoRaMoteMock.go   | 17 ++++++++++-------
 go.mod            |  2 +-
 go.sum            |  4 ++--
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/LoRaMoteConf.json b/LoRaMoteConf.json
index 8dafec7..a42caef 100644
--- a/LoRaMoteConf.json
+++ b/LoRaMoteConf.json
@@ -29,10 +29,10 @@
 		"mote2": {
 			"otaa": false,
 			"gatewayEui": "0102030405060708",
-			"appEui": "0102030405060708",
+			"appEui": "",
 			"devEui": "6ef1881ba5541419",
 			"devAddr": "00c18699",
-			"appKey": "fe80c1f94e6cc62d5d6f72630b43c177",
+			"appKey": "",
 			"nwkSKey": "33998df974421457437d986eff739ffa",
 			"appSKey": "33998df974421457437d986eff739ffa",
 			"fCnt": 1295,
diff --git a/LoRaMoteMock.go b/LoRaMoteMock.go
index 28a42c2..639f204 100644
--- a/LoRaMoteMock.go
+++ b/LoRaMoteMock.go
@@ -297,7 +297,7 @@ func (mw *MoteMainWindow) MoteConfig() {
 			AssignTo:&db,
 			Name:"config",
 			DataSource: &mw.currentMoteConf,
-			ErrorPresenter: ToolTipErrorPresenter{},
+			//ErrorPresenter: ToolTipErrorPresenter{},
 		},
 		DefaultButton: &acceptPB,
 		CancelButton:  &cancelPB,
@@ -321,19 +321,19 @@ func (mw *MoteMainWindow) MoteConfig() {
 								_ = db.Reset()
 							}},
 							Label{Text:"网关EUI:"},
-							LineEdit{Text:Bind("GatewayEui")},
+							LineEdit{Text:Bind("GatewayEui",Regexp{Pattern:"^[0-9a-fA-F]{16,16}$"})},
 							Label{Text:"应用EUI:",Visible:Bind("OTAA")},
 							LineEdit{Text:Bind("AppEui"),Visible:Bind("OTAA")},
 							Label{Text:"终端EUI:"},
-							LineEdit{Text:Bind("DevEui")},
+							LineEdit{Text:Bind("DevEui",Regexp{Pattern:"^[0-9a-fA-F]{16,16}$"})},
 							Label{Text:"应用秘钥:",Visible:Bind("OTAA")},
 							LineEdit{Text:Bind("AppKey"),Visible:Bind("OTAA")},
 							Label{Text:"终端地址:"},
-							LineEdit{Text:Bind("DevAddr"),ReadOnly:Bind("OTAA")},
+							LineEdit{Text:Bind("DevAddr",Regexp{Pattern:"^[0-9a-fA-F]{8,8}$"}),ReadOnly:Bind("OTAA")},
 							Label{Text:"网络会话秘钥:"},
-							LineEdit{Text:Bind("NwkSKey"),ReadOnly:Bind("OTAA")},
+							LineEdit{Text:Bind("NwkSKey",Regexp{Pattern:"^[0-9a-fA-F]{32,32}$"}),ReadOnly:Bind("OTAA")},
 							Label{Text:"应用会话秘钥:"},
-							LineEdit{Text:Bind("AppSKey"),ReadOnly:Bind("OTAA")},
+							LineEdit{Text:Bind("AppSKey",Regexp{Pattern:"^[0-9a-fA-F]{32,32}$"}),ReadOnly:Bind("OTAA")},
 							Label{Text:"上行计数:"},
 							NumberEdit{Value:Bind("FCnt")},
 						},
@@ -402,7 +402,10 @@ func (mw *MoteMainWindow) MoteConfig() {
 								walk.MsgBox(mw, "错误", msg, walk.MsgBoxIconError)
 								return
 							}
-							_ = db.Submit()
+							if db.CanSubmit() {
+								_ = db.Submit()
+							}
+							
 							v,ok := mw.motesConf.Configs[mw.motesConf.Current]
 							if ok {
 								if mw.currentMoteConf.OTAA && v.OTAA != mw.currentMoteConf.OTAA {
diff --git a/go.mod b/go.mod
index 02f5bb6..ac69240 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/brocaar/lorawan v0.0.0-20190814113539-8eb2a8d6da09
 	github.com/eclipse/paho.mqtt.golang v1.2.0
 	github.com/golang/protobuf v1.3.2
-	github.com/lxn/walk v0.0.0-20191113135339-bf589de20b3c
+	github.com/lxn/walk v0.0.0-20191121152919-b7c43041fb1b
 	github.com/lxn/win v0.0.0-20191106123917-121afc750dd3
 	github.com/pkg/errors v0.8.1
 	gopkg.in/Knetic/govaluate.v3 v3.0.0 // indirect
diff --git a/go.sum b/go.sum
index edf526d..05e10aa 100644
--- a/go.sum
+++ b/go.sum
@@ -336,8 +336,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lxn/walk v0.0.0-20191113135339-bf589de20b3c h1:4pJw1uBKndwiBBJpcbqP1Bf90YfqTJUsHG9DVoAfIQ8=
-github.com/lxn/walk v0.0.0-20191113135339-bf589de20b3c/go.mod h1:E23UucZGqpuUANJooIbHWCufXvOcT6E7Stq81gU+CSQ=
+github.com/lxn/walk v0.0.0-20191121152919-b7c43041fb1b h1:g3UT5OL6+bccxpC0D2O35R+gNshkR8LawMFen2kB+Ys=
+github.com/lxn/walk v0.0.0-20191121152919-b7c43041fb1b/go.mod h1:E23UucZGqpuUANJooIbHWCufXvOcT6E7Stq81gU+CSQ=
 github.com/lxn/win v0.0.0-20191106123917-121afc750dd3 h1:DvGEvKK/Qnhph/EgdBN9zXA7pEosgJ0k57ojII51JAo=
 github.com/lxn/win v0.0.0-20191106123917-121afc750dd3/go.mod h1:ouWl4wViUNh8tPSIwxTVMuS014WakR1hqvBc2I0bMoA=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=