2021-08-24 1.更新iOSLinphoneDLL库

JLChen

2021-08-25 bb4b3ed9e69ed83c9dd79f3ae4c0f0081cacee83

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

@@ -1,5 +1,5 @@
using System;
using System.Collections.Generic;

using System.Collections.Generic;
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
@@ -21,8 +21,8 @@
        /// 场景内容显示区域
        /// </summary>
        FrameLayout floorChangeView;
        /// <summary>

        /// 楼层房间选择的下拉对象

        /// <summary>
        /// 楼层房间选择的下拉对象
        /// </summary>
        FloorRoomSelectPopupView floorRoomSelectView = null;
        Button btnSceneTilte;
@@ -72,7 +72,7 @@
            bodyView.AddChidren(topView);

            //不是A网关或者是成员 只允许添加场景隐藏自动化
            var HideAutoPage = DB_ResidenceData.Instance.GatewayType != 1|| DB_ResidenceData.Instance.CurrentRegion.IsOthreShare;
            var HideAutoPage = DB_ResidenceData.Instance.CurrentRegion.isOtherShare;
            //判断是否需要隐藏自动化
            if (HideAutoPage)
            {
@@ -130,17 +130,17 @@
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/AddIcon.png",
            };
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                topView.AddChidren(btnAddIconBg);
            }
            btnAddIcon = new Button()
            {
                X = Application.GetRealWidth(337-20),
                Width = Application.GetMinRealAverage(28+30),
                Height = Application.GetMinRealAverage(28+29),
                X = Application.GetRealWidth(337 - 20),
                Width = Application.GetMinRealAverage(28 + 30),
                Height = Application.GetMinRealAverage(28 + 29),
            };
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                topView.AddChidren(btnAddIcon);
            }
@@ -189,7 +189,7 @@
                Width = Application.GetMinRealAverage(16),
                Height = Application.GetMinRealAverage(16),
                X = Application.GetRealWidth(16),
               Gravity = Gravity.CenterVertical,
                Gravity = Gravity.CenterVertical,
                UnSelectedImagePath = "Public/DownIcon.png",
            };
            floorChangeView.AddChidren(btnFloorDownIcon);
@@ -199,7 +199,7 @@
            btnFloor = new Button()
            {
                X = btnFloorDownIcon.Right,
               Gravity = Gravity.CenterVertical,
                Gravity = Gravity.CenterVertical,
                Width = Application.GetRealWidth(200),
                Height = Application.GetMinRealAverage(16),
                TextColor = CSS_Color.FirstLevelTitleColor,
@@ -207,30 +207,30 @@
                TextAlignment = TextAlignment.CenterLeft,
                Text = DB_ResidenceData.Instance.CurFloor.roomName,
            };
            floorChangeView.AddChidren(btnFloor);



            string nowSelectId = null;

            btnFloor.MouseUpEventHandler += (sender, e) =>

            {

                if (this.floorRoomSelectView == null)

                {

                    //先初始化

                    this.floorRoomSelectView = new FloorRoomSelectPopupView();

                }

                //显示下拉列表

                this.floorRoomSelectView.ShowSceneView(btnFloor, (selectId, listScene) =>

                {

                    nowSelectId = selectId;

                    //重新刷新场景列表

                    this.LoadSceneFunctionControlZone(listScene);

                }, nowSelectId);

            floorChangeView.AddChidren(btnFloor);

            string nowSelectId = null;
            btnFloor.MouseUpEventHandler += (sender, e) =>
            {
                if (this.floorRoomSelectView == null)
                {
                    //先初始化
                    this.floorRoomSelectView = new FloorRoomSelectPopupView();
                }
                //显示下拉列表
                this.floorRoomSelectView.ShowSceneView(btnFloor, (selectId, listScene) =>
                {
                    nowSelectId = selectId;
                    //重新刷新场景列表
                    this.LoadSceneFunctionControlZone(listScene);
                }, nowSelectId);
            };

            #endregion



            sceneFunctionView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(53),  
                Y = Application.GetRealHeight(53),
                Height = Application.GetRealHeight(667 - 64 - 49 - 52 + 30),
            };
            scenePageView.AddChidren(sceneFunctionView);
@@ -250,15 +250,15 @@
            {
                int index = 0;
                //获取能够显示的场景
                if (listScene == null)

                {

                    //初始值

                    if (this.floorRoomSelectView == null)

                    {

                        //先初始化

                        this.floorRoomSelectView = new FloorRoomSelectPopupView();

                    }

                    listScene = this.floorRoomSelectView.GetCanShowListScene();

                if (listScene == null)
                {
                    //初始值
                    if (this.floorRoomSelectView == null)
                    {
                        //先初始化
                        this.floorRoomSelectView = new FloorRoomSelectPopupView();
                    }
                    listScene = this.floorRoomSelectView.GetCanShowListScene();
                }
                foreach (var scene in listScene)
                {
@@ -396,7 +396,7 @@
                    Width = Application.GetRealWidth(32),
                    UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
                };
                if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
                if (scene.userId == UserInfo.Current.ID)
                {
                    view.AddChidren(btnSettingIcon);
                }
@@ -412,12 +412,7 @@
                    SelectedImagePath = "Collection/CollectionIcon.png",
                    IsSelected = scene.collect,
                };
                //view.AddChidren(btnCollection);
                //2020-12-16 如果是成员隐藏收藏功能
                if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
                {
                    view.AddChidren(btnCollection);
                }
                view.AddChidren(btnCollection);
                btnCollection.MouseUpEventHandler = (sender, e) => {
                    scene.collect = btnCollection.IsSelected = !btnCollection.IsSelected;
                    scene.CollectScene();
@@ -503,7 +498,7 @@
            contentPageView.AddChidren(automationPage);
            UI2.Intelligence.Automation.MainView.automationPage = automationPage;
            UI2.Intelligence.Automation.MainView.MainShow();
        }

        }
        #endregion
    }

@@ -583,7 +578,7 @@
                if (!btnAutomationTitle.IsSelected)
                {
                    //如果是成员
                    if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
                    if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
                    {
                        //如果没有场景权限
                        if (!DB_ResidenceData.Instance.CurrentRegion.isAllowCreateScene)
@@ -606,7 +601,8 @@
                else
                {
                    //跳转到逻辑界面
                    UI2.Intelligence.Automation.MainView.SkipAddLogicPage();
                    UI2.Intelligence.Automation.MainView logicMainView = new UI2.Intelligence.Automation.MainView();
                    logicMainView.SkipAddLogicPage();
                }
            };
        }
@@ -615,7 +611,7 @@
        /// <summary>
        /// 加载场景控制事件
        /// </summary>
        void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone,Button btnShowDelay, Scene scene)
        void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone, Button btnShowDelay, Scene scene)
        {

            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>