2.4.2Google

wxr

2023-11-23 90d4fdb42a7f4818897ff76def0a151a99d2d9e1

 HDL_ON/UI/UI0-Public/TopViewDiv.cs

@@ -84,6 +84,9 @@
        /// <param name="tilte"></param>
        public void LoadTopView(uint color = CSS_Color.TopViewColor)//,Action<List<Function> action
        {
#if __ANDROID__
            maginY = 0;
#endif
            contentView = new FrameLayout()
            {
                Height = Application.GetRealHeight(64+ maginY),
@@ -144,7 +147,7 @@
            var btnSetting = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29 + maginY),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
@@ -174,7 +177,7 @@
            var btnSetting = new Button()
            {
                X = Application.GetRealWidth(337-37),
                Y = Application.GetRealHeight(20),
                Y = Application.GetRealHeight(20 + maginY),
                Width = Application.GetMinRealAverage(28+37),
                Height = Application.GetMinRealAverage(28+19),
                TextID = StringId.CombinedDimming,
@@ -201,13 +204,14 @@
        public void LoadTopView_FunctionTop(Function function, Action action,bool locationSet = true)
        {
            backAction = action;
            maginY = 10;

            LoadTopView();

            var btnSetting = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(28),
                Y = Application.GetRealHeight(28 + maginY),
                Width = Application.GetMinRealAverage(32),
                Height = Application.GetMinRealAverage(32),
                UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
@@ -241,7 +245,7 @@
            var btnSetting = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29 + maginY),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
@@ -272,7 +276,7 @@
            var btnSetting = new Button()
            {
                X = Application.GetRealWidth(355-100),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29 + maginY),
                Width = Application.GetMinRealAverage(100),
                Height = Application.GetMinRealAverage(28),
                TextColor = isDelColor ?CSS_Color.WarningColor: CSS_Color.MainColor,
@@ -300,7 +304,7 @@
            var btnAddIcon = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29 + maginY),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/AddIcon.png",
@@ -351,7 +355,7 @@
            var btnAddIcon = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29 + maginY),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/LinkIotIcon.png",
@@ -378,7 +382,7 @@
            var btnAddIcon = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29 + maginY),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/Iot_agreement_icon.png",
@@ -444,7 +448,7 @@
            var btnAddIcon = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29 + maginY),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/AddIcon.png",
@@ -494,7 +498,7 @@
            var btnAddIcon = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29+maginY),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/AddIcon.png",