请合并最新的代码（完成门锁功能）

xm

2019-11-27 a2d26f15b940c853faaf6d6959b16a6d919cb800

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

@@ -49,7 +49,7 @@
                {
                    Application.RunOnMainThread(() =>
                    {
                        RefreshList();
                        TypeRefresh();
                        CommonPage.Loading.Hide();
                    });
                }
@@ -580,27 +580,7 @@
                            var d = uList.Find((value) => { return value == curDoorLockUser.UserID; });
                            if (d != null)
                            {
                                // 类型区分
                                if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod))
                                {
                                    RefreshList();
                                }
                                else if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock))
                                {
                                    RefreshList(0);
                                }
                                else if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.FingerprintUnlock))
                                {
                                    RefreshList(15);
                                }
                                else if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock))
                                {
                                    RefreshList(3);
                                }
                                else if (doorLock.currentUserDisplayMethod == "")
                                {
                                    RefreshList();
                                }
                                TypeRefresh();
                                flMain.RemoveFromParent();
                                bottomFrameLayout.RemoveAll();
                            }
@@ -705,24 +685,7 @@
                        doorLock.currentUserDisplayMethod = btnMethodText.Text;
                        btnAllMethod.IsSelected = true;
                        oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;

                        // 类型区分
                        if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod))
                        {
                            RefreshList();
                        }
                        if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock))
                        {
                            RefreshList(0);
                        }
                        if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.FingerprintUnlock))
                        {
                            RefreshList(15);
                        }
                        if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock))
                        {
                            RefreshList(3);
                        }
                        TypeRefresh();
                    }
                    dialog.Close();
                };
@@ -792,6 +755,26 @@
            }
        }

        //类型区分 
        void TypeRefresh()
        {
            if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock))
            {
                RefreshList(0);
            }
            else if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.FingerprintUnlock))
            {
                RefreshList(15);
            }
            else if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock))
            {
                RefreshList(3);
            }
            else
            {
                RefreshList();
            }
        }
        #region ◆ 接口实现__________________________
        /// <summary>
        /// 处理变化事件 --将弃用 改用DeviceInfoChange()