2024年07月25日17:24:45

mac

2024-07-25 3f6685c77beeb12baf840733fb890860f4c26e7c

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

@@ -89,14 +89,14 @@
            #region top
            FrameLayout topView = new FrameLayout()
            {
                Height = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(74),
                BackgroundColor = CSS_Color.TopViewColor,
            };
            bodyView.AddChidren(topView);

            btnRoomTilte = new Button()
            {
                Y = Application.GetRealHeight(30),
                Y = Application.GetRealHeight(40),
                Width = Application.GetRealWidth(170),
                Height = Application.GetRealHeight(25),
                TextAlignment = TextAlignment.CenterRight,
@@ -111,7 +111,7 @@
            btnFuncTitle = new Button()
            {
                X = Application.GetRealWidth(209),
                Y = Application.GetRealHeight(30),
                Y = Application.GetRealHeight(40),
                Width = Application.GetRealWidth(170),
                Height = Application.GetRealHeight(25),
                TextAlignment = TextAlignment.CenterLeft,
@@ -125,8 +125,8 @@

            contentPageView = new PageLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(667 - 64 - 49 + 30),
                Y = Application.GetRealHeight(74),
                Height = Application.GetRealHeight(667 - 74 - 49 + 30),
                BackgroundColor = CSS_Color.MainBackgroundColor,
                IsShowPoint = false
            };
@@ -748,7 +748,14 @@
                    case ShowFunction.SecurityMonitoring:
                        if (!MainPage.NoLoginMode)
                        {
                            functionCount = 1;
                            if (OnAppConfig.Instance.RequestHttpsHost.Contains("bahrain") || !Common.ApiUtlis.Ins.hadInternet)
                            {
                                functionCount = 0;
                            }
                            else
                            {
                                functionCount = 1;
                            }
                        }
                        break;
                    case ShowFunction.Sensor:
@@ -768,16 +775,19 @@
                        functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                        break;
                    case ShowFunction.VideoDoorLock:
                        functionCount = FunctionList.List.GetVideoDoorLockList().Count;
                        functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.GetAttrState("status").ToString() == "open"
                            || obj.GetAttrState("status").ToString() == "normal_open").Count;

                        if (Common.ApiUtlis.Ins.hadInternet)
                        {
                            functionCount = FunctionList.List.GetVideoDoorLockList().Count;
                            functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.GetAttrState("status").ToString() == "open"
                                || obj.GetAttrState("status").ToString() == "normal_open").Count;
                        }
                        else
                        {
                            functionCount = 0;
                        }
                        break;
                    case ShowFunction.Aks:
                        functionCount = FunctionList.List.GetVideoControlsList().Count;
#if DEBUG
                        functionCount = 1;
#endif
                        functionOnCount = 1;
                        break;

@@ -1215,21 +1225,21 @@
                        {
                            var list =CommonMethod.Current.GetVideoDoorLockList();
                            var form = new VideoDoorLockListPage(()=> {
                                functionContentView?.RemoveFromParent();
                                this.RefreshFunctionView();
                                UpdateBottomView();
                            });
                            form.AddForm(list);
                        };
                        break;
                    case ShowFunction.Aks:

                        btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/AksFunctionBg.png";
                        //埃克斯影音中控
                        btnName.TextID = StringId.jiatingyingyuan;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            var list = HDL_ON.UI.UI2.FuntionControlView.Aks.AksCommonMethod.Current.GetVideoControlsList();
                            var form = new HDL_ON.UI.UI2.FuntionControlView.Aks.AksListPage(() => {
                                functionContentView?.RemoveFromParent();
                                this.RefreshFunctionView();
                                UpdateBottomView();
                            });
                            form.AddForm(list);
                        };
@@ -1258,8 +1268,8 @@
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        skipView.DelAction += () =>
                        {
                            functionContentView?.RemoveFromParent();
                            this.RefreshFunctionView();
                           
                            UpdateBottomView();
                        };
                    };
                }
@@ -1475,7 +1485,7 @@

//#if __Android__
                    //适配沉浸式导航栏
                    h5BasePage.Y = Application.GetRealHeight(20);
                    h5BasePage.Y = Application.GetRealHeight(35);
                    h5BasePage.Height = Application.GetRealHeight(646);
//#endif
                    MainPage.BasePageView.AddChidren(h5BasePage);
@@ -1483,7 +1493,14 @@

                    h5BasePage.AddChidren(Inverter.Ins.H5Page);//000
                    string lz = "zh";
                    if (Language.CurrentLanguage != "Chinese")
                    if (Language.CurrentLanguage == "Ukraine") {
                        lz = "ua";
                    }
                    else if (Language.CurrentLanguage == "Chinese")
                    {
                        lz = "zh";
                    }
                    else
                    {
                        lz = "en";
                    }