From 528c105b3aea0e6e00477365f16f57c1e3d7eb1c Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 24 十月 2019 15:31:28 +0800
Subject: [PATCH] 2019-10-24-3
---
ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedDelayTime.cs | 128 ++++++++++++++++++++++--------------------
1 files changed, 66 insertions(+), 62 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedDelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedDelayTime.cs
index 8c942c3..6c6ed15 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedDelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectedDelayTime.cs
@@ -11,6 +11,10 @@
BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor;
Tag = "categoryAddScene";
}
+ public override void RemoveFromParent()
+ {
+ base.RemoveFromParent();
+ }
public Button customBtn;
public SceneTargetDeviceUI SceneTargetDevice = new SceneTargetDeviceUI { Type = 1 };
public List<string> TimeList = new List<string> { "1_绉抇1", "5_绉抇5", "10_绉抇10", "1_鍒嗛挓_60" };
@@ -261,69 +265,69 @@
tList.Add($"{i} {Language.StringByID(R.MyInternationalizationString.Second)}");
}
//1-60绉�
- PickerView.Show(tList, (obj) =>
- {
- SceneTargetDevice.DelayTime = int.Parse(tList[obj].Split(' ')[0]);
+ //PickerView.Show(tList, (obj) =>
+ //{
+ // SceneTargetDevice.DelayTime = int.Parse(obj.Split(' ')[0]);
- if (state == -1)
- {
- if (isFromRoom)
- {
- Room.AddRoomScene.sceneTargetDevicesList.Add(SceneTargetDevice);
- UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
- var roomAddScene = new Room.AddRoomScene();
- UserView.HomePage.Instance.AddChidren(roomAddScene);
- UserView.HomePage.Instance.PageIndex += 1;
- roomAddScene.Show(Room.AddRoomScene.CurrentRoom);
- }
- else
- {
- CategoryAddScene.sceneTargetDevicesList.Add(SceneTargetDevice);
- UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
- var categoryAddScene = new CategoryAddScene();
- UserView.HomePage.Instance.AddChidren(categoryAddScene);
- UserView.HomePage.Instance.PageIndex += 1;
- categoryAddScene.Show();
- }
- }
- else
- {
- if (isFromRoom)
- {
- if (!string.IsNullOrEmpty(targetDeviceID))
- {
- var targetDeviceUI = Room.AddRoomScene.sceneTargetDevicesList.Find((obj1) => obj1.SceneTargetDeviceUIID == targetDeviceID);
- if (targetDeviceUI != null)
- {
- targetDeviceUI.DelayTime = SceneTargetDevice.DelayTime;
- targetDeviceUI.Type = SceneTargetDevice.Type;
- }
- }
- UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
- var roomAddScene = new Room.AddRoomScene();
- UserView.HomePage.Instance.AddChidren(roomAddScene);
- UserView.HomePage.Instance.PageIndex += 1;
- roomAddScene.Show(Room.AddRoomScene.CurrentRoom);
- }
- else
- {
- if (!string.IsNullOrEmpty(targetDeviceID))
- {
- var targetDeviceUI = CategoryAddScene.sceneTargetDevicesList.Find((obj1) => obj1.SceneTargetDeviceUIID == targetDeviceID);
- if (targetDeviceUI != null)
- {
- targetDeviceUI.DelayTime = SceneTargetDevice.DelayTime;
- targetDeviceUI.Type = SceneTargetDevice.Type;
- }
- }
- UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
- var categoryAddScene = new CategoryAddScene();
- UserView.HomePage.Instance.AddChidren(categoryAddScene);
- UserView.HomePage.Instance.PageIndex += 1;
- categoryAddScene.Show();
- }
- }
- },0,"", Language.StringByID(R.MyInternationalizationString.Confrim));
+ // if (state == -1)
+ // {
+ // if (isFromRoom)
+ // {
+ // Room.AddRoomScene.sceneTargetDevicesList.Add(SceneTargetDevice);
+ // UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
+ // var roomAddScene = new Room.AddRoomScene();
+ // UserView.HomePage.Instance.AddChidren(roomAddScene);
+ // UserView.HomePage.Instance.PageIndex += 1;
+ // roomAddScene.Show(Room.AddRoomScene.CurrentRoom);
+ // }
+ // else
+ // {
+ // CategoryAddScene.sceneTargetDevicesList.Add(SceneTargetDevice);
+ // UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
+ // var categoryAddScene = new CategoryAddScene();
+ // UserView.HomePage.Instance.AddChidren(categoryAddScene);
+ // UserView.HomePage.Instance.PageIndex += 1;
+ // categoryAddScene.Show();
+ // }
+ // }
+ // else
+ // {
+ // if (isFromRoom)
+ // {
+ // if (!string.IsNullOrEmpty(targetDeviceID))
+ // {
+ // var targetDeviceUI = Room.AddRoomScene.sceneTargetDevicesList.Find((obj1) => obj1.SceneTargetDeviceUIID == targetDeviceID);
+ // if (targetDeviceUI != null)
+ // {
+ // targetDeviceUI.DelayTime = SceneTargetDevice.DelayTime;
+ // targetDeviceUI.Type = SceneTargetDevice.Type;
+ // }
+ // }
+ // UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
+ // var roomAddScene = new Room.AddRoomScene();
+ // UserView.HomePage.Instance.AddChidren(roomAddScene);
+ // UserView.HomePage.Instance.PageIndex += 1;
+ // roomAddScene.Show(Room.AddRoomScene.CurrentRoom);
+ // }
+ // else
+ // {
+ // if (!string.IsNullOrEmpty(targetDeviceID))
+ // {
+ // var targetDeviceUI = CategoryAddScene.sceneTargetDevicesList.Find((obj1) => obj1.SceneTargetDeviceUIID == targetDeviceID);
+ // if (targetDeviceUI != null)
+ // {
+ // targetDeviceUI.DelayTime = SceneTargetDevice.DelayTime;
+ // targetDeviceUI.Type = SceneTargetDevice.Type;
+ // }
+ // }
+ // UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
+ // var categoryAddScene = new CategoryAddScene();
+ // UserView.HomePage.Instance.AddChidren(categoryAddScene);
+ // UserView.HomePage.Instance.PageIndex += 1;
+ // categoryAddScene.Show();
+ // }
+ // }
+ //}, Language.StringByID(R.MyInternationalizationString.Confrim));
}
customBtn.MouseDownEventHandler += customMouseUpEvent;
customRowView.MouseDownEventHandler += customMouseUpEvent;
--
Gitblit v1.8.0