合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs

@@ -176,7 +176,7 @@
                    ///删除控件
                    selecteddevice.del.MouseUpEventHandler += (sender, e) =>
                    {
                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
                        var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
                      Language.StringByID(MyInternationalizationString.doyouwanttodelete),
                      Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
@@ -591,8 +591,8 @@
                            break;
                        case 2:
                            {
                                actiondevice.edit.Visible = false;//隐藏编辑按钮(场景不需要编辑)

                                //在本地查找该场景;

                                actiondevice.edit.Visible = false;//隐藏编辑按钮(场景不需要编辑)
                                //在本地查找该场景;
                                var sceneinof = UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(Convert.ToInt32(actions["DeviceAddr"].ToString()));
                                //本地没有存在;
                                if (sceneinof == null)
@@ -638,6 +638,7 @@
                    actiondevice.selecetddevicestateBtn.Text = state;

                    ///编辑
                    actiondevice.edit.Tag = i.ToString();
                    actiondevice.edit.MouseUpEventHandler += (sender, e) =>
                    {
                        switch (linkType)
@@ -646,21 +647,9 @@
                            case 8:
                                {
                                    var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
                                    if (deviceinof.Type != DeviceType.ColorTemperatureLight)
                                    {
                                        var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
                                        this.AddChidren(flMain);
                                        CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_lockaction");
                                    }
                                    else
                                    {
                                        var nightlight = new Nightlight();
                                        UserView.HomePage.Instance.AddChidren(nightlight);
                                        UserView.HomePage.Instance.PageIndex += 1;
                                        nightlight.Show(deviceinof, true, "lockaction",actions);
                                    }


                                    var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
                                    this.AddChidren(flMain);
                                    CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_lockaction", int.Parse(actiondevice.edit.Tag.ToString()));
                                }
                                break;

@@ -671,7 +660,7 @@
                    actiondevice.del.MouseUpEventHandler += (sender, e) =>
                    {

                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
                        var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
                             Language.StringByID(MyInternationalizationString.doyouwanttodelete),
                             Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();