From 41f9c8837b0551c68f8fd798c06951fa716b7ab8 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 11 一月 2021 14:05:29 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs | 134 +++-----------------------------------------
1 files changed, 10 insertions(+), 124 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
old mode 100755
new mode 100644
index 2d7fbb3..d3bb907
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
@@ -63,13 +63,7 @@
//鍦烘櫙鐐瑰嚮浜嬩欢
sceneView.btnClick.MouseUpEventHandler += (sen, e) =>
{
-
- FrameLayout fLayout = new FrameLayout
- {
- BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
- };
- this.AddChidren(fLayout);
- SceneMethod(fLayout);
+ SceneMethod();
};
//寤舵椂鐐瑰嚮浜嬩欢
delayView.btnClick.MouseUpEventHandler += (sen, e) =>
@@ -89,138 +83,30 @@
/// <summary>
/// 娣诲姞鍦烘櫙
/// </summary>
- /// <param name="fLayout">寮规涓绘帶浠�</param>
- public void SceneMethod(FrameLayout fLayout)
+ public void SceneMethod()
{
- int line = 0;
var sceneList = LogicMethod.GetSceneList();
- if (sceneList.Count == 0|| sceneList.Count>5)
- {
- line = 5;
- }
- else {
- line = sceneList.Count;
- }
- LogicView.DateView view = new LogicView.DateView();
- view.btnTitle.TextID = StringId.addSceneLogic;
- view.FLayoutView(fLayout, line);
-
- view.btnCancel.MouseUpEventHandler += (sender2, e2) =>
- {
- fLayout.RemoveFromParent();
- };
- FrameLayout frameL = new FrameLayout
- {
- Y = Application.GetRealHeight(56),
- Height = Application.GetRealHeight(50 * line),
- };
-
- VerticalRefreshLayout verticalRefresh = new VerticalRefreshLayout
- {
- Y = Application.GetRealHeight(56),
- Height = Application.GetRealHeight(50 * 5),
-
- };
- verticalRefresh.BeginHeaderRefreshingAction += () =>
- {
- //鍏抽棴鍒锋柊View锛�
- verticalRefresh.EndHeaderRefreshing();
- };
-
- if (sceneList.Count == 0)
- {
- Button btnTipNot = new Button
- {
- X=Application.GetRealWidth(93),
- Y = Application.GetRealHeight(80),
- Width = Application.GetRealWidth(158),
- Height = Application.GetRealWidth(158),
- UnSelectedImagePath = "TipNot.png",
-
- };
- view.frameLayout.AddChidren(btnTipNot);
-
- Button btnTipNotText = new Button()
- {
- Y = btnTipNot.Bottom+ Application.GetRealHeight(16),
- Height = Application.GetRealHeight(20),
- TextID = StringId.secnenull,
- TextColor = CSS.CSS_Color.textColor,
- TextSize =LogicView.TextSize.text14,
- TextAlignment = TextAlignment.Center,
- };
- view.frameLayout.AddChidren(btnTipNotText);
- }
- else if (sceneList.Count <=5 ) {
- view.frameLayout.AddChidren(frameL);
- }
- else if(sceneList.Count>5) {
- view.frameLayout.AddChidren(verticalRefresh);
-
- }
-
-
- //瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鐘舵��
- Button buttonClick = new Button();
- HDL_ON.Entity.Scene sceneSelecetd = null;
- verticalRefresh.BeginHeaderRefreshingAction += () =>
- {
- //鍏抽棴鍒锋柊View锛�
- verticalRefresh.EndHeaderRefreshing();
- };
-
- for (int i = 0; i < sceneList.Count; i++)
- {
+ List<string> nameList = new List<string>();
+ for (int i = 0; i < sceneList.Count; i++) {
var scene = sceneList[i];
- LogicView.CheckView sceneView = new LogicView.CheckView();
- sceneView.btnText.Text = scene.name;
- sceneView.btnText.TextSize = LogicView.TextSize.text14;
- if (sceneList.Count <= 5)
- {
- sceneView.frameLayout.Y = Application.GetRealWidth(i*50);
- frameL.AddChidren(sceneView.FLayoutView());
- if (sceneList.Count-1==i) {
- sceneView.btnLine.BackgroundColor = CSS.CSS_Color.view;
- }
- }
- else
- {
- verticalRefresh.AddChidren(sceneView.FLayoutView());
- }
- sceneView.btnClick.Tag = scene;//鏍囪绱㈠紩
- //鍦烘櫙鐨勭偣鍑讳簨浠�
- sceneView.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- buttonClick.IsSelected = false;
- sceneView.btnCheckIcon.IsSelected = true;
- buttonClick = sceneView.btnCheckIcon;
- sceneSelecetd = sceneView.btnClick.Tag as HDL_ON.Entity.Scene;
- };
-
+ nameList.Add(scene.name);
}
- //纭鐐瑰嚮浜嬩欢
- view.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
+ PublicInterface publicInterface = new PublicInterface();
+ publicInterface.FrameOrVv(this, nameList, StringId.addSceneLogic, (index) =>
{
-
- if (sceneSelecetd == null)
- {
- //鎻愮ず锛氳繕娌￠�変腑鎵ц鍛ㄦ湡
- return;
- }
+ var sceneSelecetd = sceneList[index];
Output outputDevice = new Output();
outputDevice.target_type = "2";
outputDevice.sid = sceneSelecetd.sid;
//娌″暐浣滅敤锛屼负浜嗗彂閫佹暟鎹牸寮忕粺涓�;
- outputDevice.status = new List<Dictionary<string, string>> { new Dictionary<string, string> { { "key", "scene"},{ "value", "0" } } };
+ outputDevice.status = new List<Dictionary<string, string>> { new Dictionary<string, string> { { "key", "scene" }, { "value", "0" } } };
AddOutput(outputDevice);
- fLayout.RemoveFromParent();
LogicMethod.RemoveAllView();
AddLogic addLogic = new AddLogic();
MainPage.BasePageView.AddChidren(addLogic);
addLogic.Show();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
-
+ });
}
/// <summary>
--
Gitblit v1.8.0