From 921ac0defd69e3770e9ea10b7faf64778060975b Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Thu, 1 Aug 2019 13:54:06 +0800
Subject: [PATCH] update

Former-commit-id: cb2f4960fbaaa3bddeaae12995cd87d7d019593e
---
 .../DeviceServices/FBee/FBeeService.cs        |  2 +-
 .../IoT/IoTNode/appsettings.Development.json  |  2 +-
 .../IoTCenter/appsettings.Development.json    |  2 +-
 .../StreamingAssets/IoT.Resources.csproj      |  5 +--
 .../StreamingAssets/wwwroot/index2.html       | 37 ++++++++++++++++---
 5 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs b/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs
index f341cba6..039e74e7 100644
--- a/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs
+++ b/projects/IoT/IoT.Shared/DeviceServices/FBee/FBeeService.cs
@@ -561,7 +561,7 @@ namespace IoT.Shared.DeviceServices.FBee
                             device.AddorUpdateData(Keys.Data, historyData, DeviceDataType.String, Keys.Data, hidden: true);
                             device.AddorUpdateData(Keys.ZoneType, zoneType, DeviceDataType.String, Keys.ZoneType, hidden: true);
                             deviceRepo.SaveChanges();
-                            if (create)
+                            //if (create)
                             {
                                 this.UpdateStatus(device);
                             }
diff --git a/projects/IoT/IoTNode/appsettings.Development.json b/projects/IoT/IoTNode/appsettings.Development.json
index 66737a3f..b1d1e61b 100644
--- a/projects/IoT/IoTNode/appsettings.Development.json
+++ b/projects/IoT/IoTNode/appsettings.Development.json
@@ -6,5 +6,5 @@
       "Microsoft": "Information"
     }
   },
-  "UseMiniProfiler": true
+  "UseMiniProfiler": false
 }
\ No newline at end of file
diff --git a/projects/IoTCenter/appsettings.Development.json b/projects/IoTCenter/appsettings.Development.json
index 66737a3f..b1d1e61b 100644
--- a/projects/IoTCenter/appsettings.Development.json
+++ b/projects/IoTCenter/appsettings.Development.json
@@ -6,5 +6,5 @@
       "Microsoft": "Information"
     }
   },
-  "UseMiniProfiler": true
+  "UseMiniProfiler": false
 }
\ No newline at end of file
diff --git a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
index 1ce71b06..1692dab5 100644
--- a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
+++ b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj
@@ -11,8 +11,5 @@
   </ItemGroup>
    <ItemGroup>
     <EmbeddedResource Include="wwwroot\**\*" />
-  </ItemGroup><ItemGroup>
-  <None Remove="wwwroot\index - 复制.html.meta" />
-  <None Remove="wwwroot\index2.html" />
-</ItemGroup>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index2.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index2.html
index b0e42b49..6aaff09f 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/index2.html
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/index2.html
@@ -482,7 +482,7 @@
                                 <a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call(device.GatewayNumber,device.Number,'/ColorLight/Off')" v-else>关</a>
                             </div>
                             <div class="row">
-                                <form class="ajax" method="get" :action="vm.IoTServer+'/App/Exec'">
+                                <form class="ajax" method="get" :action="'http://'+vm.Login.Host+'/IoTCenter/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" />
@@ -505,7 +505,7 @@
                                 </form>
                             </div>
                             <div class="row">
-                                <form class="ajax" method="get" :action="vm.IoTServer+'/App/Exec'">
+                                <form class="ajax" method="get" :action="'http://'+vm.Login.Host+'/IoTCenter/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" />
@@ -539,7 +539,7 @@
                                 </form>
                             </div>
                             <div class="row">
-                                <form class="ajax" method="get" :action="vm.IoTServer+'/App/Exec'">
+                                <form class="ajax" method="get" :action="vm.IoTServer+'/IoTCenter/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" />
@@ -590,7 +590,7 @@
                                 <a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call(device.GatewayNumber,device.Number,'/Ir/KeyCodeType1Off')" v-else>禁用空调</a>
                             </div>
                             <div class="row" v-if="getData(device,'空调')==='开'">
-                                <form class="device KeyCodeType1" method="get" :action="vm.IoTServer+'/App/Exec'">
+                                <form class="device KeyCodeType1" method="get" :action="'http://'+vm.Login.Host+'/IoTCenter/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" />
@@ -674,7 +674,7 @@
                                 </ul>
                             </div>
                             <div class="row" v-if="getData(device,'空调')==='开'">
-                                <form class="device KeyCodeType1" method="get" :action="vm.IoTServer+'/App/Exec'">
+                                <form class="device KeyCodeType1" method="get" :action="'http://'+vm.Login.Host+'/IoTCenter/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" />
@@ -1384,5 +1384,32 @@
             }
         });
     </script>
+    <script>
+        $('body').on('change', 'input.ajax', function (e) {
+            var form = $(this).parents('form');
+            var url = form.attr('action') + '?' + form.serialize();
+            if (form.hasClass('KeyCodeType1')) {
+                if (e.target.name == "power" && e.target.value == "1") {
+                    url = new URI(url).setQuery('Code', '1').toString();
+                }
+                else {
+                    var list = {};
+                    list['power'] = form.find("[name = 'power']:checked").val();
+                    list['pattern'] = form.find("[name = 'pattern']:checked").val();
+                    list['direction'] = form.find("[name = 'direction']:checked").val();
+                    list['wind'] = form.find("[name = 'wind']:checked").val();
+                    list['temperature'] = form.find("[name = 'temperature']").val();
+                    list[e.target.name] = e.target.value;
+                    var code = 0;
+                    for (var name in list) {
+                        code += parseInt(list[name]);
+                    }
+                    url = new URI(url).setQuery('Code', code).toString();
+                }
+            }
+            ajax(url);
+            return false;
+        });
+    </script>
 </body>
 </html>
\ No newline at end of file