From 1de555a6892ed1228db0d5d468801a1cb777a28f Mon Sep 17 00:00:00 2001 From: luoliangyi <87842688@qq.com> Date: Fri, 5 Jan 2024 09:38:30 +0800 Subject: [PATCH] =?UTF-8?q?websdk=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=9B=BA=E4=BB=B6=E7=89=88=E6=9C=AC=E5=8F=B7=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/webservice/新版websdk接口说明.doc | Bin 355669 -> 359325 bytes sdk/webservice/ManagerV2.cpp | 24 ++++++++++++++++ sdk/webservice/ManagerV2.h | 2 ++ sdk/webservice/WSUser.cpp | 38 ++++++++++++++++++++++++++ sdk/webservice/WSUser.h | 1 + 5 files changed, 65 insertions(+) diff --git a/doc/webservice/新版websdk接口说明.doc b/doc/webservice/新版websdk接口说明.doc index 6e9c45fc17395d1690df533c97b3c786ff3516a2..065f178628f89df4b8b2d5122c3bbaaed600cfef 100644 GIT binary patch delta 27571 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 delta 27892 zcmb8%4>)XRp5XDSx`%PKh=^;n(IUo(7Nf;zXl^@A>`StN(iCH)~gh3Kd7cU;g%=>m05ZD?iq1{jQ%n+;_?0#n)NV z;(OWfd*9UjspcU~`1MyV{~ztGnODDZN&6LNoksK2pJ?Py%RP5}qh;x``}HZ8Osy`x ztHsy#5AX7Gu&k4R9(=Ure#N(?&^629^dXJLqvbzde(-A_J8CoocWE@QdT2D6%B|OG zw!Ac&;g*NozU}ZNrRyxOP4LlZ0(i;BS2db^KDU+s6Pf=9UVEkGA@{c(T*Eb*4_iKQ zd(`1qOm#5zz3ba#tsOLL z2erRv{O0g?G@22NVgi$x!Zc>EfJH1}8HYGBKkTIYwN`(`^f6AL7&ID3IKd6>@PH@0 zphqm?U__?DtWVNTYxSATWFZ?l$VDFVQGjBUpcG}OL=|dKOCdd%p4PT}G~;9EO04GY zT2|Mg9<69YJ37#f9$Z5o`Z0h(3}MWm>LYc3-}2GQe{HE6@}aabmX2crlbFFQ=COc9 zEMX1n*u)mLvBO3x%6;0F`~LM86t%;mUF=~W$2h?$&Y*jQoe3v6!v&u3Lf|82{h01G ziuyQ;?Z|USflSSr~#)L?9AT zh(-+JkpKe{QGh}e!IWs$m+9Cd6EhX4L>1~#j|Mbi1fv+kIHoX-8O%~hxfC+X%p8`m zj2l?NF-~xbGdMlUSAh#W;0dosuj`K~!;5Ke_`n|l2u27(p+_v@kN^V`k%Zhw&H6&w zkX&Z+kdFcsq6j7wqXc!RM*|wsiZ--As_LD!|8h|i?T#?26(ln%_0EIB27-c9&C8|)1 zI@F^9O>Eq`9E=ntXPtXBcQ>)P8LenTyLx}H?ho9Dm>k9k<}lAYd*oC)&&&cAaRVz@ z!#XywgIyfq7$H+nFDL5yMy<5Vfs3v3|pczM;9hhc(yGi(!ml6k{021ST1R zgIyf3p@llRPJb-d=>rxW;smESgG&nE7jE!?C%oVdAH*UK@hP?j#0(oIC&PG_CL#&R zNI@!$$V3*hQHOdopb;JDOflNhP{OKFZ+jv}^dhc&x6hvrGD7hDmEC`2O$afn9(3`j)klmEZJXDaVXLpm~0h$5I! zj7n6Y8ue&EBbw0sr1kgIH#5_Y4s@dj*D!)nj9~(kn8GyXFpq^Nuj_|zHP#M>xg_lr(-aIHk4dx8IYCgKF~CHdC4tOWoiO4|u{0zVL%T0uYE$ zgdrReh)KJyKl!N~`wvl43`_KgM*<8;L^?8HL=JM1hkO*kgyJ++@20bFc^0#@1f?iL z6{=B#S~Q{qo#;Y81~7LL?b;)vMkrSK|h#&+b1ks3r98~Jz4c;YZJs5wCLI|tA``jD zg9*hbK`E+HgIYAA>8Td|%-7Wa6{T>^|JZbK-8b@;n^@b7R?*Pg#40b7;~zA;23x@I@q|5RDkbAsz|HOaI)Rr&OFgR^_7r zg(yNj8qkPVw4ogx=)^VjqA&frep7D7R_w37QfeP-`!Rt@Oko;}Si&;au#OFE!trT- zS~x##*3Zcq)tMO=xWfaU@Paq|5r9AhAsR8zBNj;%a-jXS_F<-zk%9~uk%=s1BM#Bv}caXn_~0giBt6P)4<=Wu?8?*ec5 zz!w1s#Klf)c=MI#pZNAS>0k0|F|Ixrg2edxykhB1OsjA0zpn8EBbX8o?z*I8!fu!}wH z;{azkhsMZH2xqv!6>ji^mr?GBEH`>`_4i_tFZ|$-a6}*y(TIT_u`nVN*~o#3qMYT7 zX}w=Cv8Wg&C`BczP>mWipb<@IMl0ITjy;OnwDwj>`)ZFx`#8WcPH>7doWt>1z95|8 z0zdd80D;d+hXmIvYn2aVQ8*$H2|Z#Fhj=8Q5JfPd3e~7V?X!2@YI8xoME99`PowVM zZ}stlehgp`BN)XP#xa2z%;Jj<%fHBj&O!^Xfio1LxFSV z?e@8P{xh9(q&rJJ;E6y4AsC?uLpUN32|Z#Fm#OMAv@Mp)f%V2x?j7X35yx5s5|M;t zq#y%EWFiZtC__0aP=|W9&C*1#XQlzIXhSg?YH|rmhGuvQ6;L-gl4p&9UbUI7rHTz1uWtQRw!y)4)PUdR?xk}#>$Ol;^MO*C|6`+5?{Of)9M*2Y-Yk z0+EP<9Od#D(2oHOViaQ-#{{-;6WiFq{_`sRoYFJcfXDufD;G--aEK!u;~bi7_6igP zA_&0Iczi@q2B zt|q~DF3l7;!5N;pa-YDy^JK;g z-tb2N0uh8@gdrSJh(-*Okc<=xk)G(sQX66K^(0rF49SR)b1UI9kH3J)LKLAARlL4Y4zVg`s!@wN)T057=td8&p&tVn z#1MutP9YwbZa@F<)7(AI;t5P*3I{mE5stsBdfw3a>Z0?cGV|Hdd2BfJh(!VnNJJ8n zk&X-)k%v_Nn$d-B^q?OD7{m~UF@|wWVHz{Ik#}7`MHx4kUcoBXv4Kr& z!TEcfbKnjS1R@B*2toMwq(49|PbO-%fS*{rq%uHe)3s}SoRrAsz`ZAPworKsIvnuj{udBZui+C`UaS z(1>QVq7ChA$i=f|`#zU;Rt;hZBN)XPW-*6(EMO5USj8GPvBhTXTDx`a&RLJK+qYPI z6WiFq0SrJ=oq#Lc-~(UyA?PJ*Gct(jV1ytPVMs>?j4+`Xr6@x=n$e23mux3! zsZ+MIsr)Zz)HYtxjxKbg2iMSxK@4FSBbdWH7O;r5moCnzYs{=;1KZfaF7~jGBOK!l z=g<`JRpAbgf{SN+9?W>b8$R$w7{U>ONW?&oSi~V7naHA$o{O$SE@4?L%0>?I)%y>0 z_qkUxS%X^Cp}s(R2&D@{f)y-#h3@!Yut(}y+kjTIp&cC<#1Mutf+Q|aLiANV2?QHVwi;$F7ZB>S#5xv0jmHXaEuAQ7oZLpm~0h$5I! zj7n6Y`en0zK#sj?X6n&^Ml_)r?dU)^dTI-dmxXd)56>Vro z2Rbp08O&l0>)6014slfYrA<&X&%Sj!{SmJ^#tBa0`U=$;Uhswwq7aQ3BqIf>NPFe8 zJsGy1-Za)4k%=snpcG{&M-{43gId&~3C(DI#jLN=-g-39%Az)mV*-U>AGX#}STkQe?Zb-a6hd zj(a&rpYV!PczvH=5(2G9wV;Cd&qSm3MyNUoN6Wc4V8O0cuu#6j6!4_^}8~ZrGA&zj2Gq%_6QSup! z&Y_t2ap43nc*6&N@J9dw5riD%BG1G@EUguJa41)kJQfzB2qqMx1Qn=66{^vLYv@HE zMlfo+IEY7?8N(E&F@ssmVIK!Lg!`+UP!WhA1S8?qi~fhtUh7_B>k@c@0ZB+k8q$#g zBeIc$T;!n;MKGcGRomG?ZgZk2t(c`HC`AP-QH5&MpaG3&LNkUjf>DgUdeI9%#>@<6 zF^45A;|5l+iVbXH8#~y=Db6Uw((FEC<{Y|WenvRL3C@T`9O99PBqSpRsW28>o83}- z-{D&sS(b?`WTOn_s6Zv^(SSy@p&cFQL>FaATl`8FGc%aQ9Com)-XD1BK4+KLIB&r7 zwJ(1}e7oyYP92`S+6&(BK?EWZg=i$efJCGs4e7{$@wJOb!$xMZk%N2`pb!^z>BvMDvXO(_65GQ~`^KCt1}&FY6ruAO`%QHRcw6nCTL>9%_Jxs`AQ2`23gi@5D92Ka4AZ271K8fJ7uAxzxI|lbKFIIx>)j zY~-LAB`8HXDo}|kRAZ*}b31#6#j}{hB9^d>8(6^xHnD}9aD9VKhdVspxMOE~u*eVo z2tWuz5r%L?z=%v_p#-I>N|T4jhfE*g7$-P| z-p&tpbCEA&Ou^Daue@ zK}5SX;F_y9d%K*46{til>QIjc^kV>n7{UZ5F@-tIS5Omqknu3n3s}Svj&XuhXnx2B zL4hNj;0AYi!1IS@{Y~l8^JFFhk%&Sx5@0|gQjvyqWWb1Qrg5t!P6#1~G(Tj9>zjmA0nwXK$_K z;y=kNrZA0FtYIDdIKUx};QAInAl%^rPXxVns{_-%=qnT(#Oh##BLa~yAQ4GOMlSM@ zj{+2;0+nys!dL$G;*rHelvv4{DpaEm^=LpNn$U-S3}6r=7{wUI+0Y(oT8uL@fdwpL z3Cq~SJ`Qk*BPdl=UAVv%ZdKB|GOhi(8#C_kf;W8N3qJ%Q7$FE%?=QJ@uP%f4SsrX; zu*`@|c- zS?`#s7i?1&GgYWYJsQx6CJbN@LzuxVmT?1zIHHivi$Hd}8ul35cEsvqIM;H(zzg1p zLp%~-Kr&L0iZrAntM<$L1#UmDmOYTgtFw`VT-2Zzb*M)h+R=d?TthGV&|iDeFVN4- z5QZ^^aZF$Vi&(-9tY8&u*vA15Da4WwaLCLN9DhtLf-_v;ia-P*7$FEp1R{}+j33{6 z6eTAV`C=I?HX;*Q$U{B~U_voUP>M2Cp&B))rMNSxZneyGq6^*V!61e(jB!k05>uGQ z4tB9eAzpH1T7#+fSfs1tK!Gz{;0jN8!5cmZKp=t;j1a`v-3lv|2CvkPcorwXfD9Os zhkO*E5>;qGBL*;tAewJm8FPdTLES7NtXE=xET{ap{aE1$9;RY{w!{=S;J!fb6 zFyo5|L?Q~&NPq!}NJSdbkpUyJkwYPN{pL9=%0~eTQGrTSp$4_6Lp}P?k3kG!nxgE& zIj31PgE`D&9UIufO>D!dp05WNxWWUT@T$Mv-A#j>E@>~8Mj;w8&?6QGBq9l^NJBa@ zU_=gb@x>SU104YivN{j>s74KHQHNHvp&i}m!8P=v4~z8|m-aNT!#R`&w!GnvTH(kd7r4R=e(*;Cf)I=lghG#4#33H(6lGT{(pi)NBQlYN zVw9j1WvE0Is!@Yl)S;>2BJcQCyH`E`)g{;P4%T&|3*G2JKL#*}A|q~{jnp$Z!v$WAX1%{c4Pe?EJ_tY{f)I=l zgd+mch=Cr-NI@!PSaMcVnMp?mjL3uu#VA23>QIjcG@=Q8=%*0db8Ws;KZ^!1h!Kop z469hfIySJ0J?!HE$2e(})Sox(A9!;@PP+)xJmD3mIKw#{f65+#Gh7gk2t*w@{o@Lm?+gg3(C5O-=S0!Yl~5WQk0@0w4Ikf5-XJmqmW?M-YM$f+Qp(1*u3wCbE!?JmkOsZ=E0W zc|`#VQG`;Ip&S+HMIZVxfH90?0yFPh&yO=q&teYqSim8Ua156=8VK-!C%oVXe+0CB z;rTIuRe=ac1R@cIXv82FdB{gGN>GY2)V6)mQ731LmvoxDRk!_19>E>Ft`lA8Mi2VX zj{yu~2*Yh;&wk;dHq6>_OkfgIn8qCDv4BM^VHs;!#|C!z(viB0Q||55$Q@Sg;t0n$ z!70w5s9d|?1P^$^5B>;1p!$V(t(H@+dj7vJ1!~>ZKRUW}pY{XwFZj=V&*KhNTJ`4d zF8SyKd3z|r5RL>GkcM=WpcG|jKqETPi5XS;cy8x;el+t7j_euM%wi7nSi&-HUE(Dp7@Iw4x2|=xG1k{c8t{hcSXtjA0T}n8p@vVjDZy#W7BBN^yB|OLoeP=I0#k zP~ZqBxWOGB@I*WkU_c_$k@543NRkX@jL1PQ@{o@LG@%)-=*IwtF@jOd|D2t3M?j~X zjOSUifK{yF1gAKITL+s4U--d*L?j^@X&q*LzvL*{S`gNlnKV|VBLhZcA{TkcM*-T= zflhRx9|IVqNJ~`TATy&F!#E}|i5bjd0gG6|Cbn=BJJ_WVyQsch7VTjlx)0d#ne6p{xxPS#RG<>Is6##4(2kx?2~V?j=9tg_NO|M(TQW3Srh%731`m@_zXBg&V^9Mb+A27a z9||%al-HxwNVG$SIPyy3wU8lz=Hd1j<)H&IW=&W!?}d!+a*D*qskx9*OBie9Ed~vt zdO-%@Xuu|91Pd8+BK1j*OUUpGPHF5#$RGuyaD0kA2T8dYx%~E!JP%3JkSq(yoRD+} z$zqTs1W6*0(0_^9mymmjn3srm2~n4TatR2R&~1sl_9&osKmwN~@L0lxCCXRAb0w;_ z9um4Lfu<56`j*6YNQ%dAx$@lpNkWfI0;FAD6iItNGHwjRa_%ewLldvv{#*$zv ziGq?KCJ8r^a3P8Dk>DJOt&yl0iE5Eh6puHknvmcP3BDj=;w?fS_#J-0Zw!eSkO%$p zcwQc_%kyw~oGnkIF%5ZCBu{$e z(TqGqk;fhKxWe={FP7&7(yK3>^3szo9pTbzEq%(;B`iI<(hV!UsM7r@eU{SGC>@2; z!zW#H(xE0jU(#_U-Axmaeje$dX@c~PNY{pRM0ho_$00ZHCvWkO+$+n?t=y5yEu`G* z$&H!ZM#)W&+@Z+rgf#x8sV*&TX(&qzSK6Y|mXyX{Eu@JhZ6ax)NRvXE1ae82>#$r# z7hFRx z`Y?oHj9?D)Sivfeae`C0QkdISdFc8tpS^Fo!s$&u(+9ptfB}g}LMqabjtm%)gIwex z|LR5DiEMNQDp7@MG@=R3=s+jB(2XASp&vsOV)vY1zWXpnFoRjlVF8O+!ZNn8gI(<5 z9Gb4%55ui-j6Ul5*A(|qUv{P+{1Jd)gdh~jNI@#nz=)mtbvm^y0~X4#NLOf)k47s_ z1%{FDP&pt&VNOGaw~RG#=0Ps@*@Rnv{^`~f6Z7^nzfx1`m9MI=tSWb@i6f0{?-n<>w(KM9HRH5d>|50fFj5!g&i2f#H04#sZYMshf2Ka z_p~BkXM$JANQ3KeNuq8b4GoYn_S!I?L=HK1+RTdr$e^1I{w4nv9wzgQ3YlXfgeR6Y?ssj9C@`MUYZZ6!!6ANx+A z4EiNas;DPvWFQ_gL{~9n;4B#*Yx2p@eqx{uk0nE6$*@>50M-dS(zrIk4*^I_vwxfQ zu=q<$O-y8M9tt4swo-Iq0y5fD%u{^br*6Mny=qW?tNQ(=Qbz5Ov78J@f{el>V=67c zC!JFe3Q?4P`_1O7XY8ZMA{IBG5i){N2d3flG{+NUNFfRL2 zqb?nAEV{iwY%j-lgt{?rIq%6kVj%+vnb3eHG{ZI+(D2h28xyN|t7!!e-s;swYD~&g z%Dw8N|5>?i`ROkY^9~s*=m63-jYb?2AnnvHtYz4LtyKBx*I0avQ=H)(F3+$x;0tNm z1|#Pgd26Ja-KP9c_3A$>UsD(VixMUkI4_7acU~a_+zem@GN{b~T#fvk(4*OC|KaWO z;W9vsZE%=n8lK!@64T!WY|kay(G=s66S5m@};@Phhx+I?4lFn@j=aOtLiRQhfPL_mYNh+3?^svlB-(?6N*s* z$;g##T)Ax>DX_ft;t-YWTFID=dYNAflJhG0u9D9x>8g^RI`y*shgq(al8P$nrnXd5 zYnmx1xI#7nk}WC;peKd5u9W{?8z{+~(XVj1fuvhXs->h^O5UX8M@j;uOVQ^(O!6OX zxsSHIM@ev$-p`1WGoaWbHYcXeA)fbbB*yUp93#x{j56?T6}1#|+5wSL(a+--!B4{=4hCj^E|e zPe1(|`Tsw>`k*#Ckb)$K&zir-d7NoU(~~qj$*hx1I=S(ew6=Zw>h@3O=xHTftD62= z(Np2MGjNvINZOmEyh%raWUNVsnk1pw642s`FE-k)8U9DAn}fr?8vB$IaK)CKCW&d1 zlqN}Lv+6yL4)+G_-SP4EGxPQ{UwSW7t5$tqsZ?WMQvO2y#$^X5_0xLA_rc4Of+mS$ zk{~8|V3PA?%lEP+cS&N`%4?P_H^1U8r$0&Yk`yk<%u0u3WJxxbSk)9bzz>(yei8sFFav>Qxl8qzz zHPVF>2FZ;{f#k*55@4pwEJT80q$r^cCs)k<617tU>Zh zwtry1;n~XLT4_Xi1WT@oq>xCeh~$Du-iIyc!E@FB0Ez#Xn0|@j zmjHYTotMz~JC2Jj`$OR$?PsR!XFgKDWm3MXeNTPUk86hCk7*L{xsj^N{SJZrL{e-7 zBuric-la!P;?!NM=zD}We5>qtPBwKb(3izYC_n|;(TOhfp&!E+Z+j_Fx*7cV=j}j; z$JC);D?w`30}kC6O=MmtTe|Nga#~`b7pv_zpjI|O!k;DdS;C$rQ97bezUeCCGo96cxBRwBMZ=L|29 za6<_-lrTey6O_8*>or8)mKem;4ZM4CyInM)(p7%?zHg1XkQ(P+O>2I)>pd0fc|-e8?XZP_BW zBpyp*u_V??;-@5DN&=sBO&6DmR;A}w1#(uG-d8+sH7ESp7Kw6-hJ+y{K;ng@e_4Wi zBuqy_acZ0Gx5b~6U7*C(NY}Fjz)1JAM65^`w8WW6Jc&e%#J1YM?N+6byLZ+~42i^u zbU{KsB%(tiHj-fty}0w;FKS!<^3!L`uNWM>6!qsx4y$iTccXL@N*|x}&`I~2bdX6G zmvmA|50i8cNq3C&sYnNj^mItKg>*hhAA)oU$nCq_c*|Y1+yl!Et=yi<&1Uj*Y*m)r z=*cac+-1q_5{=~?o=(Uei`;+6&4k6dG^T!7^oDwjdIoXLeqt}1ekkkh`Ldwr|qL@B2@wpPwgaxRbqTMkn> z*yNazS}#>tDw+v6N6TN^wC(>a^IxSo-0fr@&2;e7 znb)!$_7wB{iw*}m^JJbwoVKmZ!SI4?jV-uF9#=@%jD*EVsEa3CDKROXkS)IBK-;o@ zuJzx4w4a%>pZR}W&7|0MII5h^QHohekc9+TtiZF~z9N=#Rq&O4C-D*qkobpoNT7l> zNWn~p#g;Z$cJ2w}$%+IgNMJ%DB$hy82P7IGk)5C1p$4}qovPn&ICFLXS_!#zkp95~ z&hqQXGk@l9Dv3OBk%ukvphcdabYHdK z1i9FFOI?y@Bk~MH>EZ~4^^wKJOS6=_S{`=4p=Q7C(8bN8zfR-WTk4=Q8_FEcwN4Lm OAoIu1oLtV;& devParams, std::string& errInfo) { errInfo = "错误"; diff --git a/sdk/webservice/ManagerV2.h b/sdk/webservice/ManagerV2.h index 91da3dff..c735c6e0 100644 --- a/sdk/webservice/ManagerV2.h +++ b/sdk/webservice/ManagerV2.h @@ -191,6 +191,8 @@ namespace ver_2 int CloseDevice(std::string& errInfo); // 获取设备序列号 int GetDeviceSN(std::string& sn, std::string& errInfo); + // 获取设备固件版本号 + int GetDeviceFWVersion(std::string& fwVer, std::string& errInfo); // 设置设备参数 int SetDeviceParam(const std::vector& devParams, std::string& errInfo); // 获取设备参数 diff --git a/sdk/webservice/WSUser.cpp b/sdk/webservice/WSUser.cpp index 648eb50a..642f06d2 100644 --- a/sdk/webservice/WSUser.cpp +++ b/sdk/webservice/WSUser.cpp @@ -317,6 +317,10 @@ namespace ver_2 else if ("get_device_sn" == func) { GetDeviceSN(json); + } + else if ("get_device_fwversion" == func) + { + GetDeviceFWVersion(json); } else if ("set_device_param" == func) { @@ -2472,6 +2476,40 @@ namespace ver_2 } } + void WSUser::GetDeviceFWVersion(cJSON* json) + { + assert(NULL != json); + + std::string fwVersion; + std::string errInfo; + int ret = GetManager()->GetDeviceFWVersion(fwVersion, errInfo); + + bool findIden = false; + std::string iden = GetJsonStringValue(json, "iden", &findIden); + + cJSON* retJson = cJSON_CreateObject(); + if (NULL != retJson) + { + cJSON_AddItemToObject(retJson, "func", cJSON_CreateString("get_device_fwversion")); + if (findIden) + cJSON_AddItemToObject(retJson, "iden", cJSON_CreateString(iden.c_str())); + cJSON_AddItemToObject(retJson, "ret", cJSON_CreateNumber(ret)); + if (0 != ret) + cJSON_AddItemToObject(retJson, "err_info", cJSON_CreateString(StdStringToUtf8(errInfo).c_str())); + else + cJSON_AddItemToObject(retJson, "fwversion", cJSON_CreateString(StdStringToUtf8(fwVersion).c_str())); + + char* resp = cJSON_Print(retJson); + if (NULL != resp) + { + SendResponse((const HGByte*)resp, (HGUInt)strlen(resp), HGTRUE); + free(resp); + } + + cJSON_Delete(retJson); + } + } + void WSUser::SetDeviceParam(cJSON* json) { assert(NULL != json); diff --git a/sdk/webservice/WSUser.h b/sdk/webservice/WSUser.h index 60eb8be6..26de1179 100644 --- a/sdk/webservice/WSUser.h +++ b/sdk/webservice/WSUser.h @@ -58,6 +58,7 @@ namespace ver_2 void OpenDevice(cJSON* json); void CloseDevice(cJSON* json); void GetDeviceSN(cJSON* json); + void GetDeviceFWVersion(cJSON* json); void SetDeviceParam(cJSON* json); void GetDeviceParam(cJSON* json); void ResetDeviceParam(cJSON* json);