Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/scene_wisdom

css/main.css

@@ -7303,4 +7303,9 @@ a.hasHover.tag-link:hover {
     margin-left: 10px;
     letter-spacing:1px;
     z-index: 9995;
+}
+
+.unable{
+    opacity:0.5;
+    pointer-events:none;
 }

index.html

@@ -104,6 +104,7 @@
                         <span class="ac-btn" id="moshi">模式</span>
                     </div>
                 </div>
+
                 <div class="oper-con">
                     <div id="airmode">
                         <span class="ac-btn" data-name="自动">自动</span>
@@ -869,7 +870,7 @@
  <![endif]-->
     </div>
 
-    <div class="hardware-list">
+    <div class="hardware-list unable">
         <div class="hard-header">
             <span>硬件列表</span>
             <img id="shousuo" src="./images/introduce_close.png" alt="">

js/main_2020_show.js

@@ -8,7 +8,7 @@ hardwareHotList = {}
 
 //热点  设备控制
 
-$("#hotPannel .close, #hotPannel .iconquxiao").on('click',()=>{
+$("#hotPannel .close, #hotPannel .iconquxiao").on('click',()=>{//关闭
     $("#hotPannel>div").css("display","");
     window.hotNeedUpdatePannel = null;
      
@@ -20,6 +20,29 @@ $("#hotPannel input.mui-switch").on('change',(e)=>{//灯
         $("#hotPannel input.mui-switch").prop("checked", !ifOn) //error
     })
 })
+
+
+var deviceBtnBind = function($elem, paramCode, paramValue){
+    $elem.on('click',(e)=>{
+        paramValue = paramValue instanceof Function ? paramValue() : paramValue
+        window.changeDeviceStatus(window.hotNeedUpdatePannel, paramCode, paramValue, (a)=>{
+            hotNeedUpdatePannel.showPannel()  //success  update
+        })
+    })
+}
+//空调
+deviceBtnBind($("#hotPannel .ac-con  .iconfengsu31"),  '04', '3')// windSpeed 
+deviceBtnBind($("#hotPannel .ac-con  .iconfengsu2"),  '04', '2')// windSpeed 
+deviceBtnBind($("#hotPannel .ac-con  .iconfengsu11"),  '04', '1')// windSpeed 
+deviceBtnBind($("#hotPannel .ac-con  .minbtn .ac-btn").eq(0),  '05', ()=>{return hotNeedUpdatePannel.temperature - 1 + ''})// temperature 
+deviceBtnBind($("#hotPannel .ac-con  .minbtn .ac-btn").eq(1),  '05', ()=>{return hotNeedUpdatePannel.temperature + 1 + ''})// temperature 
+deviceBtnBind($("#hotPannel .ac-con  .ac-close"),  '02', '0')// close 
+
+
+
+
+ 
+
 var getAjax = function(url, success, errorString){
     $(".waiting").addClass('showloading')
     $.ajax({//获取设备状态
@@ -15492,7 +15515,7 @@ window.Modernizr = function(n, e, t) {
                 /* if(window.MP_PREFETCHED_MODELDATA.flyInOnlyBySwitch){
                   
                 }else{ */
-                    this.createTitleElem(d.infoAttribute.hardware ? d.infoAttribute.hardware.name : d.infoAttribute.title ))  
+                    this.createTitleElem(d.infoAttribute.hardware ? d.infoAttribute.hardware.name : d.infoAttribute.title )   
                 //} 
                 
             } 
@@ -15656,7 +15679,7 @@ window.Modernizr = function(n, e, t) {
                                       
                                 }else if(devType == "温湿度"){
                                     $("#hotPannel>#temperature").removeClass("hide")
-                                    
+                                    this.temperature = parseInt(temperature)
                                     
                                     loadTemperature({
                                         id:"temperature",//dom Id
@@ -15762,7 +15785,7 @@ window.Modernizr = function(n, e, t) {
                                           if(data2.code == 0){
                                             loadMonitor({
                                                 id:"monitor",
-                                                url:  data2.data.external.hls    //'http://14.215.216.123:18080/rtp/00A153DF/hls.m3u8'
+                                                url:  data2.data.external.wsFlv    //'http://14.215.216.123:18080/rtp/00A153DF/hls.m3u8'
                                             }) 
                                           }
                                      },"获取视频地址失败" )
@@ -15792,9 +15815,12 @@ window.Modernizr = function(n, e, t) {
                                     var temperature = data.find(e=>e.paramCode == '05').paramValue
                                     var fanPos = data.find(e=>e.paramCode == '06').paramValue
                                     var fanState = data.find(e=>e.paramCode == '07').paramValue == '1' 
+                                    this.temperature = parseInt(temperature)
+                                    
                                     
-                                    loadAirConditioner({
+                                    loadAirConditioner({ 
                                         id:"air-conditioner",
+                                        name : hardware.name,
                                         val:parseInt(temperature),
                                         type: mode == 0 ? '自动': mode == 1 ? '除湿': mode == 2 ? '冷风': mode == 3 ? '送风' : '暖风',//模式
                                         ifOn,//开关机

js/showHardware.js

@@ -121,7 +121,7 @@ $(function () {
 
   window.changeDeviceStatus = function (item, paramCode, paramValue, success, fail) {//设置设备
     console.log(item);
-   
+    $(".waiting").addClass('showloading')
     let tmp = item.infoAttribute.hardware
     $.ajax({
       method: "GET",
@@ -133,13 +133,15 @@ $(function () {
       url: url + `/api/device/control/${tmp.id}/${paramCode}/${paramValue}/03`,
        
       success: function (data) {
-          console.log(data.msg)
+        console.log(data.msg)
+        $(".waiting").romoveClass('showloading')  
         if (data.code === 0) {
            success && success()
         } else {
            fail && fail()
         }
       },error:function(){
+          $(".waiting").romoveClass('showloading')
           fail && fail()
       }
     });