From 0726154a7663e206e289e62f3f3fd7da4137a361 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 12 十月 2023 13:51:36 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc

---
 HDL_ON/UI/UI1-Login/LoginPage.cs |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 5662f9d..a62f728 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -326,6 +326,10 @@
                     //etAccount.Text = "12345678904";//2.0 娴嬭瘯  钀ょ煶
                     etAccount.Text = "18316672920";
                     etAccount.Text = "18244942707";
+                    etAccount.Text = "1272061968@qq.com";//涓囩鍩庡競涔嬪厜E鍖�8鏍�206
+                    etAccount.Text = "18933160333";
+                    etAccount.Text = "18402017839";//wjc
+
                 }
                 else
                 {
@@ -343,7 +347,6 @@
                     //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 = "13430286286";//cwc
                     //etAccount.Text = "13709260805";
                     //etAccount.Text = "support5@hdlchina.com.cn";
@@ -377,9 +380,9 @@
                 else if (etAccount.Text == "18100573477")
                 {
                     etPassword.Text = "huang12345";
-                }else if(etAccount.Text == "15006564444")
+                }else if(etAccount.Text == "1272061968@qq.com")
                 {
-                    etPassword.Text = "zht626800";
+                    etPassword.Text = "a123456";
                 }
                 //etPassword.Text = "Hdl85521566";
                 btnLogin.IsSelected = true;
@@ -923,6 +926,23 @@
 
 
 #if DEBUG
+                var hesTv = new Function()
+                {
+                    sid = "hisense000000000001",
+                    deviceId = "hisense000000000001",
+                    name = "娴蜂俊鐢佃",
+                    spk = SPK.ElectricalTvHisense,
+
+                    roomIds = new List<string>() { "1405771024583090178" },
+                    attributes = new List<FunctionAttributes>()
+                    {
+                        new FunctionAttributes() { key = "on_off",value =new List<string>(){ "off" }, curValue="on",state = "on"   },
+                        new FunctionAttributes() { key = "wol",value =new List<string>(){ "on" }, curValue="on",state = "on"   },
+                    }
+                };
+                hesTv.SaveFunctionFile();
+
+
                 var airSwitchP3 = new Function()
                 {
                     sid = "airSwitchP3000000000001",

--
Gitblit v1.8.0