From 2be70a32d2a8c517bd9868fb60913fcc843e66fe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 13 五月 2020 11:21:32 +0800
Subject: [PATCH] 上传代码

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs |  136 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 102 insertions(+), 34 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index 3d4e330..0e0fbce 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -188,7 +188,7 @@
                 //閫昏緫瑙﹀彂涓婃姤
                 else if (topic == gatewayId + "/Logic/Execute_Respon")
                 {
-                    this.LogicExecutePush(null);
+                    this.LogicExecutePush(JObject.Parse(msgData));
                 }
                 //鍦烘櫙瑙﹀彂涓婃姤
                 else if (topic == gatewayId + "/Scene/Exec_Respon")
@@ -274,7 +274,7 @@
                 }
                 #endregion
 
-                #region 鈻� 绌鸿皟鏁版嵁
+                #region 鈻� 绌鸿皟鍜屾柊椋庢暟鎹�
                 //绌鸿皟鏁版嵁
                 else if (report.DeviceStatusReport.CluterID == 513)
                 {
@@ -343,29 +343,59 @@
                     locadevice.DeviceStatusReport = report.DeviceStatusReport;
                     foreach (var attData in report.DeviceStatusReport.AttriBute)
                     {
-                        if (attData.AttributeId == 0)
+                        //鍖哄垎鏄┖璋冭繕鏄柊椋�
+                        var device = Shared.Common.LocalDevice.Current.GetDevice(report.DeviceAddr, report.DeviceEpoint);
+
+                        if (device.Type == DeviceType.FreshAir)
                         {
-                            //椋庢墖妯″紡
-                            ((AC)locadevice).currentFanMode = attData.AttriButeData;
-                            //宸茬粡鎺ユ敹鍒扮姸鎬�
-                            locadevice.HadReadDeviceStatu = true;
+                            if (attData.AttributeId == 0)
+                            {
+                                switch (attData.AttriButeData)
+                                {
+                                    case 0:
+                                    case 4:
+                                        ((FreshAir)locadevice).currentFanStatus = attData.AttriButeData;
+                                        break;
+                                    case 1:
+                                    case 2:
+                                    case 3:
+                                        ((FreshAir)locadevice).currentFanSpeed = attData.AttriButeData;
+                                        break;
+                                    case 5:
+                                    case 15:
+                                        ((FreshAir)locadevice).currentFanMode = attData.AttriButeData;
+                                        break;
+                                }
+                                //宸茬粡鎺ユ敹鍒扮姸鎬�
+                                locadevice.HadReadDeviceStatu = true;
+                            }
                         }
-                        else if (attData.AttributeId == 4096)
+                        else
                         {
-                            //椋庢墖鎵
-                            ((AC)locadevice).currentFanSwingMode = attData.AttriButeData;
-                            //宸茬粡鎺ユ敹鍒扮姸鎬�
-                            locadevice.HadReadDeviceStatu = true;
-                        }
-                        else if (attData.AttributeId == 4097)
-                        {
-                            //杞崲涓轰簩杩涘埗
-                            var value = Convert.ToString(attData.AttriButeData, 2).PadLeft(16, '0');
-                            //杩欎釜璁剧疆鏄斁鍦ㄥ悗闈㈢殑
-                            value = value.Substring(value.Length - 1, 1);
-                            //鍚敤鎽嗛鍔熻兘
-                            ((AC)locadevice).UseSwingFunction = value == "1";
-                            locadevice.ReSave();
+                            if (attData.AttributeId == 0)
+                            {
+                                //椋庢墖妯″紡
+                                ((AC)locadevice).currentFanMode = attData.AttriButeData;
+                                //宸茬粡鎺ユ敹鍒扮姸鎬�
+                                locadevice.HadReadDeviceStatu = true;
+                            }
+                            else if (attData.AttributeId == 4096)
+                            {
+                                //椋庢墖鎵
+                                ((AC)locadevice).currentFanSwingMode = attData.AttriButeData;
+                                //宸茬粡鎺ユ敹鍒扮姸鎬�
+                                locadevice.HadReadDeviceStatu = true;
+                            }
+                            else if (attData.AttributeId == 4097)
+                            {
+                                //杞崲涓轰簩杩涘埗
+                                var value = Convert.ToString(attData.AttriButeData, 2).PadLeft(16, '0');
+                                //杩欎釜璁剧疆鏄斁鍦ㄥ悗闈㈢殑
+                                value = value.Substring(value.Length - 1, 1);
+                                //鍚敤鎽嗛鍔熻兘
+                                ((AC)locadevice).UseSwingFunction = value == "1";
+                                locadevice.ReSave();
+                            }
                         }
                     }
                 }
@@ -477,6 +507,8 @@
             if (locadevice != null)
             {
                 ((IASZone)locadevice).iASInfo = ias.iASInfo;
+                //濡傛灉鎺ユ敹鍒颁笂鎶�,鍗宠鏄庤繖涓紶鎰熷櫒鏄湪绾跨殑
+                locadevice.IsOnline = 1;
                 //璁板綍鍥炲鏃堕棿
                 locadevice.LastDateTime = DateTime.Now;
             }
