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

wxr

2022-03-08 41b934c1780d1a18fe8068f3bfc0e59b3b892479

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

 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);
      }
    }
        
  }
}

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

@@ -29,15 +29,8 @@
            };
            this.AddChidren(viewLayout);
            #region 功能
            //功能
            LogicView.SelectTypeView functionView = new LogicView.SelectTypeView();
            functionView.btnText.TextID = StringId.funLogic;
            functionView.btnIcon.UnSelectedImagePath = "LogicIcon/functionicon.png";
            viewLayout.AddChidren(functionView.FLayoutView());

            //场景
            LogicView.SelectTypeView sceneView= new LogicView.SelectTypeView();
            sceneView.frameLayout.Y = functionView.frameLayout.Bottom;
            sceneView.btnText.TextID = StringId.Scenes;
            sceneView.btnIcon.UnSelectedImagePath = "LogicIcon/scene.png";
            viewLayout.AddChidren(sceneView.FLayoutView());
@@ -55,18 +48,13 @@
            delayView.btnText.TextID = StringId.delayLogic;
            delayView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
            //viewLayout.AddChidren(delayView.FLayoutView());

            ////功能
            ///产品经理君焕要求，设备功能移到这里。<2022-3-7>
            new FunTpye(LogicMethod.target_if).FunTypeView(viewLayout, securityView.frameLayout.Bottom, 2);
            #endregion

            #region  所有点击事件
            //功能点击事件
            functionView.btnClick.MouseUpEventHandler += (sen, e) =>
            {
                FunTpye funTpye = new FunTpye();
                MainPage.BasePageView.AddChidren(funTpye);
                funTpye.Show(LogicMethod.target_if);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

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

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

@@ -7,42 +7,45 @@
{
    public class FunTpye : FrameLayout
    {
        public FunTpye()
        public FunTpye(string str)
        {
            Tag = "Logic";
            if_type = str;
        }
        /// <summary>
        /// 默认选中是房间时：全部区域
        /// </summary>
        private Entity.Room selectedRoom = new Entity.Room { roomId ="6688" };
        public static Entity.Room selectedRoom = new Entity.Room { roomId ="6688" };

        /// <summary>
        /// 默认选中是设备类型时：全部功能
        /// </summary>
        //public static Entity.Room selectedRoom = new Entity.Room { roomId = "6688" };
        /// <summary>
        /// 表示是(条件/目标)
        /// </summary>
        private string if_type;
        public void Show(string str)
        {
            
            if_type = str;
            this.BackgroundColor = CSS.CSS_Color.viewMiddle;
            LogicView.TopView topView = new LogicView.TopView();
            this.AddChidren(topView.FLayoutView());
            topView.clickBackBtn.MouseUpEventHandler += (e, sen) =>
            {
                RemoveFromParent();
            };
            topView.topNameBtn.TextID = StringId.selectedFunCondition;

        /// <summary>
        /// 设备功能ui
        /// </summary>
        /// <param name="viewLayout">父控件</param>
        /// <param name="bottm"></param>
        /// <param name="funCount">支持功能类型个数<表示上面所占高度></param>
        public void FunTypeView(FrameLayout viewLayout,int bottm,int funCount) {
            LogicView.FunAllAreaView funAllAreaView = new LogicView.FunAllAreaView();
            funAllAreaView.frameLayout.Y = topView.frameLayout.Bottom;
            this.AddChidren(funAllAreaView.FLayoutView());

            funAllAreaView.frameLayout.Y = bottm + Application.GetRealHeight(8);
            viewLayout.AddChidren(funAllAreaView.FLayoutView());
            VerticalScrolViewLayout vv = new VerticalScrolViewLayout
            {
                Y = Application.GetRealHeight(117),
                Height = Application.GetRealHeight(667 - 117),
                Y = funAllAreaView.frameLayout.Bottom,
                Height = Application.GetRealHeight(667 - 64 - 50 * funCount - 8),
            };
            this.AddChidren(vv);

            viewLayout.AddChidren(vv);
            if (!MainView.IsGatewayType)
            {
                funAllAreaView.frameLayout.Y = Application.GetRealHeight(0);
            }
            //房间点击事件
            EventHandler<MouseEventArgs> roomClick = (sender, e) =>
            {
@@ -51,7 +54,7 @@
                {
                    BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
                };
                this.AddChidren(fLayout);
                viewLayout.AddChidren(fLayout);
                fLayout.MouseUpEventHandler += (sender1, e1) =>
                {
                    fLayout.RemoveFromParent();
@@ -60,7 +63,7 @@
                FrameLayout bghFrameLyout = new FrameLayout
                {
                    X = Application.GetRealWidth(10),
                    Y = Application.GetRealHeight(103),
                    Y = Application.GetRealHeight(103 + 50 * funCount + 8-64),
                    Width = Application.GetRealWidth(160),
                    Height = Application.GetRealHeight(21 + 44),
                    //BackgroundImagePath = "LogicIcon/bjicon.png",
@@ -126,7 +129,8 @@

                        DeviceListView(vv, list);
                    };
                    if (roomList.Count-1==i) {
                    if (roomList.Count - 1 == i)
                    {
                        ///改变最后那条一个线的颜色,界面显示效果作用;
                        areaView.btnLine.BackgroundColor = CSS.CSS_Color.view;
                    }
@@ -135,13 +139,15 @@
            funAllAreaView.btnText1.MouseUpEventHandler += roomClick;
            funAllAreaView.btnIcon1.MouseUpEventHandler += roomClick;
            //功能点击事件
            EventHandler<MouseEventArgs> funClick = (sender3, e3) =>{
            EventHandler<MouseEventArgs> funClick = (sender3, e3) =>
            {

                //获取最终显示列表
                var functionList = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(selectedRoom, if_type);
                //获取设备列表的类型（例如：灯光类，窗帘类。。。）
                var deviceTypeList = LogicMethod.CurrLogicMethod.GetDeviceTypeList(functionList);
                if (deviceTypeList.Count==0) {
                if (deviceTypeList.Count == 0)
                {
                    //没有类型直接返回去;
                    return;
                }
@@ -150,7 +156,7 @@
                {
                    BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
                };
                this.AddChidren(fLayout);
                viewLayout.AddChidren(fLayout);
                fLayout.MouseUpEventHandler += (sender1, e1) =>
                {
                    fLayout.RemoveFromParent();
@@ -159,7 +165,7 @@
                FrameLayout bghFrameLyout = new FrameLayout
                {
                    X = Application.GetRealWidth(118),
                    Y = Application.GetRealHeight(103),
                    Y = Application.GetRealHeight(103 + 50 * funCount + 8-64),
                    Width = Application.GetRealWidth(160),
                    Height = Application.GetRealHeight(21 + 44),
                    //BackgroundImagePath = "LogicIcon/bjicon5.png",
@@ -238,6 +244,8 @@
            DeviceListView(vv, deviceList);

        }


        /// <summary>
        /// 显示设备的View
        /// </summary>
@@ -259,12 +267,15 @@
                funView.btnDeviceName.Text = dev.name;
                funView.btnRoomName.Text = dev.GetRoomListName();
                funView.btnClick.MouseUpEventHandler += (sen,e) => {
                    if (if_type == LogicMethod.condition_if) {
                    if (if_type == LogicMethod.condition_if)
                    {
                        ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
                        MainPage.BasePageView.AddChidren(conditionDeviceFunList);
                        conditionDeviceFunList.Show(dev, 0, false);
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    } else {
                    }
                    else
                    {
                        TargetDeviceFunList targetDeviceFunList = new TargetDeviceFunList();
                        MainPage.BasePageView.AddChidren(targetDeviceFunList);
                        targetDeviceFunList.Show(dev, 0, false);

 HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs

@@ -49,6 +49,7 @@
        /// </summary>
        static void clearA31Threads()
        {

            var threads = threadLists.FindAll((obj) => { return obj.Name == "A31"; });
            foreach (var thread in threads)
            {