2020-03-20-1

WJC

2020-03-20 133ca903ae9c4df6ff037f5223d5abcd0df926f4

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

@@ -33,21 +33,21 @@
            };
            this.AddChidren(middle);
            ///时间
            FunView timeview = new FunView();
            timeview.iconBtn.UnSelectedImagePath = "ZigeeLogic/time.png";
            timeview.funnameBtn.TextID = MyInternationalizationString.timecondition;
            middle.AddChidren(timeview.FunFrameView());
            timeview.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            FunView timeView = new FunView();
            timeView.iconBtn.UnSelectedImagePath = "ZigeeLogic/time.png";
            timeView.funnameBtn.TextID = MyInternationalizationString.timecondition;
            middle.AddChidren(timeView.FunFrameView());
            timeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {
                TimeView();
            };
            ///设备
            FunView functionview = new FunView();
            functionview.funFrameLayout.Y = timeview.funFrameLayout.Bottom;
            functionview.iconBtn.UnSelectedImagePath = "ZigeeLogic/function.png";
            functionview.funnameBtn.TextID = MyInternationalizationString.device;
            middle.AddChidren(functionview.FunFrameView());
            functionview.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            FunView functionView = new FunView();
            functionView.funFrameLayout.Y = timeView.funFrameLayout.Bottom;
            functionView.iconBtn.UnSelectedImagePath = "ZigeeLogic/function.png";
            functionView.funnameBtn.TextID = MyInternationalizationString.device;
            middle.AddChidren(functionView.FunFrameView());
            functionView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {
                var roomAndDeviceView = new RoomAndDeviceView();
                UserView.HomePage.Instance.AddChidren(roomAndDeviceView);
@@ -56,12 +56,12 @@
                roomAndDeviceView.Show(Language.StringByID(MyInternationalizationString.devicestate));
            };
            ///安防
            FunView securityview = new FunView();
            securityview.funFrameLayout.Y = functionview.funFrameLayout.Bottom;
            securityview.iconBtn.UnSelectedImagePath = "ZigeeLogic/security.png";
            securityview.funnameBtn.TextID = MyInternationalizationString.security;
            middle.AddChidren(securityview.FunFrameView());
            securityview.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            FunView securityView = new FunView();
            securityView.funFrameLayout.Y = functionView.funFrameLayout.Bottom;
            securityView.iconBtn.UnSelectedImagePath = "ZigeeLogic/security.png";
            securityView.funnameBtn.TextID = MyInternationalizationString.security;
            middle.AddChidren(securityView.FunFrameView());
            securityView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {
                //CurtainPanel.ButtonSet buttonSet = new CurtainPanel.ButtonSet();
                //UserView.HomePage.Instance.AddChidren(buttonSet);
@@ -73,13 +73,14 @@
                SecurityView(flMain, false);
            };
            ///地理围栏
            FunView positionview = new FunView();
            positionview.funFrameLayout.Y = securityview.funFrameLayout.Bottom;
            positionview.iconBtn.UnSelectedImagePath = "ZigeeLogic/position.png";
            positionview.funnameBtn.TextID = MyInternationalizationString.location;
            positionview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
            middle.AddChidren(positionview.FunFrameView());
            positionview.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            FunView positionView = new FunView();
            positionView.funFrameLayout.Y = securityView.funFrameLayout.Bottom;
            positionView.funFrameLayout.Height = Application.GetRealHeight(160+20);//最后一行增加20高度;
            positionView.iconBtn.UnSelectedImagePath = "ZigeeLogic/position.png";
            positionView.funnameBtn.TextID = MyInternationalizationString.location;
            positionView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
            middle.AddChidren(positionView.FunFrameView());
            positionView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {
                var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
                this.AddChidren(flMain);