Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

 ZigbeeApp/Shared/Phone/Device/Logic/DeviceTarget.cs

@@ -67,7 +67,7 @@
            };
            #endregion

            

            var middle = new FrameLayout
            {
                Y = topRowLayout.Bottom,
@@ -76,7 +76,7 @@
            };
            this.AddChidren(middle);

            #region ----- 设备------    
            #region ----- 设备------
            var deviceframelayout = new FrameLayout
            {
                Height = Application.GetRealHeight(160),
@@ -127,11 +127,6 @@

            EventHandler<MouseEventArgs> devicestateclick = (sender, e) =>
            {
                Common.Logic.LogicDviceList.Clear();
                if (Common.Logic.LogicDviceList.Count == 0)
                {
                    Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
                }
                var logicDevicePage = new LogicDevicePage();
                UserView.HomePage.Instance.AddChidren(logicDevicePage);
                UserView.HomePage.Instance.PageIndex += 1;
@@ -207,7 +202,7 @@
            sceneiconBtn.MouseUpEventHandler += sceneclick;
            #endregion

            #region ----- 安防模式------        
            #region ----- 安防模式------
            var securityframelayout = new FrameLayout
            {
                Height = Application.GetRealHeight(160),
@@ -269,7 +264,7 @@
            securityrow.MouseUpEventHandler += securityclick;
            #endregion

            #region ----- 已有自动化------      
            #region ----- 已有自动化------

            ///已有自动化
            var existenceRowLayout = new RowLayout
@@ -380,6 +375,6 @@
            #endregion
        }

        

    }
}