From 23ad902a6844438966d48deb25a89614c6ee5477 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 26 十月 2022 13:18:24 +0800
Subject: [PATCH] 金茂绿建科技系统更新
---
HDL-ON_iOS/Resources/Language.ini | 33 +++++
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 50 ++++----
HDL-ON_Android/Assets/Language.ini | 31 +++++
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 47 +++----
HDL_ON/Common/R.cs | 20 +++
HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs | 4
HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs | 112 +++++++++++++-----
SiriIntents/Server/HttpUtil.cs | 4
9 files changed, 217 insertions(+), 88 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 7ad9e66..2d60a36 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -555,6 +555,11 @@
567=Battery SOC: --%
568=Running/Total:--/--
570=Out:{0}掳/In:{1}掳
+571=Sleep
+572=Away
+573=At home
+574=Heating and dehumidification
+575=Select Mode
@@ -1775,8 +1780,13 @@
568=杩愯鏁伴噺/鎬绘暟閲�: --/--
569=浜哄眳鐜
570=瀹ゅ:{0}掳/瀹ゅ唴:{1}掳
+571=鐫＄湢
+572=绂诲
+573=鍦ㄥ
+574=鍒剁儹闄ゆ箍
+575=閫夋嫨妯″紡
-
+
2532=璁垮閭�璇疯褰�
2533=璁垮绠＄悊
@@ -2971,6 +2981,13 @@
567=Battery SOC: --%
568=Running/Total:--/--
570=Out:{0}掳/In:{1}掳
+571=Sleep
+572=Away
+573=At home
+574=Heating and dehumidification
+575=Select Mode
+
+
2532=Visitor Invitation Record
2533=Visitor management
@@ -4174,6 +4191,13 @@
567=Battery SOC: --%
568=Running/Total:--/--
570=Out:{0}掳/In:{1}掳
+571=Sleep
+572=Away
+573=At home
+574=Heating and dehumidification
+575=Select Mode
+
+
2532=Visitor Invitation Record
@@ -5364,6 +5388,11 @@
567=Battery SOC: --%
568=Running/Total:--/--
570=Out:{0}掳/In:{1}掳
+571=Sleep
+572=Away
+573=At home
+574=Heating and dehumidification
+575=Select Mode
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 53e41e4..2d60a36 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -555,6 +555,11 @@
567=Battery SOC: --%
568=Running/Total:--/--
570=Out:{0}掳/In:{1}掳
+571=Sleep
+572=Away
+573=At home
+574=Heating and dehumidification
+575=Select Mode
@@ -1775,8 +1780,13 @@
568=杩愯鏁伴噺/鎬绘暟閲�: --/--
569=浜哄眳鐜
570=瀹ゅ:{0}掳/瀹ゅ唴:{1}掳
+571=鐫＄湢
+572=绂诲
+573=鍦ㄥ
+574=鍒剁儹闄ゆ箍
+575=閫夋嫨妯″紡
-
+
2532=璁垮閭�璇疯褰�
2533=璁垮绠＄悊
@@ -2971,6 +2981,13 @@
567=Battery SOC: --%
568=Running/Total:--/--
570=Out:{0}掳/In:{1}掳
+571=Sleep
+572=Away
+573=At home
+574=Heating and dehumidification
+575=Select Mode
+
+
2532=Visitor Invitation Record
2533=Visitor management
@@ -4174,6 +4191,13 @@
567=Battery SOC: --%
568=Running/Total:--/--
570=Out:{0}掳/In:{1}掳
+571=Sleep
+572=Away
+573=At home
+574=Heating and dehumidification
+575=Select Mode
+
+
2532=Visitor Invitation Record
@@ -4819,7 +4843,7 @@
9=袙褏芯写 褋 泻芯写 蟹邪 锌芯褌胁褗褉卸写械薪懈械
10=袦芯谢褟, 懈蟹褔邪泻邪泄褌械...
11=袟邪褌胁芯褉懈
-12= 袙蟹械屑械褌械 泻芯写 蟹邪 锌芯褌胁褗褉卸写械薪懈械
+12=袙蟹械屑械褌械 泻芯写 蟹邪 锌芯褌胁褗褉卸写械薪懈械
13=袙谢懈蟹邪薪械 褋 锌邪褉芯谢邪
14=袪械谐懈褋褌褉懈褉邪泄褌械 褋械
15=袦芯谢褟, 胁褗胁械写械褌械 屑芯斜懈谢薪懈褟 褋懈 薪芯屑械褉
@@ -5364,6 +5388,11 @@
567=Battery SOC: --%
568=Running/Total:--/--
570=Out:{0}掳/In:{1}掳
+571=Sleep
+572=Away
+573=At home
+574=Heating and dehumidification
+575=Select Mode
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 91f1b18..be3e98e 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,6 +5,26 @@
public static class StringId
{
/// <summary>
+ /// 閫夋嫨妯″紡
+ /// </summary>
+ public const int SelectMode = 575;
+ /// <summary>
+ /// 鍒剁儹闄ゆ箍
+ /// </summary>
+ public const int HeatingAndDehumidification = 574;
+ /// <summary>
+ /// 鍦ㄥ
+ /// </summary>
+ public const int AtHome = 573;
+ /// <summary>
+ /// 绂诲
+ /// </summary>
+ public const int AwayHome = 572;
+ /// <summary>
+ /// 鐫＄湢
+ /// </summary>
+ public const int Sleep = 571;
+ /// <summary>
/// 瀹ゅ:27掳/瀹ゅ唴:27掳
/// </summary>
public const int IndoorTempOutdoorTemp = 570;
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 511a91e..bf39c96 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,8 +17,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index a6a5bd7..f593fa1 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -1257,31 +1257,31 @@
};
- Button btnAcstPower = new Button()
- {
- X = Application.GetRealWidth(115),
- Y = Application.GetRealHeight(70),
- Width = Application.GetRealWidth(32),
- Height = Application.GetRealWidth(32),
- SelectedImagePath = "Public/PowerOpen.png",
- UnSelectedImagePath = "Public/PowerClose.png",
- IsSelected = function.trait_on_off.curValue.ToString() == "on",
- };
- view.AddChidren(btnAcstPower);
- btnAcstPower.MouseUpEventHandler = (sender, e) => {
- btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
- new System.Threading.Thread(() =>
- {
- string onoff = btnAcstPower.IsSelected ? "on" : "off";
- Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add(FunctionAttributeKey.OnOff, onoff);
- foreach (var temp in FunctionList.List.GetAcstParentList())
- {
- Control.Ins.SendWriteCommand(temp, d);
- }
- })
- { IsBackground = true }.Start();
- };
+ //Button btnAcstPower = new Button()
+ //{
+ // X = Application.GetRealWidth(115),
+ // Y = Application.GetRealHeight(70),
+ // Width = Application.GetRealWidth(32),
+ // Height = Application.GetRealWidth(32),
+ // SelectedImagePath = "Public/PowerOpen.png",
+ // UnSelectedImagePath = "Public/PowerClose.png",
+ // IsSelected = function.trait_on_off.curValue.ToString() == "on",
+ //};
+ //view.AddChidren(btnAcstPower);
+ //btnAcstPower.MouseUpEventHandler = (sender, e) => {
+ // btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
+ // new System.Threading.Thread(() =>
+ // {
+ // string onoff = btnAcstPower.IsSelected ? "on" : "off";
+ // Dictionary<string, string> d = new Dictionary<string, string>();
+ // d.Add(FunctionAttributeKey.OnOff, onoff);
+ // foreach (var temp in FunctionList.List.GetAcstParentList())
+ // {
+ // Control.Ins.SendWriteCommand(temp, d);
+ // }
+ // })
+ // { IsBackground = true }.Start();
+ //};
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index acbc6c3..68485bc 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1073,30 +1073,29 @@
};
functionView.AddChidren(btnJMLogo);
- Button btnAcstPower = new Button()
- {
- X = Application.GetRealWidth(120),
- Y = specialList.Contains(index) ? Application.GetRealWidth(160) : Application.GetRealWidth(117),
- Width = Application.GetRealWidth(32),
- Height = Application.GetRealWidth(32),
- SelectedImagePath = "Public/PowerOpen.png",
- UnSelectedImagePath = "Public/PowerClose.png",
- IsSelected = functionOnCount > 0,
- Tag = item + "_AllControl",
- };
- functionView.AddChidren(btnAcstPower);
- btnAcstPower.MouseUpEventHandler = (sender, e) =>
- {
- btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
- string onoff = btnAcstPower.IsSelected ? "on" : "off";
- Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add(FunctionAttributeKey.OnOff, onoff);
-
- foreach (var temp in FunctionList.List.GetAcstParentList())
- {
- Control.Ins.SendWriteCommand(temp, d);
- }
- };
+ //Button btnAcstPower = new Button()
+ //{
+ // X = Application.GetRealWidth(120),
+ // Y = specialList.Contains(index) ? Application.GetRealWidth(160) : Application.GetRealWidth(117),
+ // Width = Application.GetRealWidth(32),
+ // Height = Application.GetRealWidth(32),
+ // SelectedImagePath = "Public/PowerOpen.png",
+ // UnSelectedImagePath = "Public/PowerClose.png",
+ // IsSelected = functionOnCount > 0,
+ // Tag = item + "_AllControl",
+ //};
+ //functionView.AddChidren(btnAcstPower);
+ //btnAcstPower.MouseUpEventHandler = (sender, e) =>
+ //{
+ // btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
+ // string onoff = btnAcstPower.IsSelected ? "on" : "off";
+ // Dictionary<string, string> d = new Dictionary<string, string>();
+ // d.Add(FunctionAttributeKey.OnOff, onoff);
+ // foreach (var temp in FunctionList.List.GetAcstParentList())
+ // {
+ // Control.Ins.SendWriteCommand(temp, d);
+ // }
+ //};
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs
index 167d25e..774698a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs
@@ -180,7 +180,7 @@
if(view!= null)
{
view.btnSubHumidityValues.Text = temp.GetAttrState(AcstSub_AttrEnum.room_humidity.ToString()) + "%";
- view.btnSubTempValues.Text = temp.GetAttrState(AcstSub_AttrEnum.room_humidity.ToString()) + "%";
+ view.btnSubTempValues.Text = temp.GetAttrState(AcstSub_AttrEnum.room_temp.ToString()) + "掳";
view.btnSubPower.IsSelected = temp.GetAttrState(AcstSub_AttrEnum.on_off.ToString()) == "on";
}
});
@@ -189,22 +189,39 @@
public void LoadPage()
{
var curTime = DateTime.Now;
- string helloText = "涓婂崍濂�";
+ string helloText = "涓婂崍濂�";
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ helloText = "Good morning";
+ }
if (curTime.Hour >= 8 && curTime.Hour < 12)
{
helloText = "涓婂崍濂�";
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ helloText = "Good morning";
+ }
curColor = CSS.CSS_Color.MainColor;
imageFolder = "blue";
}
else if (curTime.Hour >= 12 && curTime.Hour < 18)
{
helloText = "涓嬪崍濂�";
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ helloText = "Good afternoon";
+ }
curColor = 0xFFE7914F;
imageFolder = "orange";
}
else
{
helloText = "鏅氫笂濂�";
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ helloText = "Good evening";
+ }
+
curColor = 0xFF9175F3;
imageFolder = "purple";
}
@@ -392,16 +409,18 @@
Width = Application.GetRealWidth(60 * sensorCount),
Gravity = Gravity.Center,
};
- infoContentView.AddChidren(sensorListView);
-
+ if (sensorCount > 0)
+ {
+ infoContentView.AddChidren(sensorListView);
+ }
if (tempObj != null)
{
- sensorDiyView_Temp = new SensorDiyView(sensorListView, curColor, tempObj.state == "" ? "--" : tempObj.state, "掳", "娓╁害");
+ sensorDiyView_Temp = new SensorDiyView(sensorListView, curColor, tempObj.state == "" ? "--" : tempObj.state, "掳", Language.StringByID(StringId.Temp));
}
if (humiObj != null)
{
- sensorDiyView_Humi = new SensorDiyView(sensorListView, curColor, humiObj.state == "" ? "--" : humiObj.state, "%", "婀垮害");
+ sensorDiyView_Humi = new SensorDiyView(sensorListView, curColor, humiObj.state == "" ? "--" : humiObj.state, "%", Language.StringByID(StringId.Humidity));
}
if (pm25Obj != null)
{
@@ -434,26 +453,45 @@
{
energyCount++;
}
-
var energyListView = new HorizontalScrolViewLayout()
{
Width = Application.GetRealWidth(100 * energyCount),
Gravity = Gravity.Center,
Visible = false,
};
- infoContentView.AddChidren(energyListView);
+ if (energyCount > 0)
+ {
+ infoContentView.AddChidren(energyListView);
+ }
if (totalObj != null)
{
- sensorDiyView_EleActivePower = new SensorDiyView(energyListView, curColor, totalObj.state == "" ? "--" : totalObj.state , "KW", "鐢ㄧ數鍔熺巼", 100);
+ string text = "鐢ㄧ數鍔熺巼";
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ text = "Power";
+ }
+
+ sensorDiyView_EleActivePower = new SensorDiyView(energyListView, curColor, totalObj.state == "" ? "--" : totalObj.state , "KW", text, 100);
}
if (dayObj != null)
{
- sensorDiyView_EleDay = new SensorDiyView(energyListView, curColor, dayObj.state == "" ? "--" : dayObj.state , "KW", "浠婃棩鑰楃數",100);
+ string text = "浠婃棩鑰楃數";
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ text = "Power of today";
+ }
+ sensorDiyView_EleDay = new SensorDiyView(energyListView, curColor, dayObj.state == "" ? "--" : dayObj.state , "KW", text,100);
}
if (monthObj != null)
{
- sensorDiyView_EleMonth = new SensorDiyView(energyListView, curColor, monthObj.state == "" ? "--" : monthObj.state , "KWh", "鏈湀鑰楃數", 100);
+ string text = "鏈湀鑰楃數";
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ text = "Power of month";
+ }
+ sensorDiyView_EleMonth = new SensorDiyView(energyListView, curColor, monthObj.state == "" ? "--" : monthObj.state , "KWh", text, 100);
}
+
var btnChangeClick = new Button();
infoView.AddChidren(btnChangeClick);
@@ -473,8 +511,10 @@
energyListView.Visible = false;
}
};
- btnChangeClick.MouseUpEventHandler = changeInfoEvent;
-
+ if (sensorCount > 0 && energyCount > 0)
+ {
+ btnChangeClick.MouseUpEventHandler = changeInfoEvent;
+ }
#endregion
@@ -521,6 +561,10 @@
Height = Application.GetRealHeight(54),
};
subTitleView.AddChidren(btnTitleText2);
+ if(Language.CurrentLanguage != "Chinese")
+ {
+ btnTitleText2.Text = "My Home";
+ }
int subFunctionCount = 0;
@@ -620,7 +664,7 @@
{
X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(100),
- Text = "閫夋嫨妯″紡",
+ TextID = StringId.SelectScene,
TextSize = 16,
TextColor = CSS.CSS_Color.FirstLevelTitleColor,
IsBold = true,
@@ -769,7 +813,7 @@
BackgroundColor = CSS.CSS_Color.DividingLineColor,
});
IconButton heatHumiIconButton = new IconButton("FunctionIcon/Acst/grey/ModeHeatHumiIcon.png", $"FunctionIcon/Acst/{imageFolder}/ModeHeatHumiIcon.png",
- "鍒剁儹闄ゆ箍", curColor, function.GetAttrState(AcstParent_AttrEnum.mode.ToString()) == AcstParent_Attr_ModeValueEnum.heat_humidity.ToString());
+ Language.StringByID(StringId.HeatingAndDehumidification), curColor, function.GetAttrState(AcstParent_AttrEnum.mode.ToString()) == AcstParent_Attr_ModeValueEnum.heat_humidity.ToString());
heatHumiIconButton.Click(() => {
btnModeControl.SelectedImagePath = $"FunctionIcon/Acst/{imageFolder}/ModeHeatHumiIcon2.png";
dialog.Close();
@@ -800,7 +844,7 @@
BackgroundColor = CSS.CSS_Color.DividingLineColor,
});
IconButton humiIconButton = new IconButton("FunctionIcon/Acst/grey/ModeHumiIcon.png", $"FunctionIcon/Acst/{imageFolder}/ModeHumiIcon.png",
- "鍔犳箍", curColor, function.GetAttrState(AcstParent_AttrEnum.mode.ToString()) == AcstParent_Attr_ModeValueEnum.humidity.ToString());
+ Language.StringByID(StringId.Humidification), curColor, function.GetAttrState(AcstParent_AttrEnum.mode.ToString()) == AcstParent_Attr_ModeValueEnum.humidity.ToString());
humiIconButton.Click(() => {
btnModeControl.SelectedImagePath = $"FunctionIcon/Acst/{imageFolder}/ModeHumiIcon2.png";
dialog.Close();
@@ -828,15 +872,21 @@
IsSelected = function.trait_on_off.state == "on"
};
bottomView.AddChidren(btnPowerControl);
- btnPowerControl.MouseUpEventHandler = (sender, e) => {
- btnPowerControl.IsSelected = !btnPowerControl.IsSelected;
+ btnPowerControl.MouseUpEventHandler = (sender, e) =>
+ {
+ string msg = btnPowerControl.IsSelected ? "纭畾鍏抽棴鎬诲紑鍏冲悧锛�" : "纭畾鎵撳紑鎬诲紑鍏冲悧锛�";
+ new PublicAssmebly().TipOptionMsg(StringId.Tip, msg, () =>
+ {
+ btnPowerControl.IsSelected = !btnPowerControl.IsSelected;
- new System.Threading.Thread(() => {
- Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add(FunctionAttributeKey.OnOff, btnPowerControl.IsSelected ? "on" : "off");
- Control.Ins.SendWriteCommand(function, d);
- })
- { IsBackground = true }.Start();
+ new System.Threading.Thread(() =>
+ {
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.OnOff, btnPowerControl.IsSelected ? "on" : "off");
+ Control.Ins.SendWriteCommand(function, d);
+ })
+ { IsBackground = true }.Start();
+ });
};
@@ -890,7 +940,7 @@
{
X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(100),
- Text = "閫夋嫨鍦烘櫙",
+ TextID = StringId.SelectScene,
TextSize = 16,
TextColor = CSS.CSS_Color.FirstLevelTitleColor,
IsBold = true,
@@ -915,7 +965,7 @@
BackgroundColor = CSS.CSS_Color.DividingLineColor,
});
IconButton atHomeIconButton = new IconButton("FunctionIcon/Acst/grey/SceneAtHome.png", $"FunctionIcon/Acst/{imageFolder}/SceneAtHome.png",
- "鍦ㄥ", curColor, function.GetAttrState(AcstParent_AttrEnum.scene.ToString()) == AcstParent_Attr_SceneValueEnum.at_home.ToString());
+ Language.StringByID(StringId.AtHome), curColor, function.GetAttrState(AcstParent_AttrEnum.scene.ToString()) == AcstParent_Attr_SceneValueEnum.at_home.ToString());
atHomeIconButton.Click(() => {
btnModeControl.SelectedImagePath = $"FunctionIcon/Acst/{imageFolder}/SceneAtHome2.png";
dialog.Close();
@@ -947,7 +997,7 @@
BackgroundColor = CSS.CSS_Color.DividingLineColor,
});
IconButton awayHomeIconButton = new IconButton("FunctionIcon/Acst/grey/SceneAwayHomeIcon.png", $"FunctionIcon/Acst/{imageFolder}/SceneAwayHomeIcon.png",
- "绂诲", curColor, function.GetAttrState(AcstParent_AttrEnum.scene.ToString()) == AcstParent_Attr_SceneValueEnum.leave_home.ToString());
+ Language.StringByID(StringId.AwayHome), curColor, function.GetAttrState(AcstParent_AttrEnum.scene.ToString()) == AcstParent_Attr_SceneValueEnum.leave_home.ToString());
awayHomeIconButton.Click(() => {
btnModeControl.SelectedImagePath = $"FunctionIcon/Acst/{imageFolder}/SceneAwayHomeIcon2.png";
dialog.Close();
@@ -978,7 +1028,7 @@
BackgroundColor = CSS.CSS_Color.DividingLineColor,
});
IconButton sleepIconButton = new IconButton("FunctionIcon/Acst/grey/SceneSleepIcon.png", $"FunctionIcon/Acst/{imageFolder}/SceneSleepIcon.png",
- Language.StringByID(StringId.Humidity), curColor, function.GetAttrState(AcstParent_AttrEnum.scene.ToString()) == AcstParent_Attr_SceneValueEnum.sleep.ToString());
+ Language.StringByID(StringId.Sleep), curColor, function.GetAttrState(AcstParent_AttrEnum.scene.ToString()) == AcstParent_Attr_SceneValueEnum.sleep.ToString());
sleepIconButton.Click(() => {
btnModeControl.SelectedImagePath = $"FunctionIcon/Acst/{imageFolder}/SceneSleepIcon2.png";
dialog.Close();
@@ -1098,7 +1148,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = 0xFF1b3053,
TextSize = 13,
- Text = sub.GetRoomListName(),
+ Text = sub.name,
};
subFunctionView.AddChidren(btnRoomInfo);
@@ -1170,7 +1220,9 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
var page = new AcstSubPage(sub,imageFolder);
MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
+ page.LoadPage(()=> {
+ btnRoomInfo.Text = sub.name;
+ });
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs
index f6a5fbd..c0490ed 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs
@@ -83,9 +83,9 @@
bodyView = this;
}
- public void LoadPage()
+ public void LoadPage(Action action)
{
- new TopViewDiv(bodyView, function.GetRoomListName()).LoadTopView();
+ new TopViewDiv(bodyView, function.name).LoadTopView_FunctionTop(function,action);
var contentView = new FrameLayout()
{
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index f61de04..56a78a0 100644
--- a/SiriIntents/Server/HttpUtil.cs
+++ b/SiriIntents/Server/HttpUtil.cs
@@ -16,8 +16,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
--
Gitblit v1.8.0