From 5f44350bce547d73e5f9acf87726e5ec9beb36c5 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Thu, 31 Oct 2019 09:33:33 +0800 Subject: [PATCH] update Former-commit-id: 5ead92707890d6c090b0eafd3f8362814ffcc9e1 --- .../Application/Models/EditNodeModel.cs | 3 ++ projects/IoTCenter/Views/Home/Node.cshtml | 13 ++++++- projects/IoTCenter/iotcenter.db | Bin 462848 -> 462848 bytes projects/IoTCenter/wwwroot/node.mobile.html | 2 +- .../Assets/StreamingAssets/wwwroot/js/node.js | 35 +++++------------- projects/IoTNode/iotnode.db | Bin 499712 -> 499712 bytes 6 files changed, 26 insertions(+), 27 deletions(-) diff --git a/projects/IoT.Shared/Application/Models/EditNodeModel.cs b/projects/IoT.Shared/Application/Models/EditNodeModel.cs index 33ae23f6..e63fbcf3 100644 --- a/projects/IoT.Shared/Application/Models/EditNodeModel.cs +++ b/projects/IoT.Shared/Application/Models/EditNodeModel.cs @@ -35,6 +35,9 @@ namespace Application.Models [Display(Name = "模板")] public string Template { get; set; } + [Display(Name = "移动模板")] + public string MobileTemplate { get; set; } + [Display(Name = "序号")] public int DisplayOrder { get; set; } diff --git a/projects/IoTCenter/Views/Home/Node.cshtml b/projects/IoTCenter/Views/Home/Node.cshtml index 59a108de..cf07fa03 100644 --- a/projects/IoTCenter/Views/Home/Node.cshtml +++ b/projects/IoTCenter/Views/Home/Node.cshtml @@ -3,6 +3,17 @@ ViewData["IsHomePage"] = true; }
+ +
@@ -32,7 +43,7 @@

云台操作

