Merge branch 'WJC' into NewFilePath

wxr

2020-12-17 1b42f39e34492ba8d4ce6336cc913877b9e064cb

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

@@ -92,59 +92,114 @@
        /// <param name="fLayout">弹框主控件</param>
        public void SceneMethod(FrameLayout fLayout)
        {
            LogicView.DateView dateView = new LogicView.DateView();
            dateView.btnTitle.TextID = StringId.addSceneLogic;
            dateView.FLayoutView(fLayout, 5);
            dateView.btnCancel.MouseUpEventHandler += (sender2, e2) =>
            int line = 0;
            var sceneList = LogicMethod.GetSceneList();
            if (sceneList.Count == 0|| sceneList.Count>5)
            {
                line = 5;
            }
            else {
                line = sceneList.Count;
            }
            LogicView.DateView view = new LogicView.DateView();
            view.btnTitle.TextID = StringId.addSceneLogic;
            view.FLayoutView(fLayout, line);

            view.btnCancel.MouseUpEventHandler += (sender2, e2) =>
            {
                fLayout.RemoveFromParent();
            };
            FrameLayout frameL = new FrameLayout
            {
                Y = Application.GetRealHeight(56),
                Height = Application.GetRealHeight(50 * line),
            };

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

            if (sceneList.Count == 0)
            {
                Button btnTipNot = new Button
                {
                    X=Application.GetRealWidth(93),
                    Y = Application.GetRealHeight(80),
                    Width = Application.GetRealWidth(158),
                    Height = Application.GetRealWidth(158),
                    UnSelectedImagePath = "TipNot.png",
                    
                };
                view.frameLayout.AddChidren(btnTipNot);

                Button btnTipNotText = new Button()
                {
                    Y = btnTipNot.Bottom+ Application.GetRealHeight(16),
                    Height = Application.GetRealHeight(20),
                    TextID = StringId.secnenull,
                    TextColor = CSS.CSS_Color.textColor,
                    TextSize =LogicView.TextSize.text14,
                    TextAlignment = TextAlignment.Center,
                };
                view.frameLayout.AddChidren(btnTipNotText);
            }
            else if (sceneList.Count <=5 ) {
                view.frameLayout.AddChidren(frameL);
            }
            else if(sceneList.Count>5) {
                view.frameLayout.AddChidren(verticalRefresh);

            }


            //定义一个局部变量记录选中状态
            Button buttonClick = new Button();
            HDL_ON.Entity.Scene sceneSelecetd = null;
            verticalRefresh.BeginHeaderRefreshingAction += () =>
            {
                //关闭刷新View；
                verticalRefresh.EndHeaderRefreshing();
            };

            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);
                LogicView.CheckView sceneView = new LogicView.CheckView();
                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.btnText.TextSize = LogicView.TextSize.text14;
                if (sceneList.Count <= 5)
                {
                    sceneView.frameLayout.Y = Application.GetRealWidth(i*50);
                    frameL.AddChidren(sceneView.FLayoutView());
                    if (sceneList.Count-1==i) {
                        sceneView.btnLine.BackgroundColor = CSS.CSS_Color.view;
                    }
                }
                else
                {
                    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;
                    sceneView.btnCheckIcon.IsSelected = true;
                    buttonClick = sceneView.btnCheckIcon;
                    sceneSelecetd = sceneView.btnClick.Tag as HDL_ON.Entity.Scene;
                };

            }
            //确认点击事件
            dateView.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
            view.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
            {
                if (sceneSelecetd == null)
                {
@@ -154,7 +209,7 @@
                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" } } };
                AddOutput(outputDevice);
                fLayout.RemoveFromParent();
@@ -201,7 +256,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);