From a19e58425e44c8a83c3d1b23de292659c38a6b1e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 05 六月 2023 14:09:20 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 108 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 94 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index a9e2fdb..c5bdf9f 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -22,6 +22,70 @@
Application.HideSoftInput();
};
pm = new HttpServerRequest();
+#if __ANDROID__
+ BaseActivity.HideKeyboardEvent = () => {
+ if (this.Y != 0)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ this.Y = 0;
+ }
+ catch { }
+ });
+ }
+ };
+ BaseActivity.ShowKeyboardEvent = () => {
+ try
+ {
+ if (etPassword.Foucs)
+ {
+ new Thread(() =>
+ {
+ for (var i = 0; i < 10; i++)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ this.Y = 0 - Application.GetRealHeight(10 * i);
+ }
+ catch { }
+ });
+ Thread.Sleep(10);
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+ }
+ catch { }
+ };
+ BaseActivity.SmsAction = (message) => {
+ Console.WriteLine($"鎺ユ敹鍒扮煭淇★細"+ message);
+
+ string pattern = @"銆怘DL銆�.*(\d{6}).*";
+
+ Regex regex = new Regex(pattern);
+
+ Match match = regex.Match(message);
+
+ if (match.Success)
+ {
+ string code = match.Groups[1].Value;
+ Console.WriteLine("楠岃瘉鐮佷负锛�" + code);
+ if(loginType==0 && logintMode == 1)
+ {
+ etPassword.Text = code;
+ }
+ smsCode = code;
+ }
+ else
+ {
+ Console.WriteLine("鏈壘鍒伴獙璇佺爜锛�");
+ }
+ };
+#endif
}
public override void RemoveFromParent()
@@ -33,13 +97,20 @@
waitPage = null;
}
+#if __ANDROID__
+ BaseActivity.HideKeyboardEvent = () => {
+
+ };
+ BaseActivity.ShowKeyboardEvent = () => { };
+ BaseActivity.SmsAction = (sms) => { };
+#endif
base.RemoveFromParent();
//2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
//Application.HideSoftInput();
}
- #region 灞�閮ㄥ彉閲�
+#region 灞�閮ㄥ彉閲�
/// <summary>
/// 鐧诲綍绫诲瀷
/// 0:鎵嬫満
@@ -54,9 +125,13 @@
int logintMode = 0;
string account = "";
string password = "";
- #endregion
+ /// <summary>
+ /// 鐭俊楠岃瘉鐮�
+ /// </summary>
+ string smsCode = "";
+#endregion
- #region 鎺т欢鍒楄〃
+#region 鎺т欢鍒楄〃
/// <summary>
/// 绛夊緟鎻愮ず
/// </summary>
@@ -149,7 +224,7 @@
/// 鏈嶅姟鍣ㄨ姹傚璞�
/// </summary>
HttpServerRequest pm;
- #endregion
+#endregion
string verAccount = "";
@@ -190,6 +265,9 @@
UnSelectedImagePath = "Public/Logo-bg.png"
};
bodyView.AddChidren(btnIcon_bg);
+ btnIcon_bg.MouseDownEventHandler += (sender, e) => {
+ Application.HideSoftInput();
+ };
#if DEBUG
btnIcon_bg.MouseUpEventHandler += (sender, e) =>
@@ -208,7 +286,6 @@
//return;
if (b)
{
- //etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
//etAccount.Text = "1033326940@qq.com";
//etAccount.Text = "18022428438";//wjc
//etAccount.Text = "13602944661";//kx
@@ -218,7 +295,6 @@
//etAccount.Text = "tf@smarttech.com.ua";
//etAccount.Text = "455740454@qq.com";
//etAccount.Text = "18688565449";
- etAccount.Text = "support7@hdlautomation.com";
//etAccount.Text = "18570064522";
//etAccount.Text = "18718417827";
//etAccount.Text = "18188019284";
@@ -237,6 +313,8 @@
//etAccount.Text = "13751916353";
etAccount.Text = "13549566666";
etAccount.Text = "18316672920";
+ etAccount.Text = "support7@hdlautomation.com";
+ etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
}
else
{
@@ -297,7 +375,7 @@
};
#endif
- #region 鐧诲綍鏂瑰紡閫夋嫨
+#region 鐧诲綍鏂瑰紡閫夋嫨
btnPhoneLogin = new Button()
{
X = Application.GetRealWidth(28),
@@ -822,6 +900,7 @@
new FunctionAttributes() { key = "mode",value =new List<string>(){ "day", "night", "away", "normal", "timer" }, curValue="day",state = "day" },
new FunctionAttributes() { key = "set_temp",value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 35,min = 5 },
new FunctionAttributes() { key = "room_temp",value =new List<string>(){ "" }, curValue="26",state = "26" },
+ new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳F", state = "掳F" },
},
};
fh.SaveFunctionFile();
@@ -1250,8 +1329,8 @@
#endif
- #endregion
- #region 鍦烘櫙
+#endregion
+#region 鍦烘櫙
var scene1 = new Scene()
{
sid = "scene1",
@@ -1545,6 +1624,7 @@
new FunctionAttributes() { key = "set_temp",step = "0.5", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
new FunctionAttributes() { key = "room_temp", value = new List<string>() { }, curValue = "20", state = "20" },
new FunctionAttributes() { key = "swing", value = new List<string>() {"up_down", "left_right", "stop" }, curValue = "20", state = "20" },
+ new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳F", state = "掳F" },
}
};
ac2.SaveFunctionFile();
@@ -1570,7 +1650,7 @@
// collect = false,
//};
//scene6.SaveSceneFile();
- #endregion
+#endregion
var lightSwitch6 = new Function()
@@ -1633,11 +1713,11 @@
#region 闅愮鏀跨瓥
AddServiceAgreementControl(bodyView);
- #endregion
+#endregion
}
- #region 鈻� 鏈嶅姟鍗忚___________________________
+#region 鈻� 鏈嶅姟鍗忚___________________________
bool isAgreePrivacyPolicy = false;
/// <summary>
/// 娣诲姞鏈嶅姟鍗忚鎺т欢
@@ -1759,12 +1839,12 @@
OpenWebViewPage(true);
};
- #if __ANDROID__
+#if __ANDROID__
//if(OnAppConfig.Instance.FirstRunApp || !OnAppConfig.Instance.isAgreePrivacyPolicy)
//{
// HDL_ON_Android.HDLONUtils.StartSplashActivity();
//}
- #endif
+#endif
}
/// <summary>
--
Gitblit v1.8.0