谷歌版本问题修复

wxr

2024-10-28 505effa88b17ce8c3c7ac5403b76d9e5d0cfc2a5

 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs

@@ -29,18 +29,6 @@
        /// 位置信息跳转编辑按钮
        /// </summary>
        Button btnLocationInfoRight;
        /// <summary>
        /// 删除设备
        /// </summary>
        Button delTextBtn;
        /// <summary>
        /// 下一级图标
        /// </summary>
        Button delRightBtn;
        /// <summary>
        /// 删除设备行FrameLayout
        /// </summary>
        FrameLayout delView;

        #endregion

@@ -54,15 +42,14 @@
        /// <summary>
        /// 解绑设备回调
        /// </summary>
        Action actionDel;
        public Action actionDel;
        #endregion

        public FunctionBaseInfoSetPage(Function func, Action action,Action actionDel=null)
        public FunctionBaseInfoSetPage(Function func, Action action)
        {
            bodyView = this;
            function = func;
            actionRefresh = action;
            this.actionDel = actionDel;
        }

        public override void RemoveFromParent()
@@ -84,15 +71,179 @@
        public void LoadPage(bool locationSetting = true)
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.Setting)).LoadTopView(actionRefresh);
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Setting));
            topView.maginY = 10;
            topView.LoadTopView();


            var contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(600),
                ScrollEnabled = false,
            };
            bodyView.AddChidren(contentView);

            //可视对讲
            if (function.spk == SPK.LinphoneXiMo)
            {
                var linphoneConnectView = new FrameLayout()
                {
                    Height = Application.GetRealHeight(55),
                    BackgroundColor = CSS_Color.MainBackgroundColor,
                };
                contentView.AddChidren(linphoneConnectView);

                var linphoneConnectTitle = new Button()
                {
                    X = Application.GetRealWidth(16),
                    Width = Application.GetRealWidth(160),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.SubheadingFontSize,
                    TextID = StringId.ConnectionMode,
                };
                linphoneConnectView.AddChidren(linphoneConnectTitle);

                var linphoneConnectValues = new Button()
                {
                    X = Application.GetRealWidth(86),
                    Width = Application.GetRealWidth(237),
                    TextAlignment = TextAlignment.CenterRight,
                    TextColor = CSS_Color.PromptingColor1,
                    TextSize = CSS_FontSize.TextFontSize,
                    Text = DB_ResidenceData.Instance.linphoneConnectType.ToString()
                };
                linphoneConnectView.AddChidren(linphoneConnectValues);

                var linphoneConnectRight = new Button()
                {
                    X = Application.GetRealWidth(339),
                    Gravity = Gravity.CenterVertical,
                    Width = Application.GetMinRealAverage(16),
                    Height = Application.GetMinRealAverage(16),
                    UnSelectedImagePath = "Public/RightIcon.png",
                };
                linphoneConnectView.AddChidren(linphoneConnectRight);

                linphoneConnectView.AddChidren(
                    new Button()
                    {
                        Gravity = Gravity.CenterHorizontal,
                        BackgroundColor = CSS_Color.DividingLineColor,
                        Width = Application.GetRealWidth(343),
                        Height = Application.GetRealHeight(1)
                    });

                EventHandler<MouseEventArgs> linphoneHandler = (senderBase, senderBasee) =>
                {

                    Dialog dialog = new Dialog();

                    var pView = new FrameLayout()
                    {
                        BackgroundColor = CSS_Color.DialogTransparentColor1,
                    };
                    dialog.AddChidren(pView);

                    var optionBaseView = new FrameLayout()
                    {
                        Y = Application.GetRealHeight(500),
                        Height = Application.GetRealHeight(160),
                        AnimateSpeed = 0.3f,
                        Animate = Animate.DownToUp,
                    };
                    pView.AddChidren(optionBaseView);

                    var optionView = new VerticalScrolViewLayout()
                    {
                        Gravity = Gravity.CenterHorizontal,
                        Width = Application.GetRealWidth(343),
                        Height = Application.GetRealHeight(100),
                        BackgroundColor = CSS_Color.MainBackgroundColor,
                        Radius = (uint)Application.GetRealWidth(12),
                        ScrollEnabled = false,
                    };
                    optionBaseView.AddChidren(optionView);

                    var btnUdp = new Button()
                    {
                        Height = Application.GetRealHeight(50),
                        TextAlignment = TextAlignment.Center,
                        TextColor = CSS_Color.TextualColor,
                        SelectedTextColor = CSS_Color.MainColor,
                        TextSize = CSS_FontSize.SubheadingFontSize,
                        Text = "UDP",
                        IsSelected = DB_ResidenceData.Instance.linphoneConnectType == LinphoneConnectType.UDP
                    };
                    optionView.AddChidren(btnUdp);

                    optionView.AddChidren(new Button() { Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });

                    var btnTcp = new Button()
                    {
                        Height = Application.GetRealHeight(50),
                        TextAlignment = TextAlignment.Center,
                        TextColor = CSS_Color.TextualColor,
                        SelectedTextColor = CSS_Color.MainColor,
                        TextSize = CSS_FontSize.SubheadingFontSize,
                        Text = "TCP",
                        IsSelected = DB_ResidenceData.Instance.linphoneConnectType == LinphoneConnectType.TCP
                    };
                    optionView.AddChidren(btnTcp);

                    var btnCancel = new Button()
                    {
                        Gravity = Gravity.CenterHorizontal,
                        Y = Application.GetRealHeight(8) + optionView.Bottom,
                        Width = Application.GetRealWidth(343),
                        Height = Application.GetRealHeight(50),
                        BackgroundColor = CSS_Color.MainBackgroundColor,
                        Radius = (uint)Application.GetRealWidth(12),
                        TextID = StringId.Cancel,
                        TextColor = CSS_Color.WarningColor,
                        TextSize = CSS_FontSize.SubheadingFontSize,
                    };
                    optionBaseView.AddChidren(btnCancel);

                    dialog.Show();

                    pView.MouseUpEventHandler = (sender, e) =>
                    {
                        dialog.Close();
                    };

                    btnCancel.MouseUpEventHandler = (sender, e) =>
                    {
                        dialog.Close();
                    };
                    btnUdp.MouseUpEventHandler = (sender, e) =>
                    {
                        DB_ResidenceData.Instance.linphoneConnectType = LinphoneConnectType.UDP;
                        DB_ResidenceData.Instance.SaveResidenceData();
                        linphoneConnectValues.Text = LinphoneConnectType.UDP.ToString();
                        dialog.Close();
                        new PublicAssmebly().TipMsg(StringId.Tip, StringId.ConnectionModeChangeTip);
                    };

                    btnTcp.MouseUpEventHandler = (sender, e) =>
                    {
                        DB_ResidenceData.Instance.linphoneConnectType = LinphoneConnectType.TCP;
                        DB_ResidenceData.Instance.SaveResidenceData();
                        linphoneConnectValues.Text = LinphoneConnectType.TCP.ToString();
                        dialog.Close();
                        new PublicAssmebly().TipMsg(StringId.Tip, StringId.ConnectionModeChangeTip);
                    };


                };

                linphoneConnectValues.MouseUpEventHandler = linphoneHandler;
                linphoneConnectRight.MouseUpEventHandler = linphoneHandler;

                return;
            }


            #region name view
            var nameView = new FrameLayout()
