From a2927467ebfa938a420f392deb6882b35570fd33 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 十二月 2020 16:48:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs
index 914a20e..97db491 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs
@@ -147,10 +147,10 @@
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
//濡傛灉鐢ㄦ埛閰嶇疆浜嗛渶瑕佽В閿佺殑鐣岄潰浣嗘槸娌℃湁璁剧疆瀵嗙爜锛屽垯鍦ㄨ繑鍥炴椂娓呯┖闇�瑕佽В閿佺殑鐣岄潰
Action action = () => {
- if(MainPage.LoginUser.appUnlockPage.Count > 0&& MainPage.LoginUser.appUnlockPasswrod == "")
+ if(OnAppConfig.Instance.appUnlockPage.Count > 0&& OnAppConfig.Instance.appUnlockPasswrod == "")
{
- MainPage.LoginUser.appUnlockPage = new System.Collections.Generic.List<string>();
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.appUnlockPage = new System.Collections.Generic.List<string>();
+ OnAppConfig.Instance.SaveUserConfig();
}
};
new TopViewDiv(bodyView, Language.StringByID(StringId.InterpretationSettings)).LoadTopView(action);
@@ -418,7 +418,7 @@
Height = Application.GetRealHeight(260),
BackgroundColor = CSS_Color.MainBackgroundColor,
ScrollEnabled = false,
- Visible = MainPage.LoginUser.appUnlockPage.Count > 0
+ Visible = OnAppConfig.Instance.appUnlockPage.Count > 0
};
bodyView.AddChidren(unlockOptionView);
@@ -470,7 +470,7 @@
{
Height = Application.GetRealHeight(50),
};
- if ( !MainPage.LoginUser.appUnlockType.Contains("2"))
+ if ( !OnAppConfig.Instance.appUnlockType.Contains("2"))
{
unlockOptionView.AddChidren(passwordUnlockDiv);
}
@@ -504,7 +504,7 @@
Height = Application.GetMinRealAverage(38),
UnSelectedImagePath = "Public/Switch_2.png",
SelectedImagePath = "Public/SwitchOn_2.png",
- IsSelected = MainPage.LoginUser.appUnlockType.Contains("1")
+ IsSelected = OnAppConfig.Instance.appUnlockType.Contains("1")
};
passwordUnlockDiv.AddChidren(btnPasswordUnlockkSwtichIcon);
@@ -532,7 +532,7 @@
{
Height = Application.GetRealHeight(50),
};
- if (MainPage.LoginUser.appUnlockPasswrod != "" && MainPage.LoginUser.appUnlockType.Contains("1"))
+ if (OnAppConfig.Instance.appUnlockPasswrod != "" && OnAppConfig.Instance.appUnlockType.Contains("1"))
{
unlockOptionView.AddChidren(resetPasswordDiv);
}
@@ -557,7 +557,7 @@
};
resetPasswordDiv.AddChidren(btnResetPasswordTitle);
- if (MainPage.LoginUser.appUnlockPasswrod != "" && MainPage.LoginUser.appUnlockType.Contains("1"))
+ if (OnAppConfig.Instance.appUnlockPasswrod != "" && OnAppConfig.Instance.appUnlockType.Contains("1"))
{
unlockOptionView.AddChidren(new Button()
{
@@ -574,7 +574,7 @@
{
Height = Application.GetRealHeight(50),
};
- if (!MainPage.LoginUser.appUnlockType.Contains("1"))
+ if (!OnAppConfig.Instance.appUnlockType.Contains("1"))
{
unlockOptionView.AddChidren(gestureUnlockDiv);
}
@@ -606,7 +606,7 @@
Height = Application.GetMinRealAverage(38),
UnSelectedImagePath = "Public/Switch_2.png",
SelectedImagePath = "Public/SwitchOn_2.png",
- IsSelected = MainPage.LoginUser.appUnlockType.Contains("2")
+ IsSelected = OnAppConfig.Instance.appUnlockType.Contains("2")
};
gestureUnlockDiv.AddChidren(btnGestureUnlockkSwtichIcon);
@@ -621,7 +621,7 @@
};
gestureUnlockDiv.AddChidren(btnGestureUnlockTitle);
- if (!MainPage.LoginUser.appUnlockType.Contains("1"))
+ if (!OnAppConfig.Instance.appUnlockType.Contains("1"))
{
unlockOptionView.AddChidren(new Button()
{
@@ -639,7 +639,7 @@
{
Height = Application.GetRealHeight(50),
};
- if (MainPage.LoginUser.appUnlockPasswrod != "" && MainPage.LoginUser.appUnlockType.Contains("2"))
+ if (OnAppConfig.Instance.appUnlockPasswrod != "" && OnAppConfig.Instance.appUnlockType.Contains("2"))
{
unlockOptionView.AddChidren(resetGestureDiv);
}
@@ -664,7 +664,7 @@
};
resetGestureDiv.AddChidren(btnResetGestureTitle);
- if (MainPage.LoginUser.appUnlockPasswrod != "" && MainPage.LoginUser.appUnlockType.Contains("2"))
+ if (OnAppConfig.Instance.appUnlockPasswrod != "" && OnAppConfig.Instance.appUnlockType.Contains("2"))
{
unlockOptionView.AddChidren(new Button()
{
@@ -696,7 +696,7 @@
{
Height = Application.GetRealHeight(51),
};
- if (sTouchID && MainPage.LoginUser.appUnlockPasswrod != ""&&!MainPage.LoginUser.appUnlockType.Contains("4"))
+ if (sTouchID && OnAppConfig.Instance.appUnlockPasswrod != ""&&!OnAppConfig.Instance.appUnlockType.Contains("4"))
{
unlockOptionView.AddChidren(fingerprintUnlockDiv);
}
@@ -729,7 +729,7 @@
Height = Application.GetMinRealAverage(38),
UnSelectedImagePath = "Public/Switch_2.png",
SelectedImagePath = "Public/SwitchOn_2.png",
- IsSelected = MainPage.LoginUser.appUnlockType.Contains("3")
+ IsSelected = OnAppConfig.Instance.appUnlockType.Contains("3")
};
fingerprintUnlockDiv.AddChidren(btnFingerprintUnlockSwtichIcon);
@@ -750,7 +750,7 @@
{
Height = Application.GetRealHeight(50),
};
- if (sFaceID && MainPage.LoginUser.appUnlockPasswrod != "" && !MainPage.LoginUser.appUnlockType.Contains("4"))
+ if (sFaceID && OnAppConfig.Instance.appUnlockPasswrod != "" && !OnAppConfig.Instance.appUnlockType.Contains("4"))
{
unlockOptionView.AddChidren(faceIdUnlockDiv);
}
@@ -782,7 +782,7 @@
Height = Application.GetMinRealAverage(38),
UnSelectedImagePath = "Public/Switch_2.png",
SelectedImagePath = "Public/SwitchOn_2.png",
- IsSelected = MainPage.LoginUser.appUnlockType.Contains("4")
+ IsSelected = OnAppConfig.Instance.appUnlockType.Contains("4")
};
faceIdUnlockDiv.AddChidren(btnFaceIdUnlockSwtichIcon);
--
Gitblit v1.8.0