Merge branch 'CJL' into NewFilePath

wxr

2020-12-15 dbf79099f47d5f06223edfd5b8dc06c51b1830aa

 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs

@@ -696,7 +696,7 @@
            {
                Height = Application.GetRealHeight(51),
            };
            if (sTouchID && UserInfo.Current.appUnlockPasswrod != ""&&!UserInfo.Current.appUnlockType.Contains("4"))
            if (sTouchID && UserInfo.Current.appUnlockPasswrod != "" && !UserInfo.Current.appUnlockType.Contains("4"))
            {
                unlockOptionView.AddChidren(fingerprintUnlockDiv);
            }
@@ -750,7 +750,7 @@
            {
                Height = Application.GetRealHeight(50),
            };
            if (sFaceID && UserInfo.Current.appUnlockPasswrod != "" && !UserInfo.Current.appUnlockType.Contains("4"))
            if (sFaceID && UserInfo.Current.appUnlockPasswrod != "" && !UserInfo.Current.appUnlockType.Contains("3"))
            {
                unlockOptionView.AddChidren(faceIdUnlockDiv);
            }