From 59e221cdb1ba8a666f68c5a2014e59e6f1870b43 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 13:43:53 +0800
Subject: [PATCH] Merge branch 'release0123' into V1.5.9

---
 HDL_ON/UI/UI1-Login/LoginPage.cs |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index fe9387a..c62a818 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -217,7 +217,7 @@
                     //etAccount.Text = "18316120654";//tujie
                     //etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
                     etAccount.Text = "18244942707";
-                    etAccount.Text = "3083375423@qq.com";//闄堜紵娼� 鑷爺鍙瀵硅
+                    etAccount.Text = "tf@smarttech.com.ua";
                 }
                 else
                 {
@@ -227,17 +227,17 @@
                     //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
                     //etAccount.Text = "15971583093";//楂樿儨
                     //etAccount.Text = "15217626103";//鏄嗘槑閲戣寕椤圭洰
                     //etAccount.Text = "18598273624";
-                    etAccount.Text = "tf@smarttech.com.ua";
+                    //etAccount.Text = "tf@smarttech.com.ua";
                     //etAccount.Text = "18814122445";//钁f辰鏂� 澶╂渤鍔炲叕瀹�
-                    etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
-                    etAccount.Text = "18402017839";//wjc
+                    //etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
+                    //etAccount.Text = "18402017839";//wjc
                     //etAccount.Text = "13430286286";//cwc
                     //etAccount.Text = "13709260805";
                     //etAccount.Text = "support5@hdlchina.com.cn";
@@ -245,15 +245,15 @@
                     //etAccount.Text = "info@smartlife-ks.com";
                     //etAccount.Text = "551775569@qq.com";//wcf
                     //etAccount.Text = "15626203746";
-                    etAccount.Text = "18186330667";
+                    etAccount.Text = "18244942707";
                     //etAccount.Text = "zhangquansongjava@163.com";
                     //etAccount.Text = "s.savinov@hdlautomation.ru";
                 }
                 b = !b;
                 etPassword.Text = "123456";
-                if(etAccount.Text == "s.savinov@hdlautomation.ru")
+                if(etAccount.Text == "15014291819")
                 {
-                    etPassword.Text = "BWGVOFCJ";
+                    etPassword.Text = "hdl123456";
                 }
                 //etPassword.Text = "Hdl85521566";
                 btnLogin.IsSelected = true;
@@ -1136,7 +1136,8 @@
         /// <param name="frameBack"></param>
         private void AddServiceAgreementControl(FrameLayout frameLayout)
         {
-            isAgreePrivacyPolicy = OnAppConfig.Instance.isAgreePrivacyPolicy;
+            isAgreePrivacyPolicy = false;
+            OnAppConfig.Instance.isAgreePrivacyPolicy = false;
 
 
 

--
Gitblit v1.8.0