Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

old mode 100755
new mode 100644
@@ -170,8 +170,8 @@
                                                    return;
                                                }
                                                airSwitch.OnOffStatus = airSwitch.DeviceStatusReport.AttriBute[0].AttriButeData;
                                                (rowFL.GetChildren(0) as FunctionMainView).IsSelected = airSwitch.OnOffStatus == 1;

                                                (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu();
                                                (rowFL.GetChildren(0) as FunctionMainView).IsSelected = airSwitch.OnOffStatus == 1;
                                                (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu();

                                                //记录回复时间
                                                airSwitch.LastDateTime = DateTime.Now;
                                            }

@@ -208,7 +208,7 @@

                                case DeviceType.Thermostat:
                                    //AC功能
                                    if (common.DeviceStatusReport.CluterID == 513)
                                    if ((common as ZigBee.Device.AC).DeviceStatusReport.CluterID == 513)
                                    {
                                        var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
                                        ac.DeviceStatusReport = common.DeviceStatusReport;
@@ -253,7 +253,7 @@
                                        (rowFL.GetChildren(0) as FunctionMainView).StatuButton.Text = deviceUI.GetDeviceStatu();
                                    }
                                    //当CluterID=3,就证明该设备在线，直接标记
                                    if (common.DeviceStatusReport.CluterID == 3)
                                    if ((common as ZigBee.Device.AC).DeviceStatusReport.CluterID == 3)
                                    {
                                        var ac = deviceUI.CommonDevice as AC;
                                        ac.IsOnline = 1;
@@ -311,7 +311,7 @@
                    }

                });

            }

           

        }
        /// <summary>
        /// Changeds the IL ogic status.
@@ -778,7 +778,7 @@
            {
                ShowNoGatewayTip();
            }



        }

        #endregion
@@ -920,7 +920,7 @@
        private void GoToAddGateWay(object sender, MouseEventArgs mouseEventArgs)
        {
            var selectNewGateWayForm = new UserCenter.GatewayAdd.NewGateWayMenuSelectForm { };
            selectNewGateWayForm.AddForm();
            selectNewGateWayForm.AddForm(selectNewGateWayForm);
        }

        #endregion
@@ -972,7 +972,7 @@
            else
            {
                deviceVerticalScrolViewLayout = new VerticalScrolViewLayout { };
                

                functionSceneBodyView.AddChidren(deviceVerticalScrolViewLayout);
               for(int i=0;i<deviceList.Count;i++)
                {
@@ -996,7 +996,7 @@
                        deviceVerticalScrolViewLayout.AddChidren(itemView);
                    }

                   

                    //删除设备
                    EventHandler<MouseEventArgs> delEvent = (sender, e) =>
                    {