From 710b6c0b6b740a5e1d7544a83db314ec70714a8a Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 30 Oct 2019 17:08:06 +0800
Subject: [PATCH] update

Former-commit-id: 3956ab3edd344fdd184b93f317633a81f994252c
---
 projects/IoTCenter/Views/Home/Node.cshtml     |  10 ++-
 projects/IoTCenter/iotcenter.db               | Bin 462848 -> 462848 bytes
 .../Assets/StreamingAssets/wwwroot/js/node.js |  66 +++++++++++++++++-
 .../Assets/StreamingAssets/wwwroot/node.html  |  10 ++-
 projects/IoTNode/iotnode.db                   | Bin 499712 -> 499712 bytes
 5 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/projects/IoTCenter/Views/Home/Node.cshtml b/projects/IoTCenter/Views/Home/Node.cshtml
index 508228d4..59a108de 100644
--- a/projects/IoTCenter/Views/Home/Node.cshtml
+++ b/projects/IoTCenter/Views/Home/Node.cshtml
@@ -108,7 +108,12 @@
                     <div class="col-md-12">
                         <div class="box box-solid btns">
                             <div class="box-header with-border">
-                                <h3 class="box-title"><img src="/images/light2.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                                <h3 class="box-title">
+                                    <img src="/images/light2.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}<span :style="{
+                                                                                                                                                                      display:'inline-block',
+                                                                                                                                                                      color:'#eee',
+                                                                                                                                                                      backgroundColor:getLightColor(GetDataValue(device.Number,'色调'),GetDataValue(device.Number,'饱和度'),GetDataValue(device.Number,'亮度'))}">{{getLightColor(GetDataValue(device.Number,'色调'),GetDataValue(device.Number,'饱和度'),GetDataValue(device.Number,'亮度'))}}</span>
+                                </h3>
                                 <div class="box-tools pull-right">
                                     <img v-if="GetDataValue(device.Number,'状态')=='开'" v-on:click="CallApi(device.Number,'/ColorLight/Off')" src="/images/on.png" />
                                     <img v-if="GetDataValue(device.Number,'状态')=='关'" v-on:click="CallApi(device.Number,'/ColorLight/On')" src="/images/off.png" />
@@ -613,8 +618,9 @@
     </div>
 </div>
 @section scripts{
+    <script src="/js/node.js"></script>
     <script>
         var debug = true;
+        loadData();
     </script>
-    <script src="/js/node.js"></script>
 }
