2020.06.12

lss

2020-06-12 9c16d3614d9b88c637f967518a329f239fcd3aaf

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

@@ -18,71 +18,76 @@
        }
        public void Show()
        {
            #region  上面的布局代码

           
            #region  界面的布局代码
            TopView view = new TopView();
            this.AddChidren(view.TopRowView());
            view.toptitleNameBtn.TextID = MyInternationalizationString.selection;
            view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
            #endregion
            #region  最下面的布局代码
           
            var middle = new FrameLayout
            {
                Y = view.topRowLayout.Bottom,
                Height = Application.GetRealHeight(1920 - 184),
                Height = Application.GetRealHeight(Method.H - 184),
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
            };
            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());
          
            ///设备
            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());
          
            ///安防
            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());
    
            ///地理围栏
            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());
            #endregion

            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) =>
            functionView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {
                var roomAndDeviceView = new RoomAndDeviceView();
                UserView.HomePage.Instance.AddChidren(roomAndDeviceView);
                UserView.HomePage.Instance.PageIndex += 1;
                roomAndDeviceView.IfType = LogicView.IfString.Condition_Logic;
                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) =>
            securityView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {
                var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
                this.AddChidren(flMain);
                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) =>
            positionView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
            {
                var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
                this.AddChidren(flMain);
                LocationView(flMain, false);
            };

            #endregion

        }

        /// <summary>
@@ -479,7 +484,7 @@
                    UserView.HomePage.Instance.AddChidren(logicCommunalPage);
                    UserView.HomePage.Instance.PageIndex += 1;
                    logicCommunalPage.Show(() => { });
                }, strname, true, latitude, longitude, r);
                }, strname, Language.StringByID(R.MyInternationalizationString.uSave), true, latitude, longitude, r);
            };
        }

@@ -488,6 +493,7 @@
        /// </summary>
        void TimeView()
        {

            UserView.HomePage.Instance.ScrollEnabled = false;
            Dictionary<string, string> SecurityConditionsInfo = new Dictionary<string, string>();
            #region  ------界面布局部分