update

Former-commit-id: ee9a2f124d7f34d8e9fb0b58ff835c832e600bf7

projects/WebApp/wwwroot/js/message.js

@@ -21,29 +21,4 @@ connection.on("ServerToClient", function (method, message, to, from) {
     var event = method.substr(0, 1).toLowerCase() + method.substr(1);
     var model = JSON.parse(message);
     store.dispatch('update', {event,model,to,from});
-    //store.commit('update', method,message,to,from);
-    //store.commit('update',method,message,to,from)
-    //if (method === 'NodeEntityUpdated') {
-    //    store.commit('updateNode', model);
-    //}
-    ////else if (method === 'NodeEntityInserted') {}
-    ////else if (method === 'NodeEntityDeleted') {}
-    //else if (method === 'DeviceEntityInserted') {
-    //    store.commit('insertDevice', model);
-    //}
-    //else if (method === 'DeviceEntityUpdated') {
-    //    store.commit('updateDevice', model);
-    //}
-    //else if (method === 'DeviceEntityDeleted') {
-    //    store.commit('deleteDevice', model);
-    //}
-    //else if (method === 'DataEntityInserted') {
-    //    store.commit('insertData', model);
-    //}
-    //else if (method === 'DataEntityUpdated') {
-    //    store.commit('updateData', model);
-    //}
-    //else if (method === 'DataEntityDeleted') {
-    //    store.commit('deleteData', model);
-    //}
 });

projects/WebApp/wwwroot/js/store.js

@@ -75,7 +75,7 @@ const store = new Vuex.Store({
                 }
             }
             if (state.device) {
-                let device = state.device.number === model.number;
+                let device = state.device.id === model.deviceId ? state.device : null;
                 if (device) {
                     updateByKey(device.data, model);
                 }

projects/WebApp/wwwroot/pages/home.js

@@ -16,7 +16,7 @@
                             store.commit('setUser', response.data);
                         })
                         .catch(function (error) {
-                        })
+                        });
                 },
                 methods: {
                     logout: function () {

projects/WebApp/wwwroot/pages/iot/device/ir.html

@@ -6,16 +6,34 @@
             <span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
         </div>
         <div class="card-body">
-            <div class="row media" style="height:100px;">
+            <div class="weui-tab" style="height:100px;">
-                <div class="col col-md-4 col-sm-4 align-self-center">
+                <div class="weui-navbar">
-                    <img class="mh-100" src="/IoTCenter/images/curtain.png" style="width:48px;" />
+                    <a href="javascript:;" class="weui-tabbar__item">
+                        <p class="weui-tabbar__label">空调</p>
+                    </a>
+                    <a href="javascript:;" class="weui-tabbar__item">
+                        <p class="weui-tabbar__label">电视</p>
+                    </a>
+                    <a href="javascript:;" class="weui-tabbar__item">
+                        <p class="weui-tabbar__label">机顶盒</p>
+                    </a>
+                    <a href="javascript:;" class="weui-tabbar__item">
+                        <p class="weui-tabbar__label">自定义</p>
+                    </a>
                 </div>
-                <div class="col col-md-8 col-sm-8 align-self-center">
+                <div class="weui-tab__panel">
-                    <div class="row" style="line-height:28px;">
+                    <div class="weui-tab__content">
-                        <span>{{getDeviceDataValue(device,'状态')}}</span>
+                        {{getCode.pattern}}
-                        <img style="height:32px;" v-on:click="execApi(device.number,'/Curtain/On')" src="/IoTCenter/images/left.png" />
+                        <input type="button" value="1" />
-                        <img style="height:32px;" v-on:click="execApi(device.number,'/Curtain/Stop')" src="/IoTCenter/images/stop.png" />
+                    </div>
-                        <img style="height:32px;" v-on:click="execApi(device.number,'/Curtain/Off')" src="/IoTCenter/images/right.png" />
+                    <div class="weui-tab__content">
+                        2
+                    </div>
+                    <div class="weui-tab__content">
+                        3
+                    </div>
+                    <div class="weui-tab__content">
+                        4
                     </div>
                 </div>
             </div>
@@ -24,6 +42,72 @@
 </template>
 <script>
     ({
-        props: ['device']
+        props: ['device'],
+        mounted: function () {
+            weui.tab('.weui-tab');
+        },
+        computed: {
+            getCode: function () {
+                var code = getDeviceDataValue(this.device, '按键');
+                var pattern = 0;
+                var direction = 0;
+                var wind = 0;
+                var power = 2;
+                var temperature = 1;
+                if (code > 480 + 2) {
+                    pattern = 480;
+                }
+                else if (code > 360 + 2) {
+                    pattern = 360;
+                }
+                else if (code > 240 + 2) {
+                    pattern = 240;
+                }
+                else if (code > 120 + 2) {
+                    pattern = 120;
+                }
+                else {
+                    pattern = 0;
+                }
+                code -= pattern;
+                if (code > 75 + 2) {
+                    direction = 75;
+                }
+                else if (code > 60 + 2) {
+                    direction = 60;
+                }
+                else {
+                    direction = 0;
+                }
+                code -= direction;
+                if (code > 45 + 2) {
+                    wind = 45;
+                }
+                else if (code > 30 + 2) {
+                    wind = 30;
+                }
+                else if (code > 15 + 2) {
+                    wind = 15;
+                }
+                else {
+                    wind = 0;
+                }
+                code -= wind;
+                if (code === 1) {
+                    power = 1;
+                }
+                else {
+                    power = 2;
+                    temperature = code - power;
+                }
+                return {
+                    pattern: pattern,
+                    direction: direction,
+                    wind: wind,
+                    power: power,
+                    temperature: temperature
+                };
+            }
+        }
     });
 </script>