@@ -498,10 +530,10 @@
         private void DoorLockDeviceReportPush(JObject receiveData)
         {
             //鍙湁寰愭鐨勯棬閿佺晫闈㈡病鏈夋墦寮�鐨勬儏鍐典笅,鎵嶄細澶勭悊杩欎釜涓滆タ
-            if (ControlCommonResourse.IsDoorLockPageOpen == false)
+            if (ControlCommonResourse.IsDoorLockPageOpen == false && UserCenterResourse.UserInfo.AuthorityNo == 1)
             {
                 var device = Common.LocalDevice.Current.GetDevice(receiveData.Value<string>("DeviceAddr"), receiveData.Value<int>("Epoint"));
-                if ((device is ZigBee.Device.DoorLock) == false)
+                if (device.Type != DeviceType.DoorLock)
                 {
                     //瀹冧笉鏄棬閿�
                     return;
@@ -509,10 +541,21 @@
                 var info = Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLockAlarmsResult>(receiveData["Data"].ToString());
                 if (info.Clusterid == 257)
                 {
-                    //甯稿紑妯″紡寮�鍚�
-                    if (info.AlarmCode == 216)
+                    //甯稿紑妯″紡鍏抽棴
+                    if (info.AlarmCode == 217 || info.AlarmCode == 219)
                     {
-                        DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device, DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush, null);
+                        HdlThreadLogic.Current.RunThread(async () =>
+                        {
+                            //娓╁眳鍩庣殑瑕佺綉鍏充腑鏄惁鏈夐�昏緫瀛樺湪 
+                            //鍙傛暟:2-甯稿紑鑷姩鍖�;3-澶辨晥鏃堕棿鑷姩鍖�
+                            var result = await Shared.Phone.Device.Logic.SkipView.Exist(2);
+                            HdlThreadLogic.Current.RunMain(() =>
+                            {
+                                //寮瑰嚭寰愭鐨勯偅涓獥鍙�
+                                DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device, DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush,
+                                    result != 0 ? true : false, null);
+                            });
+                        });
                     }
                 }
             }
@@ -539,13 +582,18 @@
             tempDevice.IsOnline = Convert.ToInt32(receiveData["Data"]["IsOnline"].ToString());
 
             //澶勭悊缃戝叧涓婃姤鐨勬暟鎹�,鐒跺悗鍙樻洿鏈湴缂撳瓨
-            var locadevice = Common.LocalDevice.Current.GetDevice(tempDevice.DeviceAddr, tempDevice.DeviceEpoint);
-            if (locadevice != null)
+            var locadevice = Common.LocalDevice.Current.GetDevicesByMac(tempDevice.DeviceAddr);
+            for (int i = 0; i < locadevice.Count; i++)
             {
-                locadevice.IsOnline = tempDevice.IsOnline;
+                bool onlineChanged = locadevice[i].IsOnline != tempDevice.IsOnline;
+                locadevice[i].IsOnline = tempDevice.IsOnline;
                 //璁板綍鍥炲鏃堕棿
-                locadevice.LastDateTime = DateTime.Now;
-                locadevice.ReSave();
+                locadevice[i].LastDateTime = DateTime.Now;
+                if (onlineChanged == true)
+                {
+                    //鍦ㄧ嚎鐘舵�佸彉鏇翠簡,鎵嶄繚瀛�
+                    locadevice[i].ReSave();
+                }
             }
 
             this.DeviceReportPush(tempDevice, ReceiveComandDiv.A璁惧鍦ㄧ嚎涓婃姤);
@@ -705,10 +753,30 @@
         /// <param name="receiveData"></param>
         private void LogicExecutePush(JObject receiveData)
         {
-            //鐩墠涓嶅鐞嗛�昏緫涓婃姤鍐呭
-
             //鏄剧ず鏈夋柊娑堟伅鐨勭壒鏁�
             this.ShowHadNewMessageAppeal();
+
+            //杩欎釜涓滆タ鏆傛椂涓嶅鐞�
+            ////鍙湁寰愭鐨勯棬閿佺晫闈㈡病鏈夋墦寮�鐨勬儏鍐典笅,鎵嶄細澶勭悊杩欎釜涓滆タ
+            //if (ControlCommonResourse.IsDoorLockPageOpen == false && UserCenterResourse.UserInfo.AuthorityNo == 1)
+            //{
+            //    var device = Common.LocalDevice.Current.GetDevice(receiveData.Value<string>("DeviceAddr"), receiveData.Value<int>("Epoint"));
+            //    if (device.Type != DeviceType.DoorLock)
+            //    {
+            //        return;
+            //    }
+            //    //鑷姩鍖栨墽琛� 甯稿紑鍏抽棴
+            //    var data = Newtonsoft.Json.JsonConvert.DeserializeObject<LogicPushResult>(receiveData["Data"].ToString());
+            //    if (data.ActionData != null && data.ActionData.Actiontype == 8
+            //        && data.ActionData.PassDataString == "055704010113")
+            //    {
+            //        HdlThreadLogic.Current.RunMain(() =>
+            //        {
+            //            //寮瑰嚭寰愭鐨勯偅涓獥鍙�
+            //            DoorLock.DoorLockCommonInfo.NomallyOpenModeInvalidDialog((ZigBee.Device.DoorLock)device, DoorLock.DoorLockCommonInfo.DoorLockMessType.ServicePush, null);
+            //        });
+            //    }
+            //}
         }
 
         #endregion

--
Gitblit v1.8.0