From 9e92eed00fe1f98d9f41b3a0012bcc7914eb8dea Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 17 四月 2024 14:42:30 +0800
Subject: [PATCH] 协议更新，图标更新
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 665 ++++++++----------------------------------------------
1 files changed, 106 insertions(+), 559 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index ad186c7..3a2e734 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -22,76 +22,6 @@
Application.HideSoftInput();
};
pm = new HttpServerRequest();
-#if __ANDROID__
- BaseActivity.HideKeyboardEvent = () => {
- if (this.Y != 0)
- {
- Application.RunOnMainThread(() =>
- {
- try
- {
- this.Y = 0;
- }
- catch { }
- });
- }
- };
- BaseActivity.ShowKeyboardEvent = () => {
- try
- {
- if (etPassword.Foucs)
- {
-
- new Thread(() =>
- {
- Thread.Sleep(100);
- if (this.Y < 0)
- {
- return;
- }
- for (var i = 0; i < 10; i++)
- {
- Application.RunOnMainThread(() =>
- {
- try
- {
- this.Y = 0 - Application.GetRealHeight(10 * i);
- }
- catch { }
- });
- Thread.Sleep(10);
- }
- })
- { IsBackground = true }.Start();
- }
- }
- catch { }
- };
- BaseActivity.SmsAction = (message) => {
- Console.WriteLine($"鎺ユ敹鍒扮煭淇★細"+ message);
-
- string pattern = @"銆怘DL銆�.*(\d{6}).*";
-
- Regex regex = new Regex(pattern);
-
- Match match = regex.Match(message);
-
- if (match.Success)
- {
- string code = match.Groups[1].Value;
- Console.WriteLine("楠岃瘉鐮佷负锛�" + code);
- if(loginType==0 && logintMode == 1)
- {
- etPassword.Text = code;
- }
- smsCode = code;
- }
- else
- {
- Console.WriteLine("鏈壘鍒伴獙璇佺爜锛�");
- }
- };
-#endif
}
public override void RemoveFromParent()
@@ -103,20 +33,13 @@
waitPage = null;
}
-#if __ANDROID__
- BaseActivity.HideKeyboardEvent = () => {
-
- };
- BaseActivity.ShowKeyboardEvent = () => { };
- BaseActivity.SmsAction = (sms) => { };
-#endif
base.RemoveFromParent();
- //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
+ ////2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
//Application.HideSoftInput();
}
-#region 灞�閮ㄥ彉閲�
+ #region 灞�閮ㄥ彉閲�
/// <summary>
/// 鐧诲綍绫诲瀷
/// 0:鎵嬫満
@@ -131,13 +54,9 @@
int logintMode = 0;
string account = "";
string password = "";
- /// <summary>
- /// 鐭俊楠岃瘉鐮�
- /// </summary>
- string smsCode = "";
-#endregion
+ #endregion
-#region 鎺т欢鍒楄〃
+ #region 鎺т欢鍒楄〃
/// <summary>
/// 绛夊緟鎻愮ず
/// </summary>
@@ -230,7 +149,7 @@
/// 鏈嶅姟鍣ㄨ姹傚璞�
/// </summary>
HttpServerRequest pm;
-#endregion
+ #endregion
string verAccount = "";
@@ -252,8 +171,6 @@
#if __Android__
OnAppConfig.Instance.isAgreePrivacyPolicy = true;
#endif
- this.BackgroundColor = CSS_Color.MainBackgroundColor;
-
var btnIcon = new Button()
{
X = Application.GetRealWidth(28),
@@ -270,12 +187,9 @@
Y = Application.GetRealHeight(69),
Width = Application.GetMinRealAverage(254),
Height = Application.GetMinRealAverage(156),
- UnSelectedImagePath = "Public/Logo-bg.png"
+ UnSelectedImagePath = "Public/Logo-bg000.png"
};
bodyView.AddChidren(btnIcon_bg);
- btnIcon_bg.MouseDownEventHandler += (sender, e) => {
- Application.HideSoftInput();
- };
#if DEBUG
btnIcon_bg.MouseUpEventHandler += (sender, e) =>
@@ -294,105 +208,26 @@
//return;
if (b)
{
- //etAccount.Text = "1033326940@qq.com";
- //etAccount.Text = "18022428438";//wjc
- //etAccount.Text = "13602944661";//kx
- //etAccount.Text = "13226233133";//璞嗚眴
- //etAccount.Text = "18316120654";//tujie
- //etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
- //etAccount.Text = "tf@smarttech.com.ua";
- //etAccount.Text = "455740454@qq.com";
- //etAccount.Text = "18688565449";
- //etAccount.Text = "18570064522";
- //etAccount.Text = "18718417827";
- //etAccount.Text = "18188019284";
- //etAccount.Text = "13143792049";
- //etAccount.Text = "13288623489";//缃楁檽涓�
- //etAccount.Text = "18244942707";
- //etAccount.Text = "13143792049";
- //etAccount.Text = "18688414428";//澶╂渤3妤�
- //etAccount.Text = "13418062953";
- //etAccount.Text = "13138683659";
- //etAccount.Text = "15217626103";
- //etAccount.Text = "18100573477";
- //etAccount.Text = "18321091245";
- //etAccount.Text = "13751916353";
- //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";
-
-
+ //etAccount.Text = "13580507523";
+ etAccount.Text = "13478265371";
}
else
{
- //etAccount.Text = "464027401@qq.com";//
- //etAccount.Text = "15217626103";//
- //etAccount.Text = "13168123446";//鏄嗘槑閲戣寕椤圭洰锛屾柊椋庨棶棰�
- //etAccount.Text = "2949126848@qq.com";//闄堢惓
- //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 = "18814122445";//钁ｆ辰鏂� 澶╂渤鍔炲叕瀹�
- //etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
- //etAccount.Text = "13430286286";//cwc
- //etAccount.Text = "13709260805";
- //etAccount.Text = "support5@hdlchina.com.cn";
- //etAccount.Text = "13375012441";
- //etAccount.Text = "info@smartlife-ks.com";
- //etAccount.Text = "551775569@qq.com";//wcf
etAccount.Text = "15626203746";
- //etAccount.Text = "zhangquansongjava@163.com";
- //etAccount.Text = "s.savinov@hdlautomation.ru";
}
b = !b;
etPassword.Text = "123456";
- if(etAccount.Text == "info@hdlegypt.com")
+ if(etAccount.Text == "wxr@hdlchina.com.cn")
{
- etPassword.Text = "@Hdl2020";
- }
- else if(etAccount.Text == "18600200915")
- {
- etPassword.Text = "ZJtiaoshi";
- }else if(etAccount.Text == "13288623489")
- {
- etPassword.Text = "luoxiaodong";
- }else if(etAccount.Text == "15014291819")
- {
- etPassword.Text = "hdl123456";
- }else if (etAccount.Text == "15855403939")
- {
- etPassword.Text = "yyr123456";
- }
- else if (etAccount.Text == "649362315@qq.com")
+ etPassword.Text = "CQDWYEOV";
+ }else if(etAccount.Text == "13478265371")
{
etPassword.Text = "aa123456";
- }else if(etAccount.Text == "dcai.assist@gmail.com")
+ }else if (etAccount.Text == "13580507523")
{
- etPassword.Text = "GraniteTileS57";
+ etPassword.Text = "a123456";
}
- //etPassword.Text = "Hdl85521566";
btnLogin.IsSelected = true;
};
#endif
@@ -419,7 +254,7 @@
Height = Application.GetRealHeight(40),
TextID = StringId.LoginByEmail,
TextColor = CSS_Color.PromptingColor1,
- TextAlignment = TextAlignment.CenterLeft,
+ TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.TextFontSize,
};
bodyView.AddChidren(btnEmailLogin);
@@ -484,9 +319,6 @@
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")
@@ -786,8 +618,8 @@
#region 鍔熻兘
var lightRgb1 = new Function()
{
- sid = "light10000000000",
- deviceId = "light10000000000",
+ sid = "light1",
+ deviceId = "light1",
name = Language.CurrentLanguage == "Chinese"? "瀹㈠巺姘涘洿鐏�1": "RGB light 1",
spk = SPK.LightRGB,
roomIds = new List<string>() { "1405771024583090178"},
@@ -797,12 +629,8 @@
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="100",state = "100" },
new FunctionAttributes() { key = "rgb",value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
- new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
+ //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" },
- new FunctionAttributes() { key = "colorful",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
- new FunctionAttributes() { key = FunctionAttributeKey.ColorfulBegin,value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
- new FunctionAttributes() { key = FunctionAttributeKey.ColorfulEnd,value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
- new FunctionAttributes() { key = FunctionAttributeKey.ColorfulTime,value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
},
};
lightRgb1.SaveFunctionFile();
@@ -929,7 +757,6 @@
new FunctionAttributes() { key = "mode",value =new List<string>(){ "day", "night", "away", "normal", "timer" }, curValue="day",state = "day" },
new FunctionAttributes() { key = "set_temp",value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 35,min = 5 },
new FunctionAttributes() { key = "room_temp",value =new List<string>(){ "" }, curValue="26",state = "26" },
- new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳C", state = "掳C" },
},
};
fh.SaveFunctionFile();
@@ -937,119 +764,6 @@
#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",
@@ -1084,161 +798,35 @@
};
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 = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-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 = "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 = "娴嬭瘯娓╂帶鍣�",
- spk = SPK.HvacCac,
- attributes = new List<FunctionAttributes>
- {
- new FunctionAttributes(){ key = "on_off",curValue = "on",state = "on" },
- new FunctionAttributes(){ key = "cac_valve",curValue = "on",state = "on" },//姣涚粏闃�
- new FunctionAttributes(){ key = "fh_valve",curValue = "on",state = "on" },//鍦版殩闃�
- new FunctionAttributes(){ key = "mode",curValue = "cool",state = "cool", value = new List<string>{ "cool","heat"} },
- new FunctionAttributes(){ key = "set_temp",curValue = "20",state = "20",min = 16,max = 30 },
- new FunctionAttributes(){ key = "room_temp",curValue = "20",state = "20" },
- new FunctionAttributes(){ key = "dew_point_temp",curValue = "20",state = "20" },//闇茬偣娓╁害
- new FunctionAttributes(){ key = "surface_temp",curValue = "20",state = "20" },//琛ㄩ潰娓╁害
- new FunctionAttributes(){ key = "energy_saving",curValue = "true",state = "true" },//鑺傝兘
- new FunctionAttributes(){ key = "room_humidity",curValue = "66",state = "66" },
- //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 = "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
//{
@@ -1290,69 +878,15 @@
// }
//});
- 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()
+ //{
+ // spk = SPK.SensorDryContact,
+ // name = "骞叉帴鐐�",
+ // attributes = new List<FunctionAttributes>()
+ // {
+ // new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
+ // },
+ //});
//FunctionList.List.Functions.Add(new Function()
//{
@@ -1367,7 +901,7 @@
// new AttrKeyConfig (){
// key = "pm2.5",
// type = "interval" ,
- // unit = "ug/m鲁",
+ // unit = "ug/m虏",
// configs = new List<AttrKeyInfo>(){
// new AttrKeyInfo(){ start = "0",end = "75",color = "0xFFADE764", desc = "鑹ソ"},
// new AttrKeyInfo(){ start = "76",end = "150",color = "0xFFFFD154",desc = "杞�/涓害姹℃煋"},
@@ -1377,19 +911,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()
//{
@@ -1431,16 +965,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>() {
@@ -1526,7 +1060,6 @@
#endregion
-
#region 鍦烘櫙
var scene1 = new Scene()
{
@@ -1799,8 +1332,7 @@
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",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 = "set_temp",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" },
}
@@ -1822,7 +1354,6 @@
new FunctionAttributes() { key = "set_temp",step = "0.5", 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" },
- new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳C", state = "掳C" },
}
};
ac2.SaveFunctionFile();
@@ -1848,7 +1379,7 @@
// collect = false,
//};
//scene6.SaveSceneFile();
-#endregion
+ #endregion
var lightSwitch6 = new Function()
@@ -1885,14 +1416,37 @@
LoadEventList();
account = etAccount.Text.Trim();
+#if DEBUG1211
+ //鏈湴妯″紡
+ Button btnLocalMode = new Button()
+ {
+ Y = Application.GetRealHeight(600),
+ Height = Application.GetRealHeight(67),
+ Text = "Local Mode",
+ TextAlignment = TextAlignment.Center,
+ BackgroundColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.TextualColor,
+ };
+ bodyView.AddChidren(btnLocalMode);
+
+ btnLocalMode.MouseUpEventHandler = (sender, e) =>
+ {
+ MainPage.LocalMode = true;
+ UserInfo.Current = new UserInfo();
+ MainPage.GoUserPage();
+ };
+
+ MainPage.Log("etAccount.TextAlignment : " + etAccount.TextAlignment.ToString());
+
+#endif
#region 闅愮鏀跨瓥
AddServiceAgreementControl(bodyView);
-#endregion
+ #endregion
}
-#region 鈻� 鏈嶅姟鍗忚___________________________
+ #region 鈻� 鏈嶅姟鍗忚___________________________
bool isAgreePrivacyPolicy = false;
/// <summary>
/// 娣诲姞鏈嶅姟鍗忚鎺т欢
@@ -2014,12 +1568,12 @@
OpenWebViewPage(true);
};
-#if __ANDROID__
+ #if __ANDROID__
//if(OnAppConfig.Instance.FirstRunApp || !OnAppConfig.Instance.isAgreePrivacyPolicy)
//{
// HDL_ON_Android.HDLONUtils.StartSplashActivity();
//}
-#endif
+ #endif
}
/// <summary>
@@ -2039,13 +1593,6 @@
/// <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