From df3906c03db154e8622b7caeaa3bf93b67c6d40a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 15 十月 2021 10:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into CJL-Linphone
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index e6c5f40..966b679 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -209,10 +209,10 @@
//etAccount.Text = "18022428438";//wjc
//etAccount.Text = "13602944661";//kx
etAccount.Text = "13226233133";//璞嗚眴
- //etAccount.Text = "18316672920";
+ etAccount.Text = "18316672920";
//etAccount.Text = "18316120654";//tujie
- etAccount.Text = "15626203746";
- etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
+ //etAccount.Text = "15626203746";
+ //etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
}
else
{
@@ -230,9 +230,11 @@
//etAccount.Text = "15971583093";//楂樿儨
//etAccount.Text = "15217626103";//鏄嗘槑閲戣寕椤圭洰
//etAccount.Text = "18598273624";
- etAccount.Text = "tf@smarttech.com.ua";
+ //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
}
b = !b;
etPassword.Text = "123456";
@@ -668,7 +670,7 @@
{
new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
- new FunctionAttributes() { key = "cct",value =new List<string>(){ "0","65535" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = "cct",value =new List<string>(){ "0","65535" }, curValue="0",state = "0" ,min = 2700,max = 6500 },
new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
new FunctionAttributes() { key = "delay",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
},
--
Gitblit v1.8.0