合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs

@@ -178,14 +178,7 @@
                flMain.RemoveFromParent();
            };

            var lockcolorfra = new FrameLayout
            {
                Width = Application.GetRealWidth(1080),
                Height = Application.GetRealHeight(100),
                Y = Application.GetRealHeight(1920 - 100),
                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
            };
            flMain.AddChidren(lockcolorfra);
  

            var lockcolorfra1 = new FrameLayout
            {
@@ -197,6 +190,7 @@
                Radius = (uint)Application.GetRealHeight(60),
            };
            flMain.AddChidren(lockcolorfra1);
            lockcolorfra1.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);

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