Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -240,7 +240,7 @@
                    string state = "";
                    switch (linkType)
                    {
                        

                        case 0:
                        case 8:
                            {
@@ -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;