Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs

@@ -5,6 +5,7 @@
using HDL_ON.Entity;
using HDL_ON.UI;
using HDL_ON.UI.CSS;
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Shared;
@@ -605,21 +606,35 @@
            };
        }


        /// <summary>
        /// 加载功能列表界面
        /// </summary>
        void LoadFunctionPageView()
        void LoadFunctionPageView ()
        {
            #region
            functionsPageView = new VerticalScrolViewLayout()
            {
                BackgroundColor = CSS_Color.BackgroundColor,
                Height = Application.GetRealHeight(667 - 64 - 49 + 20),
            };
            contentPageView.AddChidren(functionsPageView);
            this.RefreshFunctionView();

            FrameLayout functionContentView;
        }
        FrameLayout functionContentView;
        /// <summary>
        /// 显示功能列表界面
        /// </summary>
        void RefreshFunctionView()
        {
            #region
            //functionsPageView = new VerticalScrolViewLayout()
            //{
            //    BackgroundColor = CSS_Color.BackgroundColor,
            //    Height = Application.GetRealHeight(667 - 64 - 49 + 20),
            //};
            //contentPageView.AddChidren(functionsPageView);

            //FrameLayout functionContentView;
            functionContentView = new FrameLayout()
            {
                Y = Application.GetRealHeight(16),
@@ -655,6 +670,9 @@
                int functionOnCount = 0;
                switch (item)
                {
                    case ShowFunction.IpCam:
                        functionCount = FunctionList.List.GetIpCamImouList().Count;
                        break;
                    case ShowFunction.MechanicalArm:
                        functionCount = FunctionList.List.GetMechanicalArmList().Count;
                        functionOnCount = FunctionList.List.GetMechanicalArmList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
@@ -742,6 +760,14 @@
                        functionCount = FunctionList.List.GetAcstParentList().Count;
                        functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                        break;
                    case ShowFunction.VideoDoorLock:
                        functionCount = FunctionList.List.GetVideoDoorLockList().Count;
#if DEBUG
                        //functionCount = 1;
#endif
                        functionOnCount = 1;
                        break;



                }
@@ -795,12 +821,12 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    IsMoreLines = true,
                };
                functionView.AddChidren(btnName);
                functionView.AddChidren(btnName); 

                if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
                    && item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir && item != ShowFunction.Music
                    && item != ShowFunction.EnergyMonitoring && item != ShowFunction.SecurityCenter
                    && item != ShowFunction.Acst
                    && item != ShowFunction.Acst && item != ShowFunction.IpCam
                    && functionCount != 0)
                {
                    Button btnFunctionCount = new Button()
@@ -866,6 +892,14 @@
                        functionPageTitleId = StringId.Lights;

                        #endregion
                        break;
                    case ShowFunction.IpCam:
                        btnName.TextID = StringId.SecurityMonitoring;

                        btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/SecurityMonitoringFunctionBg.png";

                        functionPageTitleId = StringId.SecurityMonitoring;

                        break;
                    case ShowFunction.MechanicalArm:
                        btnName.TextID = StringId.MechanicalArm;
@@ -1059,7 +1093,7 @@
                        btnName.TextID = StringId.Panel;
                        break;
                    case ShowFunction.SecurityMonitoring:
                        btnName.TextID = StringId.SecurityMonitoring;
                        btnName.TextID = StringId.EZVIZ;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            HDLCommon.Current.Go2EZvizMonitor(bodyView);
@@ -1132,12 +1166,30 @@
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        };
                        break;

                    case ShowFunction.VideoDoorLock:
                        //萤石视频门锁
                        btnName.TextID = StringId.yingshishipinmensuo;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            var list =CommonMethod.Current.GetVideoDoorLockList();
                            var form = new VideoDoorLockListPage(()=> {
                                functionContentView?.RemoveFromParent();
                                this.RefreshFunctionView();
                            });
                            form.AddForm(list);
                        };
                        break;

                }
                //界面跳转--音乐跳转自己的界面--环境跳转自己的界面
                if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring && item != ShowFunction.DoorLock
                    && ShowFunction.EnergyMonitoring != item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item
                //界面跳转--音乐跳转自己的界面--环境跳转自己的界面--(萤石视频门锁)跳转自己的界面
                if (item != ShowFunction.VideoDoorLock
                    && item != ShowFunction.Music
                    && item != ShowFunction.Environmental
                    && item != ShowFunction.SecurityMonitoring
                    && item != ShowFunction.DoorLock
                    && ShowFunction.EnergyMonitoring != item
                    && ShowFunction.VideoIntercom != item &&
                    ShowFunction.SecurityCenter != item
                    && ShowFunction.Acst != item)
                {
                    btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
@@ -1433,6 +1485,8 @@
            #endregion
        }

       

        void refreshInverterInfo(Button btnPowerTenerationToday, Button btnWorkingMode, Button btnCurrentPowerGeneration)
        {
            new System.Threading.Thread(() =>