From 702cad5d5236fe14c714fdc0f0d02a2399b772ac Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 10 四月 2024 16:07:30 +0800
Subject: [PATCH] Delete Shared.IOS-1.dll
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 596 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 379 insertions(+), 217 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 5418dd3..ad186c7 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -310,28 +310,42 @@
//etAccount.Text = "13288623489";//缃楁檽涓�
//etAccount.Text = "18244942707";
//etAccount.Text = "13143792049";
- etAccount.Text = "18688414428";//澶╂渤3妤�
- //etAccount.Text = "18244942707";
- //etAccount.Text = "12345678904";
+ //etAccount.Text = "18688414428";//澶╂渤3妤�
//etAccount.Text = "13418062953";
- etAccount.Text = "13138683659";
+ //etAccount.Text = "13138683659";
//etAccount.Text = "15217626103";
//etAccount.Text = "18100573477";
//etAccount.Text = "18321091245";
//etAccount.Text = "13751916353";
- etAccount.Text = "13549566666";
- etAccount.Text = "18316672920";
- etAccount.Text = "support7@hdlautomation.com";
- etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
- etAccount.Text = "15855403939";
+ //etAccount.Text = "13549566666";
+ //etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
+ //etAccount.Text = "15855403939";
+ //etAccount.Text = "15006564444";
+ //etAccount.Text = "pjh@hdlchina.com.cn";
+ //etAccount.Text = "12345678904";//2.0 娴嬭瘯 钀ょ煶
+ //etAccount.Text = "18316672920";
+ //etAccount.Text = "18244942707";
+ //etAccount.Text = "1272061968@qq.com";//涓囩鍩庡競涔嬪厜E鍖�8鏍�206
+ //etAccount.Text = "13533335801";
+ //etAccount.Text = "13682244600";
+ //etAccount.Text = "marketing@australindo.co.id";
+ //etAccount.Text = "13922115008";//鍒樻��
+ //etAccount.Text = "1272061968@qq.com";
+ //etAccount.Text = "info@hdlegypt.com";
+ //etAccount.Text = "18402017839";
+ //etAccount.Text = "support7@hdlautomation.com";
+ etAccount.Text = "649362315@qq.com";
+ etAccount.Text = "15014291819";
+
+
}
else
{
//etAccount.Text = "464027401@qq.com";//
//etAccount.Text = "15217626103";//
- etAccount.Text = "13168123446";//鏄嗘槑閲戣寕椤圭洰锛屾柊椋庨棶棰�
+ //etAccount.Text = "13168123446";//鏄嗘槑閲戣寕椤圭洰锛屾柊椋庨棶棰�
//etAccount.Text = "2949126848@qq.com";//闄堢惓
- etAccount.Text = "15014291819 ";
+ //etAccount.Text = "15014291819 ";
//etAccount.Text = "13676202754";//宸存灄鏈嶅姟鍣�
//etAccount.Text = "13602944661";//kx
//etAccount.Text = "18666455392";//13375012446//13602944661//tzy 18778381374
@@ -341,7 +355,6 @@
//etAccount.Text = "tf@smarttech.com.ua";
//etAccount.Text = "18814122445";//钁ｆ辰鏂� 澶╂渤鍔炲叕瀹�
//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";
@@ -355,36 +368,36 @@
}
b = !b;
etPassword.Text = "123456";
- if(etAccount.Text == "18188019284")
+ if(etAccount.Text == "info@hdlegypt.com")
{
- etPassword.Text = "CEZUJHSZ";
+ etPassword.Text = "@Hdl2020";
}
- else if(etAccount.Text == "13143792049")
+ else if(etAccount.Text == "18600200915")
{
- etPassword.Text = "BVVBQATD";
+ etPassword.Text = "ZJtiaoshi";
}else if(etAccount.Text == "13288623489")
{
etPassword.Text = "luoxiaodong";
- }else if(etAccount.Text == "18688414428")
+ }else if(etAccount.Text == "15014291819")
{
- etPassword.Text = "HDL1985000";
+ etPassword.Text = "hdl123456";
}else if (etAccount.Text == "15855403939")
{
etPassword.Text = "yyr123456";
}
- else if (etAccount.Text == "18100573477")
+ else if (etAccount.Text == "649362315@qq.com")
{
- etPassword.Text = "huang12345";
- }else if(etAccount.Text == "13549566666")
+ etPassword.Text = "aa123456";
+ }else if(etAccount.Text == "dcai.assist@gmail.com")
{
- etPassword.Text = "12345678";
+ etPassword.Text = "GraniteTileS57";
}
//etPassword.Text = "Hdl85521566";
btnLogin.IsSelected = true;
};
#endif
-#region 鐧诲綍鏂瑰紡閫夋嫨
+ #region 鐧诲綍鏂瑰紡閫夋嫨
btnPhoneLogin = new Button()
{
X = Application.GetRealWidth(28),
@@ -471,6 +484,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")
@@ -770,8 +786,8 @@
#region 鍔熻兘
var lightRgb1 = new Function()
{
- sid = "light1",
- deviceId = "light1",
+ sid = "light10000000000",
+ deviceId = "light10000000000",
name = Language.CurrentLanguage == "Chinese"? "瀹㈠巺姘涘洿鐏�1": "RGB light 1",
spk = SPK.LightRGB,
roomIds = new List<string>() { "1405771024583090178"},
@@ -921,6 +937,119 @@
#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",
+ deviceId = "airSwitchP3000000000001",
+ name = "娴嬭瘯-涓夌浉鏅鸿兘绌哄紑",
+ spk = SPK.AirSwitchP3,
+ roomIds = new List<string>() { "1405771024583090178" },
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
+ new FunctionAttributes() { key = "delay",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ new FunctionAttributes() { key = FunctionAttributeKey.PowerA,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.PowerB,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.PowerC,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.VoltageA,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.VoltageB,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.VoltageC,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.CurrentA,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.CurrentB,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.CurrentC,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.TempA,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.TempB,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.TempC,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.MaxCurrent,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.MaxTemp,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.ElectricityA,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.ElectricityB,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.ElectricityC,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ new FunctionAttributes() { key = FunctionAttributeKey.TotalElectricity,value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 1000,min = 0 },
+ },
+ //collect = true,
+ };
+ airSwitchP3.SaveFunctionFile();
+
+ if (FunctionList.List.groupControls.Count == 0)
+ {
+ FunctionList.List.groupControls.Add(new GroupControl()
+ {
+ name = "缇ゆ帶娴嬭瘯",
+ collect = true,
+ sid = "234567876545678765",
+ uids = new List<string>()
+ {
+ "1405771024583090178",
+ "9191a3a2-026f-4667-a0b1-e3af699e7295",
+ },
+ roomIds = new List<string>()
+ {
+ "1405771024583090178",
+ "9191a3a2-026f-4667-a0b1-e3af699e7295",
+ },
+ sids = new List<GroupControlFunction>()
+ {
+ new GroupControlFunction(){
+ sid = lightRgb1.sid,
+ spk = SPK.LightRGB,
+ },
+ new GroupControlFunction(){
+ sid = "light2",
+ spk = SPK.LightRGB,
+ },
+ }
+ });
+ }
+
+
+ var series1 = new Function()
+ {
+ sid = "light10000000000series1",
+ deviceId = "light10000000000series1",
+ name = Language.CurrentLanguage == "Chinese" ? "搴忓垪1" : "Series1",
+ spk = SPK.CommonSeries,
+ roomIds = new List<string>() { "1405771024583090178" },
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
+ },
+ };
+ series1.SaveFunctionFile();
+
+
+ var series2 = new Function()
+ {
+ sid = "light10000000000series2",
+ deviceId = "light10000000000series2",
+ name = Language.CurrentLanguage == "Chinese" ? "搴忓垪2" : "Series2",
+ spk = SPK.CommonSeries,
+ roomIds = new List<string>() { "1405771024583090178" },
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
+ },
+ };
+ series2.SaveFunctionFile();
+
+
var mechanicalArm = new Function()
{
sid = "mechanicalArm1",
@@ -955,142 +1084,142 @@
};
FunctionList.List.Functions.Add(lightRgbw1);
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺鎬绘帶",
- // spk = SPK.AcstParent,
- // collect = true,
- // attributes = new List<FunctionAttributes>()
- //{
- // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- // new FunctionAttributes(){ key = AcstParent_AttrEnum.mode.ToString(),curValue = AcstParent_Attr_ModeValueEnum.cool.ToString(),state = AcstParent_Attr_ModeValueEnum.cool.ToString(),
- // value = new List<string>
- // {
- // AcstParent_Attr_ModeValueEnum.cool.ToString(),
- // AcstParent_Attr_ModeValueEnum.dry.ToString(),
- // AcstParent_Attr_ModeValueEnum.fan.ToString(),
- // AcstParent_Attr_ModeValueEnum.heat.ToString(),
- // AcstParent_Attr_ModeValueEnum.humidity.ToString(),
- // AcstParent_Attr_ModeValueEnum.heat_humidity.ToString(),
- // }
- // },
- // new FunctionAttributes(){ key = AcstParent_AttrEnum.scene.ToString(), curValue = AcstParent_Attr_SceneValueEnum.at_home.ToString(), state = AcstParent_Attr_SceneValueEnum.at_home.ToString(),
- // value = new List<string>()
- // {
- // AcstParent_Attr_SceneValueEnum.at_home.ToString(),
- // AcstParent_Attr_SceneValueEnum.leave_home.ToString(),
- // AcstParent_Attr_SceneValueEnum.sleep.ToString(),
- // }
- // },
- // new FunctionAttributes(){ key = AcstParent_AttrEnum.day_electricity.ToString(),curValue = "99",state = "99"},
- // new FunctionAttributes(){ key = AcstParent_AttrEnum.month_electricity.ToString(),curValue = "999",state = "999"},
- // new FunctionAttributes(){ key = AcstParent_AttrEnum.total_electricity.ToString(),curValue = "9999",state = "9999"},
- // new FunctionAttributes(){ key = AcstParent_AttrEnum.active_power.ToString(),curValue = "9999",state = "9999"},
- // //new FunctionAttributes(){ key = AcstParent_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- // //new FunctionAttributes(){ key = AcstParent_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- // //new FunctionAttributes(){ key = AcstParent_AttrEnum.co2.ToString(),curValue = "266",state = "266"},
- // //new FunctionAttributes(){ key = AcstParent_AttrEnum.tvoc.ToString(),curValue = "666",state = "666"},
- // //new FunctionAttributes(){ key = AcstParent_AttrEnum.pm25.ToString(),curValue = "36",state = "36"},
- //}
- //});
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺鎬绘帶",
+ spk = SPK.AcstParent,
+ //collect = true,
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.mode.ToString(),curValue = AcstParent_Attr_ModeValueEnum.cool.ToString(),state = AcstParent_Attr_ModeValueEnum.cool.ToString(),
+ value = new List<string>
+ {
+ AcstParent_Attr_ModeValueEnum.cool.ToString(),
+ AcstParent_Attr_ModeValueEnum.dry.ToString(),
+ AcstParent_Attr_ModeValueEnum.fan.ToString(),
+ AcstParent_Attr_ModeValueEnum.heat.ToString(),
+ AcstParent_Attr_ModeValueEnum.humidity.ToString(),
+ AcstParent_Attr_ModeValueEnum.heat_humidity.ToString(),
+ }
+ },
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.scene.ToString(), curValue = AcstParent_Attr_SceneValueEnum.at_home.ToString(), state = AcstParent_Attr_SceneValueEnum.at_home.ToString(),
+ value = new List<string>()
+ {
+ AcstParent_Attr_SceneValueEnum.at_home.ToString(),
+ AcstParent_Attr_SceneValueEnum.leave_home.ToString(),
+ AcstParent_Attr_SceneValueEnum.sleep.ToString(),
+ }
+ },
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.day_electricity.ToString(),curValue = "99",state = "99"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.month_electricity.ToString(),curValue = "999",state = "999"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.total_electricity.ToString(),curValue = "9999",state = "9999"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.active_power.ToString(),curValue = "9999",state = "9999"},
+ //new FunctionAttributes(){ key = AcstParent_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ //new FunctionAttributes(){ key = AcstParent_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ //new FunctionAttributes(){ key = AcstParent_AttrEnum.co2.ToString(),curValue = "266",state = "266"},
+ //new FunctionAttributes(){ key = AcstParent_AttrEnum.tvoc.ToString(),curValue = "666",state = "666"},
+ //new FunctionAttributes(){ key = AcstParent_AttrEnum.pm25.ToString(),curValue = "36",state = "36"},
+ }
+ });
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-1",
- // spk = SPK.AcstSub,
- // sid = "0000001",
- // attributes = new List<FunctionAttributes>()
- //{
- // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- //}
- //});
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-2",
- // spk = SPK.AcstSub,
- // sid = "0000002",
- // attributes = new List<FunctionAttributes>()
- //{
- // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- //}
- //});
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-3",
- // spk = SPK.AcstSub,
- // sid = "0000003",
- // attributes = new List<FunctionAttributes>()
- //{
- // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- //}
- //});
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-4",
- // spk = SPK.AcstSub,
- // sid = "0000004",
- // attributes = new List<FunctionAttributes>()
- //{
- // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- //}
- //});
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-5",
- // spk = SPK.AcstSub,
- // sid = "0000005",
- // attributes = new List<FunctionAttributes>()
- //{
- // new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- // new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- //}
- //});
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-1",
+ spk = SPK.AcstSub,
+ sid = "0000001",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ }
+ });
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-2",
+ spk = SPK.AcstSub,
+ sid = "0000002",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ }
+ });
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-3",
+ spk = SPK.AcstSub,
+ sid = "0000003",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ }
+ });
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-4",
+ spk = SPK.AcstSub,
+ sid = "0000004",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ }
+ });
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-5",
+ spk = SPK.AcstSub,
+ sid = "0000005",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ }
+ });
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯姊﹀够绐楀笜",
- // spk = SPK.CurtainDream,
- // sid = "1234577",
- // attributes = new List<FunctionAttributes> {
- // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- // new FunctionAttributes(){ key = "percent",curValue= "100",state = "100" },
- // new FunctionAttributes(){ key = "angle",curValue= "0",state = "0" },
- // }
- //});
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯姊﹀够绐楀笜",
+ spk = SPK.CurtainDream,
+ sid = "1234577",
+ attributes = new List<FunctionAttributes> {
+ new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
+ new FunctionAttributes(){ key = "percent",curValue= "100",state = "100" },
+ new FunctionAttributes(){ key = "angle",curValue= "0",state = "0" },
+ }
+ });
- //FunctionList.List.Functions.Add(new Function
- //{
- // name = "娴嬭瘯姣背娉紶鎰熷櫒",
- // spk = SPK.SenesorMegahealth,
- // attributes = new List<FunctionAttributes>
- // {
- // new FunctionAttributes(){ key = "enable",curValue = "true",state = "true" },
- // new FunctionAttributes(){ key = "people_num",curValue = "0",state = "0" },
- // new FunctionAttributes(){ key = "people_id",curValue = "1",state = "1" },
- // new FunctionAttributes(){ key = "target_status",curValue = "0",state = "0" },//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
- // new FunctionAttributes(){ key = "people_status",curValue = "false",state = "false" },//鐘舵�� 鏈変汉鏃犱汉
- // //new FunctionAttributes(){ key = "",curValue = "",state = "" },
- // //new FunctionAttributes(){ key = "",curValue = "",state = "" },
- // //new FunctionAttributes(){ key = "",curValue = "",state = "" },
- // }
- //});
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯姣背娉紶鎰熷櫒",
+ spk = SPK.SenesorMegahealth,
+ attributes = new List<FunctionAttributes>
+ {
+ new FunctionAttributes(){ key = "enable",curValue = "true",state = "true" },
+ new FunctionAttributes(){ key = "people_num",curValue = "0",state = "0" },
+ new FunctionAttributes(){ key = "people_id",curValue = "1",state = "1" },
+ new FunctionAttributes(){ key = "target_status",curValue = "1",state = "1" },//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
+ new FunctionAttributes(){ key = "people_status",curValue = "false",state = "false" },//鐘舵�� 鏈変汉鏃犱汉
+ //new FunctionAttributes(){ key = "",curValue = "",state = "" },
+ //new FunctionAttributes(){ key = "",curValue = "",state = "" },
+ //new FunctionAttributes(){ key = "",curValue = "",state = "" },
+ }
+ });
FunctionList.List.Functions.Add(new Function
{
name = "娴嬭瘯娓╂帶鍣�",
@@ -1161,15 +1290,69 @@
// }
//});
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.SensorDryContact,
- // name = "骞叉帴鐐�",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
- // },
- //});
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorDryContact,
+ name = "骞叉帴鐐�",
+ //collect = true,
+ sid = "sss000001",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "contact_status",curValue= "open",state = "open" },
+ },
+ });
+
+ 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()
+ {
+ spk = SPK.OtherCommon,
+ name = "閫氱敤寮�鍏�",
+ //collect = true,
+ sid = "sssCommon000001",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "on_off",curValue= "on",state = "off" },
+ },
+ });
+
+
+
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorPir,
+ name = "浜轰綋瀛樺湪浼犳劅鍣�1",
+ collect = true,
+ sid = "sss000001111",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "people_status",curValue= "false",state = "false" },
+ },
+ });
+
+
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorPirHold,
+ name = "浜轰綋瀛樺湪浼犳劅鍣�2",
+ collect = true,
+ sid = "sss0000011112",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "people_status",curValue= "true",state = "true" },
+ },
+ });
//FunctionList.List.Functions.Add(new Function()
//{
@@ -1194,19 +1377,19 @@
// },
//});
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.SensorHelp,
- // name = "娴嬭瘯绱ф�ユ眰鍔╂寜閽�",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
- // new FunctionAttributes(){ key = "alarm_status",curValue= "alarm",state = "alarm" },
- // new FunctionAttributes(){ key = "battery_value",curValue= "200",state = "200" },
- // new FunctionAttributes(){ key = "battery_percentage",curValue= "10",state = "10" },
- // new FunctionAttributes(){ key = "battery_state",curValue= "low",state = "low" },
- // },
- //});
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorHelp,
+ name = "娴嬭瘯绱ф�ユ眰鍔╂寜閽�",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
+ new FunctionAttributes(){ key = "alarm_status",curValue= "alarm",state = "alarm" },
+ new FunctionAttributes(){ key = "battery_value",curValue= "200",state = "200" },
+ new FunctionAttributes(){ key = "battery_percentage",curValue= "10",state = "10" },
+ new FunctionAttributes(){ key = "battery_state",curValue= "low",state = "low" },
+ },
+ });
//FunctionList.List.Functions.Add(new Function()
//{
@@ -1248,16 +1431,16 @@
// },
//});
- //FunctionList.List.Functions.Add(new Function()
- //{
- // spk = SPK.SensorGas,
- // name = "鐕冩皵浼犳劅鍣�",
- // attributes = new List<FunctionAttributes>()
- // {
- // new FunctionAttributes(){ key = "enable",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
- // new FunctionAttributes(){ key = "status",curValue= "normal",state = "normal" ,value = new List<string>(){ "alarm", "normal" } },
- // },
- //});
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.SensorGas,
+ name = "鐕冩皵浼犳劅鍣�",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "enable",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
+ new FunctionAttributes(){ key = "status",curValue= "normal",state = "normal" ,value = new List<string>(){ "alarm", "normal" } },
+ },
+ });
//FunctionList.List.Functions.Add(new Function() { spk = SPK.PjtIr, name = "娴嬭瘯鎶曞奖浠�",
// attributes = new List<FunctionAttributes>() {
@@ -1344,35 +1527,6 @@
#endregion
- if (FunctionList.List.groupControls.Count == 0)
- {
- FunctionList.List.groupControls.Add(new GroupControl()
- {
- name = "缇ゆ帶娴嬭瘯",
- collect = true,
- uids = new List<string>()
- {
- "1405771024583090178",
- "9191a3a2-026f-4667-a0b1-e3af699e7295",
- },
- roomIds = new List<string>()
- {
- "1405771024583090178",
- "9191a3a2-026f-4667-a0b1-e3af699e7295",
- },
- sids = new List<GroupControlFunction>()
- {
- new GroupControlFunction(){
- sid = "light1",
- spk = SPK.LightRGB,
- },
- new GroupControlFunction(){
- sid = "light2",
- spk = SPK.LightRGB,
- },
- }
- });
- }
#region 鍦烘櫙
var scene1 = new Scene()
{
@@ -1645,7 +1799,8 @@
new FunctionAttributes() { key = "on_off", value = new List<string>() { "on", "off" }, curValue = "on", state = "on" },
new FunctionAttributes() { key = "mode", value = new List<string>() { "cool", "heat", "fan", "auto", "dry" }, curValue = "cool", state = "cool" },
new FunctionAttributes() { key = "fan", value = new List<string>() { "high", "medium", "low", "auto" }, curValue = "auto", state = "auto" },
- new FunctionAttributes() { key = "set_temp",step = "1", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
+ new FunctionAttributes() { key = "set_temp",unit = "F", step = "1", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
+ new FunctionAttributes() { key = FunctionAttributeKey.TempType,unit = "F", step = "1", 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" },
}
@@ -1884,6 +2039,13 @@
/// <returns></returns>
private bool CheckPrivacyPolicy()
{
+#if DEBUG
+ return true;
+#endif
+ if(HttpUtil.GlobalRequestHttpsHost == "https://test-gz.hdlcontrol.com")
+ {
+ return true;
+ }
if (isAgreePrivacyPolicy == false)
{
//璇峰悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥��
--
Gitblit v1.8.0