- +
diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db index 6db246fd83852b9dee80de83094b01a56f8b0f97..92245dd417a4c66b6b32c31e75ce4aab8d329165 100644 GIT binary patch delta 1434 zcma)6U1%It6uvWeX70}H?rh6$lBOnQH`&yMa?`oXkYf>-r>%C z_k8Dk=R32w+OxRYv-Z-A{^~U7#$G<3AHX1$T3ViIEYAqf-qP4xv|aX*o_ml(Ut5=0W)fbss#U zysmeop4ZOh9)_e*9~PV9LIq9>e$5C1+q7_%1|GHzLU3qW5f1&x3oPI8j5wT1fV37< zGjyvsj^Ys8K`q9Vk{DOLxaOK};Q6LEnE)Lp_KYw#uocBFwk?BVN@##1>X>fGS1qhf zB)|oida)HaHa4S>b60BwQ_qZXWVG zze|Z%HOE>&pV}_9YB+RV&K<`T2bN3uF)|_&xt?n{qY2Ome4}x&CT@OJNd%TYg-gmI zxTy^(d3j!rxztTaQWbbv{ZT8(z0xf%cwZ5YiSS5ct_T|ICb`yUMWqj@&7&O8xL6EQoK4im?1fY1iXumSm`muZas&ERgtA{}k1J=?PGzq?nw~<>q%LVk)w7v_tdM#DeW`7| zU)uGeEb&Vx*?JoJqGPk4(rA!1HFTfk3=)4OjR?D);wNv=x7m=2NI~rZskebPJDenR zvbA@xat0X^u?&|T&LEpz$RG!rj>R@I=s;MX(_2}_qzOi-T z>i4J571(DRLOHBY?2OZn-?rn>f8!**lGI;;#MaVi=uW}<(={HszoT2ock>KcDH6+U zRYkhsur(FgVSRKbGik$ZcU4dtfaR2?HNgo`+Rc7fk(00+8als_{t)a3y=&yo?7hg76lHuRl!(n9r delta 605 zcmXAjUr1AN6vuz}-|yW2SJ`9~+uC*4G>psc+;St8A>#VSlt3aZrZ2LzW{^l3#iA$} zR`}9+3tx&JN-U`x2*L2B=rt+`!FpIx5d_jpA^oNg=fL@%^Z9;HWieb?3@=|TE)1L3 z=ZpS)k-NANJR-Ie7=`yzO>CDUYOi$@6b$G1sB3;vgX(9xAzm`p^vmKV?SUJXCJkz* ztP~CC$EEK|l-@C0@Ob=p6l<7@m%qKW7H_5ptVQ?%hMzNI~CFAYf3(jfD%$sNiM zH7G^IP23+7j`?#j!QX*!x=rY~HRK4aM1RPUp8cir7-=O1gcyxGqyT^5HaK*Nyrlio zN2yO-5;MZ8kmDco9(SK}RzMS>8K-sU3_FfnSOinuwH%OhfT \ No newline at end of file diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js index 1c186035..fd934023 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js @@ -57,11 +57,6 @@ function loadTemplate() { axios.post(url, { crossDomain: true }) .then(function (response) { var html = response.data; - $(html).each(function (i, n) { - if (n.tagName === 'STYLE') { - $('head').append(n); - } - }); $('#template').html(html); init(); }) @@ -220,29 +215,16 @@ function updateItem(list, item) { $(document).on('change', '#camera', function (e) { UpdateCamera() }); -$('body').on('mousedown touchstart', 'img.camera.ajax', function (e) { +$(document).on('mousedown touchstart', 'img.camera.ajax', function (e) { var number = $('#camera').val(); - if ($(this).hasClass('Zoomin')) { - ajax('/App/ExecApi', { connectionId: connectionId, number: number, method: '/Onvif/Zoomin' }, 'post'); - } else if ($(this).hasClass('Zoomout')) { - ajax('/App/ExecApi', { connectionId: connectionId, number: number, method: '/Onvif/Zoomout' }, 'post'); - } else if ($(this).hasClass('Left')) { - ajax('/App/ExecApi', { connectionId: connectionId, number: number, method: '/Onvif/Left' }, 'post'); - } else if ($(this).hasClass('Right')) { - ajax('/App/ExecApi', { connectionId: connectionId, number: number, method: '/Onvif/Right' }, 'post'); - } else if ($(this).hasClass('Up')) { - ajax('/App/ExecApi', { connectionId: connectionId, number: number, method: '/Onvif/Up' }, 'post'); - } else if ($(this).hasClass('Down')) { - ajax('/App/ExecApi', { connectionId: connectionId, number: number, method: '/Onvif/Down' }, 'post'); - } else if ($(this).hasClass('Stop')) { - ajax('/App/ExecApi', { connectionId: connectionId, number: number, method: '/Onvif/Stop' }, 'post'); - } + var cmd = $(this).attr('data-cmd'); + ajax('/App/ExecApi', { connectionId: connectionId, number: number, method: '/Onvif/'+cmd }, 'post'); return false; }); -$('body').on('mouseup touchend', 'img.ajax', function (e) { - console.log($(this).html()); - if (!$(this).hasClass('Stop')) { - var number = $('#camera').val(); +$(document).on('mouseup touchend', 'img.camera.ajax', function (e) { + var number = $('#camera').val(); + var cmd = $(this).attr('data-cmd'); + if (cmd!=='Stop') { setTimeout(function () { ajax('/App/ExecApi', { number: number, method: '/Onvif/Stop' }, 'post'); }, 500); @@ -287,6 +269,9 @@ function onMessage(method, json, from) { } /*vue*/ function init() { + $('#template style').each(function (i, n) { + $('head').append(n); + }); vm = new Vue({ el: '#app', data() { diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db index 6501d9c17f7a11c3d964e1db2d6d53a58ab2b176..74a26d5d1dc7948cedcacf5a07d1bbd36b851a78 100644 GIT binary patch delta 1845 zcma)-eQeZZ9LJxwchA#%>2+h^K;qcK20O5qw%4~qWc03AaAPExOidt;;oT-O!r+cq z5q1(8BXbN`d<12nAOs@Wq0%;_j%f!D{9UaWw+D@-lzeSIJKalpo{}Fy{)abrLC5*i?oZf%Vn3_YO95t^2mAu z(@jvD2Cjj6S25K~EhGoX&14~Qil_jiF5I1hYY2c#(y-oYXo8a|&$5?z-l$90i8zO0 zsnwE(%V{Q3mr!~8dN@&1MwMD6ufd)z;)LWswZ$Nup>|# zPy!5dllhF{hf$a=p6-X`(Vw_%Xz!=ZyP z=>9fH)sRCTNN@q~K48zB$Ju=_Xf5u9$9)qk!4(QTAn%ix$iw6&auHeXp6I&cZO4xv zf*I?;A@~&}!uZrNyN7MZppU|Lj@XEEcu_f3ZrwNmOWjm8wFjdtoav>``oH$?_phb~ zv6h7r5)dV#rg7Xejh-i|cg$*vMC^pkHHBJvJnmvs3aUrg# z3NM3mK`Xxp-t)mq@ICFjg6SMINZ)b1AP0*{-&Wk1gEOpmbFdc?A$+(6tLGC|{&jdixu6xX``J+7o4{fsNnB>`F|EuK{*V2YpcUNp{p8!=gWmn* zT=IyQ_nh-Aq3_ZybP=+U0e^rgNV~h-GPRu==eq1lP`~Xh$y2eX3N_e4eyb9t?AxE! zL!(SJO5wJ-s6P)hWy<|EU^+XU0D$(?;2U4SQrw{<2H#0R7N68nsRtx7({0gY7GKkm zNbnXDMKOYr>v=69^2vwcU-XWhs7wq^Kvq)~$|tSG3(?V%dG6Vu7<9XcH`z`$7-(l6 zFxwg0-{$+v_p0}nx6w;@c6o|GH*KKHXbBvIY3OnFyFVbNxEfr5+DD0GADJNjwtH!y zS7x5FZ4^$xlhz^LC4_keSFJ-5-m?|WA!P~k>rseq%slCc3UI|*B#@eho7N)9NM@>> z4hkkYZPGPkNx*Zf8q;+RNrC5Yb$;?o%dYWw={{H*OJph?QvNV$ED0GVMIM3rFA)yt znUSEe?4)6k_6YP{HJYZ+ABh=D4o6{}6V3KBZzO0e`*l=f`CUUG^M9Z*Z0AuR;ypWt zRcX{fxw`8?EJEupSNSjhzF!H z6*g$<1e{2r2qEKxDLZz*u0gY1YA7P%nJE;8Pdkc2+^`<0ln|2eq4j8$fAHktf!^L* zJ3k$4&fwLRsEoF)ts2Uw6JjdDiw`s0y#Zxe=k?NX+EzUOGIo9_c+W;Oiy6rgv9rw9 qgN>-ujl4EbM1vSLqp2hsv}QD;GYIE;+%BAKM`grCD{lw-qwrsCMhs&B delta 1110 zcmYLHZA_JA7=GU8d7t}!&&PY-bATd0;mBc-u(QJf`A`rLG9`1!WNQO=A_I(aoufw( zOUIjSnqy4-=$^)!5n?)#W4Yd<8Yi>Otz09A8~kW&Dp@pUO}GBAddVL>+x0xVpX`fL)cJlNUJvj2fVzUkrsv0G}SLg#U?((JGrh5 zDV1!Bwf9%2T9q+aCU~fTn&Xg1ZBf`mQ&DKMj>O?LO)qYJwK!y-+Lm}rnEcryVEGTi z-ITy)HO!1V#%1Fj<0T_#sGe!H*>lx%)D!U(dvyJt{*~TO`NyHQSS!&ycptyUlh}dP zm=5#sJq*BJr~|+JTmB@6$au=B$Bpa2=E#boBxRtiu<;B`Dg9L2Ask z!_QoTfE0DAmoNc&;Qr2i)*Ykr1Z)hz5WEEqkSqU@cht3VM7}GVWLP@X8P!tz#BX9; zoVErN@Q~Ar>u|{OUV}$2^?CNQM$RPEQhgFKX-^VXgR@O+bXHgcN%#Vl%k*N*4$^%S zK+w!;ka87cN(Qa}5Vxv~v0F4AgH_hT4-k=}BowkD6L3k>LOVlc1x2BqmTwv!w{Gd> z##tlix#4NjAL*vP#69Y+aZS0RE{F4dXV7uO(V)$;UiMIXTT8)DumWyF2MBpw=BnfB zcJaF~l?i2sSi%#$?4;kjmZ~=3gcdV%-Hj~AM@wt4l)9(EOWQtxfYxf}*#FCX)K`OH z9xk)Kt-%^ad!;y38eYugeh$|o{aJ;3>Afm!x9YZ_kJGJcyKb$v>!z(Z>|ZA)*-}2| zk|jpAXUvnK_vz{GGwv0xqb|2|zhl91!jY+sf)6J#!skS@`l(hcX5 z=23eb+bQ0O<-Sm`EIj+=`2Dfrw1!RD_rB>PB>#k4B>+WkLM_#fkl?=>rIpRA{7vI|RiI7r5Rd{cigGCX_i z{IAD8pY1Wj