From 5727cf0b9b54da0a191dd1e23cb5abf21320fbff Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 25 十一月 2019 10:34:17 +0800
Subject: [PATCH] IOS使用新的项目名称
---
ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectLightSetting.cs | 87 ++++++++++++++++++++++++++-----------------
1 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectLightSetting.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectLightSetting.cs
old mode 100644
new mode 100755
index c3ba396..0ba6c83
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectLightSetting.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectLightSetting.cs
@@ -17,6 +17,10 @@
BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor;
Tag = "categoryAddScene";
}
+ public override void RemoveFromParent()
+ {
+ base.RemoveFromParent();
+ }
/// <summary>
/// 鏄剧ず鐏厜鐨勮缁嗚缃晫闈� 榛樿-1(鏂板-榛樿寮�)锛�0鍏� 锛�1寮�
/// </summary>
@@ -27,7 +31,19 @@
public void Show(DeviceUI device, string targetDeviceID="", int state=-1, bool isFromRoom = false)
{
#region topview
- var topBGView = new FrameLayout()鈥� {鈥� Height = Application.GetRealHeight(CommonPage.Navigation_Height),鈥� BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor鈥� };鈥� AddChidren(topBGView);鈥� var topView = new FrameLayout()鈥� {鈥� Y = Application.GetRealHeight(CommonPage.NavigationTitle_Y),鈥� Height = Application.GetRealHeight(CommonPage.Navigation_Height - CommonPage.NavigationTitle_Y),鈥� BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor,鈥� };鈥� AddChidren(topView);
+ var topBGView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(CommonPage.Navigation_Height),
+ BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor
+ };
+ AddChidren(topBGView);
+ var topView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(CommonPage.NavigationTitle_Y),
+ Height = Application.GetRealHeight(CommonPage.Navigation_Height - CommonPage.NavigationTitle_Y),
+ BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor,
+ };
+ AddChidren(topView);
var title = new Button()
{
@@ -38,7 +54,8 @@
Gravity = Gravity.CenterHorizontal
};
topView.AddChidren(title);
- var back = new Device.CommonForm.BackButton() { };鈥� topView.AddChidren(back);
+ var back = new Device.CommonForm.BackButton() { };
+ topView.AddChidren(back);
back.MouseUpEventHandler += (sender, e) =>
{
this.RemoveFromParent();
@@ -163,7 +180,7 @@
};
dimmingRowView.AddChidren(dimmingNextBtn);
- var confirmBtn = new CommonForm.CompleteButton() { };
+ var confirmBtn = new CommonForm.CompleteButton(1,2,3);
AddChidren(confirmBtn);
if (state == -1)
{
@@ -322,26 +339,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;
+ // };
+ //}
}
}
//淇敼
@@ -364,18 +381,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