From 115f917d7b67bf91a83139aacad718f96a55d9bf Mon Sep 17 00:00:00 2001
From: liushoushan_notebook <ccliushou@126.com>
Date: Fri, 10 Jun 2022 15:44:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E5=90=AF=E5=8A=A8=E5=87=BA=E7=8E=B0=E7=9A=84?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeviceConfigVMs/DeviceConfigVM.cs         |   3 ++-
 IoTGateway/iotgateway.db                      | Bin 311296 -> 311296 bytes
 Plugins/Plugin/DeviceService.cs               |   3 +++
 Plugins/Plugin/MyMqttClient.cs                |   5 +++++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/IoTGateway.ViewModel/BasicData/DeviceConfigVMs/DeviceConfigVM.cs b/IoTGateway.ViewModel/BasicData/DeviceConfigVMs/DeviceConfigVM.cs
index 733773a..1a52d77 100644
--- a/IoTGateway.ViewModel/BasicData/DeviceConfigVMs/DeviceConfigVM.cs
+++ b/IoTGateway.ViewModel/BasicData/DeviceConfigVMs/DeviceConfigVM.cs
@@ -31,7 +31,8 @@ namespace IoTGateway.ViewModel.BasicData.DeviceConfigVMs
                 .GetSelectListItems(Wtm, y => y.DeviceName);
             if (Entity.DeviceId != null)
             {
-                if (Entity.EnumInfo != null)
+                //if (Entity.EnumInfo != null)
+                if (!string.IsNullOrEmpty( Entity.EnumInfo))
                 {
                     AllTypes = new List<ComboSelectListItem>();
                     var EnumInfos = JsonSerializer.Deserialize<Dictionary<string, int>>(Entity.EnumInfo);
diff --git a/IoTGateway/iotgateway.db b/IoTGateway/iotgateway.db
index d386b0567ca2816af0ddb4805a9336eea62d3442..35bf842306400c43e553d222648bd5067d1e8adb 100644
GIT binary patch
delta 2740
zcma)8TWlOx8J-zWHhY=bak_Thy0v%hEX5m`@wv{K+0rO8v%3(R>>8&-QEtvAwj)=$
zxJlE1p|aOX6C@<IC_+b~s`3&Q#6zekVpEBRh&-SoMWrfIcqA1dkP5u<KtScp?7B1{
z(bXBv%$fh3|Mvao|7K$&w;`^d$cdNLrzPX*H+F!}8s;5IlHLw?=9PW>f{|b(<<|ft
zRhyc&2e8>H$yzMT#X^4as_YgIHW!zh$C?B{3@BN4@i72svuQV%mYR!zEiFQX`K_z+
z6T`L%K>@gBgv-RW5Mz!@Vdwr;IWd^a{$5ICB+0m@AIM1Af_5cyn-^Y}hd6j$R^wYo
zy!|@;P;1YC5k8vK!&J%>9)`&zfA^$P<d6JZZuBfTW#E*FV<Fddu>(1LOWsx8moP$8
zY)hsh-@~Lru?G-Du8En0Ou{O*=~K6A!T>Q;b6v<>aQ4iZ=dH8H*Ve3aE2mDZJ<AW>
zls_$21KR{{0or9?moc<l0A1oZ&BaqIrx8H0JPK7fg3A<G7&>B*$dQtkxzVa@Gs1l2
z3xD-z^5#QA6D?CDlv$KOWCI$lM5$yi!U5iFhzMVPOKuEx4R@C#i!mER%7F-wkKL4i
zsS5aRb^dfyeq7cPMn*D-@mu4Pk>S}}a<M~h$#=7*sew@LC-wxtH=|5-4!tA)VD5>@
zbX&^4pSf#fjKkV|b~t;&AX+JNJ(Et~OW(-8nRzL5DBbQ%7L=v*dSrp2Y6T%tI1UUP
zlTg<-JrFRH)<{4c8-ohKld&rlRx6k>6C%$y2_e|@Yt%Lgs4$nYDkaF9h!?_|V^^Sn
z%B@k8cpf%gk5H5P#IE^OQu6^RL<>t4_>Rw97-<uVd{{MwjF|{k8FerLcHritmHc0W
zO0jeBGs<g2+q1i+Q4!>K#}(^g<0a#eaXowDV`F!A_Zt(1Al+%tC_frdjl1%A7nS9@
zvP(4%OV_&78+B!WG%a<fxS^EzbElLkxfnkzH4deZ(%UJZEXAeW`LLmE8;l{y+!ZMo
zsm@^iw*Ec+IsFTIUi-UtN4wSqB7)%P76ko(+=ZYIce)Vtu`q^U@{?_IFsuCL`|3$W
z9ZVS0lJQUDE5;9v_l%Y?%?qoFIQXlIIQZh$5w{PsytOW}n7H!hx2O2Vx^i)A*Lz}D
zOYHsMT^sSPcC?GP#N+ZtTj^}H2QJR-$|Y80<8=1@>}GaS|FK@yu4_9o-^%3D*V2!t
zE~ljA`D9{yd%K!g5ukh9)>9V-65-gGu7^?ckZX?bVOvxbMpP6xA)e{_%r>#_p#V@o
zDe)>xFRUD2+Pk>*bRb4mR27{xprU*cshPfmm<cMFV7n&NIdrRcM7>2EaZ;w(0+@nz
zVzURDORxFhGO{g10dRmF%azmx<w%&z?Ts9jBv~A+z>OLbj1P`)JEmvbwpsO|hdkRy
z)Meq>6>*(eJ#IaJe6>71{mkCF2}A6l+DyX<_O>3G)Yc=FQYcBmNV1=UE%crLKPp9U
zCiIglL^$5-rL(<wSs6mX8?MWM8^_y9PG|y`F!D{3lC+Or!Y6hp<jeh7KVQ(oJRRQB
z-ADW3`C(<EFWsl|TKHJ$Bi(&8EWVmk9xe9ccjvEziXtnS`<<`-d0<l+H=dOq764x8
z0x07^bVo#6qa&L5I?I2WQ=T0D80bKN9wRi(oA1cQ$F@M|79{~u&0#_jbV%pmkn#&f
z6RB5Q#-Pa7Se}1sMEP6_B4z<GVBEkyQqki?Rwl%9Y?s;0>HOnw1Ka0P>3h<sv?=M3
zkMB{fA^jEYj+j0$u1pl{&gLF<A+2Ud<q!BDX4K!Q*^Bb8I&aUas$4!+Ooy_b5B1?4
zNg#-$CK$mC?1)rq;>7u`m=Xvu0|Y@<ag!AvBCFz8K<s2<Ui_}SfcR)#g()EdLgaTv
z{Ht|UTYqt9q+bv9u`eZ~e<E0OiRnX(MFRlT^r)aFkr(1oRIM?_lKo&68LgjLTsnR3
zDfZ;Kr}i&+$eR0Nu;4i4^9QWPT(GdOx_@Ebnumhg<v;TAy1E>_eS?3quHKL6{zZPd
zp{~vL=u7`Vzb!bLJV*}O*R^@AB$!+J4}tWUdpO<x@6qGA18T%`m!v!VFEeV9FCS3_
z&s`Ec_wKBi-Z-K@Q|~9u#fb3w$=6PPctI^iA+7Q6)P;%b3&Nt9PVsg_ExvYCJ^F8;
Ck%<og

delta 1420
zcma)+ZA@EL9LDcCJ+1A1JKca0b&P_|MlrX!uk9_!LSG;X8D-TQ30r|W3gQN35HyZN
zTSPE1u^6H!F)@50%Unz$Vz>~6kSxad!A;!<H1UHhPG_RVPkzCvw{-X(vzwEXoO|>8
z|DXGu=bUV|ENhK-fnyFODV$t6AU=ZcU8eS*oCmPR1JzKdiB?7{o#e|U;3cyQpyK|%
z^!S;Hu>tXkAyFKVG81R}A5Hal#=<AhogiBa;An*^NV-Q78x*ZUl>E9XDxpxo++6?;
z_W`TCot>xfBG=7-&3o8+;#mgeL|g{w&&iaR!Bv{LR{-bcd*CI*=j05hD_TiW2HCg@
zy!@@g=FP=fNr+}fpOsW{avd}xRab%}yb6341AhG*^Uc2)ZI7{Ol0uqSLH$D(^4MPy
zDH3T3DB-XWR<*F8wgzM&6x0<VD5`3NucbbraxptLsx4tI^5*+s>Y(hA<OWHzhF{Zl
zSqlY;v;kz7%N4c^G+Z{4%0Mrf+W_%$O^|{fNoi1m4VvzkRV5S%5^)36ld4VdA<8w`
zIP=yfI1FezRw=CF&+!a#Zvn3<Z-Fm(AD*ES|En+>YKexUnuF}L!8-HwHE^l($Pq@N
z_#4bNW^j^C@D=<ZR#_iY;MbWKnbT&y2d3$H(epN{vl)Qgc0;du>Opw1{2pu1YUw=n
z+7akKgtsj<OLzt+F~i^B*ZDbqkUzds<B8H{z6~zf$lM65BLgGwGor_#7uZWL3K^In
z=Z7sZzr~^5?JkO8wwXe)HKTA>h`SS&n_?gA-P1s<T6N~Bv+ym%+i@3#f5Bb&GQN&;
z#4`%5yo^FCFZ+`zkHXtL!k4K;aa+B>F~9yw9mzfqr}ydW7M;Ug|4nEApu=lLn&k4Z
zZZ?~TW;Sn|?ySYm34ounes_wm<=){M*aEZ5yv&r*i}YdFtc!9^SO&zM=8tY@2j+$E
zY&mEa%Ag&s{$vB4RYm`(DGI-UUHmkEAD8D2vahqpm=Bl~y+i0`<e#tc1k9;s)Jvo1
z7}_8=+t632&qW*NN9_m!GLV7Q%vkD~qp9K1Mp@IyP8^ko#!@5wnPFwpK^uU>MvYeO
z3`EpmpheMzpe9O!s>@*^64gUOt0+ryKnjLrHHwtIB+~o!q*A%=Co|{zheieyO3rC7
zR%|!8DxXu1MPlKA75`RIZ57m*6cQqlh%SWn*4AiL)ItGWK_lZ$a^rYY=~RCE-n2iK
zetPIkTJo19lGHWeJ(NhN`a3fH>3@8aP9TZ2cc2i;K^sk8>Oi|_5?Ch8#?giLJK5vD
z=dN&X;2HincOI+U!(27{Gy5?=$1bvyYyvZ^4=4F`>zFLDd$F=|z85Tprg!MIV%F*W
zosf2;C0i-tKeQn)8R$XvrRAsX)^e=}J>GFQE;@>*<ZjHdlVmUQm0G;oVYMjqS{;ws
Ota~FLN8XElsPA_zpn|#p

diff --git a/Plugins/Plugin/DeviceService.cs b/Plugins/Plugin/DeviceService.cs
index 8321fa1..442023d 100644
--- a/Plugins/Plugin/DeviceService.cs
+++ b/Plugins/Plugin/DeviceService.cs
@@ -87,6 +87,9 @@ namespace Plugin
                 {
                     var systemManage = DC.Set<SystemConfig>().FirstOrDefault();
                     var driver = _DrvierManager.DriverInfos.Where(x => x.Type.FullName == Device.Driver.AssembleName).SingleOrDefault();
+                    if (driver == null)
+                        return;
+                    
                     var settings = DC.Set<DeviceConfig>().Where(x => x.DeviceId == Device.ID).AsNoTracking().ToList();
                     Type[] types = new Type[1] { typeof(Guid) };
                     object[] param = new object[1] { Device.ID };
diff --git a/Plugins/Plugin/MyMqttClient.cs b/Plugins/Plugin/MyMqttClient.cs
index f446243..f2e7210 100644
--- a/Plugins/Plugin/MyMqttClient.cs
+++ b/Plugins/Plugin/MyMqttClient.cs
@@ -480,6 +480,11 @@ namespace Plugin
                         case IoTPlatformType.IoTSharp:
                             foreach (var payload in SendModel[device.DeviceName])
                             {
+                                //if (payload.Values.ContainsKey("ts"))
+                                //    payload.Values["ts"] = payload.TS;
+                                //else
+                                //    payload.Values.Add("ts",payload.TS);
+
                                 UploadISTelemetryDataAsync(device.DeviceName, payload.Values);
                             }
                             break;