主页界面修改完成

api/device.js

@@ -11,7 +11,7 @@ module.exports = {
   //获取回路参数
   getloop:(Device) => request('/devices/relays?id=' + Device,'GET'),
   //控制回路开关
-  loopSwitch:(params)=>request('/devices/operation','POST',params),
+  loopSwitch:(params) => request('/devices/operation','POST',params),
   //获取回路的开关状态
-  loopSwitchstate:(Device,relayid)=>request('/devices/relays/status?device_id='+ Device + '&relay_ids=' + relayid,'GET')
+  loopSwitchstate:(Device,relayid) => request('/devices/relays/status?device_id='+ Device + '&relay_ids=' + relayid,'GET')
 }

pages/control/control.js

@@ -41,7 +41,8 @@ Page({
     deviceId:'',
     deviceKey:'',
     moudule:0,
-    id:0
+    id:0,
+    play:0,
   },
   //回路开
   Open(e){
@@ -49,6 +50,10 @@ Page({
     var moudule = that.data.moudule
     var id = that.data.id
     var opens = e.target.dataset.open
+    var loops = that.data.loops
+    if(typeof(loops) == String){
+      loops = parseInt(loops)
+    }
     if(opens == 1){
       if(moudule == 0){
         control.Switch(that.data.deviceId,that.data.deviceKey,{ 'R1_RelayStatus':13,'Reflash':3})
@@ -57,7 +62,7 @@ Page({
         control.newSwitch({deviceId:id,relayIds:"1",operation:1})
       }
     }
-    else if (opens == 2 && that.data.loops == "2") {
+    else if (opens == 2 && loops >= 2) {
       if(moudule == 0){
         control.Switch(that.data.deviceId,that.data.deviceKey,{ 'R2_RelayStatus':13,'Reflash':3})
       }
@@ -65,44 +70,90 @@ Page({
         control.newSwitch({deviceId:id,relayIds:"2",operation:1})
       }
     }
-    else if (opens == 3 && that.data.loops == "3") {
+    else if (opens == 3 && loops >= 3) {
       if(moudule == 0){
         control.Switch(that.data.deviceId,that.data.deviceKey,{ 'R3_RelayStatus':13,'Reflash':3})
       }
       else{
-        control.newSwitch({deviceId:id,relayIds:2,operation:1})
+        control.newSwitch({deviceId:id,relayIds:"3",operation:1})
       }
     }
-    else if (opens == 4 && that.data.loops == "4") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R4_RelayStatus':13,'Reflash':3})
+    else if (opens == 4 && loops >= 4) {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{ 'R4_RelayStatus':13,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"4",operation:1})
+      }
     }
-    else if (opens == 5 && that.data.loops == "5") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R5_RelayStatus':13,'Reflash':3})
+    else if (opens == 5 && loops >= "5") {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{ 'R5_RelayStatus':13,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"5",operation:1})
+      }
     }
-    else if (opens == 6 && that.data.loops == "6") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R6_RelayStatus':13,'Reflash':3})
+    else if (opens == 6 && loops >= "6") {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{ 'R6_RelayStatus':13,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"6",operation:1})
+      }
     }
-    else if (opens == 7 && that.data.loops == "7") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R7_RelayStatus':13,'Reflash':3})
+    else if (opens == 7 && loops >= "7") {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{ 'R7_RelayStatus':13,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"7",operation:1})
+      }
     }
-    else if (opens == 8 && that.data.loops == "8") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R8_RelayStatus':13,'Reflash':3})
+    else if (opens == 8 && loops >= "8") {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{ 'R8_RelayStatus':13,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"8",operation:1})
+      }
     }
-    else if (opens == 9 && that.data.loops == "9") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R9_RelayStatus':13,'Reflash':3})
+    else if (opens == 9 && loops >= "9") {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{ 'R9_RelayStatus':13,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"9",operation:1})
+      }
     }
-    else if (opens == 10 && that.data.loops == "10") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R10_RelayStatus':13,'Reflash':3})
+    else if (opens == 10 && loops >= "10") {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{ 'R10_RelayStatus':13,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"10",operation:1})
+      }
     }
