From 97e259d966cb5cb5d73c105d5dbaadcc1f920614 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 十月 2019 13:48:43 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectCurtainSetting.cs | 106 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectCurtainSetting.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectCurtainSetting.cs
index 4441f5d..204623f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectCurtainSetting.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectCurtainSetting.cs
@@ -213,7 +213,7 @@
};
percentSliderRowView.AddChidren(seekBarTitle);
- var confirmBtn = new Device.CommonForm.CompleteButton() { };
+ var confirmBtn = new Device.CommonForm.CompleteButton(1,2,3);
AddChidren(confirmBtn);
if (state == -1)
@@ -390,50 +390,50 @@
if (isFromRoom)
{
//鍥炲埌鎴块棿娣诲姞鍦烘櫙鐣岄潰
- var sameScene = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.DeviceUI == sceneTargetDevice.DeviceUI);
- if (sameScene == null)
- {
- 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
- {
- //鎻愮ず璇ヨ澶囧凡鍔犲叆
- 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)
+ //{
+ // 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
+ //{
+ // //鎻愮ず璇ヨ澶囧凡鍔犲叆
+ // 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;
+ // };
+ //}
}
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;
+ // };
+ //}
}
}
//淇敼
@@ -456,18 +456,18 @@
}
else
{
- var targetDeviceUI = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == targetDeviceID);
- if (targetDeviceUI != null)
- {
- targetDeviceUI.DeviceUI = sceneTargetDevice.DeviceUI;
- targetDeviceUI.TaskList = sceneTargetDevice.TaskList;
- 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();
+ //var targetDeviceUI = CategoryAddScene.sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == targetDeviceID);
+ //if (targetDeviceUI != null)
+ //{
+ // targetDeviceUI.DeviceUI = sceneTargetDevice.DeviceUI;
+ // targetDeviceUI.TaskList = sceneTargetDevice.TaskList;
+ // 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();
}
}
};
--
Gitblit v1.8.0