From 77f4d007a704b0d4a8c7e85b615d5541255f4d0f Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 19 Jul 2019 19:08:00 +0800
Subject: [PATCH] update

Former-commit-id: f79e83e6eec8dc4d7ebe9f408581c1bf27d27660
---
 .../FBeeService/Controllers/IrController.cs   |   4 +-
 .../Infrastructure/DeviceService.cs           |   1 +
 .../Assets/StreamingAssets/wwwroot/index.html |  57 ++++++++++++++++--
 .../Assets/StreamingAssets/wwwroot/js/app.js  | Bin 49188 -> 55730 bytes
 4 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/projects/IoT/IoTServices/FBeeService/Controllers/IrController.cs b/projects/IoT/IoTServices/FBeeService/Controllers/IrController.cs
index d68ac407..27e26b32 100644
--- a/projects/IoT/IoTServices/FBeeService/Controllers/IrController.cs
+++ b/projects/IoT/IoTServices/FBeeService/Controllers/IrController.cs
@@ -16,9 +16,9 @@ namespace FBeeService.Controllers
             this._deviceService = deviceService;
         }
 
-        [HttpGet, Route("[action]"), SwaggerOperation("发送指令")]
+        [HttpGet, Route("/[controller]/[action]"), SwaggerOperation("发送指令")]
 
-        public ApiResponse PressKey([SwaggerParameter("网关编号")]string gateway, [SwaggerParameter("设备编号")]string number, [SwaggerParameter("按键类型")]byte type, [SwaggerParameter("键值")]ushort code)
+        public ApiResponse Send([SwaggerParameter("网关编号")]string gateway, [SwaggerParameter("设备编号")]string number, [SwaggerParameter("按键类型")]byte type, [SwaggerParameter("键值")]ushort code)
         {
             return this.AsyncAction(() =>
             {
diff --git a/projects/IoT/IoTServices/FBeeService/Infrastructure/DeviceService.cs b/projects/IoT/IoTServices/FBeeService/Infrastructure/DeviceService.cs
index fb4615ce..bf7b7552 100644
--- a/projects/IoT/IoTServices/FBeeService/Infrastructure/DeviceService.cs
+++ b/projects/IoT/IoTServices/FBeeService/Infrastructure/DeviceService.cs
@@ -1231,6 +1231,7 @@ namespace FBeeService
                             }
                         }
                         deviceRepo.SaveChanges();
+                        this.SendDevice(device);
                     }
                 }
             }
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
index 14dc32be..9e62527b 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
@@ -569,19 +569,64 @@
                             <div class="row">
                                 <a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call(device.GatewayNumber,device.Number,'/Ir/KeyCodeType1On')" v-if="getData(device,'空调')==='关'">启用空调</a>
                                 <a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call(device.GatewayNumber,device.Number,'/Ir/KeyCodeType1Off')" v-else>禁用空调</a>
-                                <a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call(device.GatewayNumber,device.Number,'/Ir/KeyCodeType2On')" v-if="getData(device,'电视')==='关'">启用电视</a>
-                                <a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call(device.GatewayNumber,device.Number,'/Ir/KeyCodeType2Off')" v-else>禁用电视</a>
-                                <a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call(device.GatewayNumber,device.Number,'/Ir/KeyCodeType5On')" v-if="getData(device,'电视')==='关'">启用自定义</a>
-                                <a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call(device.GatewayNumber,device.Number,'/Ir/KeyCodeType5Off')" v-else>禁用自定义</a>
                             </div>
                             <div class="row" v-if="getData(device,'空调')==='开'">
-                                <form class="ajax" method="get" :action="vm.IoTServer+'/App/Exec'">
+                                <form class="KeyCodeType1" method="get" :action="vm.IoTServer+'/App/Exec'">
                                     <input type="hidden" name="ConnectionId" :value="vm.ConnectionId" />
                                     <input type="hidden" name="Gateway" :value="device.GatewayNumber" />
                                     <input type="hidden" name="Number" :value="device.Number" />
+                                    <input type="hidden" name="Method" value="/Ir/Send" />
                                     <input type="hidden" name="Type" value="1" />
+                                    <input type="hidden" name="Code" :value="getValue(device,'按键')" />
+                                    <div class="row">
+                                        <div class="col-20">
+                                            <label>电源：</label>
+                                        </div>
+                                        <div class="col-80">
+                                            <label><input class="ajax" name="power" type="radio" value="2" v-model="getCode1(getValue(device,'按键')).power" />开</label>
+                                            <label><input class="ajax" name="power" type="radio" value="1" v-model="getCode1(getValue(device,'按键')).power" />关</label>
+                                        </div>
+                                    </div>
                                     <div class="row">