@@ -197,122 +348,6 @@
                    });
                #endregion
            }
            #region 共享
           
            //var sharedView = new FrameLayout()
            //{
            //    Height = Application.GetRealHeight(55),
            //    BackgroundColor = CSS_Color.MainBackgroundColor,
            //};
            //contentView.AddChidren(sharedView);
            //var btnSharedText = new Button()
            //{
            //    X = Application.GetRealWidth(16),
            //    Width = Application.GetRealWidth(160),
            //    TextAlignment = TextAlignment.CenterLeft,
            //    TextColor = CSS_Color.FirstLevelTitleColor,
            //    TextSize = CSS_FontSize.SubheadingFontSize,
            //    TextID = StringId.Shared,
            //};
            //sharedView.AddChidren(btnSharedText);

            //var btnSharedRight = new Button()
            //{
            //    X = Application.GetRealWidth(339),
            //    Gravity = Gravity.CenterVertical,
            //    Width = Application.GetMinRealAverage(16),
            //    Height = Application.GetMinRealAverage(16),
            //    UnSelectedImagePath = "Public/RightIcon.png",
            //};
            //sharedView.AddChidren(btnSharedRight);

            //sharedView.AddChidren(
            //    new Button()
            //    {
            //        Gravity = Gravity.CenterHorizontal,
            //        Y = Application.GetRealHeight(54),
            //        BackgroundColor = CSS_Color.DividingLineColor,
            //        Width = Application.GetRealWidth(343),
            //        Height = Application.GetRealHeight(1)
            //    });
            #endregion

            #region 删除设备行

            delView = new FrameLayout() 
            {
                Height = Application.GetRealHeight(55),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            if (this.function.spk == SPK.VideoDoorLock)
            {
                contentView.AddChidren(delView);
            }
            var lineBtn = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                BackgroundColor = CSS_Color.DividingLineColor,
                Width = Application.GetRealWidth(343),
                Height = Application.GetRealHeight(1)
            };
            delView.AddChidren(lineBtn);
             delTextBtn = new Button() 
            {
                X = Application.GetRealWidth(16),
                Width = Application.GetRealWidth(160),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextID = StringId.DeleteDevice,
            };
            delView.AddChidren(delTextBtn);

            delRightBtn= new Button()
            {
                X = Application.GetRealWidth(339),
                Gravity = Gravity.CenterVertical,
                Width = Application.GetMinRealAverage(16),
                Height = Application.GetMinRealAverage(16),
                UnSelectedImagePath = "Public/RightIcon.png",
            };
            delView.AddChidren(delRightBtn);

           

           
            #endregion