-    else if (opens == 11 && that.data.loops == "11") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R11_RelayStatus':13,'Reflash':3})
+    else if (opens == 11 && loops >= "11") {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{ 'R11_RelayStatus':13,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"11",operation:1})
+      }
     }
-    else if (opens == 12 && that.data.loops == "12") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R12_RelayStatus':13,'Reflash':3})
+    else if (opens == 12 && loops >= "12") {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{ 'R12_RelayStatus':13,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"12",operation:1})
+      }
     }
     setTimeout(function(){
       //旧设备
       if(moudule == 0){
+        var lamp = wx.getStorageSync('lamp')
         getData(that.data.deviceId,that.data.deviceKey).then(bind => {
         let Bind = bind.data.data
         if(bind.data.errno == 0){
@@ -151,14 +202,29 @@ Page({
       }
       //新设备
       else{
-        console.log(opens)
-        //var Switchstate = wx.getStorageSync('lamp')
-        //let opens = control.newswitchReal(id,opens)
-        // Switchstate[opens-1] = control.newswitchReal(id,opens)
-        // setTimeout(function(){
-        //   wx.setStorageSync('lamp', Switchstate)
-        //   that.setData({lamp:wx.getStorageSync('lamp')})
-        // },500)
+        var Switchstate = wx.getStorageSync('lamp')
+        loopSwitchstate(id,opens).then(res=>{
+          if(res.data.code == 0){
+            var relay = res.data.data
+            if(relay[0].status == 1){
+              Switchstate[opens - 1] = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp1.png'
+            }
+            else{
+              Switchstate[opens - 1] = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp.png'
+            }
+          }
+          else{
+            wx.showModal({
+              title:'错误',
+              content:res.data.msg,
+              showCancel:false
+            })
+          }
+        })
+        setTimeout(function(){
+          wx.setStorageSync('lamp', Switchstate)
+          that.setData({lamp:wx.getStorageSync('lamp')})
+        },500)
       }
     },2000)
   },
@@ -169,6 +235,10 @@ Page({
     var id = that.data.id
     var lamp = wx.getStorageSync('lamp')
     var shuts = e.target.dataset.shut
+    var loops = that.data.loops
+    if(typeof(loops) == String){
+      loops = parseInt(loops)
+    }
     if(shuts == 1){
       if(moudule == 0){
         control.Switch(that.data.deviceId,that.data.deviceKey,{'R1_RelayStatus':12,'Reflash':3})
@@ -177,7 +247,7 @@ Page({
         control.newSwitch({deviceId:id,relayIds:"1",operation:0})
       }
     }
-    else if (shuts == 2 && that.data.loops == "2") {
+    else if (shuts == 2 && loops >= 2) {
       if(moudule == 0){
         control.Switch(that.data.deviceId,that.data.deviceKey,{'R2_RelayStatus':12,'Reflash':3})
       }
@@ -185,35 +255,85 @@ Page({
         control.newSwitch({deviceId:id,relayIds:"2",operation:0})
       }
     }
-    else if (shuts == 3 && that.data.loops == "3") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R3_RelayStatus':12,'Reflash':3})
+    else if (shuts == 3 && loops >= 3) {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{'R3_RelayStatus':12,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"3",operation:0})
+      }
     }
-    else if (shuts == 4 && that.data.loops == "4") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R4_RelayStatus':12,'Reflash':3})
+    else if (shuts == 4 && loops >= 4) {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{'R4_RelayStatus':12,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"4",operation:0})
+      }
     }
-    else if (shuts == 5 && that.data.loops == "5") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R5_RelayStatus':12,'Reflash':3})
+    else if (shuts == 5 && loops >= 5) {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{'R5_RelayStatus':12,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"5",operation:0})
+      }
     }
-    else if (shuts == 6 && that.data.loops == "6") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R6_RelayStatus':12,'Reflash':3})
+    else if (shuts == 6 && loops >= 6) {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{'R6_RelayStatus':12,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"6",operation:0})
+      }
     }
-    else if (shuts == 7 && that.data.loops == "7") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R7_RelayStatus':12,'Reflash':3})
+    else if (shuts == 7 && loops >= 7) {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{'R7_RelayStatus':12,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"7",operation:0})
+      }
     }
-    else if (shuts == 8 && that.data.loops == "8") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R8_RelayStatus':12,'Reflash':3})
+    else if (shuts == 8 && loops >= 8) {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{'R8_RelayStatus':12,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"8",operation:0})
+      }
     }
-    else if (shuts == 9 && that.data.loops == "9") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R9_RelayStatus':12,'Reflash':3})
+    else if (shuts == 9 && loops >= 9) {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{'R9_RelayStatus':12,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"9",operation:0})
+      }
     }
-    else if (shuts == 10 && that.data.loops == "10") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R10_RelayStatus':12,'Reflash':3})
+    else if (shuts == 10 && loops >= 10) {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{'R10_RelayStatus':12,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"10",operation:0})
+      }
     }
-    else if (shuts == 11 && that.data.loops == "11") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R11_RelayStatus':12,'Reflash':3})
+    else if (shuts == 11 && loops >= 11) {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{'R11_RelayStatus':12,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"11",operation:0})
+      }
     }
-    else if (shuts == 12 && that.data.loops == "12") {
-      control.Switch(that.data.deviceId,that.data.deviceKey,{'R12_RelayStatus':12,'Reflash':3})
+    else if (shuts == 12 && loops >= "12") {
+      if(moudule == 0){
+        control.Switch(that.data.deviceId,that.data.deviceKey,{'R12_RelayStatus':12,'Reflash':3})
+      }
+      else{
+        control.newSwitch({deviceId:id,relayIds:"12",operation:0})
+      }
     }
     setTimeout(function(){
       if(moudule == 0){
@@ -222,40 +342,40 @@ Page({
           if(bind.data.errno == 0){
             for(let r1 = 0;r1 < Bind.length;r1++){         
               if(Bind[r1].id == 'R1_RelayStatus'){
-                var switchReal = control.switchReal(Bind[r1].current_value,lamp,0)
+                var switchReal = control.SwitchReal(Bind[r1].current_value,lamp,0)
               }
               else if(Bind[r1].id == 'R2_RelayStatus'){
-                var switchReal = control.switchReal(Bind[r1].current_value,lamp,1)
+                var switchReal = control.SwitchReal(Bind[r1].current_value,lamp,1)
               }
               else if(Bind[r1].id == 'R3_RelayStatus'){
-                var switchReal = control.switchReal(Bind[r1].current_value,lamp,2)
+                var switchReal = control.SwitchReal(Bind[r1].current_value,lamp,2)
               }
               else if(Bind[r1].id == 'R4_RelayStatus'){
-                var switchReal = control.switchReal(Bind[r1].current_value,lamp,3)
+                var switchReal = control.SwitchReal(Bind[r1].current_value,lamp,3)
               }
               else if(Bind[r1].id == 'R5_RelayStatus'){
-                var switchReal = control.switchReal(Bind[r1].current_value,lamp,4)
+                var switchReal = control.SwitchReal(Bind[r1].current_value,lamp,4)
               }
               else if(Bind[r1].id == 'R6_RelayStatus'){
-                var switchReal = control.switchReal(Bind[r1].current_value,lamp,5)
+                var switchReal = control.SwitchReal(Bind[r1].current_value,lamp,5)
               }
               else if(Bind[r1].id == 'R7_RelayStatus'){
-                var switchReal = control.switchReal(Bind[r1].current_value,lamp,6)
+                var switchReal = control.SwitchReal(Bind[r1].current_value,lamp,6)
               }
               else if(Bind[r1].id == 'R8_RelayStatus'){
-                var switchReal = control.switchReal(Bind[r1].current_value,lamp,7)
+                var switchReal = control.SwitchReal(Bind[r1].current_value,lamp,7)
               }
               else if(Bind[r1].id == 'R9_RelayStatus'){
-                var switchReal = control.switchReal(Bind[r1].current_value,lamp,8)
+                var switchReal = control.SwitchReal(Bind[r1].current_value,lamp,8)
               }
               else if(Bind[r1].id == 'R10_RelayStatus'){
-                var switchReal = control.switchReal(Bind[r1].current_value,lamp,9)
+                var switchReal = control.SwitchReal(Bind[r1].current_value,lamp,9)
               }
               else if(Bind[r1].id == 'R11_RelayStatus'){
-                var switchReal = control.switchReal(Bind[r1].current_value,lamp,10)
+                var switchReal = control.SwitchReal(Bind[r1].current_value,lamp,10)
               }
               else if(Bind[r1].id == 'R12_RelayStatus'){
-                var switchReal = control.switchReal(Bind[r1].current_value,lamp,11)
+                var switchReal = control.SwitchReal(Bind[r1].current_value,lamp,11)
               }
             }
             wx.setStorageSync('lamp',switchReal)
@@ -265,8 +385,24 @@ Page({
       }
       else{
         var Switchstate = wx.getStorageSync('lamp')
-        Switchstate[shuts] = control.newswitchReal(id,shuts)
-        console.log(Switchstate)
+        loopSwitchstate(id,shuts).then(res=>{
+          if(res.data.code == 0){
+            var relay = res.data.data
+            if(relay[0].status == 1){
+              Switchstate[shuts - 1] = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp1.png'
+            }
+            else{
+              Switchstate[shuts - 1] = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp.png'
+            }
+          }
+          else{
+            wx.showModal({
+              title:'错误',
+              content:res.data.msg,
+              showCancel:false
+            })
+          }
+        })
         setTimeout(function(){
           wx.setStorageSync('lamp', Switchstate)
           that.setData({lamp:wx.getStorageSync('lamp')})
@@ -974,8 +1110,8 @@ Page({
     var obj = {'R1_RelayStatus':13,'R2_RelayStatus':13,'R3_RelayStatus':13,'R4_RelayStatus':13,
     'R5_RelayStatus':13,'R6_RelayStatus':13,'R7_RelayStatus':13,'R8_RelayStatus':13,'R9_RelayStatus':13,
     'R10_RelayStatus':13,'R11_RelayStatus':13,'R12_RelayStatus':13,'Reflash':3}
+    var obj1 = {}
     postData(that.data.deviceId,that.data.deviceKey,obj).then(res => {
-      console.log(res)
       if(res.data.errno == 0){
         wx.setStorageSync('lamp', [])
         var lamp = wx.getStorageSync('lamp')
@@ -1149,6 +1285,7 @@ Page({
                     var deviceId = group[d].devices[g].deviceId
                     var deviceKey = group[d].devices[g].deviceKey
                     var moudule = group[d].devices[g].module
+                    that.setData({play:0})
                   }
                   //新设备信息
                   else{
@@ -1156,6 +1293,7 @@ Page({
                     var circuits = group[d].devices[g].circuits
                     var moudule = group[d].devices[g].module
                     var id = group[d].devices[g].id
+                    that.setData({play:1})
                   }
                 }
               }
@@ -1338,12 +1476,6 @@ Page({
                 let loopState = res.data.data
                 //loopState.length可以视为回路数量
                 for(let n = 0;n < loopState.length;n++){
-                  if(loopState[n].status == 1){
-                    lamp[n] = "https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp1.png"
-                  }
-                  else{
-                    lamp[n] = "https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp.png"
-                  }
                   var Loop = that.data.Loop
                   var color = that.data.Color
                   var size = that.data.Size
@@ -1354,8 +1486,6 @@ Page({
                   Address[n] = "/image/modify.png"
                   that.setData({Color:color,Size:size,address:Address,Loop:Loop})
                 }
-                wx.setStorageSync('lamp', lamp)
-                that.setData({lamp:lamp})
               }
               else{
                 wx.showModal({
@@ -1365,6 +1495,33 @@ Page({
                 })
               }
             })
+            loopSwitchstate(id,'1,2,3,4,5,6,7,8').then(res=>{
+              if(res.data.code == 0){
+                var relay = res.data.data
+                for(let e = 0;e < relay.length;e++){
+                  if(relay[e].status == 1){
+                    lamp[e] = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp1.png'
+                  }
+                  else if(relay[e].status == 0){
+                    lamp[e] = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp.png'
+                  }
+                  else{
+                    lamp[e] = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp.png'
+                  }
+                }
+              }
+              else{
+                wx.showModal({
+                  title:'错误',
+                  content:res.data.msg,
+                  showCancel:false
+                })
+              }
+            })        
+            setTimeout(function(){
+              wx.setStorageSync('lamp',lamp)
+              that.setData({lamp:wx.getStorageSync('lamp')})
+            },2000)
           }
         }
         else{
@@ -1407,13 +1564,15 @@ Page({
               var deviceId = group[index].devices[t].deviceId
               var deviceKey = group[index].devices[t].deviceKey
               var moudule = group[index].devices[t].module
+              that.setData({play:0})
             }
             //新设备信息
             else{
-              var circuitNum = group[d].devices[g].circuitNum
+              var circuitNum = group[index].devices[t].circuitNum
               var circuits = group[index].devices[t].circuits
               var moudule = group[index].devices[t].module
               var id = group[index].devices[t].id
+              that.setData({play:1})
             }
           }
         }
@@ -1601,12 +1760,6 @@ Page({
           let loopState = res.data.data
           //loopState.length可以视为回路数量
           for(let n = 0;n < loopState.length;n++){
-            if(loopState[n].status == 1){
-              lamp[n] = "https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp1.png"
-            }
-            else{
-              lamp[n] = "https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp.png"
-            }
             var Loop = that.data.Loop
             var color = that.data.Color
             var size = that.data.Size
@@ -1617,8 +1770,6 @@ Page({
             Address[n] = "/image/modify.png"
             that.setData({Color:color,Size:size,address:Address,Loop:Loop})
           }
-          wx.setStorageSync('lamp', lamp)
-          that.setData({lamp:lamp})
         }
         else{
           wx.showModal({
@@ -1628,34 +1779,51 @@ Page({
           })
         }
       })
-    }
-  },
-  //手动
-  manual:function(e){
-    var that = this
-    var deviceId = that.data.deviceId
-    var deviceKey = that.data.deviceKey
-    wx.request({
-      url: 'https://api.heclouds.com/cmds?device_id=' + deviceId,
-      method:'POST',
-      header:{"api-key": deviceKey},
-      data:{
-        'ManualStatus':1,
-        'Reflash':3
-      },
-      success:res =>{
-        if(res.statusCode == 200){
-          that.setData({
-            Modecontrol:'手动'
-          })
+      loopSwitchstate(id,'1,2,3,4,5,6,7,8').then(res=>{
+        if(res.data.code == 0){
+          var relay = res.data.data
+          for(let e = 0;e < relay.length;e++){
+            if(relay[e].status == 1){
+              lamp[e] = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp1.png'
+            }
+            else if(relay[e].status == 0){
+              lamp[e] = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp.png'
+            }
+            else{
+              lamp[e] = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp.png'
+            }
+          }
         }
         else{
           wx.showModal({
             title:'错误',
-            content:res.errMsg,
+            content:res.data.msg,
             showCancel:false
           })
         }
+      })        
+      setTimeout(function(){
+        wx.setStorageSync('lamp',lamp)
+        that.setData({lamp:wx.getStorageSync('lamp')})
+      },2000)
+    }
+  },
+  //手动
+  manual:function(e){
+    var that = this
+    var deviceId = that.data.deviceId
+    var deviceKey = that.data.deviceKey
+    postData(deviceId,deviceKey,{'ManualStatus':1,'Reflash':3}).then(res => {
+      console.log(res.data)
+      if(res.data.errno == 0){
+        that.setData({Modecontrol:'手动'})
+      }
+      else{
+        wx.showModal({
+          title:'错误',
+          content:res.data.error,
+          showCancel:false
+        })
       }
     })
   },
@@ -1664,27 +1832,16 @@ Page({
     var that = this
     var deviceId = that.data.deviceId
     var deviceKey = that.data.deviceKey
-    wx.request({
-      url: 'https://api.heclouds.com/cmds?device_id=' + deviceId,
-      method:'POST',
-      header:{"api-key": deviceKey},
-      data:{
-        'ManualStatus':0,
-        'Reflash':3
-      },
-      success:res =>{
-        if(res.statusCode == 200){
-          that.setData({
-            Modecontrol:'自动'
-          })
-        }
-        else{
-          wx.showModal({
-            title:'错误',
-            content:res.errMsg,
-            showCancel:false
-          })
-        }
+    postData(deviceId,deviceKey,{'ManualStatus':1,'Reflash':3}).then(res => {
+      if(res.data.errno == 0){
+        that.setData({Modecontrol:'自动'})
+      }
+      else{
+        wx.showModal({
+          title:'错误',
+          content:res.data.error,
+          showCancel:false
+        })
       }
     })
   },
@@ -1773,6 +1930,7 @@ Page({
                       var deviceId = group[d].devices[g].deviceId
                       var deviceKey = group[d].devices[g].deviceKey
                       var moudule = group[d].devices[g].module
+                      that.setData({play:0})
                     }
                     //新设备信息
                     else{
@@ -1780,6 +1938,7 @@ Page({
                       var circuits = group[d].devices[g].circuits
                       var moudule = group[d].devices[g].module
                       var id = group[d].devices[g].id//设备的序号
+                      that.setData({play:1})
                     }
                   }
                 }
@@ -1987,30 +2146,29 @@ Page({
                   })
                 }
               })
-              for(let e = 0;e < circuitNum;e++){
-                loopSwitchstate(id,(e+1)).then(res=>{
-                  if(res.data.code == 0){
-                    var relay = res.data.data
-                    if(relay[0].status == 1){
-                      var ever = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp1.png'
+              loopSwitchstate(id,'1,2,3,4,5,6,7,8').then(res=>{
+                if(res.data.code == 0){
+                  var relay = res.data.data
+                  for(let e = 0;e < relay.length;e++){
+                    if(relay[e].status == 1){
+                      lamp[e] = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp1.png'
                     }
-                    else if(relay[0].status == 0){
-                      var ever = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp.png'
+                    else if(relay[e].status == 0){
+                      lamp[e] = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp.png'
                     }
                     else{
-                      var ever = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp.png'
+                      lamp[e] = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp.png'
                     }
-                    lamp[e] = ever
-                  }
-                  else{
-                    wx.showModal({
-                      title:'错误',
-                      content:res.data.msg,
-                      showCancel:false
-                    })
                   }
-                })
-              }
+                }
+                else{
+                  wx.showModal({
+                    title:'错误',
+                    content:res.data.msg,
+                    showCancel:false
+                  })
+                }
+              })        
               setTimeout(function(){
                 wx.setStorageSync('lamp',lamp)
                 that.setData({lamp:wx.getStorageSync('lamp')})

pages/control/control.wxml

@@ -126,11 +126,15 @@
       <button style="right:17%;" class="loop-1-1" bindtap="Open" data-open="{{12}}">开</button>
       <button style="right:2%;" class="loop-1-2" bindtap="Shut" data-shut="{{12}}">关</button>
   </view>
-  <view class="loop-1">
+  <view class="loop-1" wx:if="{{play == 0 ? true : false}}">
     <text class="manual" style="font-weight: 550;">{{Modecontrol}}</text>
     <button style="width: 17%;top: 15%;" class="loop-install-1" bindtap="manual">手动</button>
     <button style="width: 17%;top: 15%;" class="loop-install-2" bindtap="automatic">自动</button>
     <button style="width: 17%;top: 15%;" class="loop-install-3" bindtap="Fullopen">全开</button>
     <button style="width: 17%;top: 15%;" class="loop-install-4" bindtap="Allclosed">全关</button>
   </view>
+  <view class="loop-1" wx:if="{{play == 1 ? true : false}}">
+    <button style="width: 17%;top: 15%;" class="loop-install-3" bindtap="Fullopen">全开</button>
+    <button style="width: 17%;top: 15%;" class="loop-install-4" bindtap="Allclosed">全关</button>
+  </view>
 </view>

pages/loop/loop.js

@@ -64,13 +64,13 @@ Page({
     deviceId:'',
     deviceKey:'',
     num:0,//记录回路数量
+    play:1,//新老设备的页面切换
+    timeValue:'00:00',
   },
   //分组下拉
   changegroup:function(e){
     var that = this
-    that.setData({
-      groupIndex:e.detail.value
-    })
+    that.setData({groupIndex:e.detail.value})
     wx.setStorageSync('groupIndex', e.detail.value)
     var groupName = that.data.groupName[that.data.groupIndex]//选择的分组名称
     wx.setStorageSync('groupName',groupName)//将修改的分组名称放入缓存

pages/loop/loop.wxml

@@ -23,7 +23,7 @@
     </view>
   </picker>
 </view>
-<view class="subject">
+<view class="subject" wx:if="{{play == 0 ? true : false}}">
    <!-- 时控一 -->
   <view class="Time-control">
     <text style="left: 5%;top: 8%;">时</text>
@@ -38,9 +38,9 @@
     </picker>
     <button class="Timecontrol-button-2" style="top: 8%;background-color: {{timecontrolcolor1}};color: {{fontcolor1}};"bindtap="change1">{{fixed1}}</button>
     <picker mode="{{type2}}" value="{{time[1]}}" start="00:00" end="23:59" bindchange="bindTimeChange2">
-        <view class="Timecontrol-picker-1" style="top: 56%;width:18%;background-color: {{timecontrolcolor2}};color: {{fontcolor2}};"> {{time[1]}}</view>
-      </picker>
-      <button class="Timecontrol-button-2" style="top:56%;background-color: {{timecontrolcolor2}};color: {{fontcolor2}};"bindtap="change2">{{fixed2}}</button>
+      <view class="Timecontrol-picker-1" style="top: 56%;width:18%;background-color: {{timecontrolcolor2}};color: {{fontcolor2}};"> {{time[1]}}</view>
+    </picker>
+    <button class="Timecontrol-button-2" style="top:56%;background-color: {{timecontrolcolor2}};color: {{fontcolor2}};"bindtap="change2">{{fixed2}}</button>
   </view>
   <!-- 时控二 -->
   <view class="Time-control" style="margin-top:0.4%">
@@ -114,7 +114,31 @@
     </view>
   </view>
 </view>
-<view class="Refresh">
+<view class="Refresh" wx:if="{{play == 0 ? true : false}}">
   <button class="Refresh-1" style="width: 28%" bindtap="RefreshPage">刷新页面</button>
   <button class="Refresh-2" style="width: 28%" bindtap="Storedata">存储数据</button>
 </view>
+<!-- 新设备 -->
+<view class="subject" wx:if="{{play == 1 ? true : false}}">
+  <!-- 时控1 -->
+  <view class="newtime1">
+    <text style="left: 2%;top: 8%;">时</text>
+    <text style="left: 2%;top: 32%;">控</text>
+    <text style="left: 2%;top: 57%;">一</text>
+    <switch></switch>
+    <text style="left: 40%;">开启时间</text>
+    <text style="left: 75%;">关闭时间</text>
+    <picker mode="time" start="00:00" end="23:59" value="{{timeValue}}">
+        <view class="startTime">{{timeValue}}</view>
+    </picker>
+  </view>
+  <!-- 时控2 -->
+  <view class="newtime2">
+    <switch></switch>
+  </view>
+  <!-- 光控 -->
+  <view class="newlight">
+    <switch></switch>
+  </view>
+</view>
+

pages/loop/loop.wxss

@@ -227,4 +227,69 @@ page{
   align-items:center;
   justify-content:center; 
   color: white;
+}
+
+/* 新设备时控 */
+.newtime1{
+  background-color: cornflowerblue;
+  width: 100%;
+  height: 25%;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+
+.newtime1 switch{
+  position: absolute;
+  left: 12%;
+}
+
+.startTime{
+  position: absolute;
+  left: 40%;
+  top: 40%;
+  background-color: blue;
+  width: 20%;
+  height: 30%;
+  border-radius: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.newtime1 text{
+  font-size: calc(100vw * 18/375);
+  font-weight: 550;
+  position: absolute;
+  top: 2%;
+}
+
+.newtime2{
+  background-color: cornflowerblue;
+  width: 100%;
+  height: 25%;
+  margin-top: 1%;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+
+.newtime2 switch{
+  position: absolute;
+  left: 2%;
+}
+/* 新设备光控 */
+.newlight{
+  background-color: cornflowerblue;
+  width: 100%;
+  height: 25%;
+  margin-top: 1%;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+
+.newlight switch{
+  position: absolute;
+  left: 2%;
 }

utils/control.js

@@ -108,6 +108,7 @@ function newswitchReal(Device,relayid){
       }
       else{
         let ever = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp.png'
+        console.log(ever)
         return ever
       }
     }