From af0266fa5570b6adcdb22f631bf13170e8646ca5 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:15:21 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectAirSwitchSetting.cs | 70 ++++++++++++++++++----------------
1 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectAirSwitchSetting.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectAirSwitchSetting.cs
index 8d7afb9..0ef09bb 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectAirSwitchSetting.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectAirSwitchSetting.cs
@@ -14,6 +14,10 @@
BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor;
Tag = "categoryAddScene";
}
+ public override void RemoveFromParent()
+ {
+ base.RemoveFromParent();
+ }
/// <summary>
/// 鏄剧ずAirSwitch鐨勮缁嗚缃晫闈� 榛樿-1(鏂板-榛樿寮�)锛�0鍏� 锛�1寮�
/// </summary>
@@ -171,7 +175,7 @@
};
dimmingRowView.AddChidren(dimmingNextBtn);
- var confirmBtn = new CommonForm.CompleteButton() { };
+ var confirmBtn = new CommonForm.CompleteButton(1,2,3);
AddChidren(confirmBtn);
if (state == -1)
{
@@ -334,26 +338,26 @@
else
{
//鍥炲埌鍒嗙被
- var sameScene = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.DeviceUI == sceneTargetDevice.DeviceUI);
- if (sameScene == null)
- {
- 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
- {
- //鎻愮ず璇ヨ澶囧凡鍔犲叆
- var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.ThisSceneHadTheDevice), Language.StringByID(R.MyInternationalizationString.Close));
- alert.Show();
- alert.ResultEventHandler += (sendAlert, eAlert) =>
- {
- return;
- };
- }
+ //var sameScene = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.DeviceUI == sceneTargetDevice.DeviceUI);
+ //if (sameScene == null)
+ //{
+ // 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
+ //{
+ // //鎻愮ず璇ヨ澶囧凡鍔犲叆
+ // var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.ThisSceneHadTheDevice), Language.StringByID(R.MyInternationalizationString.Close));
+ // alert.Show();
+ // alert.ResultEventHandler += (sendAlert, eAlert) =>
+ // {
+ // return;
+ // };
+ //}
}
}
//淇敼
@@ -376,18 +380,18 @@
}
else
{
- var targetDeviceUI = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == targetDeviceID);
- if (targetDeviceUI != null)
- {
- targetDeviceUI.Type = sceneTargetDevice.Type;
- targetDeviceUI.DeviceUI = sceneTargetDevice.DeviceUI;
- targetDeviceUI.TaskList = sceneTargetDevice.TaskList;
- }
- UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
- var categoryAddScene = new CategoryAddScene();
- UserView.HomePage.Instance.AddChidren(categoryAddScene);
- UserView.HomePage.Instance.PageIndex += 1;
- categoryAddScene.Show();
+ //var targetDeviceUI = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == targetDeviceID);
+ //if (targetDeviceUI != null)
+ //{
+ // targetDeviceUI.Type = sceneTargetDevice.Type;
+ // targetDeviceUI.DeviceUI = sceneTargetDevice.DeviceUI;
+ // targetDeviceUI.TaskList = sceneTargetDevice.TaskList;
+ //}
+ //UserView.HomePage.Instance.RemoveViewByTag("categoryAddScene");
+ //var categoryAddScene = new CategoryAddScene();
+ //UserView.HomePage.Instance.AddChidren(categoryAddScene);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //categoryAddScene.Show();
}
}
};
--
Gitblit v1.8.0