From 121a169187a380e4f2e696e02eebfde70797659d Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Sun, 3 Dec 2017 11:23:19 +0000 Subject: [PATCH] [BF] Now load the right Dll --- IoT/Connector/ADataBackend.cs | 2 +- IoT/Connector/AUserBackend.cs | 2 +- IoT/Connector/Data/Mosquitto/Mosquitto.cs | 2 +- .../bin/Release/ConnectorDataMosquitto.dll | Bin 8192 -> 8192 bytes .../Data/Mosquitto/bin/Release/Utils-IoT.dll | Bin 14336 -> 14336 bytes IoT/Connector/Data/Mqtt/Mqtt.cs | 2 +- .../Mqtt/bin/Release/ConnectorDataMqtt.dll | Bin 6656 -> 6656 bytes .../Data/Mqtt/bin/Release/Utils-IoT.dll | Bin 14336 -> 14336 bytes .../bin/Release/ConnectorUserTelegram.dll | Bin 8704 -> 8704 bytes .../User/Telegram/bin/Release/Utils-IoT.dll | Bin 14336 -> 14336 bytes IoT/bin/Release/Utils-IoT.dll | Bin 14336 -> 14336 bytes IoT/packages.config | 49 ------------------ 12 files changed, 4 insertions(+), 53 deletions(-) diff --git a/IoT/Connector/ADataBackend.cs b/IoT/Connector/ADataBackend.cs index 61bcfe6..4df5ffc 100644 --- a/IoT/Connector/ADataBackend.cs +++ b/IoT/Connector/ADataBackend.cs @@ -12,7 +12,7 @@ namespace BlubbFish.Utils.IoT.Connector { if(settings.Count == 0) { return null; } - String object_sensor = "BlubbFish.Utils.IoT.Connector.Data." + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower(); + String object_sensor = "BlubbFish.Utils.IoT.Connector.Data." + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower()+", "+ "ConnectorData" + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower(); Type t = null; try { t = Type.GetType(object_sensor, true); diff --git a/IoT/Connector/AUserBackend.cs b/IoT/Connector/AUserBackend.cs index 1b2dc6e..556e091 100644 --- a/IoT/Connector/AUserBackend.cs +++ b/IoT/Connector/AUserBackend.cs @@ -14,7 +14,7 @@ namespace BlubbFish.Utils.IoT.Connector { } public static AUserBackend GetInstance(Dictionary settings) { - String object_sensor = "BlubbFish.Utils.IoT.Connector.User." + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower(); + String object_sensor = "BlubbFish.Utils.IoT.Connector.User." + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower()+", "+ "ConnectorUser" + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower(); Type t = null; try { t = Type.GetType(object_sensor, true); diff --git a/IoT/Connector/Data/Mosquitto/Mosquitto.cs b/IoT/Connector/Data/Mosquitto/Mosquitto.cs index 2e13847..34beb6a 100644 --- a/IoT/Connector/Data/Mosquitto/Mosquitto.cs +++ b/IoT/Connector/Data/Mosquitto/Mosquitto.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Text.RegularExpressions; namespace BlubbFish.Utils.IoT.Connector.Data { - class Mosquitto : ADataBackend, IDisposable { + public class Mosquitto : ADataBackend, IDisposable { private Process p; private String message; diff --git a/IoT/Connector/Data/Mosquitto/bin/Release/ConnectorDataMosquitto.dll b/IoT/Connector/Data/Mosquitto/bin/Release/ConnectorDataMosquitto.dll index 48e4aa5a6c954b7a160bd54c55515d4d8830ed97..4299dde4e3c806bee98ff19d7116ce0adb41d525 100644 GIT binary patch delta 92 zcmZp0XmFU&!PI$vV^2{7q&o>z`y t00Jf;mSJRIurUK-2?mCsV3*)a8x;fBYczZ9>i2*2{&9HA<^YKe>;MY@Admn6 delta 92 zcmZp0XmFU&!SwaS#;z_-MuyFzT<^IB_C9|zd->AsPD^FfwaV8x7;hF46JXN$dO|sh u0SK6YScZ{-!Nv@TB^Vfjf?a~|?mPZwSE{kwyt=E(Jyv_NHU~&-Uh!1010vSG`tK2`~}v*$23|mqqwNX(M|S<NpG_Ei-$;@G3(NNd#!bu?a-9zn6|k!>849&P8^5l&->eB<7S1X5EAAWVO-#Srtj^YYXE;X1BVCD+wu=&Q%U*< zJ=#cfPm}b7&sh6gUvv|NvyN#)2iu9a{EanU{1E!hH6ekot0>MAu+XF_-*5%JY!93b zblPwO2|_-hrC1RI2nj9A%!IZG?VlkSwqF?wI&ICMz=O zOpat!XL_PHxrwn(@&HgZ2zUT769X&57cHPJB?bn@$rlaGHwQ4~aELDfN-;7p2r}in zGB9xIGKpvv-DF}Yn5@7pH`$R}Z1P`b5kW;}h61LdWCn(Ud=a3cBKyhndCd8_fM#kj z3V_V_X5b2)e2iO(cNWyNqHLfRyk=|$nqkY$0MYNrz~w#p8P7MV2h0o%%AvswH{=)? zKqf1@hkCjI=@)XFzwuhIF;-007jflp&;$xGv`I8^NHf_nOqkp(VqWh7^cqBrjlr2A z0M0XKa%RYd@Hl2M*fY5?l!AGU97`FTfxJ4XoF`K~gF8bTR4$ZB0Lbfy${k~V%jm%{ z9V&O8`4f4N3pp*ESJQ)r`HKsDu1Hh2cT2-E{fgsSF(73ftnv(yjd0Rr{N dle!Ta5Ea>-QO_|*MV36#@L@`q3$x@A90)g79wz_* diff --git a/IoT/Connector/Data/Mqtt/bin/Release/Utils-IoT.dll b/IoT/Connector/Data/Mqtt/bin/Release/Utils-IoT.dll index 34d22f557c389c28d50ada959798b367c164aa7a..6f8d8fe05b599a8d9236983090b8a02c86244ec7 100644 GIT binary patch delta 820 zcmbVKOK1~O6g~4sYs{o=VnUjh!1010vSG`tK2`~}v*$23|mqqwNX(M|S<NpG_Ei-$;@G3(NNd#!bu?a-9zn6|k!>849&P8^5l&->eB<7S1X5EAAWVO-#Srtj^YYXE;X1BVCD+wu=&Q%U*< zJ=#cfPm}b7&sh6gUvv|NvyN#)2iu9a{EanU{1E!hH6ekot0>MAu+XF_-*5%JY!93b zblPwO2|_-hrC1RI2nj9A%!IZG?VlkSwqF?wI&ICMz=O zOpat!XL_PHxrwn(@&HgZ2zUT769X&57cHPJB?bn@$rlaGHwQ4~aELDfN-;7p2r}in zGB9xIGKpvv-DF}Yn5@7pH`$R}Z1P`b5kW;}h61LdWCn(Ud=a3cBKyhndCd8_fM#kj z3V_V_X5b2)e2iO(cNWyNqHLfRyk=|$nqkY$0MYNrz~w#p8P7MV2h0o%%AvswH{=)? zKqf1@hkCjI=@)XFzwuhIF;-007jflp&;$xGv`I8^NHf_nOqkp(VqWh7^cqBrjlr2A z0M0XKa%RYd@Hl2M*fY5?l!AGU97`FTfxJ4XoF`K~gF8bTR4$ZB0Lbfy${k~V%jm%{ z9V&O8`4f4N3pp*ESJQ)r`HKsDu1Hgg)!PI$vW0#$nz>$nIK3vn?eRnwuRBaShDc*cTtbiFPIoV4}O5o}PmC2lU Uja>TfUeEbHS(s;YiBu0e09Vc$cK`qY delta 64 zcmZp0X>gg)!SwaS#x6TCf&Cx&Y-TLX_FukxhQNo!Qzn~lh!rpcB`14HNeNgvb*Vr9 Ux5RP1gJoN>S>pQ5B~m@?0JnA=Y5)KL diff --git a/IoT/Connector/User/Telegram/bin/Release/Utils-IoT.dll b/IoT/Connector/User/Telegram/bin/Release/Utils-IoT.dll index 34d22f557c389c28d50ada959798b367c164aa7a..6f8d8fe05b599a8d9236983090b8a02c86244ec7 100644 GIT binary patch delta 820 zcmbVKOK1~O6g~4sYs{o=VnUjh!1010vSG`tK2`~}v*$23|mqqwNX(M|S<NpG_Ei-$;@G3(NNd#!bu?a-9zn6|k!>849&P8^5l&->eB<7S1X5EAAWVO-#Srtj^YYXE;X1BVCD+wu=&Q%U*< zJ=#cfPm}b7&sh6gUvv|NvyN#)2iu9a{EanU{1E!hH6ekot0>MAu+XF_-*5%JY!93b zblPwO2|_-hrC1RI2nj9A%!IZG?VlkSwqF?wI&ICMz=O zOpat!XL_PHxrwn(@&HgZ2zUT769X&57cHPJB?bn@$rlaGHwQ4~aELDfN-;7p2r}in zGB9xIGKpvv-DF}Yn5@7pH`$R}Z1P`b5kW;}h61LdWCn(Ud=a3cBKyhndCd8_fM#kj z3V_V_X5b2)e2iO(cNWyNqHLfRyk=|$nqkY$0MYNrz~w#p8P7MV2h0o%%AvswH{=)? zKqf1@hkCjI=@)XFzwuhIF;-007jflp&;$xGv`I8^NHf_nOqkp(VqWh7^cqBrjlr2A z0M0XKa%RYd@Hl2M*fY5?l!AGU97`FTfxJ4XoF`K~gF8bTR4$ZB0Lbfy${k~V%jm%{ z9V&O8`4f4N3pp*ESJQ)r`HKsDu1Hh!1010vSG`tK2`~}v*$23|mqqwNX(M|S<NpG_Ei-$;@G3(NNd#!bu?a-9zn6|k!>849&P8^5l&->eB<7S1X5EAAWVO-#Srtj^YYXE;X1BVCD+wu=&Q%U*< zJ=#cfPm}b7&sh6gUvv|NvyN#)2iu9a{EanU{1E!hH6ekot0>MAu+XF_-*5%JY!93b zblPwO2|_-hrC1RI2nj9A%!IZG?VlkSwqF?wI&ICMz=O zOpat!XL_PHxrwn(@&HgZ2zUT769X&57cHPJB?bn@$rlaGHwQ4~aELDfN-;7p2r}in zGB9xIGKpvv-DF}Yn5@7pH`$R}Z1P`b5kW;}h61LdWCn(Ud=a3cBKyhndCd8_fM#kj z3V_V_X5b2)e2iO(cNWyNqHLfRyk=|$nqkY$0MYNrz~w#p8P7MV2h0o%%AvswH{=)? zKqf1@hkCjI=@)XFzwuhIF;-007jflp&;$xGv`I8^NHf_nOqkp(VqWh7^cqBrjlr2A z0M0XKa%RYd@Hl2M*fY5?l!AGU97`FTfxJ4XoF`K~gF8bTR4$ZB0Lbfy${k~V%jm%{ z9V&O8`4f4N3pp*ESJQ)r`HKsDu1H - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file