全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/AddUnLockMethodTip.cs

@@ -48,11 +48,6 @@

            EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
            {
                if (doorLock.Gateway != null || doorLock.Gateway.GwResDataAction != null)
                {
                    doorLock.Gateway.GwResDataAction -= action;
                }

                this.RemoveFromParent();
            };
            this.btnBack.MouseUpEventHandler += eHandlerBack;
@@ -60,6 +55,19 @@
            this.MidFrameLayout(this);

            MidFrameLayoutContent();
        }

        /// <summary>
        /// 重写移除方法
        /// </summary>
        public override void RemoveFromParent()
        {
            ZbGateway.StatusList.Remove(this);
            if (doorLock.Gateway != null || doorLock.Gateway.GwResDataAction != null)
            {
                doorLock.Gateway.GwResDataAction -= action;
            }
            base.RemoveFromParent();
        }

        public void MidFrameLayoutContent()
@@ -248,13 +256,6 @@
                                nextBtn.Enable = true;
                                nextBtn.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                            });
                        }
                        else
                        {
                            //Application.RunOnMainThread(() =>
                            //{
                            //new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.EntryCurrentUnlockMethod), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
                            //});
                        }
                    }
                }