From c1d681f496f2e1c53f88472d803e3c95fab521af Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 29 七月 2021 09:46:16 +0800
Subject: [PATCH] 萤石测试通过
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 136 +++++++++++++++++----------------------------
1 files changed, 52 insertions(+), 84 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
old mode 100755
new mode 100644
index 76d7f8f..cfab368
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -202,7 +202,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.BelongToZone,
+ TextID = StringId.LocationManagement,
};
belongToZoneRow.AddChidren(btnBelongToTitle);
@@ -223,7 +223,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = scene.GetRoomListName() == "" ? Language.StringByID(StringId.WholeHouseScene) : scene.GetRoomListName()
+ Text = scene.GetRoomListName() == "" ? Language.StringByID(StringId.WholeZone) : scene.GetRoomListName()
};
belongToZoneRow.AddChidren(btnZoneName);
@@ -261,7 +261,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = FunctionList.List.GetDelayText( scene.delay)
+ Text = scene.GetDelayText()
};
sceneDelayRow.AddChidren(btnSceneDelayInfo);
@@ -281,9 +281,14 @@
{
Action<string> action = (obj) => {
scene.delay = obj;
- btnSceneDelayInfo.Text = FunctionList.List.GetDelayText(obj);
+ btnSceneDelayInfo.Text = scene.GetDelayText();
scene.EditScene();
};
+ Dictionary<string, string> items = new Dictionary<string, string>();
+ items.Add("30", "30s");
+ items.Add("60", "1min");
+ items.Add("120", "2min");
+ items.Add("300", "5min");
new PublicAssmebly().SetSceneDelayDialog(action,scene.delay);
};
@@ -319,13 +324,14 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.AddFunction,
+ TextID = StringId.FunctionManagement,
IsBold = true,
};
addFunctionRow.AddChidren(btnAddFunctionTitle);
functionListView = new VerticalScrolViewLayout() {
Height = 0,
+ ScrollEnabled = false,
};
contentView.AddChidren(functionListView);
@@ -373,32 +379,42 @@
var waitPage = new Loading();
new Thread(() => {
- Application.RunOnMainThread(() => {
- bodyView.AddChidren(waitPage);
- waitPage.Start(Language.StringByID(StringId.PleaseWait));
- });
- var pm = new HttpServerRequest();
- var pack = pm.GetSceneInfo(scene.userSceneId);
- if (pack.Code == StateCode.SUCCESS)
+ try
{
- var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
- var tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
- if(tempScene!= null)
- {
- scene.functions = tempScene.functions;
- }
Application.RunOnMainThread(() =>
{
- LoadFunctionRow();
- waitPage.Hide();
+ bodyView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
});
+ var pm = new HttpServerRequest();
+ var pack = pm.GetSceneInfo(scene.userSceneId);
+ if (pack.Code == StateCode.SUCCESS)
+ {
+ var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
+ var tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
+ if (tempScene != null)
+ {
+ scene.functions = tempScene.functions;
+ }
+ Application.RunOnMainThread(() =>
+ {
+ LoadFunctionRow();
+ waitPage.Hide();
+ waitPage.RemoveFromParent();
+ });
+ }
+ else
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+ }
}
- else
+ catch { }
+ finally
{
Application.RunOnMainThread(() =>
{
waitPage.Hide();
- IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+ waitPage.RemoveFromParent();
});
}
}).Start();
@@ -410,8 +426,15 @@
{
functionListView.RemoveAll();
functionListView.Height = Application.GetRealWidth(65 * scene.functions.Count);
- foreach (var scenefunction in scene.functions)
+ for(int i =0;i<scene.functions.Count;)
{
+ var scenefunction = scene.functions[i];
+ if (scenefunction.localFunction == null)
+ {
+ scene.functions.Remove(scenefunction);
+ continue;
+ }
+ i++;
var row = new RowLayout()
{
Height = Application.GetRealWidth(65),
@@ -444,7 +467,7 @@
TextAlignment = TextAlignment.BottomRight,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = GetFunctionScnenInfo(scenefunction),
+ Text = scenefunction.GetFunctionScnenInfo(),
};
row.AddChidren(btnFunctionInfo);
@@ -461,7 +484,7 @@
if (Convert.ToInt32( scenefunction.delay) > 0)
{
- btnFunctionDelayInfo.Text = Language.StringByID(StringId.Delay) + " " + FunctionList.List.GetDelayText(scenefunction.delay);
+ btnFunctionDelayInfo.Text = Language.StringByID(StringId.Delay) + " " + new Scene() { delay = scenefunction.delay }.GetDelayText();
}
else
{
@@ -491,20 +514,15 @@
};
row.AddChidren(btnFunctionFloorAndRoom);
- btnFunctionName.MouseUpEventHandler = (sender, e) =>
+ EventHandler<MouseEventArgs> skipEvent = (sender, e) =>
{
var ssf = new SceneFunctionInfoEditPage(scene, scenefunction, refreshFunctionRowAction);
MainPage.BasePageView.AddChidren(ssf);
ssf.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- btnFunctionFloorAndRoom.MouseUpEventHandler = (sender, e) =>
- {
- var ssf = new SceneFunctionInfoEditPage(scene, scenefunction, refreshFunctionRowAction);
- MainPage.BasePageView.AddChidren(ssf);
- ssf.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ btnFunctionName.MouseUpEventHandler = skipEvent;
+ btnFunctionFloorAndRoom.MouseUpEventHandler = skipEvent;
Button btnDelSceneFunction = new Button() {
@@ -518,59 +536,8 @@
scene.EditScene();
row.RemoveFromParent();
functionListView.Height = Application.GetRealWidth(65 * scene.functions.Count);
- //LoadFunctionRow(functionListView);
};
}
- }
-
- /// <summary>
- /// 瑙ｆ瀽鍦烘櫙鍔熻兘鏁版嵁
- /// </summary>
- /// <param name="sceneFunction"></param>
- string GetFunctionScnenInfo(SceneFunction sceneFunction)
- {
- var sceneFunctionInfo = "";
- foreach (var sfs in sceneFunction.status)
- {
- if (sfs.key == FunctionAttributeKey.OnOff)
- {
- if (sfs.value == "off")
- return Language.StringByID(StringId.Close);
- }
- }
-
- if (sceneFunction.status.Count == 1)
- {
- return sceneFunctionInfo += Language.StringByID(StringId.Open);
- }
-
- var modeState = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Mode);
- var tempState = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.SetTemp);
- var fanState = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.FanSpeed);
- if (modeState != null)
- {
- sceneFunctionInfo += FunctionList.List.GetValueText(modeState.key, modeState.value);
- }
- if (tempState != null)
- {
- sceneFunctionInfo += FunctionList.List.GetValueText(tempState.key, tempState.value);
- sceneFunctionInfo += FunctionList.List.GetUintString(tempState.key);
- }
- if (fanState != null)
- {
- sceneFunctionInfo += FunctionList.List.GetValueText(fanState.key, fanState.value);
- }
- var briState = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Brightness);
- if (briState != null)
- {
- sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + briState.value + "%";
- }
- var perState = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Percent);
- if (perState != null)
- {
- sceneFunctionInfo += Language.StringByID(StringId.Open) + " " + perState.value + "%";
- }
- return sceneFunctionInfo;
}
/// <summary>
@@ -792,6 +759,7 @@
pictureOptionView.Parent.RemoveFromParent();
Action<string> action = (obj) => {
scene.ImagePath = obj;
+ addSceneImageView.ImageBytes = null;//瑙ｅ喅鏈塈mageBytes涓嶅姞杞絀magePath
addSceneImageView.ImagePath = scene.ImagePath;
scene.EditScene();
};
--
Gitblit v1.8.0