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/DoorLockLogic/LockLogicCommunalPage.cs | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
index 0b59be3..b6b4f84 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -353,7 +353,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;
}
}
@@ -865,7 +865,7 @@
{
//鍦ㄦ湰鍦版煡鎵捐鍦烘櫙;
- 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)
{
@@ -919,7 +919,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);
@@ -1070,10 +1070,6 @@
tag = true;
custompushFrameLayout.Height = Application.GetRealHeight(160);
Common.Logic.CurrentLogic.LogicIsCustomPushText = 1;
- if (Common.Logic.CurrentLogic.LogicId != 0)
- {
- Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST");
- }
}
else
@@ -1081,20 +1077,20 @@
tag = false;
custompushFrameLayout.Height = Application.GetRealHeight(0);
Common.Logic.CurrentLogic.LogicIsCustomPushText = 0;
- if (Common.Logic.CurrentLogic.LogicId != 0)
- {
- Send.Data("鍒犻櫎", "/App/DelHomeLogicConfig", "POST");
- }
-
}
+ 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);
}
var saveFrameLayout = new FrameLayout
{
@@ -1148,7 +1144,7 @@
Common.Logic.LockLogicList.Add(Common.Logic.CurrentLogic);
if (tag)
{
- Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST");
+ Send.Zj(tag, Common.Logic.CurrentLogic);
}
}
}
@@ -1170,6 +1166,7 @@
}
public void AddCondition(int value)
{
+ Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
var addCondition = new AddCondition();
addCondition.conditionsIndex = value;
UserView.HomePage.Instance.AddChidren(addCondition);
--
Gitblit v1.8.0