weixin

.eslintrc.js

@@ -1,31 +0,0 @@
-/*
- * Eslint config file
- * Documentation: https://eslint.org/docs/user-guide/configuring/
- * Install the Eslint extension before using this feature.
- */
-module.exports = {
-  env: {
-    es6: true,
-    browser: true,
-    node: true,
-  },
-  ecmaFeatures: {
-    modules: true,
-  },
-  parserOptions: {
-    ecmaVersion: 2018,
-    sourceType: 'module',
-  },
-  globals: {
-    wx: true,
-    App: true,
-    Page: true,
-    getCurrentPages: true,
-    getApp: true,
-    Component: true,
-    requirePlugin: true,
-    requireMiniProgram: true,
-  },
-  // extends: 'eslint:recommended',
-  rules: {},
-}

api/device.js

@@ -0,0 +1,11 @@
+const {request} = require('../https/request.js')
+module.exports = {
+  //添加设备
+  postDevice: (params) => request('/devices/', 'POST', params),
+  //获取设备信息
+  getDevice: (Group,Device) => request('/devices?id=' + Group + '/&group_id='+ Device, 'GET'),
+  //修改设备
+  putDevice: (params) => request('/devices/', 'PUT', params),
+  //删除设备
+  delDevice: (Device) => request('/devices?id=' + Device,'DELETE')
+}

api/group.js

@@ -0,0 +1,11 @@
+const {request} = require('../https/request.js')
+module.exports = {
+  //添加分组
+  postGroup: (params) => request('/groups', 'POST', params),
+  //获取分组信息
+  getGroup: () => request('/groups', 'GET'),
+  //修改分组
+  putGroup: (params) => request('/groups', 'PUT', params),
+  //删除分组
+  delGroup: (number) => request('/groups?id=' + number, 'DELETE')
+}

api/intell.js

@@ -0,0 +1,9 @@
+const {intell} = require('../https/intell.js')
+module.exports = {
+  //查看设备基本信息（返回中有数据流，但没有值）
+  getBasic:(divice_id,key) => intell('/devices/' + divice_id, 'GET', key),
+  //查看设备数据流
+  getData:(divice_id,key) => intell('/devices/'+ divice_id + '/datastreams', 'GET',key),
+  //控制设备，发送数据
+  postData:(divice_id,key,params) => intell('/cmds?device_id=' + divice_id, 'POST',key,params),
+}

app.js

@@ -5,18 +5,21 @@ App({
     const logs = wx.getStorageSync('logs') || []
     logs.unshift(Date.now())
     wx.setStorageSync('logs', logs)
-
     // 登录
-    let times = new Date()
     let token = wx.getStorageSync('token')
-    let logintime = wx.getStorageSync('time')//登录时间
+    let time = wx.getStorageSync('time')//登录时间
+    let Time = new Date()//当前时间
+    //console.log('时间差为' + parseInt(Time - time)/1000)
+    let currentTime = wx.getStorageSync('currentTime')//过期时间
     if(token != ''){
+      if(parseInt(Time - time)/1000 < currentTime){
         wx.switchTab({
           url: 'pages/scene/scene',
         })
-    }
-    else{
-
+      }
+      else{
+        
+      }
     }
     wx.login({
       success: res => {
@@ -26,5 +29,5 @@ App({
   },
   globalData: {
     userInfo: null
-  }
+  },
 })

app.json

@@ -1,13 +1,10 @@
 {
   "pages":[
     "pages/sign/sign",
-    "pages/list/list",
     "pages/scene/scene",
     "pages/loop/loop",
     "pages/system/system",
-    "pages/control/control",
-    "pages/index/index",
-    "pages/logs/logs"
+    "pages/control/control"
   ],
   "window":{
     "backgroundTextStyle":"light",
@@ -48,5 +45,6 @@
     "scope.userLocation": {
       "desc": "你的位置信息将用于小程序位置接口的效果展示"
     }
-  }
+  },
+  "lazyCodeLoading" : "requiredComponents"
 }

components/test/test.js

@@ -1,23 +0,0 @@
-// components/test/test.js
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-
-  }
-})

components/test/test.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

components/test/test.wxml

@@ -1,7 +0,0 @@
-<!--components/test/test.wxml-->
-<view class="Add-Project">
-  <text>添加工程</text>
-  <input placeholder="请输入工程名称"/>
-  <button style="left: 10px;">取消</button>
-  <button style="color: greenyellow;right: 10px;">确定</button>
-</view>

components/test/test.wxss

@@ -1,34 +0,0 @@
-/* components/test/test.wxss */
-.Add-Project{
-  background-color:#f5f5f8;
-  margin: 80px auto;
-  width: 300px;
-  height: 120px;
-  position: relative;
-  border-radius: 5px ;
-}
-
-.Add-Project text{
-  position: absolute;
-  top:5px;
-  left: 120px;
-}
-
-.Add-Project input{
-  width: 250px;
-  height: 30px;
-  position: absolute;
-  top: 35px;
-  left: 25px;
-  background-color: white;
-}
-
-.Add-Project button{
-  width: 130px;
-  height: 30px;
-  position: absolute;
-  bottom: 5px;
-  font-size: 12px;
-  border:0px;
-  background-color: #ffffff;
-}

https/env.js

@@ -0,0 +1,14 @@
+module.exports = {
+  //开发环境
+  dev:{
+    baseUrl:'cloud.long-chi.com'
+  },
+  // 添加设备和分组
+  prod:{
+    baseUrl:'https://cloud.long-chi.com/api/minigrogram/lightcontrol'
+  },
+  //获取设备具体信息
+  intell:{
+    baseUrl:'https://api.heclouds.com'
+  }
+}   

https/intell.js

@@ -0,0 +1,18 @@
+const { baseUrl } = require('./env').intell
+module.exports = {
+  intell:function(url , type , key ,data = {}){
+    let fullUrl = `${baseUrl}${url}`
+    return new Promise((resolve,reject)=>{
+      wx.request({url: fullUrl,method:type,data,header: {"api-key":key},
+        success(res){resolve(res)},
+        fail(){
+          wx.showToast({
+            title: '接口请求错误',
+            icon:'none'
+          })
+          reject('接口请求错误')
+        }
+      })
+    })
+  }
+}

https/request.js

@@ -0,0 +1,19 @@
+const { baseUrl } = require('./env').prod
+module.exports = {
+    request : function(url, type , data = {}){
+    let fullUrl = `${baseUrl}${url}`
+    let token = wx.getStorageSync('token') ? wx.getStorageSync('token')  : ''
+    return new Promise((resolve,reject)=>{
+      wx.request({url: fullUrl,method:type,data,header: {'content-type': 'application/json','Authorization': token},
+        success(res){resolve(res)},
+        fail(){
+          wx.showToast({
+            title: '接口请求错误',
+            icon:'none'
+          })
+          reject('接口请求错误')
+        }
+      })
+    })
+  },
+}

pages/control/control.wxml

@@ -1,7 +1,7 @@
 <!--pages/control/control.wxml-->
 <!-- 主页 -->
 <view class="switch-1">
-  <image src="/image/network.png" style="position: absolute; left:5%;top:14%;width:8%;height:70%;"></image>
+  <image src="https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/network.png" style="left:5%;top:14%;width:8%;height:70%;"></image>
   <view class="Dropdown">
     <picker range="{{groupName}}" value="{{groupIndex}}" bindchange="changegroup">
       <view class="group">
@@ -24,8 +24,8 @@
         <text style="font-size: {{Size[0]}};color: {{Color[0]}};">{{loop[0]}}</text>
         <image src="{{address[0]}}" class="loop-0-image-2" bindtap="loopname" data-loopname="{{1}}"></image>
     </view>
-    <button style="right: 20%;" class="loop-0-1" bindtap="Open" data-open="{{1}}">开</button>
-    <button style="right: 5%;" class="loop-0-2" bindtap="Shut" data-shut="{{1}}">关</button>
+    <button style="right: 17%;" class="loop-0-1" bindtap="Open" data-open="{{1}}">开</button>
+    <button style="right: 2%;" class="loop-0-2" bindtap="Shut" data-shut="{{1}}">关</button>
   </view>
   <view class="loop-1">
     <image src="{{lamp[1]}}" class="loop-1-image-1"></image>
@@ -33,8 +33,8 @@
         <text style="font-size: {{Size[1]}};color: {{Color[1]}};">{{loop[1]}}</text>
         <image src="{{address[1]}}" class="loop-1-image-2" bindtap="loopname" data-loopname="{{2}}"></image>
       </view>
-      <button style="right: 20%;" class="loop-1-1" bindtap="Open" data-open="{{2}}">开</button>
-      <button style="right: 5%;" class="loop-1-2" bindtap="Shut" data-shut="{{2}}">关</button>
+      <button style="right: 17%;" class="loop-1-1" bindtap="Open" data-open="{{2}}">开</button>
+      <button style="right: 2%;" class="loop-1-2" bindtap="Shut" data-shut="{{2}}">关</button>
   </view>
   <view class="loop-1">
     <image src="{{lamp[2]}}" class="loop-1-image-1"></image>
@@ -42,8 +42,8 @@
         <text style="font-size: {{Size[2]}};color: {{Color[2]}};">{{loop[2]}}</text>
         <image src="{{address[2]}}" class="loop-1-image-2" bindtap="loopname" data-loopname="{{3}}"></image>
       </view>
