Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

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

@@ -78,7 +78,7 @@
        }

        /// <summary>

        /// UI显示 
        /// UI显示

        /// </summary>
        public void Show()
        {
@@ -343,7 +343,7 @@
                    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMDel,
                };
                rowFrameLayout.AddRightView(btnDel);
                #endregion 
                #endregion
                #region 数据处理
                switch (curDoorLockUser.UnlockType)
                {
@@ -553,7 +553,7 @@
                        }
                    };
                };
                #endregion 
                #endregion
            }
        }

@@ -637,7 +637,7 @@
                        btnAllMethod.IsSelected = true;
                        oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;

                        // 类型区分 
                        // 类型区分
                        if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod))
                        {
                            RefreshList();
@@ -823,7 +823,7 @@
                    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMDel,
                };
                rowFrameLayout.AddRightView(btnDel);
                #endregion 
                #endregion
                #region 数据处理
                switch (curDoorLockUser.UnlockType)
                {