From 86c54ca9e68644f763e8b0c8422eb8bb8ae0d725 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 18 May 2017 10:59:11 -0600 Subject: [PATCH] Fixed issue with AdHoc meeting creation to close ECS-315 --- .../PepperDash_Essentials_Core.projectinfo | Bin 1286 -> 1283 bytes .../Essentials_DM/Essentials_DM.projectinfo | Bin 1143 -> 1138 bytes .../Essentials Devices Common.projectinfo | Bin 1164 -> 1162 bytes .../Fusion/FusionSystemController.cs | 33 +++++++++++++----- .../PepperDashEssentials.projectinfo | Bin 1871 -> 1867 bytes 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo b/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo index ee8c89873495ad0d0c9a45eecef2f23a6c4b3b7c..b6936dcea3737a55f4d41ecac8fed97c55900304 100644 GIT binary patch delta 571 zcmV-B0>u4>3WExey??=*-JM7GcOTu~89zMO|McPB_Rgn|c6O-QoSL0H`h9=j?^gBO zVtJ81E$V#QR&|j#zwhtsy8C^9-`79>`~JSU?eq8jeO>=4`u7{VubyNLeKRSR{?}d9 z$J15$145;+M0r_PKTTMiEzhfGMVT+NMgBuTa|4DeL8u^v2xQT-hPrRB&CI>NZrXhD zLXg}zLo}|7I$NC0-eecIY`e&7na|_dtZ0jBnUx@me0EYTRz#oKm&@BtwrT%EBAbkiEi;@{tLrz_v#Olsb@S09BSw><0T(Dl5VG;k&O`eD-a`WZ z<+@$1+m~7Uv(N0*+ZWlgIM18bp?Z%#y^%eW-~ojJq?2X>oC2_elLP}#f1JFQ>FnP9 zoqYP~z3Ic92b2636Bxn`X6zQwKWxUrzW-l5MGtQ^MPHqTv$J#X@ZRoTwlkgVO!n{J zd$99hZ$=EicW*y`u$%APW_B#dU}A0o_`@c~cKiS0IoaI_C&e48=ZqMN?aX#34`&At z9^AYC@ZkRW{`n-|pU&>zf1mD6?(egoA9Kz;K;Z=34DOZ_5bx~&&1ByV$?h2EMSj(i z!mZ9be%r(8&co^b*}a`vmd|Fh^Mi-?r}sY1rjzq*n(xf+`?TKxEtr5?z`W%IZ0Pa- z&9ksKGz+it^Ab^awLDw4c@27m(~;jhKR?K4lSy{4Kb_7V?B2gW1bIj?ZS-*3Wf@hy?=u@dwY-W??2kz8{gl%e}8{(e|zWCM>{*zZcgn^9{s+*?{};E zZLz#apB8mKZL7M-o8R~Mb^ZOmzwhfG|9yYo+;;l={=N=@6bSf@-B(YthQ65;OaJRG z?&ImI`~jg-SgO3NtDhz;&X(uZv!cwG*&_cTpt%9Vl^|3QLS=;LSwr2o*JkQoUpH;O zcp*q`oFW?6MV&3qW^b~KTee-~wM^*oY*w^IwaiM8MLs*J7AvC9?91gXXWP8+L!|00 zC;xOY$!D*tbv@0G>*>6>%q=&ZRIBSZ)w8Oc<#qGXBO^$YpaB;sMi8^{&dx*n|K39a z{^hz|t=pGb`?JsO)Y})?vN+G1)}eZjKE07YlivY_0mPGK0-ORcgp&gUPk;Q=hkMi6 zz56@)^wWFOhdU1@`7I_egd5D*EueqcjD>ywzj%rs-fD`zItyoK=iuSJ-MwsQI@y`* z-@o@@=fU2L7=G{Ge*R!L-?`1~SdhWQ+yd~2O^ogK|HX5%yAw`|H&o9VF%;XG?M@!f z4jw$XcmLtR{qz0vNxnaw-G9G7-J9IsXFosYoOyu43Ah>DEhiw}+5el#z8jL=G0uzp zswIV6op=1Uhtr*h)BCe~JF_gG&1UBZ5ARR!eVR=t=h-yhnceqkzX4h>0k?p8%L&-f z|lR7ojusSe+GZ@@ZrIJlT-w! M2+}yB!ABJU0G}&D82|tP diff --git a/Essentials DM/Essentials_DM/Essentials_DM.projectinfo b/Essentials DM/Essentials_DM/Essentials_DM.projectinfo index 39965f7af9295a3afe5007711728dd6ef93e86f8..d071b712d0bc5be7c8b46197b36b08eaf425c495 100644 GIT binary patch delta 975 zcmV;=12Fve2=WM!v41^yv%B-?{@$aVo$=nMpB~)Xr;k6Szo^}u+MPW5eShEYR`uIr zd67OX>U`Q(b&)r}@9+CEU#;@`Y1Yht-{1H3kN>{EZ*IH%eScrqefsnZ|Ignae@=>J z=dRD0d%WRSV>>v~3v65~J>VKBdIcuns_Sz8p^>x$c zix+}Qm%@bbMV&3qW^b~K;jb5YEmLqjn-y(QEwd6sl+RA8#fru{`*L~9`7tm2>{4iW zx=t69eD=Cp*VFvCp3aNQ+|J)gwYq*&J*&!DUN;{-GHkr}(JvW&^hL2O7VE{cqF!8O zb^epof+ztdAAj%cJf#2cJtW{?uG`hReVMgCD_lq&e331S^So&tcK7I0on8m`_m2+! zi>z24(-(_LdF=q~(>LB^3<8;zCAAC&PXFybcyRyVqaJ;_g!wkXqt6~b%qG)&Q{sq& zhqDI}kHrm$Q61 zrM^CT^gToP`yt^^YMR%&T8>{Ai&go0p4BT7!12@kvY6(t*Q-@kw+c|HInA34Q!yOW2rg9i`p-G6v+|9t;^lJ8Gv_wP^lCinMu zhIEVvC?NPPz}<@A@vi>gMdpJ+GJA0Q6yKdr_J1dP4<--y9zJ|{Z|7iV@4?>r&V$)> z_xxb*!A_uuZiE>S{}zznm-z8s|KBwa55swIBKjh~YO7^aop&t3!|Be$>HXQgomrO8 zX0!8yhxe!VKFy|+^K6>$%aPxa0qq z&B*T1jJ*Dd=ikmt!eU@T&UdEwcka(-`E+)WJvg{G+n+qRzqk9~{tl^>$%BCj8H5_l z$1PyL=X?zI`~QmR=zL%&XK!e7o@Q+}o=9b_n~sCMoyn)W)BS_#LAE!g@g3|vy#FB2 xXT;F=9z2-dY#~0#?~kDNOTPb0ehEi2#d$H!APO|bb=k_0{~sSBZLq=+006q&D98W+ delta 980 zcmV;_11tRU2=@q(v44H=W^eD&{ryL~562Jg?R~oQ>AmfpPao~ z>bJ%6B7Iua`LwO-B5!`*-}hy{TIKcAteOA5zwhfG|9yYo+;;i<{=TmJ^ywG=pT9r; zoD|E>XXELr`~h`X*b%<0tDmO6&X(uZv!cwG*&_ehK_!!^YF9ek?g$dz{I$NC0-eecUUoY}nrr>xsE83!3W+jFwpPf{T6^(WF~*!Sr}=R`ofnt6oxhW6b^WG#R+Y27Za#Ws*m&=wUo!gWi(*+U){AFF zy|~Ki{3odeQGWtVKHk}RNdMn^NWi~bx2tvgGHZWUxR5&dB3l;cdDA-V?$M_@y$~c~-AT0LM@B%VL_pUawYF-6}w(<}}Ol z{mDL2G0V)o|Ka&gmfzdoe{gSdKHKxD`5w^ao!j?un~8Yz9{vC9&scv>zCZft zRo?Kx`G3z}GBUID>Fs98%(aqjGCRMYP0zD~o$2)6WODG}d~bJ_PYxdL?(Q8-c4xPl z8Ur$zk6Qr#p!qPJ{=aJy9t`TJld8@`((mldb|(*K2M-?HyZ`Xu{`vm-B;TLT?%$v8 zP44fr4T|X)4^TkxTY$S2!Q);1zl+QVgJkyL_J1k9JDu!L_8v?g?mc|?@ZQeB&fbH) z^PLB?>F)W#-h-V$58VheApR{Nzc2CQz5c&z9v+7C;6(IAe$`gXraJFff``+chtvDB zdpol%pUr0H2M_O0?|qt0C+FET-qaDQ+2!TlXlDU$~S z6EX-jn2%e)e$V+B?Dzi_)6x0BPR`!Y%@hz1c#1kl!Cc?U#K2m;4frW{UG-nn4t3jO((MA^$&ipux++5C8z% CcQvN~ diff --git a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo index 0c9c0cb1ea977d6ec9cd80b74f5ba9ac11372ee2..da52e9593507b8001c6d076e3ed1262b070f28d4 100644 GIT binary patch delta 982 zcmV;{11bEB35p4j!heG|yE~8W?>@SJfBbM~|H1D5_Rgn|c6O-QoSL0H`h9=j?^gBO zVtJ81E$V#QR&|j#zwht+GGDFo`f1k8f8XEt^^gC)zi)0k{(XPnK_oYRH7PcIKc242 z9}rT7rOV5@`f0-FYTGc~dy`!RO@pb`R*Srr$vvLUingehSqaL>X9RLZB$|D>yxq*3_CGgty&WT* zE++Zxb+xXi`Efm+7nix^jFW10{ib?Wm9xBVK6+%tYVV_8GWzI?Vp%NKi)Tf>xXSAM zC#eMy3qm*E*?)OR|KEE^z`tC#t9AP_Yk#ORKplUPEsOKKX&u)0=+m2+#n9x7tXLjX zqs64Wb`bXI8*e6uq0GvXng%4H|8^fdxc})#J<4@S_H7~qefH_6Sw7o+xHG-?;K74z zwts&o-`V~2;inHDd^$aN@Nkb>%B0<9JURh4wtHSpvw!l3JzF<2s*v+(zRH)gd^sf~ zK6>;$Gb#7ONja%$(rbF@b+K5Lujg64BEcRD#MkT9s;XNBsDz$oS-wBn-@E@X%g#R~ zir;^DzLVwm_V*v$o1D)ALca%edFS?h+-iy*y$1q6cXQdFtnZILdX+a!5&rX+jLh_X zdaLRCJb!ERtL(Z7XYRq?{$9SfyO(A64)*Wu?Hy$IXAgJt$)}$l>^(d`$Zj!n9l*h) z-2(gvO>;(h&pgZ>AD^mlzkrhj60I@zD>J(xV)d-(9-y`6)dy$5^e zI}c{l-SdOJ2Rnh1yAftEE4P6B-m?<#_Wv6b^e~(tC-N`ytF~G;)p^JMJe=-4oZg?^ z+nJHUpUut>9^Rkc`!t(Q&a-L0GrR9k%?4<}q}&4L?IvYIhyUN0j@_N1`FNF|mxwK@ z<$u|-&1+C5oS6LH`T0RUn@qBU{pob}VE6w0$-{>S`}wC2_74swfy~?nY%oK&0RFx+ zG~Dz5N2Y3bXsTZS#Pe_GC1E!(Q|CL=`#bk%vwS)`$Q~Tro9#~?+~3=MaDRui)8xUx zObtQ}Ch8Wj-*=)0JN|$5Jas;>v$i)hYfn$JHXF~f*3Hww-p=IH-Rb_p^dQ@t(zwZy zy8j^0XCwj?=1l#0+Dy&cQoTde2y(yV`@iIuaI99G7t;*VL!(@mtql7A0ih|T+e#7u E03F{begFUf delta 984 zcmV;}11J2735*Gl!hZ*E_Vym#-+#3G>3HYh!Gi}6Ki%H>^wG`^wVPABlSjYr@B7`V zep@Ur(x*k8Pur?4^5*ybeP8CQRbD^Mn)&bh`@a71-}m>;ZO^~&?>mU)#;+#Drtino zRrv!#s<4E4Syw+z_?#`zt7k=-FSAAd!$o))*Oj1F5Nd?-S${)_wAW@HUtc$EzIY+% zZkkXU;6uG*mPv^yDZdv1`T3x@Xo>k>6ubYn^8Nu57=$DK>`l47Ci}m7JQ7^8t zI{!&(LDYiSjemD`9@78!9un{`*X?TEzRcPmst{1eUu4VTJa1Zu^*#FZCT=k_`64Tp z$JA&sDX$%befq|m$zdq7vZST~N$9_O5BK*z{isK|F3G-4WT4M>4kq_^vi-?qHp$O- zb|&}tK0SZ9vwyI6Z+CyXvkT=WlXjc&=mgx@?s+xM%6}jBY~9GHLe8i8Dqqg><&=>4 z=+XDgq}&fD<)o%buj!@N#bQ;yo@e!nBzr6nU$0lIs%{ma5_+0t`Tk^o@BYIqJO6a| z;m-Ys=Q~+`Z-4*6y~+7(&nNVIK$mxJ-^Z<{=+S#1@N+kp{mJ_N=%ZJ8!xZ5^f62&9 z->0{lzJJfNHowZQn{ehH?CtO6d%JsCcJE;S-rn9pc7OJ8H=lg^>A~K^^MmXbGuHte zOxi8Lf6%0L`u_jMd_4%~%i;6;pHy`o&d<)yY^;~! z-+3^b?w%j)J=h79+>J1US-Az|_nwt_xBuUmpoifEIgx*nU$xb;sm?q0=izkc;q?CO z-p(w`XS3P)!NdF0d!J_0$$2)-cV_qfso4N6n3P+^Af>D zwSPQYws{T8gcFnBJ3l|jXOl^Gus@y79_-$~KY94@U_bx#!T!O)B#@cgfDLBo7Qo+k zhK76o|HxGB4o%hTpLqW5yd>-fX6k%rdVlBsY?e=F2ib#zd$aw?gZq2C5AN@fcA7jG zn5jXi!9?8x_WMrMV8{Qjo~OM{F)@I{b*1CB**xQ+Wx;x!Jm>y(%QyMop zQuiO^`HV#1-h&5If1Wl|^R`s)5H*6_FZup2`6V2y73ak?gY?iS*JUe%{(k@w8pQ!j G5&!^H{W)>~ diff --git a/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs b/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs index d7ee0254..c4aed8fc 100644 --- a/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs +++ b/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs @@ -45,10 +45,19 @@ namespace PepperDash.Essentials.Fusion Event CurrentMeeting; - string RoomGuid; + string RoomGuid + { + get + { + return GUIDs.RoomGuid; + } + + } uint IpId; + FusionRoomGuids GUIDs; + bool GuidFileExists; bool IsRegisteredForSchedulePushNotifications = false; @@ -75,6 +84,7 @@ namespace PepperDash.Essentials.Fusion StaticAssets = new List(); + GUIDs = new FusionRoomGuids(); var mac = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, 0); @@ -94,7 +104,7 @@ namespace PepperDash.Essentials.Fusion Guid roomGuid = Guid.NewGuid(); - RoomGuid = string.Format("{0}-{1}-{2}", slot, mac, roomGuid.ToString()); + GUIDs.RoomGuid = string.Format("{0}-{1}-{2}", slot, mac, roomGuid.ToString()); } CreateSymbolAndBasicSigs(IpId); @@ -159,7 +169,7 @@ namespace PepperDash.Essentials.Fusion Debug.Console(1, this, "Writing GUIDs to file"); - var GUIDs = new FusionRoomGuids(Room.Name, IpId, RoomGuid, StaticAssets); + GUIDs = new FusionRoomGuids(Room.Name, IpId, RoomGuid, StaticAssets); var JSON = JsonConvert.SerializeObject(GUIDs, Newtonsoft.Json.Formatting.Indented); @@ -208,12 +218,10 @@ namespace PepperDash.Essentials.Fusion { var JSON = File.ReadToEnd(filePath, Encoding.ASCII); - var GUIDs = JsonConvert.DeserializeObject(JSON); + GUIDs = JsonConvert.DeserializeObject(JSON); IpId = GUIDs.IpId; - RoomGuid = GUIDs.RoomGuid; - StaticAssets = GUIDs.StaticAssets; } @@ -452,7 +460,7 @@ namespace PepperDash.Essentials.Fusion string.Format("{0}", dtEnd.ToString("s")) + "AdHoc Meeting" + "Room User" + - "" + + "Example Message" + "" + ""; @@ -460,6 +468,10 @@ namespace PepperDash.Essentials.Fusion FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.CreateMeeting.StringValue = createMeetingRequest; + //Debug.Console(1, this, "Sending CreateMeeting Request: \n{0}", command); + + //FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.CreateMeeting.StringValue = command; + } /// @@ -616,7 +628,7 @@ namespace PepperDash.Essentials.Fusion } else if (element.Name == "Event") { - Debug.Console(1, this, "Event Found:\n{0}", element.OuterXml); + Debug.Console(2, this, "Event Found:\n{0}", element.OuterXml); XmlReader reader = new XmlReader(element.OuterXml); @@ -1071,6 +1083,11 @@ namespace PepperDash.Essentials.Fusion public string RoomGuid { get; set; } public List StaticAssets { get; set; } + public FusionRoomGuids() + { + StaticAssets = new List(); + } + public FusionRoomGuids(string roomName, uint ipId, string roomGuid, List staticAssets) { RoomName = roomName; diff --git a/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo b/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo index bec487cda98475a47e508ce68f87a2da32f87c98..161f60482c2c169e18843ec834f14bc7a73ea8a2 100644 GIT binary patch delta 1586 zcmV-22F>};4$BUZwts^+yE~8W?>*YNKmPRLrw{h`=;Kcx?d(vyIkh`^^!xt4->vGm z#quJ3TGaWpt?D9ge&65M_4NDxzOR4$_x*iy+u!f|`?|jUcK)Z6Vj2HxJYD^Ox-RU< zU)I%6Q?F;s^Xgeq=F4o6|Lma^#b_lM6odg`cGggT?X{VY*MHYdn=f7nRs+&5r*Ym7ik?f71=9k4Zf4yFXz7bb06YecUhykKUu}AI@a;r{w#ik6z^skDLGeB_lIQpWbegz6fV# zGCRMYO@Gg`gPrO0-ehv{;Cyd)mQM~I?(Xg#Om=6tnHd8zn2uWj{<_m)`ul(196Y$y z9GtfEyk6!l*_Oq6SxhrnDI_-oFD?eG7Eldu;~f&-O`580$Jgk9V5 z>8DvfBZqZ*@4^+z~+AmTv2loyh&K?}>&Zg4` zv-{Hr4<7D5pw!Y3-^U;Zb8ri|UvCcnUmSMtc7Nh-=P;bq*Q*w3;nn>5Y}w}Zc{c5c z!)&%sw8;)Woqc-#>4Vv9dT;09bf5HezPCT6u-Ko7+W`*d;}+m=nvdJ{`v1ad>4ekX zIMz*DEsoo^E+%Vos|Tir2sPQC?N9ITKAe1d|9*DpFY?*nB)&W-QT}I zo6h1B69*Xva5n?K{dC0p`+wgg>~-R4H-Z=WRZID@>b#Rre>f#2a({MjXGR2@&B&L$ zKfU*9Hl1LcJF{R-Vgs~}B-{w|_N4E1^?(0Ds&^vhFv`r|<&NCv=bs+r6tq74l%m(! z!QKvKe)jivA5daD%k%6!PHqP#pz|$&-JZ^_kN+1ExDyRKtY78lB^HFM<$!+4@136? z{nJJ_F2XAgGo-=92uc(9+-;_Sh}Bydr?U}Io|3AhFD+fTsoQ2t*yA)UzBjep|x zPdwkK@6UIp_jm5kX8Ck>kWu(L+n+qRPds~nhg|;2gMs-Ngc{1j&9HAj9fMu|zh*W% zAK1C+#LR9;PqQ`~&$8Cd2I-8+r@PbrgXuxGH>ELB#`*q(JSR5>nVzXX8$&d^nW`P4 kMG*QW-~T1Qgjd&#b6we?k*&*C1`GQC0MDY_?1&=(0MI#ig8%>k delta 1590 zcmV-62Fdx$4$lsdwtok2_Vym#-+#1sZ~W=~`#bkOeYm~z>7$(;YB#5LCy##L-}k#! z{kB+Mq)&@FpSD$9{EZ*KeheScrqx8KhHbW$wiUyY}$A5hnY z9r??;`f2L*YaV>v^MCRBx@q&p3&CoD`ZR=# zI$NC0-eeaywp!%1%+m2}RAbki?G&F>tLrz_v#Olsb@S09BLRCK{gTl~Ulhw?v0gkY>cv%7=RZj;h$fJa z@y^ae`v2ZT0)PJHx?Qc?ms$I>#L<+Xcv zpT6;CCHnrXEU8s6X8P~m!~J`h+YV{EH2F5cqR%Gh2a`|Fr@PaK=jYkM!M)jj_UXe1 zyVHDs`tZ}q-i%txtZW{H(so0O=hZYTe>SIJ6ORd{o`2@6d^yXPQ|jxZN8dA~z8{kM zq^3!%tL6B0u~?O_=UKfX*&9F2FNP0nX~J`LXky1aAyK5m$UNAJ<~4`;IaQ}X@MN3ZgR$IXBKl98FDPj5F# zUxYI=nSY(%&!)uKJJadC$>iX{`QGj;~L@6UbmXZUOk~PKW95|9x}t z;8t^R+RpQOnYUzH7VBj(&0wXB2rBvReVTvz>AihYG!O6Z?(gLJr{}wq{d_XLfA9Q$ zo;|q5ylm_yn5$cK_BH2fBM$%Xo4}x0sa>ZZIjgfc`ZnCG7P7g>$ldt2z1VES!#=gNOHshj*rv zoyq?Fdk=OV?9E8=@7>$aAMEBkx0wzLGMI^50REaYVf*`k;Uw&Zli)z5;zKqm3}M%H z>>Nz)?_~Rv$!wCJ@9a$O?|pjyaA*Hu@80hIbcbiwPJhBpAUl(ABjB4R;imrnUpNW( z!bxyIPpUe9NiKX=zP?^g!#OzEy`O)&b1i>8Fv}*ppFTLa_h5Q{@NlwwKd=@z zKn$kf7I1Hxf*ZQ~f8h-556!^uj}dg3e`mHkc{n?G@ZjG4hX?o1_s=I3Sh&?)kyqgPp)ty%ApFW)2JPYx-`xbD&-W>eDIDhQk?Zn;AVK}L;S1r=QtNHcWvd!!B zY}yfr*=+y8!`teDdw|Zb|h)|RL+5VJRcS4EzjGUL9-B0t`G~1hf`sw81z|`CT zJb##;TXgXr({n@5|1X@PPK52o^6k7N@B$B#*u8&$^6=roe*Wo${ey!^;G%ZH#=r&>a0}qKpMc?^{J(HQI)9O| z8^!CNc)n5JpYKfX@7$lw^6Bg#dw@02$%FgEv-fw%<)1tln2$lIp*-9S`}Wf@*yaCg zW~1|gotsX~?1uC-YqRkzYu#*+&X|0