Merge branch 'Dev-Branch' into wjc

mac

2023-09-11 cc37cf55c02da9e49eab9859ed72f146dee6f635

 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
            };
@@ -1481,7 +1481,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";
                    }