2019-12-19-1

WJC

2019-12-19 7a23bcdf0fe5f7442aa95ec2203cd5b6670a910d

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

@@ -36,6 +36,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.selection,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);

@@ -393,7 +394,7 @@
                //Radius = (uint)Application.GetRealHeight(60),
            };
            flMain.AddChidren(securityfra);
            securityfra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
            securityfra.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
            #region  -------取消   完成
            var timetype = new RowLayout
            {
@@ -730,7 +731,7 @@
                //Radius = (uint)Application.GetRealHeight(60),
            };
            flMain.AddChidren(Locationfra);
            Locationfra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
            Locationfra.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);

            #region  -------取消   完成
            var typeRow = new RowLayout
@@ -924,8 +925,13 @@
                {
                    LocationConditionsInfo.Remove("IsValid");
                }
                if (LocationConditionsInfo.ContainsKey("WhoSiteUId"))
                {
                    LocationConditionsInfo.Remove("WhoSiteUId");
                }
                LocationConditionsInfo.Add("Type", "7");
                LocationConditionsInfo.Add("IsValid", "1");
                LocationConditionsInfo.Add("WhoSiteUId", Config.Instance.Guid);
                if (leavehomeSelected.Visible)
                {
                    if (LocationConditionsInfo.ContainsKey("AtHome"))
@@ -1011,7 +1017,7 @@
               // Radius = (uint)Application.GetRealHeight(60),
            };
            flMain.AddChidren(timetypeframelayout);
            timetypeframelayout.SetCornerWithSameRadius(20,HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);
            timetypeframelayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);

            #region  -------取消   完成
            var timetype = new RowLayout