-      <button style="right:20%;" class="loop-1-1" bindtap="Open" data-open="{{3}}">开</button>
-      <button style="right: 5%;" class="loop-1-2" bindtap="Shut" data-shut="{{3}}">关</button>
+      <button style="right:17%;" class="loop-1-1" bindtap="Open" data-open="{{3}}">开</button>
+      <button style="right: 2%;" class="loop-1-2" bindtap="Shut" data-shut="{{3}}">关</button>
   </view>
   <view class="loop-1">
     <image src="{{lamp[3]}}" class="loop-1-image-1"></image>
@@ -51,8 +51,8 @@
         <text style="font-size: {{Size[3]}};color: {{Color[3]}};">{{loop[3]}}</text>
         <image src="{{address[3]}}" class="loop-1-image-2" bindtap="loopname" data-loopname="{{4}}"></image>
       </view>
-      <button style="right:20%;" class="loop-1-1" bindtap="Open" data-open="{{4}}">开</button>
-      <button style="right:5%;" class="loop-1-2" bindtap="Shut" data-shut="{{4}}">关</button>
+      <button style="right:17%;" class="loop-1-1" bindtap="Open" data-open="{{4}}">开</button>
+      <button style="right:2%;" class="loop-1-2" bindtap="Shut" data-shut="{{4}}">关</button>
   </view>
   <view class="loop-1">
     <image src="{{lamp[4]}}" class="loop-1-image-1"></image>
@@ -60,8 +60,8 @@
         <text style="font-size: {{Size[4]}};color: {{Color[4]}};">{{loop[4]}}</text>
         <image src="{{address[4]}}" class="loop-1-image-2" bindtap="loopname" data-loopname="{{5}}"></image>
       </view>
-      <button style="right:20%;" class="loop-1-1" bindtap="Open" data-open="{{5}}">开</button>
-      <button style="right:5%;" class="loop-1-2" bindtap="Shut" data-shut="{{5}}">关</button>
+      <button style="right:17%;" class="loop-1-1" bindtap="Open" data-open="{{5}}">开</button>
+      <button style="right:2%;" class="loop-1-2" bindtap="Shut" data-shut="{{5}}">关</button>
   </view>
   <view class="loop-1">
     <image src="{{lamp[5]}}" class="loop-1-image-1"></image>
@@ -69,8 +69,8 @@
         <text style="font-size: {{Size[5]}};color: {{Color[5]}};">{{loop[5]}}</text>
         <image src="{{address[5]}}" class="loop-1-image-2" bindtap="loopname" data-loopname="{{6}}"></image>
       </view>
-      <button style="right:20%;" class="loop-1-1" bindtap="Open" data-open="{{6}}">开</button>
-      <button style="right:5%;" class="loop-1-2" bindtap="Shut" data-shut="{{6}}">关</button>
+      <button style="right:17%;" class="loop-1-1" bindtap="Open" data-open="{{6}}">开</button>
+      <button style="right:2%;" class="loop-1-2" bindtap="Shut" data-shut="{{6}}">关</button>
   </view>
   <view class="loop-1">
     <image src="{{lamp[6]}}" class="loop-1-image-1"></image>
@@ -78,8 +78,8 @@
         <text style="font-size: {{Size[6]}};color: {{Color[6]}};">{{loop[6]}}</text>
         <image src="{{address[6]}}" class="loop-1-image-2" bindtap="loopname" data-loopname="{{7}}"></image>
       </view>
-      <button style="right:20%;" class="loop-1-1" bindtap="Open" data-open="{{7}}">开</button>
-      <button style="right:5%;" class="loop-1-2" bindtap="Shut" data-shut="{{7}}">关</button>
+      <button style="right:17%;" class="loop-1-1" bindtap="Open" data-open="{{7}}">开</button>
+      <button style="right:2%;" class="loop-1-2" bindtap="Shut" data-shut="{{7}}">关</button>
   </view>
   <view class="loop-1">
     <image src="{{lamp[7]}}" class="loop-1-image-1"></image>
@@ -87,8 +87,8 @@
         <text style="font-size: {{Size[7]}};color: {{Color[7]}};">{{loop[7]}}</text>
         <image src="{{address[7]}}" class="loop-1-image-2" bindtap="loopname" data-loopname="{{8}}"></image>
       </view>
-      <button style="right:20%;" class="loop-1-1" bindtap="Open" data-open="{{8}}">开</button>
-      <button style="right:5%;" class="loop-1-2" bindtap="Shut" data-shut="{{8}}">关</button>
+      <button style="right:17%;" class="loop-1-1" bindtap="Open" data-open="{{8}}">开</button>
+      <button style="right:2%;" class="loop-1-2" bindtap="Shut" data-shut="{{8}}">关</button>
   </view>
   <view class="loop-1">
     <image src="{{lamp[8]}}" class="loop-1-image-1"></image>
@@ -96,8 +96,8 @@
         <text style="font-size: {{Size[8]}};color: {{Color[8]}};">{{loop[8]}}</text>
         <image src="{{address[8]}}" class="loop-1-image-2" bindtap="loopname" data-loopname="{{9}}"></image>
       </view>
-      <button style="right:20%;" class="loop-1-1" bindtap="Open" data-open="{{9}}">开</button>
-      <button style="right:5%;" class="loop-1-2" bindtap="Shut" data-shut="{{9}}">关</button>
+      <button style="right:17%;" class="loop-1-1" bindtap="Open" data-open="{{9}}">开</button>
+      <button style="right:2%;" class="loop-1-2" bindtap="Shut" data-shut="{{9}}">关</button>
   </view>
   <view class="loop-1">
     <image src="{{lamp[9]}}" class="loop-1-image-1"></image>
@@ -105,8 +105,8 @@
         <text style="font-size: {{Size[9]}};color: {{Color[9]}};">{{loop[9]}}</text>
         <image src="{{address[9]}}" class="loop-1-image-2" bindtap="loopname" data-loopname="{{10}}"></image>
       </view>
-      <button style="right:20%;" class="loop-1-1" bindtap="Open" data-open="{{10}}">开</button>
-      <button style="right:5%;" class="loop-1-2" bindtap="Shut" data-shut="{{10}}">关</button>
+      <button style="right:17%;" class="loop-1-1" bindtap="Open" data-open="{{10}}">开</button>
+      <button style="right:2%;" class="loop-1-2" bindtap="Shut" data-shut="{{10}}">关</button>
   </view>
   <view class="loop-1">
     <image src="{{lamp[10]}}" class="loop-1-image-1"></image>
@@ -114,8 +114,8 @@
         <text style="font-size: {{Size[10]}};color: {{Color[10]}};">{{loop[10]}}</text>
         <image src="{{address[10]}}" class="loop-1-image-2" bindtap="loopname" data-loopname="{{11}}"></image>
       </view>
-      <button style="right:20%;" class="loop-1-1" bindtap="Open" data-open="{{11}}">开</button>
-      <button style="right:5%;" class="loop-1-2" bindtap="Shut" data-shut="{{11}}">关</button>
+      <button style="right:17%;" class="loop-1-1" bindtap="Open" data-open="{{11}}">开</button>
+      <button style="right:2%;" class="loop-1-2" bindtap="Shut" data-shut="{{11}}">关</button>
   </view>
   <view class="loop-1">
     <image src="{{lamp[11]}}" class="loop-1-image-1"></image>
@@ -123,14 +123,14 @@
         <text style="font-size: {{Size[11]}};color: {{Color[11]}};">{{loop[11]}}</text>
         <image src="{{address[11]}}" class="loop-1-image-2" bindtap="loopname" data-loopname="{{12}}"></image>
       </view>
-      <button style="right:20%;" class="loop-1-1" bindtap="Open" data-open="{{12}}">开</button>
-      <button style="right:5%;" class="loop-1-2" bindtap="Shut" data-shut="{{12}}">关</button>
+      <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">
     <text class="manual" style="font-weight: 550;">{{Modecontrol}}</text>
-    <button style="width: 17%;top: 15%;" class="loop-install-1">手动</button>
-    <button style="width: 17%;top: 15%;" class="loop-install-2">自动</button>
+    <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>
+</view>

pages/control/control.wxss

