完善后退功能

hxb

2022-09-20 f8f87a4fe67a1539b6fb85a54e4c178474792285

 HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs

@@ -9,14 +9,6 @@
        {
            Tag = "Logic";
        }
        /// <summary>
        /// 默认选中是房间时：全部区域
        /// </summary>
        private Entity.Room selectedRoom = new Entity.Room { roomId = "6688" };
        /// <summary>
        /// 表示是(条件/目标)
        /// </summary>
        private string if_type = LogicMethod.condition_if;
        public void Show()
        {
            LogicView.TopView topView = new LogicView.TopView();
@@ -49,8 +41,10 @@
            sceneView.frameLayout.Y = timeView.frameLayout.Bottom;
            sceneView.btnText.TextID = StringId.Scenes;
            sceneView.btnIcon.UnSelectedImagePath = "LogicIcon/scene.png";
            viewLayout.AddChidren(sceneView.FLayoutView());

            if (MainView.IsGatewayType)
            {
                viewLayout.AddChidren(sceneView.FLayoutView());
            }
            //室外变化
            LogicView.SelectTypeView shiwaiView = new LogicView.SelectTypeView();
            shiwaiView.frameLayout.Y = sceneView.frameLayout.Bottom;
@@ -67,27 +61,30 @@
            likiadaodaView.frameLayout.Y = shiwaiView.frameLayout.Bottom;
            likiadaodaView.btnText.TextID = StringId.likiadaoda;
            likiadaodaView.btnIcon.UnSelectedImagePath = "LogicIcon/location.png";

            if (MainView.IsGatewayType)
            {
                viewLayout.AddChidren(likiadaodaView.FLayoutView());
            }
            int count = 3;//输入类型个数
            //2022年05月24日15:08:22 隐藏掉地理围栏
            //if (MainView.IsGatewayType)
            //{
            //    count = 4;
            //    viewLayout.AddChidren(likiadaodaView.FLayoutView());
            //}
            ////功能
            ///产品经理君焕要求，设备功能移到这里。<2022-3-7>
            new FunTpye(LogicMethod.condition_if).FunTypeView(viewLayout, likiadaodaView.frameLayout.Bottom,4);
            new FunTpye(LogicMethod.condition_if).FunTypeView(viewLayout, shiwaiView.frameLayout.Bottom, count);

            #endregion

            #region  所有点击事件
            //时间
            timeView.btnClick.MouseUpEventHandler += (sen, e) =>
      {
             {

          TimeTpye timeTpye = new TimeTpye();
          MainPage.BasePageView.AddChidren(timeTpye);
          timeTpye.Show();
          MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

      };
             };
            
            //场景点击事件
            sceneView.btnClick.MouseUpEventHandler += (sen, e) =>