From e5b6b609ce6017a7e25ac5a097e249839914bf5d Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Mon, 30 Sep 2019 09:31:36 +0800
Subject: [PATCH] 1.0 rc11

Former-commit-id: 1a7c79574b5dca15a0820699733d51522dae00a1
---
 .../DeviceServices/FBee/FBeeService.cs        |   4 +-
 projects/IoT/IoTNode/appsettings.json         |   2 +-
 projects/IoTCenter/appsettings.json           |   2 +-
 projects/IoTCenter/wwwroot/node.html          |  66 ++++++++++++++----
 .../StreamingAssets/IoT.Resources.csproj      |   1 +
 .../StreamingAssets/wwwroot/images/batch.png  | Bin 338 -> 1327 bytes
 .../StreamingAssets/wwwroot/images/stop32.png | Bin 0 -> 839 bytes
 .../StreamingAssets/wwwroot/images/zoomin.png | Bin 2033 -> 673 bytes
 .../wwwroot/images/zoomout.png                | Bin 1897 -> 594 bytes
 9 files changed, 58 insertions(+), 17 deletions(-)
 create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/images/stop32.png

diff --git a/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs b/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs
index e6805e27..17da1621 100644
--- a/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs
+++ b/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs
@@ -1276,7 +1276,7 @@ namespace IoT.Shared.DeviceServices.FBee
                         else if (clusterId == ClusterId.temperature)
                         {
                             var temperature = BitConverter.ToInt16(props[0x0000]) / 100f;
-                            var desc = temperature < 16 ? "低" : (temperature > 26 ? "高" : "适中");
+                            var desc = temperature < 16 ? "低" : (temperature > 28 ? "高" : "适中");
                             var data1 = device.CreateData(Keys.Temperature, temperature, DeviceDataType.Float, "温度", "℃", desc);
                             device.AddorUpdateData(data1);
                             var dto1 = data1.To<EditDataModel>();
@@ -1286,7 +1286,7 @@ namespace IoT.Shared.DeviceServices.FBee
                         else if (clusterId == ClusterId.humidity)
                         {
                             var humidity = BitConverter.ToInt16(props[0x0000]) / 100f;
-                            var desc = humidity < 40 ? "低" : (humidity > 50 ? "高" : "适中");
+                            var desc = humidity < 30 ? "低" : (humidity > 80 ? "高" : "适中");
                             var data1 = device.CreateData(Keys.Humidity, humidity, DeviceDataType.Float, "湿度", "RH%", desc);
                             device.AddorUpdateData(data1);
                             var dto1 = data1.To<EditDataModel>();
diff --git a/projects/IoT/IoTNode/appsettings.json b/projects/IoT/IoTNode/appsettings.json
index 324313b4..857e388c 100644
--- a/projects/IoT/IoTNode/appsettings.json
+++ b/projects/IoT/IoTNode/appsettings.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.10",
+  "version": "1.0.0-rc.11",
   "Logging": {
     "LogLevel": {
       "Default": "Warning",
diff --git a/projects/IoTCenter/appsettings.json b/projects/IoTCenter/appsettings.json
index 0c412c57..8919826a 100644
--- a/projects/IoTCenter/appsettings.json
+++ b/projects/IoTCenter/appsettings.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.10",
+  "version": "1.0.0-rc.11",
   "Logging": {
     "LogLevel": {
       "Default": "Warning",
diff --git a/projects/IoTCenter/wwwroot/node.html b/projects/IoTCenter/wwwroot/node.html
index 572edbd6..1fa94994 100644
--- a/projects/IoTCenter/wwwroot/node.html
+++ b/projects/IoTCenter/wwwroot/node.html
@@ -44,6 +44,14 @@
             right: 0;
         }
 
+    .danger {
+        color: red;
+    }
+
+    .normal {
+        color: green;
+    }
+
     .ptz {
         width: 100%;
     }
@@ -341,7 +349,9 @@
                             <img src="/images/temperature.png" style="width:48px;height:48px;margin:19px;" />
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
-                            <h3 style="line-height:100px;margin:0;">{{GetDeviceDataValue(device.Number,'温度','Description')}}</h3>
+                            <h3 style="line-height:100px;margin:0;" :class="GetDeviceDataValue(device.Number,'温度','Description')==='适中'?'normal':'danger'">
+                                {{GetDeviceDataValue(device.Number,'温度','Description')}}
+                            </h3>
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">温度：{{GetDeviceDataValue(device.Number,'温度','Value')}}{{ GetDeviceDataValue(device.Number,'温度','Unit')}}</span>
@@ -356,7 +366,9 @@
                             <img src="/images/humidity.png" style="width:48px;height:48px;margin:19px;" />
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
-                            <h3 style="line-height:100px;margin:0;">{{GetDeviceDataValue(device.Number,'湿度','Description')}}</h3>
+                            <h3 style="line-height:100px;margin:0;" :class="GetDeviceDataValue(device.Number,'湿度','Description')==='适中'?'normal':'danger'">
+                                {{GetDeviceDataValue(device.Number,'湿度','Description')}}
+                            </h3>
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">湿度：{{GetDeviceDataValue(device.Number,'湿度','Value')}}{{ GetDeviceDataValue(device.Number,'温度','Unit')}}</span>
@@ -371,7 +383,9 @@
                             <img src="/images/pm25.png" style="width:48px;height:48px;margin:19px;" />
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
-                            <h3 style="line-height:100px;margin:0;">{{GetDeviceDataValue(device.Number,'PM2.5','Description')}}</h3>
+                            <h3 style="line-height:100px;margin:0;" :class="GetDeviceDataValue(device.Number,'PM2.5','Description')==='污染'?'danger':'normal'">
+                                {{GetDeviceDataValue(device.Number,'PM2.5','Description')}}
+                            </h3>
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">PM2.5：{{GetDeviceDataValue(device.Number,'PM2.5','Value')}}{{ GetDeviceDataValue(device.Number,'PM2.5','Unit')}}</span>
@@ -379,21 +393,23 @@
                     </div>
                 </div>
             </div>
-            <!--<div class="col-md-6  col-xs-6">
+            <div class="col-md-6  col-xs-6">
                 <div class="box box-solid">
                     <div class="row">
                         <div class="col-md-4 col-xs-4">
                             <img src="/images/pm25.png" style="width:48px;height:48px;margin:19px;" />
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
-                            <h3 style="line-height:100px;margin:0;">{{GetDeviceDataValue(device.Number,'PM100','Description')}}</h3>
+                            <h3 style="line-height:100px;margin:0;" :class="GetDeviceDataValue(device.Number,'PM10','Description')==='污染'?'danger':'normal'">
+                                {{GetDeviceDataValue(device.Number,'PM10','Description')}}
+                            </h3>
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
-                            <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">PM10：{{GetDeviceDataValue(device.Number,'PM100','Value')}}{{ GetDeviceDataValue(device.Number,'PM100','Unit')}}</span>
+                            <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">PM10：{{GetDeviceDataValue(device.Number,'PM10','Value')}}{{ GetDeviceDataValue(device.Number,'PM10','Unit')}}</span>
                         </div>
                     </div>
                 </div>
-            </div>-->
+            </div>
             <div class="col-md-6  col-xs-6" v-for="device in GetDevices('光强检测器')" :data-device-number="device.Number">
                 <div class="box box-solid">
                     <div class="row">
@@ -401,7 +417,9 @@
                             <img src="/images/light.png" style="width:48px;height:48px;margin:19px;" />
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
-                            <h3 style="line-height:100px;margin:0;">{{GetDeviceDataValue(device.Number,'光照度','Description')}}</h3>
+                            <h3 style="line-height:100px;margin:0;" :class="GetDeviceDataValue(device.Number,'光照度','Description')==='适中'?'normal':'danger'">
+                                {{GetDeviceDataValue(device.Number,'光照度','Description')}}
+                            </h3>
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">{{device.DisplayName||device.Name}} 光照 {{GetDeviceDataValue(device.Number,'光照度','Value')}}{{ GetDeviceDataValue(device.Number,'光照度','Unit')}}</span>
@@ -417,6 +435,7 @@
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
                             <img src="/images/warn.png" style="width:36px;height:36px;margin:32px 0 0 0;" v-if="GetDeviceDataValue(device.Number,'状态','Value')==='警报'" />
+                            <h3 style="line-height:100px;margin:0;" class="normal" v-else>正常</h3>
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">{{device.DisplayName||device.Name}} {{GetDeviceDataValue(device.Number,'状态','Value') }}</span>
@@ -432,6 +451,7 @@
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
                             <img src="/images/warn.png" style="width:36px;height:36px;margin:32px 0 0 0;" v-if="GetDeviceDataValue(device.Number,'状态','Value')==='警报'" />
+                            <h3 style="line-height:100px;margin:0;" class="normal" v-else>正常</h3>
                         </div>
                         <div class="col-md-4 col-xs-4" style="height:100px;">
                             <span style="display:inline-block;position:absolute;right:20px;bottom:5px;white-space: nowrap;">{{device.DisplayName||device.Name}} {{GetDeviceDataValue(device.Number,'状态','Value') }}</span>
@@ -441,11 +461,31 @@
             </div>
         </div>
     </div>
-
+    <div class="col-md-3 col-xs-6 control" v-for="device in GetDevices('窗帘')" :data-device-number="device.Number">
+        <div class="box box-solid">
+            <div class="box-header with-border">
+                <h3 class="box-title"><img src="/images/curtain.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                <div class="box-tools pull-right">
+                    {{GetDataValue(device.Number,'状态')}}
+                </div>
+            </div>
+            <div class="box-body">
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="row" style="text-align:center;padding:3px 0;">
+                            <img @click="CallApi(device.Number,'/Curtain/On')" src="/images/on.png" />
+                            <img @click="CallApi(device.Number,'/Curtain/Stop')" src="/images/stop32.png" />
+                            <img @click="CallApi(device.Number,'/Curtain/Off')" src="/images/off.png" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="col-md-3 col-xs-6 control" v-for="device in GetDevices('一路开关')" :data-device-number="device.Number">
         <div class="box box-solid">
             <div class="box-header with-border">
-                <h3 class="box-title"><img src="/images/switch2.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                <h3 class="box-title"><img src="/images/switch.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
             </div>
             <div class="box-body">
                 <div class="row">
@@ -462,7 +502,7 @@
     <div class="col-md-3 col-xs-6 control" v-for="device in GetDevices('二路开关')" :data-device-number="device.Number">
         <div class="box box-solid">
             <div class="box-header with-border">
-                <h3 class="box-title"><img src="/images/switch2.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                <h3 class="box-title"><img src="/images/switch.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
                 <div class="box-tools pull-right">
                     <button class="btn btn-sm bg-olive" @click="CallApi(device.Number,'/Switch3/On')" :data-node-number="ViewModel.Number">一键开</button>
                     <button class="btn btn-sm bg-olive" @click="CallApi(device.Number,'/Switch3/Off')" :data-node-number="ViewModel.Number">一键关</button>
@@ -510,7 +550,7 @@
     <div class="col-md-3 col-xs-6 control" v-for="device in GetDevices('智能插座')" :data-device-number="device.Number">
         <div class="box box-solid">
             <div class="box-header with-border">
-                <h3 class="box-title"><img src="/images/switch2.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                <h3 class="box-title"><img src="/images/socket.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
                 <div class="box-tools pull-right">
                     {{parseFloat(GetDataValue(device.Number,'电量')).toFixed(2)}} kWh
                 </div>
@@ -530,7 +570,7 @@
     <div class="col-md-3 col-xs-6 control" v-for="device in GetDevices('插座')" :data-device-number="device.Number">
         <div class="box box-solid">
             <div class="box-header with-border">
-                <h3 class="box-title"><img src="/images/switch2.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                <h3 class="box-title"><img src="/images/socket.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
             </div>
             <div class="box-body">
                 <div class="row">
diff --git a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
index f76dc3e4..18176fe7 100644
--- a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
+++ b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
@@ -11,5 +11,6 @@
     <EmbeddedResource Include="wwwroot\**\*" />
   </ItemGroup><ItemGroup>
   <None Remove="wwwroot\images\smoke.png" />
+  <None Remove="wwwroot\images\stop32.png" />
 </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/batch.png b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/batch.png
index 4003d3a73d40326f7ea10d920de8e18c885ff299..c612333237033fbbfe4a6d4dde141efcb449f449 100644
GIT binary patch
literal 1327
zcmV+~1<?A5P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000E`Nkl<ZXhZE;
zOLE#+6g^jMJ3VXR4aBZ8OyjH|cm*aaussZPRog2tS%Jv_GBjR6;}wLgAb1L{f^5Jj
zvrbIwbX|dDAtdpTkyGw&%_!dIo_GJ}3ZD5V&s=`|`vKS&LmMytJ`}J5qAUViwMK9x
zMAxNsoZpMrSu|<4ZYvhuLkh|Q+40UL90<CEbnyL`Yv*j&Njp1L19r22ERYKT-vrWe
zEp~##D7FQ+LP!PRm?9_6yJFV_i2ZR;7V^>;I%$uBp~$II-MdO!6AM6J-P*dppvYU2
zr%tWZPC8(^c5({AxjS9^Aq|Ax8k|~yK8pEAw(n}Clei7B0JdBGHi3N-$4;%(Gr394
zLBMtzVAZH4a%pnj!kPpS3jp+m1gMiNn+oq=<_qYOucLd_Y%JnaCgEqBT=FDp4RZk0
z9As-UBzTr)HfcgkwI?sf)#5>TU7<DT3h?GJ06d@gv9TL=?0EoFr>&1`MK2;``RtFw
z9gCBpD;vAcyWNqVVK@8xmdKYZ=SBBKwJ-;u&>VCGGP<knoj&HWLaW~+r0rCT4G%yT
z$4wA`#PzsVtoVP=185B#3M!`IFbU*#b5PeH;9s;3^YQP}{4=hWc4Gl-w+3_t2WtT!
zD37bfvR<@K0D9hCwHQ47oCcmffI@RHnq|I+jGMt3JQK=E0|alz)zW@~3H7~<dsi(T
zXOKJCk|zLwS7G_)!>DFc@-iB0R|S(N02lJssqO_9vXF_@j09-k)r$311^3tI1%SlY
zXpUMeC1xo<igXn)c>#!vknz>1)<eX(S0abhWeOq>04{LmC&sWGiTyxOIg)MH+I;Vq
z1tuWY4Ir+Fi;Y52;k1Skk%kswBzt0sQFtYx2}~ZF$OwF%mFI~iy-`oB1sXW1hzd4q
zDVJ$NC_TTX+HT%9C=6nE>Rzu4Ll?5qG10mafMvq|%>Vxz0Mr)%yb;j`-s}^~O~iy=
zneBu_QpthOCLLiqE8(#RI2WL-HHgsAiN$kbgq>J_D-B};g2IYGUJ>Y$UU#^<6F)TI
zymDo;ZsJg>nV9IVlHI4B-F+R9qm{#G(AYzc*Otgu1mHi0$4!Ye2-J-dna>_Prm=}l
zWElY{5RbtF|1>Hk3a$Q7C|9efJ8IYK2B7Cp&*V|Ko%H-Fe0e}lec#ww#!03*V;%rJ
z%IC#o#E4l(TFM+7nn##W5FA>I@<mvQ{*bWFvN&#7BY9}R_XVMQKCYEs#};$BHuY=J
zfFEFf4lD5#019~$TWbO!F52O?G9PNO+5bY3t1z`F<WbmmO-hQz@O;}KxRXdNPO~1)
zqp^0C%hJf*FyXt(nf_YMQ6%1nne#<@U1RN%sZ44Pn9}Pzej)d8xzg(#W#ycLk|L6$
z;s+es(1Qmi<?LJ{oK0ZT1{_(~4zIO^e2SY}B#)Q~EoXHiVm@M0QY>XS;tvg1VLPV6
z<5C1SaoS7l2fRrO<#5@Q&>QmoI{5=cJ&F35FIQ$mK0)36YvV&&$zr!|kA!T9@H)x#
zmXBFQ8ahVx#;m{tE8)VngtIX#zR|+5DJ}1fSzRa(`<s9roi)QkFb}qX3Uw|GDJ=8H
zr9H7X=-#^54oTa|eG$CW7xg+cpy$HsWGy|WWwOqip*HTdoJt=8=n?GT$7W|)QMnXA
lmT>o!d;SOTl&>9k*FW?Nj$Uhws;mG2002ovPDHLkV1fYEYHa`j

literal 338
zcmV-Y0j>UtP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003QNkl<ZSV!%b
z?GeF16h%)eK?RgR1*iZWPyr<<few^F2XsIOI$*BJnphv%eL{@Mo5>%tdr$6@w^u^R
zm6WWH1z-kDjo=%gon31M&>jMbDG6&$Apl2U9;2QL7XlEed%fN4fS$BzRNVpNbgda+
z4Xl7|Bt#47WqSS=fO;p8nDPb90Civ=qx{73V1NZsGYD$Q63}{;*?|)<G4y<xI_2iW
zTL2wH&z*1uP&rUJP&wc`paW?D=x}O;1QJccA_tKsq%M`t6gR3bA3Ta=MFZSKF#nAC
zO8}Rk)bqaI^KUqy^yC7oLd?tb{K*ysMT(yVP?C)ep?cL0d6tL#2GqlDkbn0#jr{jK
kZy(EFv%Ec{zAqi%3=yDkA>CZmYXATM07*qoM6N<$f{by8WB>pF

diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/stop32.png b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/stop32.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ddc43764ca54f15417cf6b55fc4d0efa514e598
GIT binary patch
literal 839
zcmV-N1GxN&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80009HNkl<ZSVzrQ
zO;X}u5PdI|8kZBifKX-F4xV7}1mXz>mWB<UVDJR$0$hqG7(9W@3B)Z-m3RS?S!z+~
zss13D1o;(alpV>JuV26JuiyKKcmDC6<6|uVPNP?_EFOuV2oZ;5K@$*>F35mHCk*8_
zsOGz?Cbkj)r}?Wygy#gat86TgfxtQqy#4mF^$P(wSC3iB=$b%roGG3NwnL%=2?tT8
z$_!{_EkRKrB@%mPJ<t)_mEa^dm<MDo0Ns?}9SKK(-y%{As`=KkjP$+J=#@!c5cn*D
zKp=<n$}$sxsWo{&$@*4a>~e6L3swmpt#QsD9ex_MNF3?2P~>11h*tm%?cwNNGY8~m
z=;h1n1fE{I+w8Rfeltv1_Q7;HUIEB7`yB#bMR4m^-O?t(qi-{fep{K)p71^QFu7+6
zfOfkD`C)4QY-f|SJI#KLz){qY^MIMg122;&z?5TWG|-+1!Q<q+6o5>lKhO>iMJmaL
z)26b>>vh<e4ixR7N7VQ7xoEE#K-748)cmTOI`2_gAUGRV-TERRyN!Mw#CHLH`krf!
zZ=w`Yf^kE}0HO~eyc|~dYsn9Hn|;y$L(g40xSXqg(GuLv0uVK1GLd-0D9dT;H1M_n
zBzi1nCjp?>CHQ65dEFX-$$U}m@T>U)P3~_A7SOyc0JGTqH~=!u|5yUZgYV^ylz*Hi
zeD`A*52C3_r8LEZh^P-w+_Qf&h)ke)qj;hbYmH*!FgS5Lu{=-4`ShfnEk-JxFLo|1
zMrz9>H6iB;5>ZbDAA5sGmH35Xl%!jLw(q&e>tsD|Z9<M;>BDS8BBQQKCq!DqYQC}w
zh}e**#M3S;H6$7=WyyfHJlmBwS+X5tXpN~^*^(uira)5N(b!m$wZPlIS%nQ_O2PAl
zp)IauN@EaXTi#NOrq9$&7+W5q1Ikm%mJ9bRN=b-fbbnAu7TV=E+45wj=3*jp5&8XP
zEa*|2Ft*vnWIB-P4bWr>h@<j7Vdeo~KtU&jw6}gWTbA)A@0VJvO*UWU+dm?mJU{iN
REiV87002ovPDHLkV1gdwf$;zU

literal 0
HcmV?d00001

diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/zoomin.png b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/zoomin.png
index 2dd1c41021dcd78e212e3a23752041ed43d35508..d249f6e5283789571867c8418784dd1dbd155403 100644
GIT binary patch
delta 650
zcmV;50(JfI51|E+BYy&DNkl<ZXhZE;OKuZE5Pf9`>#;A8M6zcavjQX#$qmd6l2w%P
z22Mb7gKX@G6>tLQ1{i^acMMxQQk)BnXAQ|b)bU3n+w*CA#>BX1>FJ)TSFgJKs!Oou
zkF2@>_`d*@8r=>A&#(Y4f_=)?fq$~wk7LzpbgLq031mlyeSeaG2n6hSj{Rc1cfvsN
z!_7;%`~7YBf>;Cuh%>KVIgN9y)aac;@LtFHX^#SVygLrm1b}tX+b<Ab7ImNCFUnRe
zB?F%XvZn(g9MV8=;Gb05YJU`fuLGyDuVWzZwZ&$yEx>DK#{kGX+Vj3|82A@a58E^h
zY#akt^QtD~M}Gk?y}Et0YyeiCLSciRQ(0Pb834K|U>KN+SYisP^~Gk_RU#{Zyz!m#
zrEb)t>UI`qKox}o*ixc#;Mmm}IX(Wty13p+Qj}?cWt~FG<~-k)t`1RP@&GW;)@A~@
zZ+=GFJc<EQ4h0;xje^)NEui#$r~ElhYEG}wW<cd(fq%ExNyc=W(g1kpJC*aK?-~H(
zY5?BW3WODzLcpO2w(s8)XK|4YMBGKowss1orPx%Vl#!ZYV6FeiijD415ve|CDM7k}
zy8U!UN=#jBEqyPP^%+PMa|S?+{LMm*8U|8UwaGG-l0u#f3vI7neyh8Gdi}~7Sk_?!
zz+A6qoPR^+3}hTo?ayr-1KNXDk}iQGzizv6;Z<r^f<G-K8g*z$G2{#Py1E_h$dw$&
ztl`lwA3b?BINts~ye|knrRLQSkk7TluewI!hF~p`f#INAd(1j&P1Ufw<2mKoLAMT_
k4{2>~J@KkQu04Rioq<VD%5E4100000NkvXXt^-0~g5{qyM*si-

delta 2020
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
C^W{?j

diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/zoomout.png b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/zoomout.png
index 093194b0cd32f7783f222dcba6bbf2328725006d..9d09c3ce1c976d97e2981b254daa08ff997bcc3f 100644
GIT binary patch
delta 570
zcmV-A0>%C54$=gWBYy%JNkl<ZXhZE;Jx&5q5dH>#>V*ra3DAm_nrMU@;1R40OXUf~
z8`yxc(-Ytg)Mz4|YYQgg1z>B%9rHj40s^!9j0-+Wn3?zeEHLwiFyk+par~Gs0<mJX
z0>UPI@M3VCX({98*6QP2wTjgg5y}KwmAKE$01*gWY1ql_Zhvmif#~_`4t>1cbv|JD
zApyooBcCXY0~RaR3LqRyzz-twXmPD8RF8mlR!c`1*M8wM_=#yLJEa2`1X`Dn=$F(Z
zWZYchM&<uR;I?Te(vkyyJ2qOX-4L*+&M^djTkTQxjRSw7djFZm0pmbG1<WH9P{6?H
z#(}^R1}req0e@9LTB<s#$?`z^t{uM$c&65LtMr_WfXk|BY}(1xP&?gy!#aCeozzik
zMJ6aV3fp{5WCAfl6Y9%>_VDx7o9kfWG1Xl=e(9%{n1Ff?BiwrNbJ(~X4>)q|#HqCI
z|0AFjQZ9g7*$BguDmE(KBXa!yY>OSx0a#~^`6DpXe}81rV)c=TQlV}on4M-mxiQpA
z3|wrPdm)`))J~&mF1B=QDywH4km;pA+Bl$JQ&~mhfJ`s_(Z&J&n#w9l9S|>Cnb~3B
zz|AL}anMw^OWu1~HH{JqQ!M%VXWj6vS^HPNys*66JY2a~0(={2Vx{K?FmH+FSDR(V
zD}%EW9W&@Gy2WeOwp(posnW3H!;5Z-oneZdzmYOb>P~~@6Ig}tK=UB+&j0`b07*qo
IM6N<$f@($*&Hw-a

delta 1883
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
VBt2Gg^(O!T002ovPDHLkV1mKxuJ8Z=