-                                        <input name="power" type="button" value="2" class="ajax" />
+                                        <div class="col-20">
+                                            <label>模式：</label>
+                                        </div>
+                                        <div class="col-80">
+                                            <label><input class="ajax" name="pattern" type="radio" v-model="getCode1(getValue(device,'按键')).pattern" value="0" />制冷</label>
+                                            <label><input class="ajax" name="pattern" type="radio" v-model="getCode1(getValue(device,'按键')).pattern" value="120" />自动</label>
+                                            <label><input class="ajax" name="pattern" type="radio" v-model="getCode1(getValue(device,'按键')).pattern" value="240" />制热</label>
+                                            <label><input class="ajax" name="pattern" type="radio" v-model="getCode1(getValue(device,'按键')).pattern" value="360" />抽湿</label>
+                                            <label><input class="ajax" name="pattern" type="radio" v-model="getCode1(getValue(device,'按键')).pattern" value="480" />送风</label>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-20">
+                                            <label>温度：</label>
+                                        </div>
+                                        <div class="col-80">
+                                            <input class="ajax" name="temperature" type="range" step="1" min="1" max="15" :value="getCode1(getValue(device,'按键')).temperature" />
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-20">
+                                            <label>风向：</label>
+                                        </div>
+                                        <div class="col-80">
+                                            <label><input name="direction" type="radio" v-model="getCode1(getValue(device,'按键')).direction" value="0" class="ajax" />任意</label>
+                                            <label><input name="direction" type="radio" v-model="getCode1(getValue(device,'按键')).direction" value="60" class="ajax" />手动</label>
+                                            <label><input name="direction" type="radio" v-model="getCode1(getValue(device,'按键')).direction" value="75" class="ajax" />自动</label>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-20">
+                                            <label>风量：</label>
+                                        </div>
+                                        <div class="col-80">
+                                            <label><input class="ajax" name="wind" type="radio" v-model="getCode1(getValue(device,'按键')).wind" value="0" />自动</label>
+                                            <label><input class="ajax" name="wind" type="radio" v-model="getCode1(getValue(device,'按键')).wind" value="15" />高</label>
+                                            <label><input class="ajax" name="wind" type="radio" v-model="getCode1(getValue(device,'按键')).wind" value="30" />中</label>
+                                            <label><input class="ajax" name="wind" type="radio" v-model="getCode1(getValue(device,'按键')).wind" value="45" />低</label>
+                                        </div>
                                     </div>
                                 </form>
                             </div>
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/app.js b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/app.js
index affc59bd80f69fbd8b75f39bfab56656a3d717c9..5b50c11d9c714bef998d4cc1b382133d9b91718f 100644
GIT binary patch
delta 3397
zcmb_fOK)3M5FXW*d!59oW5?9ND!EBoJ62jJ*GU@G5Y!4(2?|b9sJci4xXz<hoW!!-
zMj;d;)D4dX?Fd$=%AzU@7IiT~Vo?IDS+HP%Shf2u$S;6z&h@n&Khrj{e0_7yoSFG%
zzBx0wyJ`C&Z_E92IsYhi_dx!y%Z~Q^&CHX7yp{C_u27s-Xp!d0png1$(;S}H=_)1o
zO#B#cc{Tnx@ue$7&P3$v5b1P-!aTk0<A~qSpFi}lHrdH1w~z9ZLw<hLu8l6xDy3<e
zA|$#q^cp4AZwC59bPn3rv9_x0yo>jg*yjI!>}I{gEgB|E8W!Nk3MBifmuB!5hu(Rb
zfSwdItl>S4_gU<QVedNjlaLL=%L#mR>=_i|_@QC`bwcB|rM3&QqeI@ncbo?CX=cql
z5u!xF=W2TfKX!!qwBtRVnrv~I$jnnw{_XrA=UVKG5>=fBl=T$+Od~S$^ae0x;qhL5
zkds+_1ouiU<nY80drSLcZw~QK!&(A1uL6HVoALdzxmL(|b)3T%y4C%$Byn6;{7b92
zUQ<}>*)1?=#>}k6hW+A@(#N*~eXMT;c{3K}54RUM)#hgZ7iT-HdXXA6B@4CLv6~U_
zjdyMa_$!AdmFug{Uxh@g743?3SE;@#cDiau&61jW(akxh{jiy#SHbxadYOh4_jQV*
z76<sxdk(L~VVtvM*a%MWzpE{ri)sNYzB-AHVLI7VhmvWaBMMKN`JrSQ=rAbSRELr&
z=ok{Ltz}qMb|k~7(JnJaCyIAMv9dYd)-5-oL=rian?s^7Mx%HR;H%;osF__;t{g+x
z?pRhtvaS}$StuItsDQ;=j-|k<aulu-iV+%BEI<Sbt0n_R8~8k25%oK7X-<<l*lBRi
z*c~x0ox_fWPF8IefA@&T20Z+;eGK(y^&!(A!_r!{6XnNxXs~YeAaA8Soxop8Gxt2`
zyM608-+AQ))gD17Re*B+pHf0)4S|hFC{#@fk*iu2SpnWEyH>)mcDMw{)L(!n@^zdS
zxtg$e=U_Mg9t^VkCkJm`8sg-4?R@kb4{x6BmG`{;qvRR>`|VD4Z@<ZZJp7a|jXlr&
zAQdz6nfq7-!7(QV$%)zTOR#$3Zjgd}Kj!nA6T>xBn8>NAfP3tH{OxV+qMTd7&KiC%
z(0TOgev%H6RI`S3?<`GYMSAf%_Cm#}CWI+UO&&@z3x>P{*|h3wi#(k<!fve-H(kG)
zuBO)8Z5wn$s^ya;WHOMQ!TFNM(veJd?R`$LSSe>ufmv7JXM&dSoU59a#>qu3u%Pq%
z8JF~q3O~vyre=<(^`-KBQ-Ank##iM>6@{O{m)bh&`g4GiNSA7-%jK!Dn&#6dru<}G
zvn8v$5>d0po*@YJ^;C}0<5nV^MfCh2=5<=-HOt?}y7+_nei?k7#lg2Yf^7OdK1)_t
z^w&{7pg8ZGKEgSp(=gjYy|K7xwOG)z7y)}QYQH2UI`e!bTDoxMpNCpyn%eMi&ZBYc
Hm)HLXkd4pt

delta 99
zcmdnAnR!VA^M+eVi(69pCKt?P+k7i&3Dab~xg48&il4AgF3{qed|->&rU`o-CmR?D
yO}=pP%;dbAE|Y^U+HfZ^lroe6VLn6N<mnexq4Hjn7if!2KCp>rve~6HkXit_b}R@0