20201217-1

wei

2020-12-17 bb6ad792b598927a5459a5fb6f6c27fb1aa9e94e

 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs

@@ -69,41 +69,70 @@
            };
            bodyView.AddChidren(topView);

            btnSceneTilte = new Button()
            //不是A网关或者是成员 只允许添加场景隐藏自动化
            if (DB_ResidenceData.Instance.GatewayType != 1 || DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            {
                Y = Application.GetRealHeight(30),
                Width = Application.GetRealWidth(170),
                Height = Application.GetRealHeight(25),
                TextAlignment = TextAlignment.CenterRight,
                TextSize = CSS_FontSize.HeadlineFontSize,
                TextColor = CSS_Color.PromptingColor1,
                SelectedTextColor = CSS_Color.MainColor,
                TextID = StringId.Scenes,
                IsSelected = true
            };
            topView.AddChidren(btnSceneTilte);

            btnAutomationTitle = new Button()
                btnSceneTilte = new Button()
                {
                    Y = Application.GetRealHeight(30),
                    //Width = Application.GetRealWidth(170),
                    Height = Application.GetRealHeight(25),
                    TextAlignment = TextAlignment.Center,
                    TextSize = CSS_FontSize.HeadlineFontSize,
                    TextColor = CSS_Color.PromptingColor1,
                    SelectedTextColor = CSS_Color.MainColor,
                    TextID = StringId.Scenes,
                    IsSelected = true
                };
                topView.AddChidren(btnSceneTilte);
                btnAutomationTitle = new Button();
            }
            else
            {
                X = Application.GetRealWidth(209),
                Y = Application.GetRealHeight(30),
                Width = Application.GetRealWidth(170),
                Height = Application.GetRealHeight(25),
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = CSS_FontSize.TextFontSize,
                TextColor = CSS_Color.PromptingColor1,
                SelectedTextColor = CSS_Color.MainColor,
                TextID = StringId.Automation,
            };
            topView.AddChidren(btnAutomationTitle);

            btnAddIcon = new Button()
                btnSceneTilte = new Button()
                {
                    Y = Application.GetRealHeight(30),
                    Width = Application.GetRealWidth(170),
                    Height = Application.GetRealHeight(25),
                    TextAlignment = TextAlignment.CenterRight,
                    TextSize = CSS_FontSize.HeadlineFontSize,
                    TextColor = CSS_Color.PromptingColor1,
                    SelectedTextColor = CSS_Color.MainColor,
                    TextID = StringId.Scenes,
                    IsSelected = true
                };
                topView.AddChidren(btnSceneTilte);

                btnAutomationTitle = new Button()
                {
                    X = Application.GetRealWidth(209),
                    Y = Application.GetRealHeight(30),
                    Width = Application.GetRealWidth(170),
                    Height = Application.GetRealHeight(25),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextSize = CSS_FontSize.TextFontSize,
                    TextColor = CSS_Color.PromptingColor1,
                    SelectedTextColor = CSS_Color.MainColor,
                    TextID = StringId.Automation,
                };
                topView.AddChidren(btnAutomationTitle);
            }
            var btnAddIconBg = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/AddIcon.png",
            };
            topView.AddChidren(btnAddIconBg);

            btnAddIcon = new Button()
            {
                X = Application.GetRealWidth(337-20),
                Width = Application.GetMinRealAverage(28+30),
                Height = Application.GetMinRealAverage(28+29),
            };
            topView.AddChidren(btnAddIcon);
            #endregion
@@ -171,7 +200,7 @@
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextAlignment = TextAlignment.CenterLeft,
                Text = DB_ResidenceData.residenceData.CurFoor,
                Text = DB_ResidenceData.Instance.CurFloor.roomName,
            };
            floorChangeView.AddChidren(btnFloor);

@@ -198,13 +227,13 @@
            try
            {
                int index = 0;
                foreach (var scene in DB_ResidenceData.functionList.scenes)
                foreach (var scene in FunctionList.List.scenes)
                {
                    if (scene.roomIds.Count == 0)//如何在房间已经移除了这个功能，则收藏界面也不会再显示
                    {
                        scene.collect = false;
                        continue;
                    }
                    //if (scene.roomIds.Count == 0)//如何在房间已经移除了这个功能，则收藏界面也不会再显示
                    //{
                    //    scene.collect = false;
                    //    continue;
                    //}
                    if (index % 2 == 0)
                    {
                        sceneFunctionView.AddChidren(new Button() { Height = Application.GetRealHeight(7) });
@@ -310,7 +339,6 @@
                };
                view.AddChidren(btnZone);


                Button btnSettingIcon;
                btnSettingIcon = new Button()
                {
@@ -333,10 +361,15 @@
                    SelectedImagePath = "Collection/CollectionIcon.png",
                    IsSelected = scene.collect,
                };
                view.AddChidren(btnCollection);
                //view.AddChidren(btnCollection);
                //2020-12-16 如果是成员隐藏收藏功能
                if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
                {
                    view.AddChidren(btnCollection);
                }
                btnCollection.MouseUpEventHandler = (sender, e) => {
                    scene.collect = btnCollection.IsSelected = !btnCollection.IsSelected;
                    scene.SaveSceneData();
                    scene.CollectScene();
                };
                LoadEvent_ControlScene(btnCoverd,btnName,btnZone, scene);
                btnSettingIcon.MouseUpEventHandler = (sender, e) => {
@@ -346,13 +379,12 @@
                    Action refreshAction = () => {
                        btnName.Text = scene.name;
                        btnZone.Text = scene.GetRoomListName();
                        //view.BackgroundImagePath = scene.ImagePath;
                        //2020-12-03 修改图片加载方法
                        ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, view);
                    };
                    var aep = new SceneEditPage(scene, backAction);
                    MainPage.BasePageView.AddChidren(aep);
                    aep.LoadPage(StringId.EditScene, refreshAction);
                    aep.LoadPage(refreshAction);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                };
            }
@@ -372,9 +404,8 @@
            //btnAddIcon.RemoveFromParent();
            automationPage = new FrameLayout();
            contentPageView.AddChidren(automationPage);
            HDL_ON.UI.UI2.Intelligence.Automation.MainView.automationPage = automationPage;
            HDL_ON.UI.UI2.Intelligence.Automation.MainView.MainShow();

            UI2.Intelligence.Automation.MainView.automationPage = automationPage;
            UI2.Intelligence.Automation.MainView.MainShow();
        }
        #endregion
    }
@@ -454,6 +485,18 @@
            {
                if (!btnAutomationTitle.IsSelected)
                {
                    //如果是成员
                    if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
                    {
                        //如果没有场景权限
                        if (!DB_ResidenceData.Instance.CurrentRegion.isAllowCreateScene)
                        {
                            //提示没有场景的创建权限
                            Utlis.ShowTip(Language.StringByID(StringId.PermissionDenied));
                            return;
                        }
                    }

                    Action action = () =>
                    {
                        LoadSceneFunctionControlZone();
@@ -466,7 +509,7 @@
                else
                {
                    //跳转到逻辑界面
                    HDL_ON.UI.UI2.Intelligence.Automation.MainView.SkipAddLogicPage();
                    UI2.Intelligence.Automation.MainView.SkipAddLogicPage();
                }
            };
        }