\ No newline at end of file
diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db
index d0336941f57ecdd332e5b6a3bd44d2cbdbf339c5..6db246fd83852b9dee80de83094b01a56f8b0f97 100644
GIT binary patch
delta 1129
zcmbVLO=uHA6rTN^Z8q6hs}!-t)TTCCH|*~0HoH<KyV*^eDy1OxU@r}rn);K7O$AR@
z6pBR=MI1yF5fl_H^`}Ovg7xabi;7UZ*}t12cu}g8w2F8N4m0mD!^ii&_xNVyM#Bi%
zr>Vy@8~1mytpN7H_uMqwilsOmrP<@SBTjd$VsF-@_^gQdQt*RsfbA)rj?-6}6A`AD
zQfx~}*vOP^*YadtH(l9DAYD$nih^|HDW2tam4Plw+OBEa1QWAl-7-AcG>|RFY$xV9
zhMv%okuC!bPggD5uw*0I?#McF+hwcWOvtD`<|GnH-EnlKvkYuWIF_ZFUQ*VRNRxF#
z^JLppld|i1hGKa(LW-9vy>@A9W_7ta_BG$(+s@Z<1ujWiToYn?c=jfHoHVpA#5`kg
zp@oT1UHHmolG4kmvy!+}xgfqE!SLwUFhdSo`Woh>?@;Im8$maXg%H274RphA@Ei>D
z<KQXpa38oG>^N%@<~V(iR;lY$Sm@7f_4k6NIy?~J4MsCGd@aJa!2>FJtq<ZCAzq=>
z(&rFgfC3;Z2bzKvETxu_{j{c*en$8>ML!=Y*<1LR@0x4ofFvvl!OOuGY0}>q_!!6u
zOEr1lw6wG4i`Xqr`1&3-t$Hg22=Ewa&L>Ez#(GQzAmWf3RZM(DgepGihdUS)Rq-o7
zG<J)cr~xsTs)$`l>nH#Op|_f`J4Xli=Zg94(2!;rpQgrVr*8Z3warY}+1EuV*VnFa
zRb!t$g+s;6{;Z|UUz%JTJ--GA-%w#Z?StDmq(m+4vIw=k{xQ%1a;br`;7lh8b#*Hx
zj7)#!{<~yV{u<7r*ut5I3lpc7Wv36OE0fr;Jc4S>ygO4IKAI^G7V;X3E#7)Cd-3d_
zDZqnqLRVjl?}|{tGa`(2{s4!GEeQWV>Z|z;!&%j`{+7E-N&zWF!XaXx|I&>9Q7jaP
z93r`SEzSpEjM1V9-wD9O{KEa)b7Qwk4H8UKl!*s|a4@j^Hb3@cZseqf<C~c9F9l*E
ATmS$7

delta 452
zcmXAjv1=4T6o+SKcjjg1X7@G*O<@9i=PHNDayxr>8zl*2lmxM{FqMTi=1}h3f8hd(
zAX-QuQ-~r23n3;&^d?}T*9mEClz><oTOnYfh0a~z_nIHy``+uloa))!$8U+N_@cXq
z;0Ao9105=oXr;)k@Rr!^QpQYqpRbt5iac}H>fxr|E-*EpFO$Z%aJc5~u~|OHCTKwy
z^@+&2W;&7ceuTO;XBq3K0mKgvW5<qb4r3bp1%yx)^|2m{ShYHK6Mn-Jh}jnEvjw_O
z=iM!L#wrxqBq@G@<F!h77doj}Mw1izL&WM%)|BQ~#0r4+Ia^o8b-TuzWTvj4*VrwR
zO7pMA6ebUL%*C_p<Cl}-7~*^Y<@NIE;9Y6M|L(U-QmpbpaCN5=zT$eo;R2P-B+u4M
zAfbE7YNwBD>OtnpR+8&E4^mHvjyifH7Es46eO*8f;twi@@FzZm8%b^zslMmIywga|
z>unF3JXk_DT{JyDauPW*O15BirzUmbL+)ltE7h-k=(2-18$Wh;%~Swau)VTUhCBXI
Q_w!NzptmZuI^)Fu0a4I*)Bpeg

diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js
index ab80916d..1c186035 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js
@@ -457,9 +457,71 @@ function init() {
                 Vue.nextTick(function () {
                     ajax(url, null, 'get');
                 });
+            },
+            getLightColor(h, s, v) {
+                return hsvToRgb(parseInt(h * 360 / 255), parseInt(s * 100 / 255), parseInt(v * 100 / 255));
             }
         }
     });
 }
-/*exec*/
-loadData();
+function hsvToRgb(h, s, v) {
+    if (h == "") h = 0;
+    if (s == "") s = 0;
+    if (v == "") v = 0;
+    h = parseFloat(h);
+    s = parseFloat(s);
+    v = parseFloat(v);
+    if (h < 0) h = 0;
+    if (s < 0) s = 0;
+    if (v < 0) v = 0;
+    if (h >= 360) h = 359;
+    if (s > 100) s = 100;
+    if (v > 100) v = 100;
+    s /= 100.0;
+    v /= 100.0;
+    C = v * s;
+    hh = h / 60.0;
+    X = C * (1.0 - Math.abs((hh % 2) - 1.0));
+    r = g = b = 0;
+    if (hh >= 0 && hh < 1) {
+        r = C;
+        g = X;
+    }
+    else if (hh >= 1 && hh < 2) {
+        r = X;
+        g = C;
+    }
+    else if (hh >= 2 && hh < 3) {
+        g = C;
+        b = X;
+    }
+    else if (hh >= 3 && hh < 4) {
+        g = X;
+        b = C;
+    }
+    else if (hh >= 4 && hh < 5) {
+        r = X;
+        b = C;
+    }
+    else {
+        r = C;
+        b = X;
+    }
+    m = v - C;
+    r += m;
+    g += m;
+    b += m;
+    r *= 255.0;
+    g *= 255.0;
+    b *= 255.0;
+    r = Math.round(r);
+    g = Math.round(g);
+    b = Math.round(b);
+    hex = r * 65536 + g * 256 + b;
+    hex = hex.toString(16, 6);
+    len = hex.length;
+    if (len < 6)
+        for (i = 0; i < 6 - len; i++)
+            hex = '0' + hex;
+    return '#' + hex;
+}
\ No newline at end of file
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html
index ae3d6f62..313c2111 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html
@@ -77,7 +77,12 @@
                                     <div class="col-md-12">
                                         <div class="box box-solid btns">
                                             <div class="box-header with-border">
-                                                <h3 class="box-title"><img :src="server+'/IoTCenter/images/light2.png'" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                                                <h3 class="box-title">
+                                                    <img :src="server+'/IoTCenter/images/light2.png'" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}<span :style="{
+                                                                                                                                                                      display:'inline-block',
+                                                                                                                                                                      color:'#eee',
+                                                                                                                                                                      backgroundColor:getLightColor(GetDataValue(device.Number,'色调'),GetDataValue(device.Number,'饱和度'),GetDataValue(device.Number,'亮度'))}">{{getLightColor(GetDataValue(device.Number,'色调'),GetDataValue(device.Number,'饱和度'),GetDataValue(device.Number,'亮度'))}}</span>
+                                                </h3>
                                                 <div class="box-tools pull-right">
                                                     <img v-if="GetDataValue(device.Number,'状态')=='开'" @click="CallApi(device.Number,'/WarmLight/Off')" :src="server+'/IoTCenter/images/on.png'" />
                                                     <img v-if="GetDataValue(device.Number,'状态')=='关'" @click="CallApi(device.Number,'/WarmLight/On')" :src="server+'/IoTCenter/images/off.png'" />
@@ -131,9 +136,10 @@
     <script type="text/javascript" src="lib/framework7/js/framework7.bundle.min.js"></script>
     <script type="text/javascript" src="lib/framework7/js/framework7-vue.bundle.min.js"></script>
     <script type="text/javascript" src="lib/flv.js/flv.min.js"></script>
+    <script type="text/javascript" src="js/node.js"></script>
     <script>
         var debug = true;
+        loadData();
     </script>
-    <script type="text/javascript" src="js/node.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db
index 29ab849e11c6dab134f33da5bfe545b72f378b5b..6501d9c17f7a11c3d964e1db2d6d53a58ab2b176 100644
GIT binary patch
delta 1549
zcmbVMeQXnD7{BY?z3;W#-L>0<Y)qlC4X|*{eYSTqu-&y+>tGRqX#yCitS~+txOE##
z)a^ovjLb1M;wxe>CPLI?TSefIU?2njGcm+~k@!Ir#uzbCgBt%Z@!C!k{A=Oz=AI|-
z^SsaVdp`RwJ<;!;9G>&!h#Z-tPJ;tsJmw69!C%c@K@@~UI-8czB?LmwL?<x3Of=IP
z72K~R2!@G}6MPN)R6#sLN(c^vwH}wQ9|jH1v0;D+ls^iV;#X1RJ+Rc-e+2X`sA(eo
z822?d#^t#6oWKG0TlN$?z-}h}s5TFFRgm@67?q<oP!i=OZ;=i;<h+{)Sz_H%qQxT^
zx)3*HjW-gy#Vd-I;LW(K@X3TA$ck(UmY%?_7Bp2$5p_e=c{Ld|c|}e{c|EGdc{v(0
z<ME_onu>s3c3Mw^KWj-bCJ4@^Yv5y=7Pbhws0dq}z)kRbX4RmFdxwj#SJ(~A1IA{m
z%O}d?W#5$TDf9Z?@<qH?yldzwY!Lf}ewD6(AHwC}E3g9))G)P#yhyGiW(XU<hQCNu
zd-5KAH0ZBKucu(tCyC<pz^Uo{J|FsZ1cc}|ySlsu3s$1q6jXhZD&0Ome&_s2A3A&z
zguU1+_7YdTIDo!0poV&H0zV3wFhpnU#qRxr09tKA$tUS%I-AXO^!m_q$J~Ow*$C(3
z%u7*0liYYp1uF_BOqijZA5$=oqtPbV>A;n6uLt!vyX=Ez_yg{}(0}*f*{Ob8Lg^bI
zbapkw7kP>6SdHg?85KjmJ+O8j2*B%bljlCMkvv5wh+EV+H$txbH0b}x!@8<HEm*s~
z!bSJ^e6*|!$`!I05wxk#F1le=tx1J%e?EkaIwFL+yI}(%M?`e48>(xm5Ea78+HA9s
zj#*M!jbj*1x5Q0d7d0!%D@j@66;-l$LlcvH!m?CBw+vYpEVE<#wzh10rn6I0)lw4C
z<{Ka!Z?&yrs%CA?rH`K9y(^pEmeGZ~N6y@P<4{!*FWqi8mZD<2p-jm_M3<1&4aHhO
zeSlTAwAot=;L~>8)vDZKFLTL!4jt`-0xqI2`k;~mHs*7q3oJ};E@=g3LCvLQQ(YN3
zR_dK%VDwJ=se+3DI^G2Z^ko;+o(8{RyIcp{!cyK6a?(g>hT)D&Oy?C{wRlaH4L)X=
zG0RkyxFV}-)7h?$bawmhcJ1DYPwtEix@9WbUqv@!bff!w`H?Nk4_owRJMHBz<R>3P
zTYF%PkRmdAzX!H6(_<&64xae8@d86I>==9DBAn55Wwr!6UuZ*xor6YtVg3If9Cv&E
z?_PL>YQlEf3D-lg@{uwi$+3qK*Z43D6Y1jG8t3+N8#$Tt(yeqo?RTpB;U5rPI!%$q
zQ32SM!t$BrFaO7Tut{{Nj#z?*>WDh$)&UrT5ed$e7U90)B82Ss>=|~D-NM$>Rji+x
pVlFVF%yy=MnOFWZoN*$<@LbUo_3Ru9TEa1xk-;XN6>q~y_zyL>#cKcn

delta 923
zcmZWnQEXFX6uy7&fB$oD*L!cvDr16+jkg&TZ2sP^-O7};KukqvKr=P6hz*-)2Fpy#
zfCp!<bdi~DRJQCaXfSBv14(5mgMSjinfPd8d;p>`xTq9-z^Fl^4<_EOFD9Oxmy`3I
z@BH8Szv6OR(ajPmc}jALmXt+yB22o(M40{Et0g&)?aUQ&HZCKx#Q8kSXnHO=kl=1K
z8lkXkiO}op$2D@6_9K+pGuU5dJtQGcm)X3Gzkk3Y7=52@663S%jrHrYbU-q1m=&{R
zzF=~b8Q&RIW5Rd|+ZNctpi)sv%3j4*G`d0sou-e_X7SzvE6B1fP2tL8o`>f?XBOQg
z_jzzA50;o*WM6Hd$(Ok;_I=IHsp@{tQ+$BuMBrQY$KaDw)I4oQjW3M7`aQj<xA-c)
zOw)~~;U@6Tcq7`f_LTaAI;IBU9HiNGHpGZBuf*t8`mB6cep6oOIq%7mYvd52($q}I
z-z`$xp@r!26i+1wd9HDVJ?}Eh9C0@K`lNQVok)_Z_2J4@W??x4I{uPpCRQ?FsRK^C
zi&<~tHyN-AM}0eN5zY=6RMZ1btJ?|%@UJu^JY5`l1~%hl8j{|a9lJA8y|ZxKi@%+6
zKcbd}1wtg8+XZ<d3GE3u>Tye_ceT9N3*QrM{KD<GFV%{Ujk)X0y0ja}gBoMfT3QA3
z9rTXC21A*HYw)6Cu~Ax8cU}nj$0$|{(7nb^L_6cPPd>YK`J>>|+3-(SrjeXwmY*GR
zwz+S7;J#MU+^nj7IQFG0u`LfOwUg0K+?<D)m#GJxZWq<kjIE=<NfI9)g)aD28mUj>
z<pRV5c1N`H|NPjWhaR~jn!+=ANHnQw$<1MxDS$nPfqPP2IC2;|)PnP<%l}Xd9ykJ>
zG#*XH@az#7_SGsM-db8}$i~-pL0F`ZLWt<eRLAYvi$A}0GC1_yD_D0do;n6w_5b2+
z44iQ<`_D0$Ra^mE8UpHT<#@tg-5c~uk`z^^>-PQF95?&TxT%Tzi|{ARaDNF;M&yk+
z9g!nq<pfv|;p(=A(~qw@9gLgCMPt&~Z)`REdQJaSpV42{d-S!wyTUHRQk~>^TwYWZ
Jv11;tz`qti7|{R#