Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs

@@ -1143,7 +1143,7 @@
                        {

                            //空调是特殊的,它的开关是属性上报来着.已经接收到网关的反馈

                            this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu();

                        }
                        }

                        if (report.DeviceStatusReport.CluterID == 514 && report.DeviceStatusReport.AttriBute[0].AttributeId == 0)

                        {

                            //新风是特殊的,它的开关是属性上报来着.已经接收到网关的反馈

@@ -1163,7 +1163,8 @@
                    if (this.dicDeviceCardControl.ContainsKey(mainKeys) == true)

                    {

                        //刷新卡片状态

                        this.dicDeviceCardControl[mainKeys].SetCardOnlineStatu(report.IsOnline == 1);

                        bool bolOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(report);

                        this.dicDeviceCardControl[mainKeys].SetCardOnlineStatu(bolOnline);

                        return;

                    }