Revert "1"

wxr

2021-07-01 43b0d5870d528f23ecd6aeceb6cfd4325188b46f

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

@@ -46,7 +46,7 @@
            LogicView.SelectTypeView delayView = new LogicView.SelectTypeView();
            delayView.frameLayout.Y = sceneView.frameLayout.Bottom;
            delayView.btnText.TextID = StringId.delayLogic;
            delayView.btnIcon.UnSelectedImagePath = "LogicIcon/delayed.png";
            delayView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
            //viewLayout.AddChidren(delayView.FLayoutView());
            #endregion

@@ -63,13 +63,7 @@
            //场景点击事件
            sceneView.btnClick.MouseUpEventHandler += (sen, e) =>
            {

                FrameLayout fLayout = new FrameLayout
                {
                    BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
                };
                this.AddChidren(fLayout);
                SceneMethod(fLayout);
                SceneMethod();
            };
            //延时点击事件
            delayView.btnClick.MouseUpEventHandler += (sen, e) =>
@@ -89,82 +83,30 @@
        /// <summary>
        /// 添加场景
        /// </summary>
        /// <param name="fLayout">弹框主控件</param>
        public void SceneMethod(FrameLayout fLayout)
        public void SceneMethod()
        {
            LogicView.DateView dateView = new LogicView.DateView();
            dateView.btnTitle.TextID = StringId.addSceneLogic;
            dateView.FLayoutView(fLayout, 5);
            dateView.btnCancel.MouseUpEventHandler += (sender2, e2) =>
            {
                fLayout.RemoveFromParent();
            };
            VerticalRefreshLayout verticalRefresh = new VerticalRefreshLayout
            {
                Y = Application.GetRealHeight(56),
                Height = Application.GetRealHeight(50 * 5),

            };
            dateView.frameLayout.AddChidren(verticalRefresh);
            //定义一个局部变量记录选中状态
            Button buttonClick = new Button();
            HDL_ON.Entity.Scene sceneSelecetd = null;
            var sceneList = LogicMethod.GetSceneList();
            verticalRefresh.BeginHeaderRefreshingAction += () =>
            {
                //关闭刷新View；
                verticalRefresh.EndHeaderRefreshing();
            };
            for (int i = 0; i < sceneList.Count; i++)
            {
            List<string> nameList = new List<string>();
            for (int i = 0; i < sceneList.Count; i++) {
                var scene = sceneList[i];
                LogicView.SelectTypeView sceneView = new LogicView.SelectTypeView();
                sceneView.frameLayout.BackgroundColor = CSS.CSS_Color.viewTranslucence;
                sceneView.btnIcon.Visible = false;
                sceneView.btnText.X = Application.GetRealWidth(20);
                sceneView.btnText.Text = scene.name;
                sceneView.btnLine.X = Application.GetRealWidth(20);
                sceneView.btnLine.Width = Application.GetRealWidth(303);
                sceneView.btnNextIcon.X = Application.GetRealWidth(303);
                sceneView.btnNextIcon.Width = Application.GetRealWidth(28);
                sceneView.btnNextIcon.Height = Application.GetRealWidth(28);
                sceneView.btnNextIcon.UnSelectedImagePath = "LogicIcon/weekoff.png";
                sceneView.btnNextIcon.SelectedImagePath = "LogicIcon/weekon.png";
                verticalRefresh.AddChidren(sceneView.FLayoutView());
                sceneView.btnClick.Tag = scene;//标记索引

                //场景的点击事件
                sceneView.btnClick.MouseUpEventHandler += (sender, e) =>
                {
                    buttonClick.IsSelected = false;
                    sceneView.btnNextIcon.IsSelected = true;
                    buttonClick = sceneView.btnNextIcon;
                    sceneSelecetd =sceneView.btnClick.Tag as HDL_ON.Entity.Scene;
                };

                nameList.Add(scene.name);
            }
            //确认点击事件
            dateView.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
            PublicInterface publicInterface = new PublicInterface();
            publicInterface.FrameOrVv(this, nameList, StringId.addSceneLogic, (index) =>
            {
                if (sceneSelecetd == null)
                {
                    //提示：还没选中执行周期
                    return;
                }
                var sceneSelecetd = sceneList[index];
                Output outputDevice = new Output();
                outputDevice.target_type = "2";
                outputDevice.sid = sceneSelecetd.sid;
                //没啥作用，为了数据格式统一,发送时不再判断
                outputDevice.status = new List<Dictionary<string, string>> { new Dictionary<string, string> { { "key", "scene"},{ "value", "0" } } };
                //没啥作用，为了发送数据格式统一;
                outputDevice.status = new List<Dictionary<string, string>> { new Dictionary<string, string> { { "key", "scene" }, { "value", "0" } } };
                AddOutput(outputDevice);
                fLayout.RemoveFromParent();
                LogicMethod.RemoveAllView();
                AddLogic addLogic = new AddLogic();
                MainPage.BasePageView.AddChidren(addLogic);
                addLogic.Show();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };

            });
        }

        /// <summary>
@@ -201,7 +143,7 @@
                    foreach (var dic in dicList)
                    {
                        string timeValue = dic["value"];
                        int hIndex = timePointView.GetValueIndex(timeValue, 0, 1, timePointView.GethIntList0());
                        int hIndex = timePointView.GetValueIndex(timeValue, 0, 1, timePointView.GethIntList());
                        int mIndex = timePointView.GetValueIndex(timeValue, 1, 0, timePointView.GetmIntList());
                        //更新初始状态
                        timePointView.mUIPickerView.setCurrentItems(hIndex, mIndex, 0);