From 19b4abbebede2255b8d9f286105c7bf41d254429 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 29 十二月 2023 09:44:58 +0800
Subject: [PATCH] 金路备份

---
 HDL_ON/UI/UI1-Login/LoginPage.cs |   72 +++++++++++++++++++++++------------
 1 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 1198236..49741e4 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -264,25 +264,25 @@
             };
             bodyView.AddChidren(btnIcon);
 
-            var btnIcon_bg = new Button()
-            {
-                X = Application.GetRealWidth(171),
-                Y = Application.GetRealHeight(69),
-                Width = Application.GetMinRealAverage(254),
-                Height = Application.GetMinRealAverage(156),
-                UnSelectedImagePath = "Public/Logo-bg.png"
-            };
-            bodyView.AddChidren(btnIcon_bg);
-            btnIcon_bg.MouseDownEventHandler += (sender, e) => {
-                Application.HideSoftInput();
-            };
+            //var btnIcon_bg = new Button()
+            //{
+            //    X = Application.GetRealWidth(171),
+            //    Y = Application.GetRealHeight(69),
+            //    Width = Application.GetMinRealAverage(254),
+            //    Height = Application.GetMinRealAverage(156),
+            //    UnSelectedImagePath = "Public/Logo-bg.png"
+            //};
+            //bodyView.AddChidren(btnIcon_bg);
+            //btnIcon_bg.MouseDownEventHandler += (sender, e) => {
+            //    Application.HideSoftInput();
+            //};
 
 #if DEBUG
-            btnIcon_bg.MouseUpEventHandler += (sender, e) =>
-            {
-                return;
+            //btnIcon_bg.MouseUpEventHandler += (sender, e) =>
+            //{
+            //    return;
                 
-            };
+            //};
 
             bool b = false;
             btnIcon.MouseUpEventHandler += (sender, e) =>
@@ -318,7 +318,6 @@
                     //etAccount.Text = "18321091245";
                     //etAccount.Text = "13751916353";
                     etAccount.Text = "13549566666";
-                    etAccount.Text = "support7@hdlautomation.com";
                     etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
                     etAccount.Text = "15855403939";
                     etAccount.Text = "15006564444";
@@ -330,6 +329,12 @@
                     etAccount.Text = "13533335801";
                     etAccount.Text = "13682244600";
                     etAccount.Text = "marketing@australindo.co.id";
+                    etAccount.Text = "support7@hdlautomation.com";
+                    etAccount.Text = "13922115008";//鍒樻��
+                    etAccount.Text = "1272061968@qq.com";
+                    etAccount.Text = "support7@hdlautomation.com";
+                    etAccount.Text = "info@hdlegypt.com";
+
 
                 }
                 else
@@ -361,9 +366,9 @@
                 }
                 b = !b;
                 etPassword.Text = "123456";
-                if(etAccount.Text == "pjh@hdlchina.com.cn")
+                if(etAccount.Text == "info@hdlegypt.com")
                 {
-                    etPassword.Text = "hdl123";
+                    etPassword.Text = "@Hdl2020";
                 }
                 else if(etAccount.Text == "18600200915")
                 {
@@ -381,9 +386,9 @@
                 else if (etAccount.Text == "18100573477")
                 {
                     etPassword.Text = "huang12345";
-                }else if(etAccount.Text == "marketing@australindo.co.id")
+                }else if(etAccount.Text == "dcai.assist@gmail.com")
                 {
-                    etPassword.Text = "HDLAGN2023";
+                    etPassword.Text = "GraniteTileS57";
                 }
                 //etPassword.Text = "Hdl85521566";
                 btnLogin.IsSelected = true;
@@ -477,6 +482,9 @@
                 PlaceholderText = Language.StringByID(StringId.PlsEntryPhoneNumber),
                 TextAlignment = TextAlignment.CenterLeft,
             };
+#if __IOS__
+            etAccount.MyTextContentType = UIKit.UITextContentType.Name;
+#endif
             accountView.AddChidren(etAccount);
 
             if (userInfo != null && userInfo.ID != "1234567890")
@@ -668,7 +676,7 @@
                 TextAlignment = TextAlignment.Center,
                 Text = "娓稿浣撻獙"
             };
-            bodyView.AddChidren(btnDomeLogin);
+            //bodyView.AddChidren(btnDomeLogin);
 
             if (Language.CurrentLanguage != "Chinese")
             {
@@ -1292,6 +1300,18 @@
                     },
                 });
 
+                FunctionList.List.Functions.Add(new Function()
+                {
+                    spk = SPK.SensorLight,
+                    name = "鍏夌収浼犳劅鍣�",
+                    //collect = true,
+                    sid = "SensorLightsss000001",
+                    attributes = new List<FunctionAttributes>()
+                    {
+                        new FunctionAttributes(){ key = "illuminance",curValue= "100",state = "100" },
+                    },
+                });
+
 
                 FunctionList.List.Functions.Add(new Function()
                 {
@@ -1864,9 +1884,11 @@
             account = etAccount.Text.Trim();
 
 
-#region 闅愮鏀跨瓥
-            AddServiceAgreementControl(bodyView);
-#endregion
+            #region 闅愮鏀跨瓥
+            isAgreePrivacyPolicy = true;
+            OnAppConfig.Instance.isAgreePrivacyPolicy = true;
+            //AddServiceAgreementControl(bodyView);
+            #endregion
 
         }
 

--
Gitblit v1.8.0