From 07b9d5701964d15dfbaa71c14975f9bf9be3d060 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 1 Nov 2019 11:18:10 +0800
Subject: [PATCH] update

Former-commit-id: ce7b036161d6c73bc9e212d2c1ea5b314f223e11
---
 projects/Infrastructure/Data/EfDbContext.cs   |   2 +-
 projects/IoTCenter/Views/Home/Node.cshtml     | 111 +++++++++---------
 projects/IoTCenter/iotcenter.db               | Bin 462848 -> 462848 bytes
 .../Assets/StreamingAssets/wwwroot/node.html  |  81 ++++++++++++-
 projects/IoTNode/iotnode.db                   | Bin 499712 -> 499712 bytes
 5 files changed, 133 insertions(+), 61 deletions(-)

diff --git a/projects/Infrastructure/Data/EfDbContext.cs b/projects/Infrastructure/Data/EfDbContext.cs
index f25b7dc9..8891e9c7 100644
--- a/projects/Infrastructure/Data/EfDbContext.cs
+++ b/projects/Infrastructure/Data/EfDbContext.cs
@@ -13,7 +13,7 @@ namespace Infrastructure.Data
     {
         public static readonly ILoggerFactory MyLoggerFactory = LoggerFactory.Create(builder =>
         {
-            //builder.AddConsole();
+            builder.AddConsole();
         });
 
         public EfDbContext(DbContextOptions options) : base(options)
diff --git a/projects/IoTCenter/Views/Home/Node.cshtml b/projects/IoTCenter/Views/Home/Node.cshtml
index 82ad71b9..7e4ccc03 100644
--- a/projects/IoTCenter/Views/Home/Node.cshtml
+++ b/projects/IoTCenter/Views/Home/Node.cshtml
@@ -5,7 +5,8 @@
 <div id="template">
     <style>
         h3 img {
-            height: 16px;
+            height: 32px;
+            margin: -8px 8px -8px -8px;
         }
 
         .box-tools img, .box-body img {
@@ -106,37 +107,34 @@
             text-align: center;
         }
 
-        input[type=range] {
-            padding: 0 10px;
+        input[type='range'] {
             -webkit-appearance: none;
-            height: 50px;
+            display: inline-block;
+            width: 100%;
+            height: 15px;
+            margin: 10px 0;
         }
 
-            input[type=range]::-webkit-slider-runnable-track {
-                width: 300px;
-                height: 5px;
-                background: #ddd;
-                border: none;
-                border-radius: 3px;
-            }
+        .hue {
+            background: -webkit-linear-gradient(left, #F00 0%, #FF0 16.66%, #0F0 33.33%, #0FF 50%,#00F 66.66%, #F0F 83.33%, #F00 100%);
+        }
 
-            input[type=range]::-webkit-slider-thumb {
-                -webkit-appearance: none;
-                border: none;
-                height: 20px;
-                width: 20px;
-                border-radius: 30%;
-                background-color: #3d9970 !important;
-                margin-top: -6px;
-            }
+        .saturation {
+            background: -webkit-linear-gradient(left, #fff 0%, green 100%);
+        }
 
-            input[type=range]:focus {
-                outline: none;
-            }
+        .brightness {
+            background: -webkit-linear-gradient(left, #000 0%, #fff 100%);
+        }
 
-                input[type=range]:focus::-webkit-slider-runnable-track {
-                    background: #ccc;
-                }
+        input[type='range']::-webkit-slider-thumb {
+            -webkit-appearance: none;
+            background-color: transparent;
+            height: 30px;
+            width: 30px;
+            border: 15px solid rgba(230,230,230,0.8);
+            border-radius: 50%;
+        }
 
         canvas {
             width: 100%;
@@ -153,7 +151,7 @@
             <div class="col-md-12">
                 <div class="box box-solid">
                     <div class="box-header with-border">
-                        <h3 class="box-title"><img src="/images/batch.png" style="height:16px;margin-right:10px;" />{{model.Name}}</h3>
+                        <h3 class="box-title"><img src="/images/batch.png" />{{model.Name}}</h3>
                     </div>
                     <div class="box-body">
                         <button class="btn bg-olive margin ajax Scene" v-for="scene in model.Scenes" :data-scene-id="scene.Id">{{scene.Name}}</button>
@@ -291,28 +289,28 @@
                         <div class="col-md-12">
                             <div class="box box-solid">
                                 <div class="box-header with-border">
-                                    <h3 class="box-title"><img src="/images/ptz.png" style="height:16px;margin-right:10px;" />云台操作</h3>
+                                    <h3 class="box-title"><img src="/images/ptz.png" />云台操作</h3>
                                 </div>
                                 <div class="box-body" style="height:178px;">
                                     <table class="ptz" style="width:100%;">
                                         <tr>
                                             <td></td>
                                             <td></td>
-                                            <td><img class="ajax camera" data-cmd="Up" :src="server+'/IoTCenter/images/up.png'" /></td>
+                                            <td><img class="ajax camera" data-cmd="Up" :src="iotCenter+'/images/up.png'" /></td>
                                             <td></td>
                                             <td></td>
                                         </tr>
                                         <tr>
-                                            <td><img class="ajax camera" data-cmd="Zoomin" :src="server+'/IoTCenter/images/zoomin.png'" /></td>
-                                            <td><img class="ajax camera" data-cmd="Left" :src="server+'/IoTCenter/images/left.png'" /></td>
-                                            <td><img class="ajax camera" data-cmd="Stop" :src="server+'/IoTCenter/images/stop.png'" /></td>
-                                            <td><img class="ajax camera" data-cmd="Right" :src="server+'/IoTCenter/images/right.png'" /></td>
-                                            <td><img class="ajax camera" data-cmd="Zoomout" :src="server+'/IoTCenter/images/zoomout.png'" /></td>
+                                            <td><img class="ajax camera" data-cmd="Zoomin" :src="iotCenter+'/images/zoomin.png'" /></td>
+                                            <td><img class="ajax camera" data-cmd="Left" :src="iotCenter+'/images/left.png'" /></td>
+                                            <td><img class="ajax camera" data-cmd="Stop" :src="iotCenter+'/images/stop.png'" /></td>
+                                            <td><img class="ajax camera" data-cmd="Right" :src="iotCenter+'/images/right.png'" /></td>
+                                            <td><img class="ajax camera" data-cmd="Zoomout" :src="iotCenter+'/images/zoomout.png'" /></td>
                                         </tr>
                                         <tr>
                                             <td></td>
                                             <td></td>
-                                            <td><img class="ajax camera" data-cmd="Down" :src="server+'/IoTCenter/images/down.png'" /></td>
+                                            <td><img class="ajax camera" data-cmd="Down" :src="iotCenter+'/images/down.png'" /></td>
                                             <td></td>
                                             <td></td>
                                         </tr>
@@ -330,10 +328,7 @@
                         <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}}<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>
+                                    <img src="/images/light.png" />{{device.DisplayName||device.Name}}
                                 </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" />
@@ -343,33 +338,33 @@
                             <div class="box-body" style="height:178px;">
                                 <form method="get" action="/App/ExecApi">
                                     <input type="hidden" name="Number" :value="device.Number" />
-                                    <input type="hidden" name="Method" value="/ColorLight/SetBrightness" />
+                                    <input type="hidden" name="Method" value="/ColorLight/SetColor" />
                                     <div class="row">
                                         <div class="col-md-2 col-xs-4">
-                                            <span class="label1">亮度</span>
+                                            <span class="label1">色调</span>
                                         </div>
                                         <div class="col-md-10 col-xs-8">
-                                            <input v-on:change="AjaxSubmit($event,device.Number,'亮度')" type="range" min="0" step="1" max="255" name="Brightness" :value="GetDataValue(device.Number,'亮度')" />
+                                            <input v-on:change="AjaxSubmit($event,device.Number,'色调')" type="range" min="0" step="1" max="255" name="Hue" class="hue" :value="GetDataValue(device.Number,'色调')" />
                                         </div>
                                     </div>
-                                </form>
-                                <form method="get" action="/App/ExecApi">
-                                    <input type="hidden" name="Number" :value="device.Number" />
-                                    <input type="hidden" name="Method" value="/ColorLight/SetColor" />
                                     <div class="row">
                                         <div class="col-md-2 col-xs-4">
-                                            <span class="label1">色调</span>
+                                            <span class="label1">饱和度</span>
                                         </div>
                                         <div class="col-md-10 col-xs-8">
-                                            <input v-on:change="AjaxSubmit($event,device.Number,'色调')" type="range" min="0" step="1" max="255" name="Hue" :value="GetDataValue(device.Number,'色调')" />
+                                            <input v-on:change="AjaxSubmit($event,device.Number,'饱和度')" type="range" min="0" step="1" max="255" name="Saturation" class="saturation" :value="GetDataValue(device.Number,'饱和度')" />
                                         </div>
                                     </div>
+                                </form>
+                                <form method="get" action="/App/ExecApi">
+                                    <input type="hidden" name="Number" :value="device.Number" />
+                                    <input type="hidden" name="Method" value="/ColorLight/SetBrightness" />
                                     <div class="row">
                                         <div class="col-md-2 col-xs-4">
-                                            <span class="label1">饱和度</span>
+                                            <span class="label1">亮度</span>
                                         </div>
                                         <div class="col-md-10 col-xs-8">
-                                            <input v-on:change="AjaxSubmit($event,device.Number,'饱和度')" type="range" min="0" step="1" max="255" name="Saturation" :value="GetDataValue(device.Number,'饱和度')" />
+                                            <input v-on:change="AjaxSubmit($event,device.Number,'亮度')" type="range" min="0" step="1" max="255" name="Brightness" class="brightness" :value="GetDataValue(device.Number,'亮度')" />
                                         </div>
                                     </div>
                                 </form>
@@ -384,7 +379,7 @@
                     <div class="col-md-12">
                         <div class="nav-tabs-custom">
                             <ul class="nav nav-tabs">
-                                <li class="header"><img src="/images/control.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</li>
+                                <li class="header"><img src="/images/control.png" style="height:32px;margin-right:10px;" />{{device.DisplayName||device.Name}}</li>
                                 <li class="active"><a href="#tab_1" data-toggle="tab">空调</a></li>
                                 <li><a href="#tab_2" data-toggle="tab">电视</a></li>
                                 <li><a href="#tab_3" data-toggle="tab">图影仪</a></li>
@@ -572,7 +567,7 @@
             <div class="col-md-12" v-if="model.Scenes&&model.Scenes.length>0">
                 <div class="box box-solid">
                     <div class="box-header with-border">
-                        <h3 class="box-title"><img src="/images/batch.png" style="height:16px;margin-right:10px;" />批量操作</h3>
+                        <h3 class="box-title"><img src="/images/batch.png" />批量操作</h3>
                         <div class="box-tools pull-right">
                             <button class="btn btn-sm bg-olive ajax NodePowerOn" :data-node-number="model.Number">一键开</button>
                             <button class="btn btn-sm bg-olive ajax NodePowerOff" :data-node-number="model.Number">一键关</button>
@@ -592,7 +587,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/switch.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                        <h3 class="box-title"><img src="/images/switch.png" />{{device.DisplayName||device.Name}}</h3>
                     </div>
                     <div class="box-body">
                         <div class="row">
@@ -609,7 +604,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/switch.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                        <h3 class="box-title"><img src="/images/switch.png" />{{device.DisplayName||device.Name}}</h3>
                         <div class="box-tools pull-right">
                             <button class="btn btn-sm bg-olive" v-on:click="CallApi(device.Number,'/Switch3/On')" :data-node-number="model.Number">一键开</button>
                             <button class="btn btn-sm bg-olive" v-on:click="CallApi(device.Number,'/Switch3/Off')" :data-node-number="model.Number">一键关</button>
@@ -632,7 +627,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/switch2.png" />{{device.DisplayName||device.Name}}</h3>
                         <div class="box-tools pull-right">
                             <button class="btn btn-sm bg-olive" v-on:click="CallApi(device.Number,'/Switch3/On')" :data-node-number="model.Number">一键开</button>
                             <button class="btn btn-sm bg-olive" v-on:click="CallApi(device.Number,'/Switch3/Off')" :data-node-number="model.Number">一键关</button>
@@ -657,7 +652,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/socket.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                        <h3 class="box-title"><img src="/images/socket.png" />{{device.DisplayName||device.Name}}</h3>
                     </div>
                     <div class="box-body">
                         <div class="row">
@@ -674,7 +669,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/socket.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                        <h3 class="box-title"><img src="/images/socket.png" />{{device.DisplayName||device.Name}}</h3>
                         <div class="box-tools pull-right">
                             {{parseFloat(GetDataValue(device.Number,'电量')).toFixed(2)}} kWh
                         </div>
@@ -694,7 +689,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/curtain.png" style="height:16px;margin-right:10px;" />{{device.DisplayName||device.Name}}</h3>
+                        <h3 class="box-title"><img src="/images/curtain.png" />{{device.DisplayName||device.Name}}</h3>
                         <div class="box-tools pull-right">
                             {{GetDataValue(device.Number,'状态')}}
                         </div>
diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db
index 80350bb7938b1a78718a9a81591763bb8d389875..18eb81e7cfcb3624255c83b245016de0e3551dd9 100644
GIT binary patch
delta 455
zcmX|5KWGzS6#u@<ckg%2-6g~$1VP(NB_Jjoce(qn(TWHvRSKm;gM*7wF#%&XXFJ?b
zC?YucXa{xBLB!3H3@$}SD>xK!=%_fk6c-2aVvCQr{NC@+`>j1cv6gQpGb1ZxDl^|w
z)0dm0mQT+t`I$eSrd>6NoGy=j(lX_rJ|!cZq2GIT^NpygrDNqM<wj|ne!2T<$vme%
z&}?bZerJxY@%AiQihC|Ds5oeAe&r(J7iJE1pi};CBEj&I(-kLc{FIQWD2QX;BSclA
zX_^+cs8wd9ckAZWT;x^w0T39Sl*1yL7ER`{P)xwQ3WKP_SAYn(Emp;;Di2-E74q}s
ztv@xqH@KLG)I5#|VId7uUL|N)FU9@;>Nq$m`4!kbejvQN*K$wYn~_3TR`>D|<Q*Hj
z&`v`BVIkng6h5K2Bl@CV=Ic2nLw;nV$v2AV$z^_D#6#t5hykzIIBO(&!nUk_Z($N%
x`DZbr_|VgE@WpWZ{Kvt0+2MINSC&c(hb3Q|m^0b|e>0&+`!3d{)O@Fmt-r9%Y-Iod

delta 402
zcmXAkJxCl;6oud0nfK1jI<un;>mq2fD+uZ?<IXs<;$MhGFc6TWNM#{5{w*kW+HEm~
zpn@oP!4$D@K}$hdu@Nz4Od}~$SSFB0A&nr><hfo>dCvE7E4!@~m6*qgSc~;o9Lao^
zf2tL-^0UFO=xe9EG#ATrzV(r19NO)YKHX$xSVOnG|DKaCSXzWBXWQvW9m{U}+MX7n
z*n>>HYj}?(<KVa*1%0d7_=^Sv2KAB`gtRQ+(-$4Dw9xZu-$s;?Pe;sBj+fkZjq>X!
zUlaY6C?<kl>H#8IWecn=O(O!KR`N>EoOY?OeO_NglM=pZR43l5sq4_0fX98h70A;M
z;8JU5I-M98PDCNy8SotQ4|CZ38&z-1v`l@V4in$3b2iIzlXZq$XJ~=y*D2#kO!HH^
zNMao`qiU9O>E1+CZxoZr!&+r!mQ!v65u)GK!=IaL^w5BRiPR`PS{UN}G-#thW9oZ7
U@S=b=bcD5Q8!Ma#H05CDKjJoKZU6uP

diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html
index 9ac48e28..351f8089 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/node.html
@@ -15,6 +15,39 @@
             table.ptz td {
                 padding: 0 12px;
             }
+
+        input[type='range'] {
+            -webkit-appearance: none;
+            display: inline-block;
+            width: 100%;
+            height: 15px;
+            margin: 10px 0;
+        }
+
+        .hue {
+            background: -webkit-linear-gradient(left, #F00 0%, #FF0 16.66%, #0F0 33.33%, #0FF 50%,#00F 66.66%, #F0F 83.33%, #F00 100%);
+        }
+
+        .saturation {
+            background: -webkit-linear-gradient(left, #fff 0%, green 100%);
+        }
+
+        .brightness {
+            background: -webkit-linear-gradient(left, #000 0%, #fff 100%);
+        }
+
+        input[type='range']::-webkit-slider-thumb {
+            -webkit-appearance: none;
+            background-color: transparent;
+            height: 30px;
+            width: 30px;
+            border: 15px solid rgba(230,230,230,0.8);
+            border-radius: 50%;
+        }
+
+        .card-header img {
+            height: 24px;
+        }
     </style>
 </head>
 <body>
@@ -147,6 +180,7 @@
                                     </div>
                                 </div>
                             </div>
+                            <!--摄像头-->
                             <template v-if="HasDevices('摄像头')">
                                 <div class="card">
                                     <div class="card-content">
@@ -157,8 +191,8 @@
                                                 </select>
                                             </f7-list-item>
                                         </f7-list>
-                                        <div style="width:100%;height:30vw;margin:0;padding:0;background:#000;text-align:center;">
-                                            <video id="liveVideo" class="video" controls autoplay muted style="width:100%;max-width:100%;height:100%;" v-on:volumechange="VolumeChange($event)"></video>
+                                        <div style="width:100%;margin:0;padding:0;background:#000;text-align:center;">
+                                            <video id="liveVideo" class="video" controls autoplay muted style="width:50vw;max-width:100%;height:100%;" v-on:volumechange="VolumeChange($event)"></video>
                                         </div>
                                     </div>
                                 </div>
@@ -191,6 +225,49 @@
                                     </div>
                                 </div>
                             </template>
+                            <!--调色灯-->
+                            <div class="card" v-for="device in GetDevices('调色灯')">
+                                <div class="card-header">
+                                    {{device.DisplayName||device.Name}}
+                                    <img v-if="GetDataValue(device.Number,'状态')=='开'" v-on:click="CallApi(device.Number,'/ColorLight/Off')" :src="iotCenter+'/images/on.png'" />
+                                    <img v-if="GetDataValue(device.Number,'状态')=='关'" v-on:click="CallApi(device.Number,'/ColorLight/On')" :src="iotCenter+'/images/off.png'" />
+                                </div>
+                                <div class="card-content card-content-padding">
+                                    <form method="get" action="/App/ExecApi">
+                                        <input type="hidden" name="Number" :value="device.Number" />
+                                        <input type="hidden" name="Method" value="/ColorLight/SetColor" />
+                                        <div class="row">
+                                            <div class="col-20">
+                                                <span class="label1">色调</span>
+                                            </div>
+
+                                            <div class="col-80">
+                                                <input type="range" class="hue" name="Hue" min="0" max="255" step="1" :value="GetDataValue(device.Number,'色调')" v-on:change="AjaxSubmit($event,device.Number,'色调')" />
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-20">
+                                                <span class="label1">饱和度</span>
+                                            </div>
+                                            <div class="col-80">
+                                                <input class="saturation" v-on:change="AjaxSubmit($event,device.Number,'饱和度')" type="range" min="0" step="1" max="254" name="Saturation" :value="GetDataValue(device.Number,'饱和度')" />
+                                            </div>
+                                        </div>
+                                    </form>
+                                    <form method="get" action="/App/ExecApi">
+                                        <input type="hidden" name="Number" :value="device.Number" />
+                                        <input type="hidden" name="Method" value="/ColorLight/SetBrightness" />
+                                        <div class="row">
+                                            <div class="col-20">
+                                                <span class="label1">亮度</span>
+                                            </div>
+                                            <div class="col-80">
+                                                <input class="brightness" v-on:change="AjaxSubmit($event,device.Number,'亮度')" type="range" min="0" step="1" max="254" name="Brightness" :value="GetDataValue(device.Number,'亮度')" />
+                                            </div>
+                                        </div>
+                                    </form>
+                                </div>
+                            </div>
                         </template>
                     </div>
                 </f7-page>
diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db
index 9779c0cfe7ba4712c695610ffb1f115939a7e1aa..d58deb36874b36af4c1fcea591bcb5316cce35a0 100644
GIT binary patch
delta 635
zcmXw0Pe>GT6rTCbZ-4K%f2VB)4^g_{YQ?t9&hD(U8nmnHp*jgg2Ls)7CDUlvS#^y}
zhZa(hA`>1dMMWhTq(w31$%B`mON15?b;;60&^d^j#d^HM<NLn%y${~R>b?oP%VL?7
zr7|r$p0ml2*l10KSm_ueUxZpxLddfuB_*lN%H&y`V7tMZL>;FM7N&wA^y0ZZJA<DG
zS;|Ih45s2sgWV@d)jC~dv)rp@dy<M>nQSquVlX7tS-~;Zbb@L*MYTHLvPI5&yOm^4
zRT?e-NA@!p5OYFMn3Ci<IpSOMb&y4I4XaWRrqXWdqLoQOP^3f`I<YSe9lT(AJST+)
zKdz@iC#sIV7Eq~cP8h84-2r<tY+h~<g`DZOrF;B%J`HL`dN&PW-eWdYP#Kr(MW@n|
zEf#Zwqb_WpXLU|j-rQfYm(gqm9WNJ{Y`t!UW|2oVC8=qOZh6|^*TGD^Am5Nfz7=1M
z_nNobbIY^WJ?ZwiO3vTT8D}kD;we}c>!FAJV3(NRvEazi4SIoc>7LX?-jM-9#oIT7
zyFOud1dh;HMAh)Y2*j<q0=yTUy7GPY#rD<fRk(_*&bniOA-dzr_QR)}Gt-+ZkFaZl
zg?N|QYG)1j@#qjlxSrUWdbYKErNY&N*<w>cKRzA;jYnf&SDyS|L*FngP$d%8@zpTo
zsTR=^c*wqu2MTbQMkBEp_7xzCA4Z^`517riQFQ>1mq3vcN&?49@Xf0w<Np%&pE|qq
Z=GjsB<FNJN9sT?`L`ghhy%~pi?O%7ZyM6!w

delta 759
zcmXw%TSydP6vt;~XTLM+UdDBWvd~;{GtFIQ##wha1>K!hL<%aBiUM17Q?qP0*UNTM
zhZf3+E+!l@3Mxtnx){ZjSozRPU{FLCd@utw?a8;G7aMPf^KicNo%3=2zw`Bt=k)2G
zqEk%DkYZED7v!RgF4g*7q`Q_-6qU<NA;d_4HSA%gv~Y~b3@%<LMk_^^Q`z=xnxZ&U
z9saFk@-wR18h4*;X-kOWdW64fAqV0IEp=3Z9Z$rFACr?L9o_9@BlhJPED$}Q-)*+z
zbc{%8QXmvbB%-I1X*iA~A78bTdyF7zhZAIwvmT8$`UKs=kwip7r^}G9InR+D`&dy=
zYxSSWBaZWx2m!q+qS+_OV${J@QckL$@I$=E_TF}gj?y17vl5C~X4sI_!j<5p*+$iD
z!SWC^n5dX)S)P=~i6Ho~Cr)_G3_*T{A%kkFqa2Q`Wwl(LUr~Z#L8*3^Dpl2P*;nFs
z`~7~!tw<rCTv{FU1q0PJ9Z^XX=lh?}KRdrn!DVh%v!ZIjs@hEoNQ@M~T?!O~PC0Fe
zYQi1`8u+-nZ3R}r8rbQ#I)}#!SXaPl9~3B~xrPS8FAKU#OBMVp3KvrR4ZgrOW^-Dv
zS+gv+EL+T%%(k@CrX|y$DUTcB6!-xVx{&-KNn$hJHwM`+>~Yp;xMT1!pO_YgriX4g
z(|=-P7nIveJ(4{4`rYj4!_2)ku9-JiFj%Ccz8#0}v?(C`9(=iQ;cDi}g0#Es&`z7Z
z^1_3W*@4S?3m*AKTwJ}X=pr0E?(6^$E#lb@*v>VpAwB7I;L{H9nk270Gx}t`1MQtK
z%=$b&FOGFWjFmlN0EI4)acdkZSjpp+uqCb^zji?@*Q%E3FKw`6O*aUPRDx%^Va_TA
h<h9va_cyP8kAWmC8M$L>@p3tjH+w<UCVD~6{SR~k-|zqc