#if stage2
            #region 添加到桌面
            var addToDesktopView = new FrameLayout()
            {
                Height = Application.GetRealHeight(55),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            contentView.AddChidren(addToDesktopView);

            var btnAddToDesktopText = new Button()
            {
                X = Application.GetRealWidth(16),
                Width = Application.GetRealWidth(160),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextID = StringId.AddToDesktop,
            };
            addToDesktopView.AddChidren(btnAddToDesktopText);

            var btnAddToDesktopRight = new Button()
            {
                X = Application.GetRealWidth(339),
                Gravity = Gravity.CenterVertical,
                Width = Application.GetMinRealAverage(16),
                Height = Application.GetMinRealAverage(16),
                UnSelectedImagePath = "Public/RightIcon.png",
            };
            addToDesktopView.AddChidren(btnAddToDesktopRight);

            #endregion
#endif

            if (function.spk == SPK.ElectricEnergy)
            {
@@ -885,6 +920,71 @@

            }

            //else if(function.spk == SPK.LightRGB)
            //{
            //    contentView.AddChidren(new Button
            //    {
            //        Height = Application.GetRealHeight(8),
            //    });

            //    var list = FunctionList.List.GetSeries();
            //    foreach (var temp in list)
            //    {

            //        #region 
            //        var viewRow0 = new FrameLayout()
            //        {
            //            Height = Application.GetRealHeight(55),
            //            BackgroundColor = CSS_Color.MainBackgroundColor,
            //        };
            //        contentView.AddChidren(viewRow0);


            //        var btnRowTitle0 = new Button()
            //        {
            //            X = Application.GetRealWidth(16),
            //            Width = Application.GetRealWidth(160),
            //            TextAlignment = TextAlignment.CenterLeft,
            //            TextColor = CSS_Color.FirstLevelTitleColor,
            //            TextSize = CSS_FontSize.SubheadingFontSize,
            //            Text = temp.name,
            //        };
            //        viewRow0.AddChidren(btnRowTitle0);

            //        var btnSwtichIcon0 = new Button()
            //        {
            //            X = Application.GetRealWidth(322),
            //            Gravity = Gravity.CenterVertical,
            //            Width = Application.GetMinRealAverage(36),
            //            Height = Application.GetMinRealAverage(36),
            //            UnSelectedImagePath = "Public/Switch_2.png",
            //            SelectedImagePath = "Public/SwitchOn_2.png",
            //        };
            //        viewRow0.AddChidren(btnSwtichIcon0);

            //        DeviceMessageRules deviceMessageRules = new DeviceMessageRules()
            //        {
            //            deviceId = function.deviceId
            //        };

            //        btnSwtichIcon0.MouseUpEventHandler = (sender, e) =>
            //        {

            //        };

            //        viewRow0.AddChidren(new Button()
            //        {
            //            Gravity = Gravity.CenterHorizontal,
            //            Y = Application.GetRealHeight(54),
            //            BackgroundColor = CSS_Color.DividingLineColor,
            //            Width = Application.GetRealWidth(343),
            //            Height = Application.GetRealHeight(1)
            //        });
            //        #endregion
            //    }

            //}

            LoadEventList();
        }