合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs

@@ -132,8 +132,8 @@
            ///添加自动化图标的控件
            var addIconBtn = new Button
            {
                Width = Application.GetMinRealAverage(69),
                Height = Application.GetMinRealAverage(69),
                Width = Application.GetRealWidth(69),
                Height = Application.GetRealWidth(69),
                X = Application.GetRealWidth(890),
                Y = Application.GetRealHeight(60),
                UnSelectedImagePath = "ZigeeLogic/add.png",
@@ -254,8 +254,8 @@
            {
                X = Application.GetRealWidth(395),
                Y = Application.GetRealHeight(92),
                Width = Application.GetMinRealAverage(294),
                Height = Application.GetMinRealAverage(294),
                Width = Application.GetRealWidth(294),
                Height = Application.GetRealWidth(294),
            };
            fLayout.AddChidren(modeIconBtn);
            if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
@@ -406,8 +406,8 @@
                ///下一级菜单图标控件
                var nextIconBtn = new Button
                {
                    Width = Application.GetMinRealAverage(104),
                    Height = Application.GetMinRealAverage(104),
                    Width = Application.GetRealWidth(104),
                    Height = Application.GetRealWidth(104),
                    X = Application.GetRealWidth(861),
                    Y = Application.GetRealHeight(17),
                    UnSelectedImagePath = "ZigeeLogic/nextIconSone.png",
@@ -460,7 +460,7 @@
                                        Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
                                        ModeView();
                                        ///添加APP开启常开模式的历史记录
                                        HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock, 9001, string.Empty);
                                        UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock, 9001, string.Empty);
                                    }


@@ -607,8 +607,8 @@
                ///显示目标功能背景颜色的控件
                var typeBjBtn = new FrameLayout
                {
                    Width = Application.GetMinRealAverage(82),
                    Height = Application.GetMinRealAverage(82),
                    Width = Application.GetRealWidth(82),
                    Height = Application.GetRealWidth(82),
                    X = Application.GetRealWidth(17),
                    Y = Application.GetRealHeight(84),
                    Radius = (uint)Application.GetMinRealAverage(41),
@@ -618,16 +618,16 @@
                ///显示目标功能图标的控件
                var typeIconBtn = new Button
                {
                    Width = Application.GetMinRealAverage(58),
                    Height = Application.GetMinRealAverage(58),
                    Width = Application.GetRealWidth(58),
                    Height = Application.GetRealWidth(58),
                    Gravity = Gravity.Center,
                };
                typeBjBtn.AddChidren(typeIconBtn);
                ///逻辑开关图标的控件
                var switchBtn = new Button
                {
                    Width = Application.GetMinRealAverage(104),
                    Height = Application.GetMinRealAverage(63),
                    Width = Application.GetRealWidth(104),
                    Height = Application.GetRealWidth(63),
                    UnSelectedImagePath = "ZigeeLogic/logicclose.png",
                    SelectedImagePath = "ZigeeLogic/logicopen.png",
                    X = Application.GetRealWidth(815),
@@ -707,7 +707,7 @@
                ///删除点击事件
                del.MouseUpEventHandler += (sender, e) =>
                {
                    var alert = new ShowMsgControl(ShowMsgType.Confirm,
                    var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
                    Language.StringByID(MyInternationalizationString.doyouwanttodelete),
                    Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();