Merge branch 'WJC' into NewFilePath

wxr

2020-12-15 d7094fc4ff54ada4c39868c8be1907e0a1c25b32

Merge branch 'WJC' into NewFilePath

 .vs/HDL_APP_Project/xs/sqlite3/storage.ide

Binary files differ

 .vs/HDL_APP_Project/xs/sqlite3/storage.ide-wal

Binary files differ

 HDL_ON/Entity/FunctionList.cs

@@ -448,6 +448,11 @@
                        for(int i=0;i<List.scenes.Count;)
                        {
                            var localScene = List.scenes[i];
                            if (localScene == null)
                            {
                                List.scenes.Remove(localScene);
                                continue;
                            }
                            var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
                            if (newScene == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录
                            {

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

@@ -14,7 +14,7 @@

        public void Show()
        {

            #region  界面布局
            this.BackgroundColor = CSS.CSS_Color.viewMiddle;
            LogicView.TopView topView = new LogicView.TopView();
            topView.setBtn.Visible = true;
@@ -35,14 +35,7 @@
                topView.setBtn.Visible = true;
                topView.clickSetBtn.Visible = true;
            }
            topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
            {
                Set set = new Set();
                MainPage.BasePageView.AddChidren(set);
                set.Show();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

            };
           

            VerticalScrolViewLayout viewLayout = new VerticalScrolViewLayout
            {
@@ -62,16 +55,16 @@
            titleCondition.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
            titleCondition.btnText.TextID = StringId.andCondition;
            viewLayout.AddChidren(titleCondition.FLayoutView());
            titleCondition.btnClick.MouseUpEventHandler += (sender, e) =>
         
            if (Logic.currlogic.relation == "and")
            {
                FrameLayout fLayout = new FrameLayout
                {
                    BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
                };
                this.AddChidren(fLayout);
                AndOrMethod(fLayout, titleCondition.btnText);
            };
                titleCondition.btnText.Text = Language.StringByID(StringId.andCondition);
            }
            else
            {
                titleCondition.btnText.Text = Language.StringByID(StringId.orCondition);

            }

            // 条件处理方法
            InpOrOutLogicMethod.InputCondition(this, viewLayout);
@@ -79,14 +72,6 @@
            LogicView.LogicAddView addInputIcon = new LogicView.LogicAddView();
            addInputIcon.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
            viewLayout.AddChidren(addInputIcon.FLayoutView());

            addInputIcon.btnClick.MouseUpEventHandler += (sen, e) =>
            {
                var addInputType = new AddInputType();
                MainPage.BasePageView.AddChidren(addInputType);
                addInputType.Show();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            #endregion

            #region  目标
@@ -106,13 +91,7 @@
            LogicView.LogicAddView addOutputIcon = new LogicView.LogicAddView();
            addOutputIcon.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
            viewLayout.AddChidren(addOutputIcon.FLayoutView());
            addOutputIcon.btnClick.MouseUpEventHandler += (sen, e) =>
            {
                var addTarget = new AddTarget();
                MainPage.BasePageView.AddChidren(addTarget);
                addTarget.Show();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
           
            #endregion

            #region  循环方式
@@ -126,13 +105,7 @@
            cyclicTitle.frameLayout.Radius = (uint)Application.GetRealHeight(12);
            cyclicTitle.btnText.Text = MainView.GetWeekText(Logic.currlogic);
            viewLayout.AddChidren(cyclicTitle.FLayoutView());
            cyclicTitle.btnClick.MouseUpEventHandler += (sender, e) =>
            {

                DateMethod(cyclicTitle.btnText);


            };
          
            #endregion

            #region  执行推送 发送通知
@@ -163,6 +136,52 @@
            LogicView.SaveView saveView = new LogicView.SaveView();
            saveView.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(24), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
            this.AddChidren(saveView.FLayoutView());

            #endregion
#endregion

            #region  界面各种点击事件
            ///设置图标点击事件
            topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
            {
                Set set = new Set();
                MainPage.BasePageView.AddChidren(set);
                set.Show();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

            };
            ///或和与点击事件
            titleCondition.btnClick.MouseUpEventHandler += (sender, e) =>
            {
                FrameLayout fLayout = new FrameLayout
                {
                    BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
                };
                this.AddChidren(fLayout);
                AndOrMethod(fLayout, titleCondition.btnText);
            };
            ///条件点击事件
            addInputIcon.btnClick.MouseUpEventHandler += (sen, e) =>
            {
                var addInputType = new AddInputType();
                MainPage.BasePageView.AddChidren(addInputType);
                addInputType.Show();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            ///目标点击事件
            addOutputIcon.btnClick.MouseUpEventHandler += (sen, e) =>
            {
                var addTarget = new AddTarget();
                MainPage.BasePageView.AddChidren(addTarget);
                addTarget.Show();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            ///循环方式点击事件
            cyclicTitle.btnClick.MouseUpEventHandler += (sender, e) =>
            {
                DateMethod(cyclicTitle.btnText);
            };
            ///保存点击事件
            saveView.btnClick.MouseUpEventHandler += (sender, e) =>
            {
                if (string.IsNullOrEmpty(Logic.currlogic.userLogicId))
@@ -209,7 +228,6 @@

            };
            #endregion

        }
        /// <summary>
        /// 循环方式(每天，每月。。)
@@ -300,13 +318,11 @@
                            break;
                        case 2:
                            {
                                // weekName = Language.StringByID(StringId.weekly);
                                WeekMethod(fLayout, button);
                            }
                            break;
                        case 3:
                            {
                                //weekName = Language.StringByID(StringId.monthly);
                                MonMethod(fLayout, button);
                            }
                            break;
@@ -393,97 +409,15 @@
        /// <param name="button">显示文本</param>
        public void MonMethod(FrameLayout fLayout, Button button)
        {
            LogicView.MonView monView = new LogicView.MonView();
            monView.btnTitle.TextID = StringId.monthly;
            monView.FLayoutView(fLayout);
            monView.btnCancel.MouseUpEventHandler += (sender2, e2) =>
            {
                monView.frameLayout.RemoveFromParent();
            };
            //定义一个局部monList列表用来记录选中数据;
            List<string> monList = new List<string>();
            if (Logic.currlogic.cycle.type == "mon")
            {
                //加载之前保存的数据
                monList.AddRange(Logic.currlogic.cycle.value);
            }
            //定义一个变量记录行数
            int lineSun = 0;
            for (int i = 1; i < 32; i++)
            {
                Button monTextBtn = new Button
                {
                    Width = Application.GetRealWidth(30),
                    Height = Application.GetRealWidth(30),
                    Radius = (uint)Application.GetRealWidth(15),
                    Text = i.ToString(),
                    TextSize = LogicView.TextSize.text14,
                    TextColor = CSS.CSS_Color.textColor,
                    SelectedTextColor = CSS.CSS_Color.view,
                    SelectedBackgroundColor = CSS.CSS_Color.textConfirmColor,
                    BackgroundColor = CSS.CSS_Color.viewTranslucence,
                    Tag = i,
                };
                monView.frameLayout.AddChidren(monTextBtn);
                if (lineSun > 0)
                {
                    monTextBtn.X = Application.GetRealWidth(16 + ((i - 1) - lineSun * 7) * 46);
                }
                else
                {

                    monTextBtn.X = Application.GetRealWidth(16 + (i - 1) * 46);
                }
                monTextBtn.Y = Application.GetRealWidth(58 + 10 + lineSun * (30 + 10));
            PublicInterface weekView = new PublicInterface();
            weekView.MonSelectShow(fLayout, Logic.currlogic, (monList) =>
                {
                    Logic.currlogic.cycle.type = "mon";
                    Logic.currlogic.cycle.value = monList;
                    button.Text = MainView.GetMonString(monList);
                });

                if (i % 7 == 0)
                {
                    //一定执行完再判断是否要换行.
                    lineSun = lineSun + 1;

                }
                monTextBtn.MouseUpEventHandler += (sender, e) =>
                {
                    string clickIndex = monTextBtn.Tag.ToString();
                    monTextBtn.IsSelected = !monTextBtn.IsSelected;
                    if (monTextBtn.IsSelected)
                    {
                        monTextBtn.IsSelected = true;
                        if (!monList.Contains(clickIndex))
                        {
                            //添加选中数据
                            monList.Add(clickIndex);
                        }
                    }
                    else
                    {
                        monTextBtn.IsSelected = false;
                        if (monList.Contains(clickIndex))
                        {
                            //移除选中数据
                            monList.Remove(clickIndex);
                        }
                    }
                };

                if (monList.Contains(i.ToString()))
                {
                    monTextBtn.IsSelected = true;
                }
            }
            //确定点击事件
            monView.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
            {
                if (monList.Count == 0)
                {
                    //提示：还没选中执行周期
                    return;
                }
                Logic.currlogic.cycle.type = "mon";
                Logic.currlogic.cycle.value = monList;
                button.Text = MainView.GetMonString(monList);
                fLayout.RemoveFromParent();
            };
        }
        /// <summary>
        /// 满足条件
@@ -492,91 +426,29 @@
        /// <param name="button">显示文本</param>
        public void AndOrMethod(FrameLayout fLayout, Button button)
        {
           

            LogicView.DateView meetTheConditionView = new LogicView.DateView();
            meetTheConditionView.btnTitle.TextID = StringId.meetTheCondition;
            meetTheConditionView.FLayoutView(fLayout, 2);
            meetTheConditionView.btnCancel.MouseUpEventHandler += (sender2, e2) =>
            {
                fLayout.RemoveFromParent();
            List<string> strList = new List<string> {
             Language.StringByID(StringId.andCondition),
             Language.StringByID(StringId.orCondition),
            };
            ///之前的状态文本
            string currCondition = button.Text;

            //定义一个局部变量记录选中文本状态
            string condition = "";
            LogicView.SelectTypeView andConditionViews = new LogicView.SelectTypeView();
            andConditionViews.frameLayout.BackgroundColor = CSS.CSS_Color.viewTranslucence;
            andConditionViews.frameLayout.Y = Application.GetRealHeight(56);
            andConditionViews.btnIcon.Visible = false;
            andConditionViews.btnText.X = Application.GetRealWidth(20);
            andConditionViews.btnText.TextID = StringId.andCondition;
            andConditionViews.btnLine.X = Application.GetRealWidth(20);
            andConditionViews.btnLine.Width = Application.GetRealWidth(303);
            andConditionViews.btnNextIcon.X = Application.GetRealWidth(303);
            andConditionViews.btnNextIcon.Width = Application.GetRealWidth(28);
            andConditionViews.btnNextIcon.Height = Application.GetRealWidth(28);
            andConditionViews.btnNextIcon.UnSelectedImagePath = "LogicIcon/weekoff.png";
            andConditionViews.btnNextIcon.SelectedImagePath = "LogicIcon/weekon.png";
            meetTheConditionView.frameLayout.AddChidren(andConditionViews.FLayoutView());
            PublicInterface conditionView = new PublicInterface();
            conditionView.SingleSelectionShow(fLayout, strList, Language.StringByID(StringId.meetTheCondition), currCondition
               , (stateValue) =>
               {
                   if (stateValue == Language.StringByID(StringId.orCondition))
                   {
                       Logic.currlogic.relation = "or";
                   }
                   else
                   {
                       Logic.currlogic.relation = "and";
                   }
                   button.Text = stateValue;

               });

            LogicView.SelectTypeView orConditionView = new LogicView.SelectTypeView();
            orConditionView.frameLayout.BackgroundColor = CSS.CSS_Color.viewTranslucence;
            orConditionView.frameLayout.Y = Application.GetRealHeight(56 + 50);
            orConditionView.btnIcon.Visible = false;
            orConditionView.btnText.X = Application.GetRealWidth(20);
            orConditionView.btnText.TextID = StringId.orCondition;
            orConditionView.btnLine.X = Application.GetRealWidth(20);
            orConditionView.btnLine.Width = Application.GetRealWidth(303);
            orConditionView.btnNextIcon.X = Application.GetRealWidth(303);
            orConditionView.btnNextIcon.Width = Application.GetRealWidth(28);
            orConditionView.btnNextIcon.Height = Application.GetRealWidth(28);
            orConditionView.btnNextIcon.UnSelectedImagePath = "LogicIcon/weekoff.png";
            orConditionView.btnNextIcon.SelectedImagePath = "LogicIcon/weekon.png";
            meetTheConditionView.frameLayout.AddChidren(orConditionView.FLayoutView());


            if (Logic.currlogic.relation == "and")
            {
                andConditionViews.btnNextIcon.IsSelected = true;
                condition = "and";
            }
            else
            {
                orConditionView.btnNextIcon.IsSelected = true;
                condition = "or";
            }
            andConditionViews.btnClick.MouseUpEventHandler += (sen1, e) =>
            {
                condition = "and";
                andConditionViews.btnNextIcon.IsSelected = true;
                orConditionView.btnNextIcon.IsSelected = false;
            };
            orConditionView.btnClick.MouseUpEventHandler += (sen1, e) =>
            {
                condition = "or";
                andConditionViews.btnNextIcon.IsSelected = false;
                orConditionView.btnNextIcon.IsSelected = true;
            };
            //确定点击事件
            meetTheConditionView.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
            {
                if (string.IsNullOrEmpty(condition))
                {
                    //提示：还没选中执行周期
                    return;
                }
                Logic.currlogic.relation = condition;
                if (condition == "or")
                {
                    button.Text = Language.StringByID(StringId.orCondition);
                }
                else
                {
                    button.Text = Language.StringByID(StringId.andCondition);
                }
                fLayout.RemoveFromParent();
            };

        }
        /// <summary>
@@ -671,5 +543,22 @@

            return stateList;
        }

        /// <summary>
        /// 灰色弹框父控件
        /// </summary>
        /// <param name="frame">显示在哪个界面</param>
        /// <returns></returns>
        public FrameLayout GetFrame(FrameLayout frame, string tagKey)
        {
            FrameLayout fLayout = new FrameLayout
            {
                BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
                Tag = tagKey,

            };
            frame.AddChidren(fLayout);
            return fLayout;
        }
    }
}

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/CheckView.cs

@@ -18,7 +18,7 @@
        public Button btnText = new Button
        {
            TextSize = TextSize.text16,
            Width = Application.GetRealWidth(130),
            Width = Application.GetRealWidth(300),
            Height = Application.GetRealHeight(20),
            TextColor = CSS.CSS_Color.textColor,
            X = Application.GetRealWidth(20),

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

@@ -13,7 +13,8 @@
        /// <param name="titleText"></param>
        /// <param name="stateText">之前状态文本</param>
        /// <param name="action">返回值</param>
        public void SingleSelectionShow(FrameLayout frameLayout, List<string> list, string titleText, string stateText, Action<string> action)
        /// <param name="textSize">显示文本字体大小</param>
        public void SingleSelectionShow(FrameLayout frameLayout, List<string> list, string titleText, string stateText,Action<string> action, int textSize=LogicView.TextSize.text14)
        {
            LogicView.DateView view = new LogicView.DateView();
            view.btnTitle.Text = titleText;
@@ -33,6 +34,7 @@
                string str = list[i];
                LogicView.CheckView checkView = new LogicView.CheckView();
                checkView.frameLayout.Y = Application.GetRealHeight(56 + 50 * i);
                checkView.btnText.TextSize = textSize;
                view.frameLayout.AddChidren(checkView.FLayoutView());
                checkView.btnText.Text = str;
                checkView.btnClick.Tag = str;//标记
@@ -75,7 +77,8 @@
        /// <param name="titleText"></param>
        /// <param name="stateTextList">之前状态文本</param>
        /// <param name="action">返回值</param>
        public void MultiSelectShow(FrameLayout frameLayout, List<string> list, string titleText, List<string> stateTextList, Action<List<string>> action)
        /// <param name="textSize">显示文本字体大小</param>
        public void MultiSelectShow(FrameLayout frameLayout, List<string> list, string titleText, List<string> stateTextList, Action<List<string>> action, int textSize = LogicView.TextSize.text14)
        {
            LogicView.DateView view = new LogicView.DateView();
            view.btnTitle.Text = titleText;
@@ -90,6 +93,7 @@
                string str = list[i];
                LogicView.CheckView checkView = new LogicView.CheckView();
                checkView.frameLayout.Y = Application.GetRealHeight(56 + 50 * i);
                checkView.btnText.TextSize = textSize;
                view.frameLayout.AddChidren(checkView.FLayoutView());
                checkView.btnText.Text = str;
                checkView.btnClick.Tag = str;//标记
@@ -140,6 +144,105 @@

        }

        /// <summary>
        /// 月-多选择
        /// </summary>
        /// <param name="frameLayout">父控件</param>
        /// <param name="action">显示文本字体大小</param>
        public void MonSelectShow(FrameLayout frameLayout,Logic logic, Action<List<string>> action)
        {
            LogicView.MonView monView = new LogicView.MonView();
            monView.btnTitle.TextID = StringId.monthly;
            monView.FLayoutView(frameLayout);
            monView.btnCancel.MouseUpEventHandler += (sender, e) =>
            {
                monView.frameLayout.RemoveFromParent();
            };
            //定义一个局部monList列表用来记录选中数据;
            List<string> monList = new List<string>();
            if (logic.cycle.type == "mon")
            {
                //加载之前保存的数据
                monList.AddRange(logic.cycle.value);
            }
            //定义一个变量记录行数
            int lineSun = 0;
            for (int i = 1; i < 32; i++)
            {
                Button monTextBtn = new Button
                {
                    Width = Application.GetRealWidth(30),
                    Height = Application.GetRealWidth(30),
                    Radius = (uint)Application.GetRealWidth(15),
                    Text = i.ToString(),
                    TextSize = LogicView.TextSize.text14,
                    TextColor = CSS.CSS_Color.textColor,
                    SelectedTextColor = CSS.CSS_Color.view,
                    SelectedBackgroundColor = CSS.CSS_Color.textConfirmColor,
                    BackgroundColor = CSS.CSS_Color.viewTranslucence,
                    Tag = i,
                };
                monView.frameLayout.AddChidren(monTextBtn);
                if (lineSun > 0)
                {
                    monTextBtn.X = Application.GetRealWidth(16 + ((i - 1) - lineSun * 7) * 46);
                }
                else
                {

                    monTextBtn.X = Application.GetRealWidth(16 + (i - 1) * 46);
                }
                monTextBtn.Y = Application.GetRealWidth(58 + 10 + lineSun * (30 + 10));

                if (i % 7 == 0)
                {
                    //一定执行完再判断是否要换行.
                    lineSun = lineSun + 1;

                }
                monTextBtn.MouseUpEventHandler += (sender, e) =>
                {
                    string clickIndex = monTextBtn.Tag.ToString();
                    monTextBtn.IsSelected = !monTextBtn.IsSelected;
                    if (monTextBtn.IsSelected)
                    {
                        monTextBtn.IsSelected = true;
                        if (!monList.Contains(clickIndex))
                        {
                            //添加选中数据
                            monList.Add(clickIndex);
                        }
                    }
                    else
                    {
                        monTextBtn.IsSelected = false;
                        if (monList.Contains(clickIndex))
                        {
                            //移除选中数据
                            monList.Remove(clickIndex);
                        }
                    }
                };

                if (monList.Contains(i.ToString()))
                {
                    monTextBtn.IsSelected = true;
                }
            }
            //确定点击事件
            monView.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
            {
                if (monList.Count == 0)
                {
                    //提示：还没选中执行周期
                    return;
                }
       

                action(monList);
                frameLayout.RemoveFromParent();
            };

        }
    }
}

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

@@ -35,8 +35,8 @@
            nameView.btnText.Height = Application.GetRealHeight(22);
            nameView.btnText.TextID = StringId.namelogic;
            nameView.btnIcon.Visible = false;
            nameView.btnNextIcon.Height = Application.GetMinRealAverage(28);
            nameView.btnNextIcon.Width = Application.GetMinRealAverage(28);
            nameView.btnNextIcon.Height = Application.GetRealWidth(28);
            nameView.btnNextIcon.Width = Application.GetRealWidth(28);
            nameView.btnNextIcon.UnSelectedImagePath = "LogicIcon/editname.png";
            viewLayout.AddChidren(nameView.FLayoutView());


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

@@ -74,6 +74,8 @@
                };
                //添加主界面
                this.AddChidren(fLayout);
                //var fLayout = GetFrame(this,"2");

                TimeHorizon(fLayout, false, 0);
            };

@@ -382,5 +384,34 @@
                timePointView.frameLayout.RemoveFromParent();
            };
        }


        /// <summary>
        /// 灰色弹框父控件
        /// </summary>
        /// <param name="frame">显示在哪个界面</param>
        /// <returns></returns>
        public FrameLayout GetFrame(FrameLayout frame, string tagKey)
        {
            for (int i = 0; i < frame.ChildrenCount; i++)
            {
                var fra = frame.GetChildren(i);
                if (fra != null)
                {
                    fra.RemoveFromParent();
                }
            }
           
           
            FrameLayout fLayout = new FrameLayout()
            {
                BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
                
            };
            frame.AddChidren(fLayout);

          
            return fLayout;
        }
    }
}