From 2eba7f5d706f7802bbd76629116499adeb518a68 Mon Sep 17 00:00:00 2001 From: WJC <wjc@hdlchina.com.cn> Date: 星期二, 31 十二月 2019 17:58:14 +0800 Subject: [PATCH] 2019-12-31-03 --- ZigbeeApp/Shared/Common/Logic.cs | 4 ++++ ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 3 +++ ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 13 ++++++++++--- ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | 11 ++++++++++- ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 10 ++++++++++ ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | 10 ++++++++++ 6 files changed, 47 insertions(+), 4 deletions(-) diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml index 655ccce..95d69f3 100644 --- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml +++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml @@ -1,24 +1,31 @@ 锘�<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default"> <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.SelectDevice" /> - <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/MemberList.cs"> + <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/TemplatePage.cs"> <Files> <File FileName="Shared/Phone/Device/Logic/DelayTime.cs" Line="208" Column="58" /> <File FileName="Shared/Phone/Device/Category/Category.cs" Line="105" Column="19" /> <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="1433" Column="51" /> - <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="117" Column="30" /> + <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="421" Column="58" /> + <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="577" Column="56" /> + <File FileName="Shared/Common/Logic.cs" Line="53" Column="42" /> + <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="2013" Column="11" /> + <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs" Line="1083" Column="73" /> + <File FileName="Shared/Phone/Device/Logic/TemplatePage.cs" Line="1" Column="1" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="GateWay" expanded="True"> <Node name="Shared" expanded="True"> + <Node name="Common" expanded="True" /> <Node name="Phone" expanded="True"> <Node name="Device" expanded="True"> <Node name="Account" expanded="True" /> <Node name="Category" expanded="True" /> <Node name="Logic" expanded="True"> - <Node name="MemberList.cs" selected="True" /> + <Node name="DoorLockLogic" expanded="True" /> + <Node name="TemplatePage.cs" selected="True" /> </Node> </Node> <Node name="UserCenter" expanded="True"> diff --git a/ZigbeeApp/Shared/Common/Logic.cs b/ZigbeeApp/Shared/Common/Logic.cs index 42c01e0..879b843 100644 --- a/ZigbeeApp/Shared/Common/Logic.cs +++ b/ZigbeeApp/Shared/Common/Logic.cs @@ -47,6 +47,10 @@ /// 鎺ㄩ�佸唴瀹� /// </summary> public string LogicCustomPushText=string.Empty; + /// <summary> + /// 璁板綍鎺ㄩ�佸紑鍏崇姸鎬� + /// </summary> + public int LogicIsCustomPushText = 0; //public Dictionary<string, string> TimeAttribute = new Dictionary<string, string>(); public TimeAttributeObj TimeAttribute = new TimeAttributeObj(); diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs index b54990f..0b59be3 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs @@ -1069,6 +1069,7 @@ { tag = true; custompushFrameLayout.Height = Application.GetRealHeight(160); + Common.Logic.CurrentLogic.LogicIsCustomPushText = 1; if (Common.Logic.CurrentLogic.LogicId != 0) { Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST"); @@ -1079,6 +1080,7 @@ { tag = false; custompushFrameLayout.Height = Application.GetRealHeight(0); + Common.Logic.CurrentLogic.LogicIsCustomPushText = 0; if (Common.Logic.CurrentLogic.LogicId != 0) { Send.Data("鍒犻櫎", "/App/DelHomeLogicConfig", "POST"); @@ -1086,7 +1088,14 @@ } }; - + if (Common.Logic.CurrentLogic.LogicIsCustomPushText == 0) + { + btnswitch.IsSelected = false; + } + else + { + btnswitch.IsSelected = true; + } var saveFrameLayout = new FrameLayout { Y = middle.Bottom, diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs index 17df288..b70c646 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs @@ -1991,6 +1991,7 @@ { tag = true; custompushFrameLayout.Height = Application.GetRealHeight(160); + Common.Logic.CurrentLogic.LogicIsCustomPushText = 1; if (Common.Logic.CurrentLogic.LogicId != 0) { Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST"); @@ -2001,6 +2002,7 @@ { tag = false; custompushFrameLayout.Height = Application.GetRealHeight(0); + Common.Logic.CurrentLogic.LogicIsCustomPushText = 0; if (Common.Logic.CurrentLogic.LogicId != 0) { Send.Data("鍒犻櫎", "/App/DelHomeLogicConfig", "POST"); @@ -2008,6 +2010,14 @@ } }; + if (Common.Logic.CurrentLogic.LogicIsCustomPushText == 0) + { + btnswitch.IsSelected = false; + } + else + { + btnswitch.IsSelected = true; + } #endregion diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs index 4ff194e..00dfbd3 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs @@ -510,6 +510,7 @@ { "Relationship",logic.Relationship} , { "LogicType",logic.LogicType} , { "LogicCustomPushText",logic.LogicCustomPushText} , + { "LogicIsCustomPushText",logic.LogicIsCustomPushText} , { "TimeAttribute", timeAttribute} , { "Conditions", conditions }, { "Actions", actions }, @@ -576,6 +577,7 @@ date.Add("LogicName", logic.LogicName); date.Add("Relationship", logic.Relationship); date.Add("LogicCustomPushText", logic.LogicCustomPushText); + date.Add("LogicIsCustomPushText", logic.LogicIsCustomPushText); mainGateWay?.Send("Logic/ReviseAttribute", jObject.ToString()); //await System.Threading.Tasks.Task.Run(async () => //{ @@ -624,6 +626,7 @@ logic.LogicType = int.Parse(Logicifon["LogicType"].ToString()); logic.Relationship = int.Parse(Logicifon["Relationship"].ToString()); logic.LogicCustomPushText =Logicifon["LogicCustomPushText"].ToString(); + logic.LogicIsCustomPushText = int.Parse(Logicifon["LogicIsCustomPushText"].ToString()); logic.TimeAttribute = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.TimeAttributeObj>(Logicifon["TimeAttribute"].ToString()); logic.Conditions = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Conditions"].ToString()); logic.Accounts = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(Logicifon["Accounts"].ToString()); diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs index 51daf32..26e9ad6 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs @@ -1199,6 +1199,7 @@ { tag = true; custompushFrameLayout.Height = Application.GetRealHeight(160); + Common.Logic.CurrentLogic.LogicIsCustomPushText = 1; if (Common.Logic.CurrentLogic.LogicId != 0) { Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST"); @@ -1209,6 +1210,7 @@ { tag = false; custompushFrameLayout.Height = Application.GetRealHeight(0); + Common.Logic.CurrentLogic.LogicIsCustomPushText = 0; if (Common.Logic.CurrentLogic.LogicId != 0) { Send.Data("鍒犻櫎", "/App/DelHomeLogicConfig", "POST"); @@ -1216,6 +1218,14 @@ } }; + if (Common.Logic.CurrentLogic.LogicIsCustomPushText == 0) + { + btnswitch.IsSelected = false; + } + else + { + btnswitch.IsSelected = true; + } var saveFrameLayout = new FrameLayout { Y = middle.Bottom, -- Gitblit v1.8.0