Merge branch 'WJC' into NewFilePath

wxr

2021-01-14 d987694e57c3bce76bd5a208d74a3696db222a4a

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

@@ -269,8 +269,38 @@
                        var if_logic = Logic.LogicList.Find((c) => c.userLogicId == logic.userLogicId);
                        if (if_logic == null)
                        {

                            Logic newlogic = new Logic();
                            newlogic.name = logic.name;
                            newlogic.userLogicId = logic.userLogicId;
                            newlogic.sid = logic.sid;
                            newlogic.relation = logic.relation;
                            newlogic.enable = logic.enable;
                            newlogic.cycle = logic.cycle;
                            for (int i = 0; i < logic.input.Count; i++)
                            {
                                if (logic.input[i] == null || string.IsNullOrEmpty(logic.input[i].condition_type))
                                {
                                    //防止调试软件乱传东西上来;
                                    //防止有空对象；
                                    //正常情况下不会出现的现象；
                                    continue;
                                }
                                newlogic.input.Add(logic.input[i]);
                            }
                            for (int i = 0; i < logic.output.Count; i++)
                            {
                                if (logic.output[i] == null || string.IsNullOrEmpty(logic.output[i].target_type))
                                {
                                    //防止调试软件乱传东西上来;
                                    //防止有空对象；
                                    //正常情况下不会该现象；
                                    continue;
                                }
                                newlogic.output.Add(logic.output[i]);
                            }
                            //添加逻辑
                            Logic.LogicList.Add(logic);
                            Logic.LogicList.Add(newlogic);
                        }
                    }

@@ -353,12 +383,6 @@
            //14-延时图标
            for (int i = 0; i < logic.output.Count; i++)
            {
                if (logic.output[i] == null)
                {
                    //防止有的空对象；
                    //正常情况下不会该现象；
                    continue;
                }
                var int1 = int.Parse(logic.output[i].target_type);
                int iconInt = 0;
                switch (int1)
@@ -389,7 +413,8 @@
                }
            }
            //图标控件的父控件
            FrameLayout frame = new FrameLayout {
            FrameLayout frame = new FrameLayout
            {
                Height=Application.GetRealHeight(40),
                Width=Application.GetRealWidth(275),
                Y= Application.GetRealHeight(56),
@@ -417,9 +442,11 @@
                    btnIcon.X = Application.GetRealWidth(12+(28+4)*i);
                }
                string strIcon = "";
                switch (iconIntValue[i]) {
                switch (iconIntValue[i])
                {
                  
                    case 1: {
                    case 1:
                        {
                            strIcon = "LogicIcon/selectTheTime.png";
                        }
                        break;
@@ -433,17 +460,21 @@
                        {
                            //分割条件和目标的图标
                            strIcon = "LogicIcon/link.png";
                        } break;
                        }
                        break;
                    case 12:
                        {

                            strIcon = "LogicIcon/selectTheFun.png";
                        }
                        break;
                    case 13: {
                    case 13:
                        {
                            strIcon = "LogicIcon/selectTheScene.png";
                        } break;
                    case 14: {
                        }
                        break;
                    case 14:
                        {
                            //strIcon = "LogicIcon/timeicon.png";
                        }
                        break;
@@ -459,12 +490,21 @@
        /// 云端唯一id
        /// </summary>
        public string userLogicId = "";
        /// <summary>
        /// 网关id
        /// </summary>
        public string gatewayId = "";
        /// <summary>
        /// 逻辑唯一标识
        /// </summary>
        public string sid = "";
        /// <summary>
        /// 逻辑名称
        /// </summary>
        public string name = "";
        /// <summary>
        /// 逻辑使能（开，关）
        /// </summary>
        public string enable = "";
        //public CycleA cycle;
        //public string modifyTime = "";