Merge remote-tracking branch 'origin/wjc' into wxr0114

wxr

2022-03-08 41b934c1780d1a18fe8068f3bfc0e59b3b892479

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

@@ -9,6 +9,14 @@
    {
      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();
@@ -36,21 +44,9 @@
      {
        viewLayout.AddChidren(timeView.FLayoutView());
      }

      //功能
      LogicView.SelectTypeView functionView = new LogicView.SelectTypeView();
      functionView.frameLayout.Y = timeView.frameLayout.Bottom;
      functionView.btnText.TextID = StringId.funLogic;
      functionView.btnIcon.UnSelectedImagePath = "LogicIcon/functionicon.png";
      viewLayout.AddChidren(functionView.FLayoutView());
      if (!MainView.IsGatewayType)
      {
        functionView.frameLayout.Y = Application.GetRealHeight(0);
      }

      //场景
      LogicView.SelectTypeView sceneView = new LogicView.SelectTypeView();
      sceneView.frameLayout.Y = functionView.frameLayout.Bottom;
            sceneView.frameLayout.Y = timeView.frameLayout.Bottom;
      sceneView.btnText.TextID = StringId.Scenes;
      sceneView.btnIcon.UnSelectedImagePath = "LogicIcon/scene.png";
      viewLayout.AddChidren(sceneView.FLayoutView());
@@ -76,6 +72,9 @@
      {
        viewLayout.AddChidren(likiadaodaView.FLayoutView());
      }
            ////功能
            ///产品经理君焕要求，设备功能移到这里。<2022-3-7>
            new FunTpye(LogicMethod.condition_if).FunTypeView(viewLayout, likiadaodaView.frameLayout.Bottom,4);

      #endregion

@@ -89,14 +88,7 @@
        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

      };
      //功能
      functionView.btnClick.MouseUpEventHandler += (sen, e) =>
      {
        FunTpye funTpye = new FunTpye();
        MainPage.BasePageView.AddChidren(funTpye);
        funTpye.Show(LogicMethod.condition_if);
        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
      };
            
      //场景点击事件
      sceneView.btnClick.MouseUpEventHandler += (sen, e) =>
      {
@@ -115,7 +107,6 @@
        weather.Show();
        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
      };

      //地理围栏
      likiadaodaView.btnClick.MouseUpEventHandler += (sen, e) =>
      {
@@ -124,7 +115,6 @@
      #endregion

    }

    /// <summary>
    /// 添加场景
    /// </summary>
@@ -326,5 +316,6 @@
        Logic.currlogic.input.Add(input);
      }
    }
        
  }
}