@@ -34,18 +34,22 @@ page{
 .group{
   background-color: cornflowerblue;
   color: white;
-  font-size: calc(100vw * 16/375);
+  font-size: calc(100vw * 18/375);
   float: left;
   margin-top: 5%;
+  height:calc(100vw * 24/375);
+  max-width: 60%;
 }
 /* 设备下拉选择 */
 .device{
   background-color: cornflowerblue;
   color: white;
-  font-size: calc(100vw * 16/375);
+  font-size: calc(100vw * 18/375);
   margin-left: 3%;
   float: left;
   margin-top: 5%;
+  height: calc(100vw * 24/375);
+  max-width: 37%;
 }
 
 /* 主体 */
@@ -65,17 +69,17 @@ page{
 
 .loop-1-image-1{
   position: absolute;
-  width: 8%;
-  height: 72.5%;
+  width: calc(100vw * 27/375);
+  height: calc(100vw * 27/375);
   left: 5%;
-  top: 10%;
+  top: 13.5%;
 }
 
 .loops{
   position: absolute;
   left: 16%;
-  width: 50%;
-  height: 100%;
+  width: 53%;
+  height: 85%;
 }
 .loops image{
   width: 9%;

pages/index/index.js

@@ -1,48 +0,0 @@
-// index.js
-// 获取应用实例
-const app = getApp()
-
-Page({
-  data: {
-    motto: 'Hello World',
-    userInfo: {},
-    hasUserInfo: false,
-    canIUse: wx.canIUse('button.open-type.getUserInfo'),
-    canIUseGetUserProfile: false,
-    canIUseOpenData: wx.canIUse('open-data.type.userAvatarUrl') && wx.canIUse('open-data.type.userNickName') // 如需尝试获取用户信息可改为false
-  },
-  // 事件处理函数
-  bindViewTap() {
-    wx.navigateTo({
-      url: '../logs/logs'
-    })
-  },
-  onLoad() {
-    if (wx.getUserProfile) {
-      this.setData({
-        canIUseGetUserProfile: true
-      })
-    }
-  },
-  getUserProfile(e) {
-    // 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认，开发者妥善保管用户快速填写的头像昵称，避免重复弹窗
-    wx.getUserProfile({
-      desc: '展示用户信息', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
-      success: (res) => {
-        console.log(res)
-        this.setData({
-          userInfo: res.userInfo,
-          hasUserInfo: true
-        })
-      }
-    })
-  },
-  getUserInfo(e) {
-    // 不推荐使用getUserInfo获取用户信息，预计自2021年4月13日起，getUserInfo将不再弹出弹窗，并直接返回匿名的用户个人信息
-    console.log(e)
-    this.setData({
-      userInfo: e.detail.userInfo,
-      hasUserInfo: true
-    })
-  }
-})

pages/index/index.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

pages/index/index.wxml

@@ -1,23 +0,0 @@
-<!--index.wxml-->
-<view class="container">
-  <view class="userinfo">
-    <block wx:if="{{canIUseOpenData}}">
-      <view class="userinfo-avatar" bindtap="bindViewTap">
-        <open-data type="userAvatarUrl"></open-data>
-      </view>
-      <open-data type="userNickName"></open-data>
-    </block>
-    <block wx:elif="{{!hasUserInfo}}">
-      <button wx:if="{{canIUseGetUserProfile}}" bindtap="getUserProfile"> 获取头像昵称 </button>
-      <button wx:elif="{{canIUse}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo"> 获取头像昵称 </button>
-      <view wx:else> 请使用1.4.4及以上版本基础库 </view>
-    </block>
-    <block wx:else>
-      <image bindtap="bindViewTap" class="userinfo-avatar" src="{{userInfo.avatarUrl}}" mode="cover"></image>
-      <text class="userinfo-nickname">{{userInfo.nickName}}</text>
-    </block>
-  </view>
-  <view class="usermotto">
-    <text class="user-motto">{{motto}}</text>
-  </view>
-</view>

pages/index/index.wxss

@@ -1,19 +0,0 @@
-/**index.wxss**/
-.userinfo {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  color: #aaa;
-}
-
-.userinfo-avatar {
-  overflow: hidden;
-  width: 128rpx;
-  height: 128rpx;
-  margin: 20rpx;
-  border-radius: 50%;
-}
-
-.usermotto {
-  margin-top: 200px;
-}

pages/list/list.js

@@ -1,72 +0,0 @@
-// pages/list/list.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    array:[]
-  },
-  apption:function(e){
-    var array = this.data.array
-    array.push('')
-    this.setData({
-      array:array
-    })
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/list/list.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {
-  }
-}

pages/list/list.wxml

@@ -1,15 +0,0 @@
-<!--pages/list/list.wxml-->
-<view class="handset">
-    <text>当前手机号为:</text>
-    <input/>
-    <button style="width: 100px;">更改手机号</button>
-</view>
-<view class="project">
-    <text>工程名称:</text>
-    <button style="width: 100px;">刷新列表</button>
-    <image src="/image/addition.png" bindtap="apption"></image>
-</view>
-<view wx:for="{{array}}" style="height: 30px;width: 100%;background-color: blue;margin-top: 2px;">
-
-</view>
-    <!-- <list-test></list-test> -->

pages/list/list.wxss

@@ -1,82 +0,0 @@
-/* pages/list/list.wxss */
-.handset{
-  width: 100%;
-  height: 40px;
-  line-height: 40px;
-  border-bottom: darkgrey solid 1px;
-}
-
-.handset text{
-  margin-left: 12px;
-  font-size: 12px;
-  width: 80px;
-  height: 40px;
-  float: left;
-}
-
-.handset input{
-  width: 150px;
-  float: left;
-  height: 30px;
-  margin-top: 5px;
-}
-
-.handset button{
-  font-size: 12px;
-  color:cornsilk;
-  height: 30px;
-  margin-top: 5px;
-  background-color: cornflowerblue;
-  float: left;
-}
-
-.handset button:active{
-  box-shadow:
-  7px 6px 28px 1px;
-  transform: translateY(4px);
-}
-
-.project{
-  width: 100%;
-  height: 40px;
-  line-height: 40px;
-  border-bottom: darkgrey solid 1px;
-  position: relative;
-}
-
-.project text{
-  margin-left: 12px;
-  font-size: 12px;
-  width: 120px;
-  height: 40px;
-  float: left;
-}
-
-.project button{
-  font-size: 12px;
-  color:cornsilk;
-  height: 30px;
-  margin-top: 5px;
-  background-color: cornflowerblue;
-  float: left;
-}
-
-.project button:active{
-  box-shadow:
-  7px 6px 28px 1px;
-  transform: translateY(4px);
-}
-
-.project image{
-  position: absolute;
-  right: 30px;
-  top: 7px;
-  width: 25px;
-  height: 25px;
-}
-
-
-
-
-
-

pages/logs/logs.js

@@ -1,18 +0,0 @@
-// logs.js
-const util = require('../../utils/util.js')
-
-Page({
-  data: {
-    logs: []
-  },
-  onLoad() {
-    this.setData({
-      logs: (wx.getStorageSync('logs') || []).map(log => {
-        return {
-          date: util.formatTime(new Date(log)),
-          timeStamp: log
-        }
-      })
-    })
-  }
-})

pages/logs/logs.json

@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "查看启动日志",
-  "usingComponents": {}
-}

pages/logs/logs.wxml

@@ -1,6 +0,0 @@
-<!--logs.wxml-->
-<view class="container log-list">
-  <block wx:for="{{logs}}" wx:key="timeStamp" wx:for-item="log">
-    <text class="log-item">{{index + 1}}. {{log.date}}</text>
-  </block>
-</view>

pages/logs/logs.wxss

@@ -1,8 +0,0 @@
-.log-list {
-  display: flex;
-  flex-direction: column;
-  padding: 40rpx;
-}
-.log-item {
-  margin: 10rpx;
-}

pages/loop/loop.wxml

@@ -1,6 +1,6 @@
 <!--pages/loop/loop.wxml-->
 <view class="switch-1">
-  <image src="/image/network.png" style="position: absolute; left:5%;top:14%;width:8%;height:70%;"></image>
+  <image src="https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/network.png" style="position: absolute; left:5%;top:14%;width:8%;height:70%;"></image>
   <view class="Dropdown">
     <picker range="{{groupName}}" value="{{groupIndex}}" bindchange="changegroup">
       <view class="group">
@@ -115,6 +115,6 @@
   </view>
 </view>
 <view class="Refresh">
-  <button class="Refresh-1" style="width: 180rpx" bindtap="RefreshPage">刷新页面</button>
-  <button class="Refresh-2" style="width: 180rpx" bindtap="Storedata">存储数据</button>
+  <button class="Refresh-1" style="width: 28%" bindtap="RefreshPage">刷新页面</button>
+  <button class="Refresh-2" style="width: 28%" bindtap="Storedata">存储数据</button>
 </view>

pages/loop/loop.wxss

@@ -33,18 +33,22 @@ page{
 .group{
   background-color: cornflowerblue;
   color: white;
-  font-size: calc(100vw * 16/375);
+  font-size: calc(100vw * 18/375);
   float: left;
   margin-top: 5%;
+  height:calc(100vw * 24/375);
+  max-width: 60%;
 }
 /* 设备下拉选择 */
 .device{
   background-color: cornflowerblue;
   color: white;
-  font-size: calc(100vw * 16/375);
+  font-size: calc(100vw * 18/375);
   margin-left: 3%;
   float: left;
   margin-top: 5%;
+  height: calc(100vw * 24/375);
+  max-width: 37%;
 }
 .loop{
   width: 100%;
@@ -62,12 +66,11 @@ page{
 
 .loop-picker{
   position: absolute;
-  height: 65%;
   left: 18%;
   top:18%;
   background-color:cornflowerblue;
   color: white;
-  font-size: calc(100vw * 16/375);
+  font-size: calc(100vw * 18/375);
 }
 /* 主体 */
 .subject{
@@ -85,7 +88,7 @@ page{
 .Time-control text{
   position: absolute;
   font-weight: 550;
-  font-size: calc(100vw * 16/375);
+  font-size: calc(100vw * 18/375);
 }
 
 .Time-control switch{
@@ -99,7 +102,7 @@ page{
   border-radius: 5px;
   height: 29.39%;
   text-align: center;
-  font-size: calc(100vw * 10/375);
+  font-size: calc(100vw * 14/375);
   display: flex;
   align-items:center;
   justify-content:center; 
@@ -107,10 +110,10 @@ page{
 
 .Timecontrol-button-2{
   height:29.39%;
-  width: 15%;
+  width: 18%;
   position: absolute;
   right: 3%;
-  font-size: calc(100vw * 10/375);
+  font-size: calc(100vw * 14/375);
   display: flex;
   align-items:center;
   justify-content:center; 
@@ -126,12 +129,12 @@ page{
 .Date-Setting text{
   position: absolute;
   font-weight: 550;
-  font-size: calc(100vw * 16/375);
+  font-size: calc(100vw * 18/375);
 }
 
 .Date-Setting image{
-  width: 7.41%;
-  height: 34.8%;
+  width: calc(100vw * 25/375);
+  height: calc(100vw * 25/375);
   position: absolute;
   top: 45%;
 }
@@ -146,7 +149,7 @@ page{
 .Light-control text{
   position: absolute;
   font-weight: 550;
-  font-size: calc(100vw * 16/375);
+  font-size: calc(100vw * 18/375);
 }
 .Light-control switch{
   position: absolute;
@@ -160,7 +163,7 @@ page{
   height: 27.21%;
   position: absolute;
   right: 16%;
-  font-size: calc(100vw * 10/375);
+  font-size: calc(100vw * 14/375);
   display: flex;
   align-items:center;
   justify-content:center; 
@@ -173,7 +176,7 @@ page{
   width: 100%;
   height: 11.4%;
   position: relative;
-  font-size: calc(100vw * 16/375);
+  font-size: calc(100vw * 18/375);
 }
 .warning text{
   font-weight: 550;
@@ -195,6 +198,10 @@ page{
   position: relative;
   text-align: center;
 }
+.Refresh button:active{
+  box-shadow:cornflowerblue;
+  transform: translateY(4px);
+}
 /* 刷新页面 */
 .Refresh-1{
   height:72.1%;
@@ -202,7 +209,7 @@ page{
   left: 12%;
   top:5%;
   background-color: cornflowerblue;
-  font-size: calc(100vw * 14/375);
+  font-size: calc(100vw * 18/375);
   display: flex;
   align-items:center;
   justify-content:center; 
@@ -215,7 +222,7 @@ page{
   right: 12%;
   top:5%;
   background-color: cornflowerblue;
-  font-size: calc(100vw * 14/375);
+  font-size: calc(100vw * 18/375);
   display: flex;
   align-items:center;
   justify-content:center; 

pages/scene/scene.js

@@ -1,6 +1,9 @@
+const {postGroup,getGroup,putGroup,delGroup} = require('../../api/group')
+const {postDevice,getDevice,putDevice,delDevice} = require('../../api/device')
+const {getBasic,getData,postData} = require('../../api/intell')
+
 // pages/scene/scene.js
 Page({
-
   /**
    * 页面的初始数据
    */
@@ -18,6 +21,89 @@ Page({
     developline:[],
     status:0,
     Status:"",
+    phone:'',
+    displaypicture:"https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/ling.png",
+    display:[]
+  },
+  //刷新列表
+  Refreshlist:function(){
+    wx.showToast({
+      title:'刷新中',
+      icon:'loading',
+      duration: 2000
+    })
+    var that = this
+    let token = wx.getStorageSync('token')
+    wx.request({
+      url: 'https://cloud.long-chi.com/api/minigrogram/lightcontrol/groups',
+      method:'GET',
+      header:{'Content-Type': 'application/json',
+      'Authorization': token},
+      success:res =>{
+        console.log('刷新成功' + res.data.msg)
+        if(res.data.code == 200){
+          var data = res.data.data
+          if(data != null){
+            for(let i = 0;i <data.length;i++){
+              if(data[i].devices != null){
+                for(let j = 0;j < data[i].devices.length;j++){
+                  let id = data[i].devices[j].deviceId
+                  let key = data[i].devices[j].deviceKey
+                  console.log('id为' + id)
+                  console.log('key为' + key)
+                  wx.request({
+                    url: 'https://api.heclouds.com/devices/' + id,
+                    method:'GET',
+                    header:{"api-key": key},
+                    success:(res) =>{
+                      console.log(res.data.data.online)
+                      if (res.data.data.online == true) {
+                        data[i].devices[j].status = '在线'
+                      }
+                      else{
+                        data[i].devices[j].status = '离线'
+                      }
+                      wx.setStorageSync('group',data)
+                      var group = wx.getStorageSync('group')
+                      for(let i = 0;i < group.length;i++){
+                        if(group[i].groupName.length > 10){
+                          group[i].groupName = group[i].groupName.slice(0,9) + '....'
+                        }
+                      }
+                      that.setData({
+                        array:group,
+                      })
+                    }
+                  })
+                }
+              }
+              else {
+                wx.setStorageSync('group',data)
+                var group = wx.getStorageSync('group')
+                for(let i = 0;i < group.length;i++){
+                  if(group[i].groupName.length > 10){
+                    group[i].groupName = group[i].groupName.slice(0,9) + '....'
+                  }
+                }
+                that.setData({
+                  array:group,
+                })
+              }
+            }
+          }
+        }
+        else{
+          wx.showModal({
+            title:'提示',
+            content:res.data.msg,
+            showCancel:false
+          })
+        }
+      },
+      fail:(bug) =>{
+        console.log(bug)
+      }
+    })
   },
   //添加分组
   apption:function(){
@@ -35,38 +121,41 @@ Page({
               showCancel:false
             })
           }
+          else if(ever.content.length > 15){
+            wx.showModal({
+              title:'提示',
+              content:'分组名称不能大于15个字符',
+              showCancel:false
+            })
+          }
           else{
-            let token = wx.getStorageSync('token')
-            wx.request({
-              url: 'http://110.40.223.170:8120/api/minigrogram/lightcontrol/groups',
-              method:'POST',
-              header:{'Content-Type': 'application/json',
-                      'Authorization': token},
-              data:{
-                groupName:ever.content
-              },
-              success:res => {
-                console.log(res)
-                if(res.data.code == 200){
-                  if(wx.getStorageSync('group') == ''){
-                    wx.setStorageSync('group', [])
-                    var a = wx.getStorageSync('group')
-                    a.push({id:res.data.data.id,name:ever.content,device:[]})
-                    wx.setStorageSync('group', a)
-                  }
-                  else{
-                    var b = wx.getStorageSync('group')
-                    b.push({id:res.data.data.id,name:ever.content,device:[]})
-                    wx.setStorageSync('group', b)
-                  }
-                  that.setData({
-                    array:wx.getStorageSync('group'),
-                  })
-                  console.log(wx.getStorageSync('group'))
-                }
+            postGroup({groupName:ever.content}).then((res)=>{
+              if(res.data.code == 200){
+                if(wx.getStorageSync('group') == ''){
+                  wx.setStorageSync('group', [])
+                  var a = wx.getStorageSync('group')
+                  a.push({id:res.data.data.id,groupName:ever.content,devices:[]})
+                  wx.setStorageSync('group', a)
+                } 
                 else{
-                  console.log("添加分组失败")
+                  var b = wx.getStorageSync('group')
+                  b.push({id:res.data.data.id,groupName:ever.content,devices:[]})
+                  wx.setStorageSync('group', b)
                 }
+                var group = wx.getStorageSync('group')
+                for(let i = 0;i < group.length;i++){
+                  if(group[i].groupName.length > 10){
+                    group[i].groupName = group[i].groupName.slice(0,9) + '....'
+                  }
+                }
+                that.setData({array:group})
+              }
+              else{
+                wx.showModal({
+                  title:'错误',
+                  content:res.data.msg,
+                  showCancel:false
+                })
               }
             })
           }    
@@ -84,26 +173,30 @@ Page({
         if (res.confirm) {
           var index = e.currentTarget.dataset.indexdel//获取对应下标
           var Idindex = that.data.array[index].id
-          var token = wx.getStorageSync('token')
-          wx.request({
-            url: 'http://110.40.223.170:8120/api/minigrogram/lightcontrol/groups?id=' + Idindex,//
-            method:'DELETE',
-            header:{'Content-Type': 'application/json',
-            'Authorization': token},
-            success:res => {
-              if(res.data.code == 200){
-                if(wx.getStorageSync('group') != ''){
-                  var deleteid = wx.getStorageSync('group')
-                  deleteid.splice(index,1)
-                  wx.setStorageSync('group', deleteid)
-                  that.setData({
-                    array:wx.getStorageSync('group'),
-                  })
-                }
+          var groupName = that.data.array[index].groupName
+          delGroup(Idindex).then((res)=>{
+            if(res.data.code == 200){
+              if(groupName == wx.getStorageSync('groupName')){
+                wx.setStorageSync('groupName', '')
+                wx.setStorageSync('deviceName', '')
               }
-              else{
-                console.log('删除分组失败')
+              var deleteid = wx.getStorageSync('group')
+              deleteid.splice(index,1)
+              wx.setStorageSync('group', deleteid)
+              var Group = wx.getStorageSync('group')
+              for(let i = 0;i < Group.length;i++){
+                if(Group[i].groupName.length > 10){
+                  Group[i].groupName = Group[i].groupName.slice(0,9) + '....'
+                  }
               }
+              that.setData({array: Group}) 
+            }
+            else{
+              wx.showModal({
+                title:'提示',
+                content:res.data.msg,
+                showCancel:false
+              })
             }
           })
         }
@@ -113,15 +206,16 @@ Page({
   //修改分组名称
   ShowChanges:function(e){
     var that = this
+    console.log('缓存的分组名称为' + wx.getStorageSync('groupName'))
     wx.showModal({
       title:'修改工程名称',
       editable:true,
       placeholderText:'请输入名称',
       success:res =>{
-      console.log(res)
         if (res.confirm) {
           var index = e.currentTarget.dataset.indexdel//获取对应下标
           var Idindex = that.data.array[index].id//获取对应下标的id值
+          var groupName = that.data.array[index].name
           if (res.content == '') {
             wx.showModal({
               title:'提示',
@@ -129,32 +223,37 @@ Page({
               showCancel:false
             })
           }
+          else if(res.content.length > 15){
+            wx.showModal({
+              title:'提示',
+              content:'分组名称不能大于15个字符',
+              showCancel:false
+            })
+          }
           else{
-            var token = wx.getStorageSync('token')
-            wx.request({
-              url: 'http://110.40.223.170:8120/api/minigrogram/lightcontrol/groups',
-              method:'PUT',
-              header:{
-                'Content-Type': 'application/json',
-                'Authorization': token
-              },
-              data:{
-                groupName:res.content,
-                id:Idindex
-              },
-              success:ever =>{
-                console.log(ever)
-                if (ever.data.code == 200) {
-                  let group = wx.getStorageSync('group')
-                  group[index].name = res.content
-                  wx.setStorageSync('group',group)
-                  that.setData({
-                    array:wx.getStorageSync('group')
-                  })
+            putGroup({id:Idindex,groupName:res.content}).then(ever=>{
+              console.log(ever)
+              if (ever.data.code == 200) {
+                if(groupName == wx.getStorageSync('groupName')){
+                  wx.setStorageSync('groupName',res.content)
                 }
-                else{
-                  console.log('修改分组名称失败')
+                let group = wx.getStorageSync('group')
+                group[index].groupName = res.content
+                wx.setStorageSync('group',group)
+                var Group = wx.getStorageSync('group')
+                for(let i = 0;i < Group.length;i++){
+                  if(Group[i].groupName.length > 10){
+                    Group[i].groupName = Group[i].groupName.slice(0,9) + '....'
+                  }
                 }
+                that.setData({array:Group})
+              }
+              else{
+                wx.showModal({
+                  title:'提示',
+                  content:ever.data.msg,
+                  showCancel:false
+                })
               }
             })
           }
@@ -171,17 +270,16 @@ Page({
     //获取设备
     wx.scanCode({
       success(res){
-         var arr = res.result.split(' ');
-         var a = arr[0]//设备id
-         var b = arr[1]//设备key
-         //获取该设备的在线状态和编码
-         wx.request({
-          url: 'https://api.heclouds.com/devices/' + a,
-          method:'GET',
-          header:{
-              'api-key':b,
-          },
-          success(ever){
+        //console.log(res.result.match(/\d+(\.\d+)?/g))
+        if(res.result.substring(0,1) == '{'){
+
+        }
+        else{
+          var arr = res.result.split(' ');
+          var a = arr[0]//设备id
+          var b = arr[1]//设备key
+          //获取该设备的在线状态和编码
+          getBasic(a,b).then(ever=>{
             var online = ever.data.data.online//设备在线状态
             switch (online) {
               case true:
@@ -194,49 +292,85 @@ Page({
               break;
             }
             var title = ever.data.data.title//设备编码
-            let token = wx.getStorageSync('token')
-            wx.request({
-              url: 'http://110.40.223.170:8120/api/minigrogram/lightcontrol/devices',
-              method:'POST',
-              header:{'Content-Type': 'application/json',
-                      'Authorization': token},
-              data:{
-                groupId:Idindex,//分组id
-                deviceSn:title,//设备编码
-                deviceName:title,//设备名称
-                deviceId:a,//设备id
-                deviceKey:b,//设备key
-                status:that.data.status//设备在线状态 
-              },
-              success:su =>{
+            getData(a,b).then(gu =>{
+              let trys = gu.data.data
+              for(let w = 0;w < trys.length;w++){
+                if(trys[w].id == "RelayCount"){
+                  var num = trys[w].current_value
+                  num = parseInt(num)
+                }
+              }
+              var numName = ''
+              for(let p = 0;p < num;p++){
+                  numName = numName + '回路' + (p + 1) + ','
+              }
+              numName = numName.slice(0,numName.length - 1)
+              //添加设备
+              postDevice({groupId:Idindex,deviceSn:title,deviceName:title,deviceId:a,deviceKey:b,status:that.data.status,circuitNum:num,circuits:numName})
+              .then(su => {
                 if (su.data.code == 200){
-                   //将设备的信息储存至本地
+                  //将设备的信息储存至本地
                   let group = wx.getStorageSync('group')
-                  group[index].device.push({id:su.data.data.id,deviceSn:title,deviceName:title,status:that.data.Status,deviceId:a,
-                  deviceKey:b})
+                  if(group[index].devices != null){
+                    group[index].devices.push({
+                      id:su.data.data.id,
+                      deviceSn:title,
+                      deviceName:title,
+                      status:that.data.Status,
+                      deviceId:a,
+                      deviceKey:b,
+                      circuitNum:num,
+                      circuits:numName
+                    })
+                  }
+                  else{
+                    group[index].devices = []
+                    group[index].devices.push({
+                      id:su.data.data.id,
+                      deviceSn:title,
+                      deviceName:title,
+                      status:that.data.Status,
+                      deviceId:a,
+                      deviceKey:b,
+                      circuitNum:num,
+                      circuits:numName
+                    })
+                  }
                   wx.setStorageSync('group', group)
+                  var Group = wx.getStorageSync('group')
+                  for(let i = 0;i < Group.length;i++){
+                    if(Group[i].groupName.length > 10){
+                      Group[i].groupName = Group[i].groupName.slice(0,9) + '....'
+                    }
+                  }
                   that.setData({
-                    array:wx.getStorageSync('group')
+                    array: Group
                   })
-                  console.log(that.data.array)
                 }
                 else{
-                  console.log('添加设备失败')
+                  wx.showModal({
+                    title:'提示',
+                    content:su.data.msg,
+                    showCancel:false
+                  })
                 }
-              }
+              })
             })
-          }
-        })
+          })  
+        }
       }
     })
   },
   //修改设备名称
   modifyequipmentname:function(e){
     var that = this
+    console.log('缓存的设备名称为' + wx.getStorageSync('deviceName'))
     var key = e.currentTarget.dataset.indexdel
     var group = wx.getStorageSync('group')
-    var deviceId = group[key[0]].device[key[1]].id
-    var token = wx.getStorageSync('token')
+    var deviceId = group[key[0]].devices[key[1]].id
+    var groupName = group[key[0]].groupName//获取当前的分组名称
+    var groupId = group[key[0]].id
+    var deviceName = group[key[0]].devices[key[1]].deviceName//获取当前的设备名称
     wx.showModal({
       title:'修改设备名称',
       editable:true,
@@ -250,27 +384,36 @@ Page({
               content:'请输入名称'
             })
           }
+          else if(res.content.length > 10){
+            wx.showModal({
+              title:'提示',
+              showCancel:false,
+              content:'设备名称不能大于10个字符'
+            })
+          }
           else{
-            wx.request({
-              url: 'http://110.40.223.170:8120/api/minigrogram/lightcontrol/devices',
-              method:'PUT',
-              header:{'Content-Type': 'application/json','Authorization': token},
-              data:{
-                deviceName:res.content,
-                id:deviceId
-              },
-              success:ever =>{
-                console.log(ever)
-                if(ever.data.code == 200){
-                  group[key[0]].device[key[1]].deviceName = res.content
-                  wx.setStorageSync('group', group)
-                  that.setData({
-                    array:wx.getStorageSync('group')
-                  })
+            putDevice({deviceName:res.content,id:deviceId,groupId:groupId}).then(ever=>{
+              console.log('修改设备名称' + ever.data.msg)
+              if(ever.data.code == 200){
+                if(groupName == wx.getStorageSync('groupName') && deviceName == wx.getStorageSync('deviceName')){
+                  wx.setStorageSync('deviceName',res.content)
                 }
-                else{
-                  console.log('修改设备名称失败')
+                group[key[0]].devices[key[1]].deviceName = res.content
+                wx.setStorageSync('group', group)
+                var Group = wx.getStorageSync('group')
+                for(let i = 0;i < Group.length;i++){
+                  if(Group[i].groupName.length > 10){
+                    Group[i].groupName = Group[i].groupName.slice(0,9) + '....'
+                  }
                 }
+                that.setData({array: Group})
+              }
+              else{
+                wx.showModal({
+                  title:'提示',
+                  content:ever.data.msg,
+                  showCancel:false
+                })
               }
             })
           }
@@ -281,7 +424,6 @@ Page({
   //删除设备
   Deletedevice:function(e){
     var that = this
-    var token = wx.getStorageSync('token')
     wx.showModal({
       title:'删除设备',
       content:'确定删除该设备吗?',
@@ -289,82 +431,127 @@ Page({
         if(res.confirm){
           let key = e.currentTarget.dataset.indexdel//获得分组和设备的下标值([分组下标,设备下标])
           let group = wx.getStorageSync('group')
-          let subscript = group[key[0]].device[key[1]].id//设备对应的id
-          wx.request({
-            url: 'http://110.40.223.170:8120/api/minigrogram/lightcontrol/devices?id=' + subscript,
-            method:'DELETE',
-            header:{'Content-Type': 'application/json','Authorization': token},
-            success:nrg => {
-              console.log(nrg)
-              if (nrg.data.code == 200) {
-                group[key[0]].device.splice(key[1],1)
-                wx.setStorageSync('group', group)
+          let subscript = group[key[0]].devices[key[1]].id//设备对应的id
+          var groupName = group[key[0]].groupName
+          var deviceName = group[key[0]].devices[key[1]].deviceName
+          delDevice(subscript).then(nrg=>{
+            if (nrg.data.code == 200) {
+              group[key[0]].devices.splice(key[1],1)
+              wx.setStorageSync('group', group)
+              var Group = wx.getStorageSync('group')
+                for(let i = 0;i < Group.length;i++){
+                  if(Group[i].groupName.length > 10){
+                    Group[i].groupName = Group[i].groupName.slice(0,9) + '....'
+                  }
+                }
                 that.setData({
-                  array:wx.getStorageSync('group')
+                  array: Group
                 })
-              }
-              else{
-                console.log('删除列表失败')
+              if(groupName == wx.getStorageSync('groupName') && deviceName == wx.getStorageSync('deviceName')){
+                wx.setStorageSync('deviceName','')
               }
             }
+            else{
+              wx.showModal({
+                title:'提示',
+                content:nrg.data.msg,
+                showCancel:false
+              })
+            }
           })
         }
       }
     })
   },
-  Refresh:function(){
-    
-  },
-  //展开设备
-  develops:function(){
-   
+   //设备的显示隐藏
+  Develop:function(e){
+    var that = this
+    let array = that.data.array
+    var pd = e.currentTarget.dataset.indexdel
+    for(let item =0;item < array.length;item++){
+      if (array[item].id == array[pd].id) {
+        //判断当前对象中的insert是否为true（true为显示，其他为隐藏） insert是新增的一个值然后进行判断
+        if (array[item].insert == "" || array[item].insert == undefined) {
+          array[item].insert = "true"
+        } else {
+          array[item].insert = ""
+        }
+      }
+    }
+    that.setData({
+      array:array
+    })
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    wx.showToast({
+      title:'获取数据中',
+      icon:'loading',
+      duration: 2000
+    })
     var that = this
-    let token = wx.getStorageSync('token')
-    // wx.request({
-    //   url:'http://110.40.223.170:8120/api/minigrogram/lightcontrol/groups',
-    //   method:'GET',
-    //   header:{'Content-Type': 'application/json','Authorization': token},
-    //   success:tp => {
-    //     console.log(tp)
-    //   }
-    // })
-    // wx.request({
-    //     url: 'http://110.40.223.170:8120/api/minigrogram/lightcontrol/devices?id=' + '5',
-    //     method:'DELETE',
-    //     header:{'Content-Type': 'application/json','Authorization': token},
-    //     success:nrg => {
-    //       console.log(nrg)
-    //     }
-    // })
-    console.log(wx.getStorageSync('group'))
-    // that.data.array = []
-    // wx.setStorageSync('information', )
-    // console.log(wx.getStorageSync('information'))
-    // wx.setStorageSync('id', [])
-    // wx.setStorageSync('values', [])
-    that.setData({
-      array:wx.getStorageSync('group'),
+    getGroup().then(res => {
+      if(res.data.code == 200){
+        var data = res.data.data
+        if(data != null){
+          for(let i = 0;i <data.length;i++){
+            if(data[i].devices != null){
+              for(let j = 0;j < data[i].devices.length;j++){
+                let id = data[i].devices[j].deviceId
+                let key = data[i].devices[j].deviceKey
+                getBasic(id,key).then(ever =>{
+                  if(ever.data.data.online == true){
+                    data[i].devices[j].status = '在线'
+                  }
+                  else{
+                    data[i].devices[j].status = '离线'
+                  }
+                  wx.setStorageSync('group',data)
+                  var tgroups = wx.getStorageSync('group')
+                  for(let i = 0;i < tgroups.length;i++){
+                    if(tgroups[i].groupName.length > 10){
+                      tgroups[i].groupName = tgroups[i].groupName.slice(0,9) + '....'
+                    }
+                  }
+                  that.setData({array:tgroups})
+                })
+              }
+            }
+            else{
+              wx.setStorageSync('group',data)
+              let group = wx.getStorageSync('group')
+              for(let i = 0;i < group.length;i++){
+                if(group[i].groupName.length > 10){
+                  group[i].groupName = group[i].groupName.slice(0,9) + '....'
+                }
+              }
+              that.setData({array:group})
+            }
+          }
+        }
+      }
+      else{
+        wx.showModal({
+          title:'错误',
+          content:res.data.msg,
+          showCancel:false
+        })
+      }
     })
-    console.log(that.data.array)
   },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady() {
-
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
   },
 
   /**

pages/scene/scene.wxml

@@ -1,30 +1,24 @@
 <!--pages/scene/scene.wxml-->
-<view class="logo"></view>
-<view class="grouping">
-  <text>当前手机号为:</text>
-  <input/>
-  <button style="width:27%;">更改手机号</button>
-</view>
 <view class="project">
     <text>工程名称:</text>
-    <button>刷新列表</button>
-    <image src="/image/addition.png" bindtap="apption"></image>
+    <button bindtap="Refreshlist">刷新列表</button>
+    <image src="https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/addition.png" bindtap="apption"></image>
 </view>
 <view class="engin">
   <block wx:for="{{array}}" wx:key="id" wx:for-index="child">
     <view class="engineering">
-      <text>{{item.name}}</text>
-      <image src="/image/modify.png" class="engineering-image-1" bindtap="ShowChanges" data-indexdel="{{child}}"></image>
-      <image src="/image/Scanning.png" class="qrcode" bindtap="scanCodeEvent" data-indexdel="{{child}}"></image>
-      <image src="/image/develop.png" class="develop" bindtap="Develop" data-indexdel="{{child}}"></image>
-      <image src="/image/delete.png" class="engineering-image-2" bindtap="removeapption" data-indexdel="{{child}}"></image>
+      <text>{{item.groupName}}</text>
+      <image src="https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/modify.png" class="engineering-image-1" bindtap="ShowChanges" data-indexdel="{{child}}"></image>
+      <image src="https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/Scanning.png" class="qrcode" bindtap="scanCodeEvent" data-indexdel="{{child}}"></image>
+      <image src="{{displaypicture}}" class="develop" bindtap="Develop" data-indexdel="{{child}}"></image>
+      <image src="https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/delete.png" class="engineering-image-2" bindtap="removeapption" data-indexdel="{{child}}"></image>
     </view>
-    <view wx:for="{{item.device}}" wx:key="id" class="develops"  wx:for-item="device">
-      <text class="develops-1">{{device.deviceSn}}</text>
-      <text class="develops-2">{{device.deviceName}}</text>
-      <text class="develops-3">{{device.status}}</text>
-      <image src="/image/set.png" style="right: 9%;" bindtap="modifyequipmentname" data-indexdel="{{[child,index]}}"></image>
-      <image src="/image/delete.png" style="right: 2%;width: 4%;" bindtap="Deletedevice" data-indexdel="{{[child,index]}}"></image>
+    <view wx:for="{{item.devices}}" wx:key="id" class="develops"  wx:for-item="devices" hidden="{{item.insert?'true':''}}">
+      <text class="develops-1">{{devices.deviceSn}}</text>
+      <text class="develops-2">{{devices.deviceName}}</text>
+      <text class="develops-3">{{devices.status}}</text>
+      <image src="https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/set.png" style="right: 9%;" bindtap="modifyequipmentname" data-indexdel="{{[child,index]}}"></image>
+      <image src="https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/delete.png" style="right: 2%;width:calc(100vw * 15/375);height: calc(100vw * 28/375);" bindtap="Deletedevice" data-indexdel="{{[child,index]}}"></image>
     </view>
   </block>
 </view>

pages/scene/scene.wxss

@@ -3,57 +3,11 @@ page{
   width: 100%;
   height: 100%;
 }
-.logo{
-  width: 100%;
-  height: 20%;
-  background-color: cornflowerblue;
-}
-.grouping{
-  width: 100%;
-  margin: 0 auto;
-  height: 6%;
-  position: relative;
-  border-bottom: darkgrey solid 1px;
-}
-.grouping text{
-  position: absolute;
-  left: 5%;
-  top:20%;
-  font-size: calc(100vw * 12/375);
-}
-
-.grouping input{
-  width: 40%;
-  height: 80%;
-  position: absolute;
-  left: 27%;
-  top: 10%;
-}
-
-.grouping button{
-  width: 20%;
-  height: 70%;
-  position:absolute;
-  right: 3%;
-  top:15%;
-  font-size: calc(100vw * 11/375);
-  display: flex;
-  align-items:center;
-  justify-content:center; 
-  background-color: cornflowerblue;
-  color: white;
-}
-
-.grouping button:active{
-  box-shadow:
-  7px 6px 28px 1px;
-  transform: translateY(4px);
-}
 
 /* 工程名称设置 */
 .project{
   width: 100%;
-  height: 6%;
+  height: 8%;
   border-bottom: darkgrey solid 1px;
   position: relative;
 }
@@ -61,8 +15,8 @@ page{
 .project text{
   position: absolute;
   left: 5%;
-  top: 20%;
-  font-size: calc(100vw * 12/375);
+  top: 30%;
+  font-size: calc(100vw * 16/375);
 }
 
 .project button{
@@ -72,11 +26,11 @@ page{
   display: flex;
   align-items:center;
   justify-content:center; 
-  left: 35%;
+  left: 40%;
   top: 15%;
   background-color: cornflowerblue;
   color: white;
-  font-size: calc(100vw * 11/375);
+  font-size: calc(100vw * 14/375);
 }
 
 .project button:active{
@@ -87,10 +41,10 @@ page{
 
 .project image{
   position: absolute;
-  right: 5%;
-  top:12.25%;
-  width: 6.7%;
-  height: 75.5%;
+  right: calc(100vw * 15/375);
+  top:20%;
+  width: calc(100vw * 30/375);
+  height: calc(100vw * 30/375);
 }
 
 .engin{
@@ -101,7 +55,7 @@ page{
 .engineering{
   background-color: cornflowerblue;
   width: 100%;
-  height: 9%;
+  height: 10%;
   display: flex;
   flex-direction: row;
   margin-top: 0.5%;
@@ -109,30 +63,30 @@ page{
 }
 
 .engineering text{
-  font-size: calc(100vw * 14/375);
+  font-size: calc(100vw * 18/375);
   position: absolute;
   left: 5%;
-  top: 15%;
+  top: 20%;
 }
 
 .engineering-image-1{
   width: 4.5%;
   height: 65%;
   position: absolute;
-  right: 30%;
+  right: 33%;
   top: 15%;
 }
 /* 扫码 */
 .qrcode{
-  width: 6%;
-  height: 65%;
+  width: calc(100vw * 24/375);
+  height: calc(100vw * 24/375);
   position: absolute;
-  right: 19%;
+  right: 22%;
   top:15%;
 }
 /* 展开设备 */
 .develop{
-  width: 4%;
+  width: 7%;
   height: 50%;
   position: absolute;
   right: 10%;
@@ -141,29 +95,30 @@ page{
 
 .develops{
   width: 100%;
-  height: 8.5%;
+  height: 9%;
+  margin-top:1%;
   position: relative;
 }
 
 .develops image{
-  width: 6%;
-  height: 70.3%;
+  width: calc(100vw * 25/375);
+  height: calc(100vw * 25/375);
   position: absolute;
-  top: 14%;
+  top: 10%;
 }
 
 .develops-1{
   position: absolute;
   left: 5%;
   top: 20%;
-  font-size: calc(100vw * 12/375);
+  font-size: calc(100vw * 14/375);
 }
 
 .develops-2{
   position: absolute;
-  left: 25%;
+  left: 28%;
   top: 20%;
-  font-size: calc(100vw * 12/375);
+  font-size: calc(100vw * 14/375);
 }
 
 .develops-3{

pages/sign/sign.js

@@ -6,66 +6,45 @@ Page({
    */
   data: {
       code:"",//储存微信传过来的code
-      number:"",
-  },
-  verification:function(e){
-    var that = this
-    that.data.number = e.detail.value
   },
   //登录功能
   sign:function(){
-    var that = this
-    var trys = /^1[3-9][0-9]{9}$/
-    var number = that.data.number
-    if(number == "") {
-      wx.showModal({
-        title:'提示',
-        showCancel:false,
-        content:'请输入手机号'
-      })
-    }
-    else if(trys.test(number) == false){
-      wx.showModal({
-        title:'提示',
-        showCancel:false,
-        content:'请输入正确的手机号'
-      })
-    }
-    else {
-      wx.login({
-        success:function(e){
-          console.log(e.code)
-          wx.request({
-            url: 'http://110.40.223.170:8120/api/minigrogram/lightcontrol/login',
-            method:'POST',
-            data:{
-              code:e.code,
-              phone:that.data.number
-            },
-            header:{"Content-Type": "application/json"},
-            success:function(res){
-              if(res.data.code == 200){
-                wx.setStorageSync('token', res.data.data.access_token)
-                let creatime = new Date()
-                wx.setStorageSync('time',creatime)
-                wx.switchTab({
-                  url: '/pages/scene/scene',
-                })   
-              }
-              else{
-                console.log('登录失败')
-              }
-            }
-          })
-        }
-      })
-    }
+    
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    var that = this
+    wx.showToast({
+      title:'登录中',
+      icon:'loading',
+      duration: 1000
+    })
+    wx.login({
+      success:function(e){
+        wx.request({
+          url: 'https://cloud.long-chi.com/api/minigrogram/lightcontrol/login',
+          method:'POST',
+          data:{code:e.code},
+          header:{"Content-Type": "application/json"},
+          success:function(res){
+            if(res.data.code == 200){
+              let time = new Date()
+              wx.setStorageSync('time',time) //登录时间
+              wx.setStorageSync('currentTime', res.data.data.expires_in)//过期时间
+              wx.setStorageSync('token', res.data.data.access_token)
+              wx.switchTab({
+                url: '/pages/scene/scene',
+              })   
+            }
+            else{
+              console.log('登录失败')
+            }
+          }
+        })
+      }
+    })
   },
 
   /**

pages/sign/sign.wxml

@@ -1,6 +1,4 @@
 <!--pages/sign/sign.wxml-->
-<view class="sign-view">
-  <input class="number" placeholder="请输入手机号" bindinput="verification"/>
-  <button class="sign-button" bindtap="sign">登录</button>
+<view class="sign-view" style="background-image: url(https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/sign-backgroud.png);background-size: 100% 100%;">
 </view>
 

pages/sign/sign.wxss

@@ -1,17 +1,39 @@
 /* pages/sign/sign.wxss */
+page{
+  width: 100%;
+  height: 100%;
+}
 .sign-view{
   width: 100%;
-  height: 100px;
-  margin-top: 200px;
+  height: 100%;
+  position: relative;
+}
+.sign-view input{
+  width: 42%;
+  height: 5%;
+  position: absolute;
+  background-color: white;
+  left: 30%;
+  top:60%;
+  font-size: calc(100vw * 10/375);
 }
-.number{
-  border: 2px solid blue;
-  width: 250px;
-  height: 40px;
-  margin: 0 auto;
+
+.sign-view button{
+  position: absolute;
+  top: 68%;
+  left: 40%;
+  width: 22%;
+  height: 5%;
+  font-size: calc(100vw * 10/375);
+  display: flex;
+  align-items:center;
+  justify-content:center;
+  background-color: cornflowerblue;
+  border:solid white 1px; 
+  color:white;
 }
-.sign-button{
-  width: 100px;
-  height: 40px;
-  margin: 10px auto;
+
+.sign-view button:active{
+  box-shadow:cornflowerblue;
+  transform: translateY(4px);
 }

pages/system/system.wxml

@@ -1,7 +1,7 @@
 <!--pages/system/system.wxml-->
 <view class="overallsituation">
   <view class="switch-1">
-  <image src="/image/network.png" style="position: absolute; left:5%;top:14%;width:8%;height:70%;"></image>
+  <image src="https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/network.png" style="position: absolute; left:5%;top:14%;width:8%;height:70%;"></image>
   <view class="Dropdown">
     <picker range="{{groupName}}" value="{{groupIndex}}" bindchange="changegroup">
       <view class="group">
@@ -19,26 +19,26 @@
   <view class="Calibration-time">
     <text style="left: 5.3%;">回路数量:</text>
     <text style="left: 27%;">{{loops}}路</text>
-    <button style="width: 21.3%;" bindtap="Calibrationtime"><span>校准时间</span></button>
+    <button style="width: 21.3%;" bindtap="Calibrationtime">校准时间</button>
   </view>
   <view class="adjustment">
     <view class="adjustment-1">
-    <image src="/image/calendar.png"></image>
+    <image src="https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/calendar.png"></image>
     <text style=" left: 12.3%;">日期：</text>
     <text style="right: 5.8%;">{{dates}}</text>
   </view>
   <view class="adjustment-1">
-    <image src="/image/Clock.png" style="height: 66%;"></image>
-    <text style=" left: 12.3%;">时间：</text>
+    <image src="https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/Clock.png" style="height: calc(100vw * 30/375);width: calc(100vw * 30/375);top: 18.75%;"></image>
+    <text style=" left: 14%;">时间：</text>
     <text style="right: 5.8%;">{{times}}</text>
   </view>
   <view class="adjustment-1">
-    <image src="/image/sunrise.png"></image>
+    <image src="https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/sunrise.png"></image>
     <text style=" left: 12.3%;">光照度:</text>
     <text style="right: 5.8%;">{{Illuminance}}</text>
   </view>
   <view class="adjustment-1">
-    <image src="/image/Fire-Extinguisher.png"></image>
+    <image src="https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/Fire-Extinguisher.png" style="width: calc(100vw * 30/375);height: calc(100vw * 40/375);"></image>
     <text style=" left: 12.3%;">消防报警：</text>
     <text style="right: 5.8%;background-color:{{Firealarmcolor}};">{{Firealarmtext}}</text>
   </view>
@@ -49,31 +49,29 @@
     <text style="position: absolute;left: 70.5%;">{{Sunsettime}}</text>
   </view>
   <view class="adjustment-1">
-    <image src="/image/time.png" style="height: 66%;"></image>
-    <text style=" left: 12.35%;">开关延时：</text>
+    <image src="https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/time.png" style="height: calc(100vw * 36/375);width: calc(100vw * 36/375);top: 13%;"></image>
+    <text style=" left: 13%;">开关延时：</text>
     <picker style="left:47%;top:18.36%;width: 14.7%;"bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
       <view class="picker">
           {{array[index]}}秒
       </view>
     </picker>
-    <text style="right: 5.8%;">{{array[index]}}秒</text>
+    <text style="right: 5.8%;">{{switchtime}}秒</text>
   </view>
   <view class="adjustment-1">
-    <image src="/image/Longitude.png" style="height: 66%;"></image>
+    <image src="https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/Longitude.png" style="height: calc(100vw * 30/375);width: calc(100vw * 30/375);top: 18.75%;"></image>
     <text style=" left: 12.35%;">经度：</text>
-    <button style="width:20.58%;left: 38.23%;top:18.36%" bindtap="simulation1">{{Manualinput1}}</button>
+    <picker mode="multiSelector" range="{{multiItems}}" bindchange="handleMulti" style="width: 20%;left: 40%;top: 20%;">
+      <view>{{ multiItems[0][multiIndex[0]] }},{{ multiItems[1][multiIndex[1]] }}'</view>
+    </picker>
     <text style="right: 5.8%;">{{longitude}}</text>
-    <modal title="经度" hidden="{{longitudemodal}}" bindconfirm="confirm1" bindcancel="cancel1">
-      <input placeholder="请输入经度" class="longitude-input" bindinput="GetLongitude"/>
-    </modal>
   </view>
   <view class="adjustment-1">
-    <image src="/image/Longitude.png" style="height: 66%;"></image>
+    <image src="https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/Longitude.png" style="height: calc(100vw * 30/375);width: calc(100vw * 30/375);top: 18.75%;"></image>
     <text style=" left: 12.35%;">纬度：</text>
-    <button style="width:20.58%;left: 38.23%;top:18.36%" bindtap="simulation2">{{Manualinput2}}</button>
-    <modal title="纬度" hidden="{{latitudemodal}}" bindconfirm="confirm2" bindcancel="cancel2">
-      <input placeholder="请输入纬度" class="latitude-input" bindinput="GetLatitude"/>
-    </modal>
+    <picker mode="multiSelector" range="{{multiItems2}}" bindchange="handleMulti2" style="width: 20%;left: 40%;top: 20%;">
+      <view>{{ multiItems2[0][multiIndex2[0]] }},{{ multiItems2[1][multiIndex2[1]] }}'</view>
+    </picker>
     <text style="right: 5.8%;">{{latitude}}</text>
   </view>
   </view>

pages/system/system.wxss

@@ -30,25 +30,28 @@ page{
 .Dropdown{
   height: 100%;
   width: 70%;
-  position: absolute;
-  left: 15%;
+  margin-left: 15%;
 }
 /* 分组下拉选择 */
 .group{
   background-color: cornflowerblue;
   color: white;
-  font-size: calc(100vw * 16/375);
+  font-size: calc(100vw * 18/375);
   float: left;
   margin-top: 5%;
+  height:calc(100vw * 24/375);
+  max-width: 60%;
 }
 /* 设备下拉选择 */
 .device{
   background-color: cornflowerblue;
   color: white;
-  font-size: calc(100vw * 16/375);
+  font-size: calc(100vw * 18/375);
   margin-left: 3%;
   float: left;
   margin-top: 5%;
+  height: calc(100vw * 24/375);
+  max-width: 37%;
 }
 
 
@@ -74,11 +77,12 @@ page{
   display: flex;
   align-items:center;
   justify-content:center; 
-}
-
-.Calibration-time span{
   font-size: calc(100vw * 12/375);
 }
+.Calibration-time button:active{
+  box-shadow:white;
+  transform: translateY(4px);
+}
 /* 主体 */
 .adjustment{
   width: 90.6%;
@@ -96,7 +100,7 @@ page{
 
 .adjustment-1 image{
   position: absolute;
-  top:20.4%;
+  top:15%;
   left: 3%;
   width: 9.5%;
   height: 61.2%;
@@ -106,7 +110,7 @@ page{
   position:absolute;
   top:29%;
   font-weight: 550;
-  font-size: calc(100vw * 15/375);
+  font-size: calc(100vw * 18/375);
 }
 
 .adjustment-1 picker{
@@ -119,9 +123,8 @@ page{
   display: flex;
   align-items:center;
   justify-content:center; 
-  font-size: calc(100vw * 12/375);
+  font-size: calc(100vw * 14/375);
 }
-
 .adjustment-1-1{
   position: absolute;
   height: 30px;
@@ -159,15 +162,19 @@ page{
   height: 9.5%;
   position: relative;
 }
+.Refresh button:active{
+  box-shadow:cornflowerblue;
+  transform: translateY(4px);
+}
 /* 刷新页面 */
 .Refresh-1{
-  width: 24%;
+  width: 28%;
   height: 75%;
   position: absolute;
   left: 10.6%;
   top:9.6%;
   background-color: cornflowerblue;
-  font-size: calc(100vw * 14/375);
+  font-size: calc(100vw * 18/375);
   color:white;
   display: flex;
   align-items:center;
@@ -175,14 +182,14 @@ page{
 }
 /* 存储数据 */
 .Refresh-2{
-  width: 24%;
+  width: 28%;
   height: 75%;
   position: absolute;
   right: 10.6%;
   top:9.6%;
   background-color: cornflowerblue;
   color: white;
-  font-size: calc(100vw * 14/375);
+  font-size: calc(100vw * 18/375);
   display: flex;
   align-items:center;
   justify-content:center; 

project.config.json

@@ -48,7 +48,7 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.19.4",
-  "appid": "wxe6a87d9d9cad4fd9",
+  "appid": "wxed5ed92d709605cf",
   "projectname": "miniprogram-92",
   "condition": {},
   "editorSetting": {

project.private.config.json

@@ -1,10 +1,10 @@
 {
-  "projectname": "%E8%B7%AF%E7%81%AF%E6%8E%A7%E5%88%B6",
+  "projectname": "weixin",
   "setting": {
-    "compileHotReLoad": false,
+    "compileHotReLoad": true,
     "bigPackageSizeSupport": true,
-    "urlCheck": false
+    "urlCheck": true
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "libVersion": "2.16.1"
+  "libVersion": "2.27.1"
 }

utils/control.js

@@ -0,0 +1,137 @@
+const {postData} = require('../api/intell')
+const {putDevice} = require('../api/device')
+function getlooplist(){
+  var group = wx.getStorageSync('group')
+  //获取分组下拉  
+  var groups = []//分组列表
+  var device = []//设备列表 
+  for(let i = 0;i < group.length;i++){
+    groups.push(group[i].groupName)
+  }
+  //改变分组下标
+  if(wx.getStorageSync('groupName') != ''){
+    for(let n = 0;n < groups.length;n++){
+      if(groups[n] == wx.getStorageSync('groupName')){
+         var groupsIndex = n//分组下标
+      }
+    }
+  }
+  for(let j = 0;j < group.length;j++){
+    if(groups[groupsIndex] == group[j].groupName){
+      if(group[j].devices != null && group[j].devices.length != 0){
+        for(let p = 0;p < group[j].devices.length;p++){
+          device.push(group[j].devices[p].deviceName)     
+        }
+        if(wx.getStorageSync('deviceName') != ''){
+         for(let m = 0;m < device.length;m++){
+           if(device[m] == wx.getStorageSync('deviceName')){
+             var deviceIndex = m//设备下标
+           }
+         }
+        }
+        //根据分组名和设备名获取key和id以及回路名称
+        for(let d = 0;d < group.length;d++){
+          if(groups[groupsIndex] == group[d].groupName){
+            for(let g = 0;g < group[d].devices.length;g++){
+              if(device[deviceIndex] == group[d].devices[g].deviceName){
+                var loopnum = group[d].devices[g].circuits
+                var deviceId = group[d].devices[g].deviceId
+                var deviceKey = group[d].devices[g].deviceKey
+              }
+            }
+          }
+        }
+      }
+  }
+  }
+
+  return [groups,groupsIndex,device,deviceIndex,loopnum,deviceId,deviceKey]
+}
+//回路开/关
+function Switch(deviceId,deviceKey,Rel){
+  postData(deviceId,deviceKey,Rel).then(res => {
+    if(res.data.errno == 10){
+      wx.showModal({
+        title:'错误',
+        content:'设备处于离线状态',
+        showCancel:false
+      })
+    }
+  })
+}
+//回路开/关读取
+function switchReal(police,lamp,index){
+  switch(police.length){
+    case 1:
+      police = '000' + police
+    break;
+    case 2:
+      police = '00' + police
+    break;
+    case 3:
+      police = '0' + police
+    break;
+    default:
+      police = police
+    break;
+  }
+  if(police.substring(2,3) == '0' && police.substring(3,4) == '0'){
+    lamp[index] = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp.png'
+  }
+  else if(police.substring(2,3) == '0' && police.substring(3,4) == '1'){
+    lamp[index] = 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image/lamp1.png'
+  }
+  return lamp 
+}
+
+//回路名称调整(未解决)
+function loopname(deviceid,groupid,loop,loops,slice,groupName,deviceName,group,content){
+  if(content == ''){
+    wx.showModal({
+      title:'提示',
+      content:'请输入名称',
+      showCancel:false
+    })
+  }
+  else if(content.length > 10){
+    wx.showModal({
+      title:'提示',
+      content:'回路名称不能大于10个字符',
+      showCancel:false
+    })
+  }
+  else{
+    loop[0] = content
+    slice = loop.slice(0,loops)
+    slice = slice.toString()
+    putDevice({id:deviceid,groupId:groupid,circuits:slice}).then(ever => {
+      if(ever.data.code == 200){
+        for(let i = 0;i < group.length;i++){
+          if(groupName == group[i].groupName){
+            for(let j = 0;j < group[i].devices.length;j++){
+              if(deviceName == group[i].devices[j].deviceName){
+                  group[i].devices[j].circuits = slice
+                  wx.setStorageSync('group', group)
+                  return loop
+              }
+            }
+          }
+        }
+      }
+      else{
+        wx.showModal({
+          title:'错误',
+          content:ever.data.msg,
+          showCancel:false
+        })
+      }
+    })
+  } 
+}
+
+module.exports = {
+  getlooplist:getlooplist,
+  Switch:Switch,
+  switchReal:switchReal,
+  loopname:loopname,
+}

utils/util.js

@@ -1,19 +0,0 @@
-const formatTime = date => {
-  const year = date.getFullYear()
-  const month = date.getMonth() + 1
-  const day = date.getDate()
-  const hour = date.getHours()
-  const minute = date.getMinutes()
-  const second = date.getSeconds()
-
-  return `${[year, month, day].map(formatNumber).join('/')} ${[hour, minute, second].map(formatNumber).join(':')}`
-}
-
-const formatNumber = n => {
-  n = n.toString()
-  return n[1] ? n : `0${n}`
-}
-
-module.exports = {
-  formatTime
-}