From f7d3739023f4d04a4ed2c30c13d9abf8da210da7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 25 七月 2022 13:58:49 +0800
Subject: [PATCH] 兼容俄语
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 54 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index fcf307c..7f8e495 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -169,7 +169,7 @@
public void LoadView(UserInfo userInfo = null)
{
#if __Android__
- OnAppConfig.Instance.isAgreePrivacyPolicy = false;
+ OnAppConfig.Instance.isAgreePrivacyPolicy = true;
#endif
var btnIcon = new Button()
{
@@ -202,21 +202,23 @@
btnIcon.MouseUpEventHandler += (sender, e) =>
{
+
//ESOnVideo.Current.Test(false);
//return;
if (b)
{
- //etAccount.Text = "tf@smarttech.com.ua";//鍥藉璐﹀彿锛屾湁浣忓畢锛岀櫥褰曟棤娉曟樉绀�
//etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
//etAccount.Text = "1033326940@qq.com";
//etAccount.Text = "18022428438";//wjc
//etAccount.Text = "13602944661";//kx
- etAccount.Text = "13226233133";//璞嗚眴
+ //etAccount.Text = "13226233133";//璞嗚眴
etAccount.Text = "18316672920";
//etAccount.Text = "18316120654";//tujie
- etAccount.Text = "15626203746";
//etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
+ etAccount.Text = "18244942707";
+ etAccount.Text = "tf@smarttech.com.ua";
+ etAccount.Text = "13418062953";
}
else
{
@@ -226,7 +228,7 @@
//etAccount.Text = "13682244600";//娉㈠摜
etAccount.Text = "13168123446";//鏄嗘槑閲戣寕椤圭洰锛屾柊椋庨棶棰�
//etAccount.Text = "2949126848@qq.com";//闄堢惓
- //etAccount.Text = "13415629083";
+ etAccount.Text = "15014291819 ";
//etAccount.Text = "13676202754";//宸存灄鏈嶅姟鍣�
//etAccount.Text = "13602944661";//kx
//etAccount.Text = "18666455392";//13375012446//13602944661//tzy 18778381374
@@ -235,7 +237,7 @@
//etAccount.Text = "18598273624";
//etAccount.Text = "tf@smarttech.com.ua";
//etAccount.Text = "18814122445";//钁ｆ辰鏂� 澶╂渤鍔炲叕瀹�
- etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
+ //etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
//etAccount.Text = "18402017839";//wjc
//etAccount.Text = "13430286286";//cwc
//etAccount.Text = "13709260805";
@@ -243,10 +245,14 @@
//etAccount.Text = "13375012441";
//etAccount.Text = "info@smartlife-ks.com";
//etAccount.Text = "551775569@qq.com";//wcf
+ etAccount.Text = "15626203746";
+ //etAccount.Text = "18244942707";
+ //etAccount.Text = "zhangquansongjava@163.com";
+ //etAccount.Text = "s.savinov@hdlautomation.ru";
}
b = !b;
etPassword.Text = "123456";
- if(etAccount.Text == "fslcjm5@163.com")
+ if(etAccount.Text == "13418062953")
{
etPassword.Text = "a123456";
}
@@ -255,7 +261,7 @@
};
#endif
-#region 鐧诲綍鏂瑰紡閫夋嫨
+ #region 鐧诲綍鏂瑰紡閫夋嫨
btnPhoneLogin = new Button()
{
X = Application.GetRealWidth(28),
@@ -535,9 +541,16 @@
};
bodyView.AddChidren(btnDomeLogin);
- if(Language.CurrentLanguage!= "Chinese")
+ if (Language.CurrentLanguage != "Chinese")
{
- btnDomeLogin.Text = "Tourist experience";
+ if (Language.CurrentLanguage == "russian")
+ {
+ btnDomeLogin.Text = "袚芯褋褌械胁芯泄 褉械卸懈屑";
+ }
+ else
+ {
+ btnDomeLogin.Text = "Tourist experience";
+ }
}
btnDomeLogin.MouseUpEventHandler = (sender, e) => {
@@ -1119,11 +1132,11 @@
#region 闅愮鏀跨瓥
AddServiceAgreementControl(bodyView);
-#endregion
+ #endregion
}
-#region 鈻� 鏈嶅姟鍗忚___________________________
+ #region 鈻� 鏈嶅姟鍗忚___________________________
bool isAgreePrivacyPolicy = false;
/// <summary>
/// 娣诲姞鏈嶅姟鍗忚鎺т欢
@@ -1131,7 +1144,13 @@
/// <param name="frameBack"></param>
private void AddServiceAgreementControl(FrameLayout frameLayout)
{
- isAgreePrivacyPolicy = OnAppConfig.Instance.isAgreePrivacyPolicy;
+ isAgreePrivacyPolicy = false;
+ OnAppConfig.Instance.isAgreePrivacyPolicy = false;
+
+
+
+
+
var frameRow = new FrameLayout()
{
Height = Application.GetRealHeight(28),
@@ -1158,7 +1177,7 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/ChooseIcon.png",
SelectedImagePath = "Public/ChooseOnIcon.png",
- IsSelected = isAgreePrivacyPolicy,
+ IsSelected = OnAppConfig.Instance.isAgreePrivacyPolicy,
Gravity = Gravity.Center
};
agreeView.AddChidren(agreeBtn);
@@ -1238,6 +1257,13 @@
{
OpenWebViewPage(true);
};
+
+ #if __ANDROID__
+ //if(OnAppConfig.Instance.FirstRunApp || !OnAppConfig.Instance.isAgreePrivacyPolicy)
+ //{
+ // HDL_ON_Android.HDLONUtils.StartSplashActivity();
+ //}
+ #endif
}
/// <summary>
--
Gitblit v1.8.0