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

WJC

2019-12-03 f8b647c263f068babb8efcc19ff4e74026a4bd28

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

@@ -78,7 +78,7 @@
                {
                    Application.RunOnMainThread(() =>
                    {
                        // 类型区分 
                        // 类型区分
                        TypeRefresh();
                        CommonPage.Loading.Hide();
                    });
@@ -87,7 +87,7 @@
        }

        /// <summary>

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

        /// </summary>
        public void Show()
        {
@@ -144,6 +144,7 @@
                btnAddFrameLayout.Width = Application.GetRealWidth(72);
            }

            MidFrameLayoutContent();
            if (doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] == true)
            {
                CommonPage.Loading.Start("Loading...");
@@ -151,7 +152,6 @@
            }
            else
            {
                MidFrameLayoutContent();
                RefreshList();
            }
        }
@@ -177,7 +177,7 @@
                TextSize = 12,
            };
            midTopFrameLayout.AddChidren(btnAllMethod);
            // 类型区分 
            // 类型区分
            if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod))
            {
                btnAllMethod.Text = Language.StringByID(R.MyInternationalizationString.AllMethod);
@@ -809,7 +809,7 @@
            }
        }

        //类型区分 
        //类型区分
        void TypeRefresh()
        {
            if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock))