From a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 06 三月 2020 15:31:36 +0800
Subject: [PATCH] 删除了郭雪城的 DeviceUi 这个类
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 92 +++++++++++++++++++++++++---------------------
1 files changed, 50 insertions(+), 42 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index 8070799..1bb7ea7 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -60,7 +60,8 @@
};
topRowLayout.AddChidren(clickBtn);
clickBtn.MouseDownEventHandler += (sender, e) =>
- {
+ {
+ action();
RemoveFromParent();
};
@@ -763,7 +764,7 @@
{
if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
{
- devicestatus.Text = Common.Logic.CurrentLogic.Accounts[a]["Account"];
+ devicestatus.Text = Common.Logic.CurrentLogic.Accounts[a]["AccountName"];
break;
}
@@ -1040,20 +1041,19 @@
del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
- Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
- alert.ResultEventHandler += (sender1, e1) =>
- {
- if (e1)
- {
- Common.Logic.CurrentLogic.Conditions.Remove(conditions);
- var logicCommunalPage = new LogicCommunalPage();
- UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- UserView.HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { });
- }
- };
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ Language.StringByID(MyInternationalizationString.doyouwanttodelete),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
+
+ alert.ConfirmClickEvent += () =>
+ {
+ Common.Logic.CurrentLogic.Conditions.Remove(conditions);
+ var logicCommunalPage = new LogicCommunalPage();
+ UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ logicCommunalPage.Show(() => { });
+ };
};
@@ -1532,7 +1532,7 @@
case 2:
{
//鍦ㄦ湰鍦版煡鎵捐鍦烘櫙;
- var sceneinof = Common.Room.AllRoomSceneUIList.Find((obj) => { return obj.Id.ToString() == actions["DeviceAddr"].ToString(); });
+ var sceneinof = UserCenter.HdlSceneLogic.Current.GetAllRoomSceneList().Find((obj) => { return obj.Id.ToString() == actions["DeviceAddr"].ToString(); });
//鏈湴娌℃湁瀛樺湪;
if (sceneinof == null)
{
@@ -1583,7 +1583,7 @@
actionsrowLayout.AddChidren(btnregionname);
/////閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
Common.Room room = new Common.Room();
- btnregionname.Text = room.GetRoomNameBySceneId(sceneinof.Id);
+ btnregionname.Text = UserCenter.HdlRoomLogic.Current.GetRoomNameBySceneId(sceneinof.Id);
//Send.RoomNmae(btnregionname, deviceinof);
@@ -1790,21 +1790,19 @@
del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
- Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
- alert.ResultEventHandler += (sender1, e1) =>
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ Language.StringByID(MyInternationalizationString.doyouwanttodelete),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ alert.ConfirmClickEvent += () =>
{
- if (e1)
- {
- Common.Logic.CurrentLogic.Actions.Remove(actions);
- // devicesFrameLayout.RemoveFromParent();
- var logicCommunalPage = new LogicCommunalPage();
- UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- UserView.HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { });
- }
+ Common.Logic.CurrentLogic.Actions.Remove(actions);
+ // devicesFrameLayout.RemoveFromParent();
+ var logicCommunalPage = new LogicCommunalPage();
+ UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ logicCommunalPage.Show(() => { });
};
- alert.Show();
};
@@ -1987,30 +1985,37 @@
custompushback.MouseUpEventHandler += customclick;
custompushRowLayout.MouseUpEventHandler += customclick;
bool tag = false;//鏍囪寮�鍏崇姸鎬�;
- btnswitch.MouseUpEventHandler += (sender1, e1) =>
+ btnswitch.MouseUpEventHandler +=(sender1, e1) =>
{
btnswitch.IsSelected = !btnswitch.IsSelected;
if (btnswitch.IsSelected)
{
tag = true;
custompushFrameLayout.Height = Application.GetRealHeight(160);
- if (Common.Logic.CurrentLogic.LogicId != 0)
- {
- Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST");
- }
+ Common.Logic.CurrentLogic.LogicIsCustomPushText = 1;
}
else
{
tag = false;
custompushFrameLayout.Height = Application.GetRealHeight(0);
- if (Common.Logic.CurrentLogic.LogicId != 0)
- {
- Send.Data("鍒犻櫎", "/App/DelHomeLogicConfig", "POST");
- }
-
+ Common.Logic.CurrentLogic.LogicIsCustomPushText = 0;
}
+ Send.Zj(tag,Common.Logic.CurrentLogic);
};
+
+ if (Common.Logic.CurrentLogic.LogicIsCustomPushText == 0)
+ {
+ tag = false;
+ btnswitch.IsSelected = false;
+ custompushFrameLayout.Height = Application.GetRealHeight(0);
+ }
+ else
+ {
+ tag = true;
+ btnswitch.IsSelected = true;
+ custompushFrameLayout.Height = Application.GetRealHeight(160);
+ }
#endregion
@@ -2020,7 +2025,10 @@
var name = logicTextBox.Text.Trim();
if (string.IsNullOrEmpty(logicTextBox.Text.Trim()))
{
- new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), Language.StringByID(MyInternationalizationString.Close)).Show();
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.PleaseEnterLogicName),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
return;
}
///鍏堥殣钘忓垽鏂悕瀛楃浉鍚岀殑鍔熻兘锛�
@@ -2046,7 +2054,7 @@
Common.Logic.LogicList.Add(Common.Logic.CurrentLogic);
if (tag)
{
- Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST");
+ Send.Zj(tag, Common.Logic.CurrentLogic);
}
}
}
--
Gitblit v1.8.0