From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码

---
 ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs |  214 +++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 149 insertions(+), 65 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index 2e68b30..23ba748 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -10,10 +10,11 @@
 {
     public class SkipView:FrameLayout
     {
+        
         /// <summary>
         /// 鍏跺畠鐣岄潰璺宠繘鏉ョ殑鍏ュ彛
         /// </summary>
-        public static void SkipAddLogic(int intvalue, DoorLock doorLock = null, UserCenter.MemberInfoRes accountObj = null)
+        public async static void SkipAddLogic(int intvalue, DoorLock doorLock = null, UserCenter.MemberInfoRes accountObj = null) 
         {
             /// 0.姝e父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.Sone闂ㄩ攣;
             switch (intvalue)
@@ -30,7 +31,6 @@
                         UserView.HomePage.Instance.AddChidren(addLogicPage);
                         UserView.HomePage.Instance.PageIndex += 1;
                         addLogicPage.Show();
-
                     }
                     break;
                 case 1:
@@ -60,13 +60,12 @@
                         doorLockLogicList.Show();
                     }
                     break;
-              
+
             }
 
         }
-
-       
         #region 鈼� 鑷姩鍖朹_________________________
+        public static bool If_once = true;//杩涙潵鍙涓�娆℃爣璇�;
         /// <summary>
         /// 鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
         /// </summary>
@@ -75,6 +74,19 @@
             //functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
             #region   ---鎺ㄨ崘妯℃澘鐨勭粍浠�
             //鎺ㄨ崘妯℃澘鑳屾櫙鎺т欢
+          
+           
+            var bjFrameLayout1 = new FrameLayout
+            {
+                Width = Application.GetRealWidth(1080 - 58),
+                Height = Application.GetRealHeight(50),
+                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+                X = Application.GetRealWidth(58),
+                //Radius = (uint)Application.GetRealHeight(50),
+                Y = Application.GetRealHeight(30),
+
+            };
+            functionSceneAutoBodyView.AddChidren(bjFrameLayout1);
             var bjFrameLayout = new FrameLayout
             {
                 Width = Application.GetRealWidth(1080 - 58),
@@ -83,15 +95,15 @@
                 X = Application.GetRealWidth(58),
                 //Radius = (uint)Application.GetRealHeight(50),
                 Y = Application.GetRealHeight(30),
-
             };
             functionSceneAutoBodyView.AddChidren(bjFrameLayout);
-            bjFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
+            bjFrameLayout1.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft);
+            bjFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerBottomLeft);
             //鍥炬爣鎺т欢
             var sigBtn = new Button
             {
-                Width = Application.GetMinRealAverage(84),
-                Height = Application.GetMinRealAverage(84),
+                Width = Application.GetRealWidth(84),
+                Height = Application.GetRealWidth(84),
                 UnSelectedImagePath = "ZigeeLogic/sign.png",
                 X = Application.GetRealWidth(58),
                 Gravity = Gravity.CenterVertical,
@@ -100,8 +112,8 @@
             //鎺ㄨ崘妯℃澘鏂囨湰鎺т欢
             var recommendtextBtn = new Button
             {
-                Width = Application.GetMinRealAverage(300),
-                Height = Application.GetMinRealAverage(84),
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(84),
                 X = sigBtn.Right + Application.GetRealWidth(35),
                 TextAlignment = TextAlignment.CenterLeft,
                 //Text = "鎺ㄨ崘妯℃澘",
@@ -115,7 +127,7 @@
             var recommendswitchBtn = new Button
             {
                 Width = Application.GetRealWidth(104),
-                Height = Application.GetRealHeight(63),
+                Height = Application.GetRealWidth(63),
                 UnSelectedImagePath = "ZigeeLogic/logicclose.png",
                 SelectedImagePath = "ZigeeLogic/logicopen.png",
                 X = bjFrameLayout.Width - Application.GetRealWidth(104 + 58),
@@ -160,14 +172,14 @@
 
                         var frameLayout = new FrameLayout
                         {
-                            Width = Application.GetMinRealAverage(369 + 46),
-                            Height = Application.GetMinRealAverage(246),
+                            Width = Application.GetRealWidth(369 + 46),
+                            Height = Application.GetRealHeight(246),
                         };
                         scenehorizontalScrol.AddChidren(frameLayout);
                         var logiciocnBtn = new Button
                         {
-                            Width = Application.GetMinRealAverage(369),
-                            Height = Application.GetMinRealAverage(246),
+                            Width = Application.GetRealWidth(369),
+                            Height = Application.GetRealWidth(246),
                             UnSelectedImagePath = "ZigeeLogic/" + i + ".png",
                             Tag = i,
                         };
@@ -175,8 +187,8 @@
 
                         var logicnameBtn = new Button
                         {
-                            Width = Application.GetMinRealAverage(250),
-                            Height = Application.GetMinRealAverage(80),
+                            Width = Application.GetRealWidth(250),
+                            Height = Application.GetRealHeight(80),
                             X = Application.GetRealWidth(23),
                             Y = Application.GetRealHeight(246 - 23 - 80),
                             TextAlignment = TextAlignment.CenterLeft,
@@ -240,10 +252,11 @@
             };
             //涓嬫媺鍒锋柊鑷姩鍖栧垪琛ㄧ殑浜嬩欢
             logicScrolView.BeginHeaderRefreshingAction += () =>
-            {
+            {
                 if (!Config.Instance.Home.IsVirtually)
                 {//铏氭嫙鐨勪笉鑾峰彇缃戝叧閫昏緫鍒楄〃
-                    //閲嶆柊鍒锋柊logic鍒楄〃
+                 //閲嶆柊鍒锋柊logic鍒楄〃
+                    If_once = true;
                     Common.Logic.LogicList.Clear();
                     Read(logicScrolView, no);
                 }
@@ -274,35 +287,40 @@
             {
                 if (!Config.Instance.Home.IsVirtually)//铏氭嫙鐨勪笉鑾峰彇缃戝叧閫昏緫鍒楄〃
                 {
-                    if (Common.Logic.LogicList.Count == 0)
+                    if (If_once)
                     {
-                        var Idlist1 = await Send.GetLogicId(0);//
-                        var Idlist2 = await Send.GetLogicId(2);//闂ㄩ攣甯稿紑妯″紡
-                        if (Idlist1.Count != 0)
+                        if (Common.Logic.LogicList.Count == 0)
                         {
-                            var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
-                            for (int j = 0; j < listlogic1.Count; j++)
+                            If_once = false;
+                            var Idlist1 = await Send.GetLogicId(0);//
+                            var Idlist2 = await Send.GetLogicId(2);//闂ㄩ攣甯稿紑妯″紡
+                            if (Idlist1.Count != 0)
                             {
-                                var logic = listlogic1[j];
-                                if (logic.LogicType != 0)
+                                var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
+                                for (int j = 0; j < listlogic1.Count; j++)
                                 {
-                                    continue;
+                                    var logic = listlogic1[j];
+                                    if (logic.LogicType != 0)
+                                    {
+                                        continue;
+                                    }
+                                    Common.Logic.LogicList.Add(logic);
                                 }
-                                Common.Logic.LogicList.Add(logic);
                             }
-                        }
-                        if (Idlist2.Count != 0)
-                        {
-                            var listlogic2 = await Send.ReadList(Idlist2.Count, 2);
-                            for (int j = 0; j < listlogic2.Count; j++)
+                            if (Idlist2.Count != 0)
                             {
-                                var logic = listlogic2[j];
-                                if (logic.LogicType != 2)
+                                var listlogic2 = await Send.ReadList(Idlist2.Count, 2);
+                                for (int j = 0; j < listlogic2.Count; j++)
                                 {
-                                    continue;
+                                    var logic = listlogic2[j];
+                                    if (logic.LogicType != 2)
+                                    {
+                                        continue;
+                                    }
+                                    Common.Logic.LogicList.Add(logic);
                                 }
-                                Common.Logic.LogicList.Add(logic);
                             }
+
                         }
                     }
                 }
@@ -316,6 +334,7 @@
             CommonPage.Loading.Hide();
         }
         static RowLayout selectedRow = new RowLayout() { Tag = "0" };//璁板綍宸︽粦鐘舵��
+       
         /// <summary>
         /// 鍔犺浇鑷姩鍖栧垪琛ㄧ晫闈�
         /// </summary>
@@ -339,8 +358,8 @@
                 var noIconBtn = new Button
                 {
                     Y = Application.GetRealHeight(294 - 55),
-                    Width = Application.GetMinRealAverage(757),
-                    Height = Application.GetMinRealAverage(435),
+                    Width = Application.GetRealWidth(757),
+                    Height = Application.GetRealWidth(435),
                     UnSelectedImagePath = "Item/NoFunction.png",
                     X = Application.GetRealWidth(104),
                 };
@@ -429,8 +448,8 @@
 
                 var logicswitchBtn = new Button
                 {
-                    Width = Application.GetMinRealAverage(104),
-                    Height = Application.GetMinRealAverage(63),
+                    Width = Application.GetRealWidth(104),
+                    Height = Application.GetRealWidth(63),
                     UnSelectedImagePath = "ZigeeLogic/logicclose.png",
                     SelectedImagePath = "ZigeeLogic/logicopen.png",
                     X = logicRowlayout.Width - Application.GetRealWidth(104 + 58),
@@ -511,7 +530,7 @@
                 logicRowlayout.AddRightView(del);
                 del.MouseUpEventHandler += (sender, e) =>
                 {
-                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+                    var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
                     Language.StringByID(MyInternationalizationString.doyouwanttodelete),
                     Language.StringByID(MyInternationalizationString.confrim));
                     alert.Show();
@@ -608,8 +627,8 @@
 
                 var typeIconBtn = new Button
                 {
-                    Width = Application.GetMinRealAverage(58),
-                    Height = Application.GetMinRealAverage(58),
+                    Width = Application.GetRealWidth(58),
+                    Height = Application.GetRealWidth(58),
                     Gravity = Gravity.Center,
 
                 };
@@ -620,7 +639,7 @@
                     Y = typebjBtn.Y + Application.GetRealHeight(35),
                     X = Application.GetRealWidth(58) + Application.GetRealWidth((12 + 82 + 12) + (12 + 45 + 82 + 12) * i),
                     Width = Application.GetRealWidth(48),
-                    Height = Application.GetRealHeight(15),
+                    Height = Application.GetRealWidth(15),
                     UnSelectedImagePath = "ZigeeLogic/connect.png",
                 };
                 logicRowlayout.AddChidren(connectIconBtn);
@@ -717,12 +736,25 @@
             timeConditionsInfo.Add("DelayTime", "0");
             timeConditionsInfo.Add("StartHour", h);
             timeConditionsInfo.Add("StartMin", m);
-            timeConditionsInfo.Add("DoorLockOpenDelayTime", timeVlaue.ToString());
+            if (UserCenter.UserCenterResourse.HideOption.DoorLockNomallyOpenTimeMode == 1)
+            {
+                //寮哄埗鍙樻洿鏃堕棿妯″紡涓哄垎閽�
+                timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 60).ToString());
+            }
+            else
+            {
+                timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 3600).ToString());
+            }
             Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
             actionsInfo.Add("LinkType", 8);
             actionsInfo.Add("DeviceAddr", common.DeviceAddr);
-            actionsInfo.Add("Epoint", common.DeviceEpoint);
+            actionsInfo.Add("Epoint", "200");
             actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
+
+            Dictionary<string, string> accounts = new Dictionary<string, string>();
+            accounts.Add("Type", "8");
+            accounts.Add("Option4", common.DeviceAddr.ToString());//鐢ㄤ簬鍒ゆ柇璇嗗埆鏄摢涓棬閿�;
+            accounts.Add("Option2", common.DeviceEpoint.ToString());
 
             Common.Logic currentLogic = new Common.Logic();
             currentLogic.IsEnable = 1;//榛樿涓哄紑
@@ -731,6 +763,7 @@
             currentLogic.LogicName = Language.StringByID(R.MyInternationalizationString.openmode);
             currentLogic.Conditions.Add(timeConditionsInfo);
             currentLogic.Actions.Add(actionsInfo);
+            currentLogic.Accounts.Add(accounts);
             var logicIfon = await Send.AddModifyLogic(currentLogic);
             if (logicIfon != null && logicIfon.LogicId != 0)
             {
@@ -747,24 +780,37 @@
         /// 娉ㄦ剰(鍙傛暟:2-甯稿紑鑷姩鍖�;3-澶辨晥鏃堕棿鑷姩鍖�);
         /// 杩斿洖鍊硷細0涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
         /// </summary>
-        public static async System.Threading.Tasks.Task<int> Exist(int valueInt)
+        public static async System.Threading.Tasks.Task<int> Exist(int valueInt, ZigBee.Device.DoorLock doorLock)
         {
+            
             int exist = 0;
-            var Idlist = await Send.GetLogicId(valueInt);
-            if (Idlist.Count != 0)
+            var IdList = await Send.GetLogicId(valueInt);
+            if (IdList.Count != 0)
             {
-                //榛樿鍙栫涓�涓�昏緫ID
-                exist = Idlist[0];
+                for (int i = 0; i < IdList.Count; i++)
+                {
+                    var id = IdList[i];
+                    var logic = await Send.GetLogic(id, valueInt);
+                    if (logic != null)
+                    {
+                        if (ExistLogic(logic, doorLock))
+                        {
+                            exist = id;
+                            ///鎵惧埌閫�鍑�
+                            break;
+                        }
+                    }
 
+                }
             }
             return exist;
         }
-    
+
         ///<summary>
-        ///鑾峰彇閫昏緫淇℃伅
+        ///鑾峰彇闂ㄩ攣鏃舵晥鎬ч�昏緫淇℃伅
         /// 杩斿洖鍊硷細null涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
         /// </summary>
-        public static async System.Threading.Tasks.Task<Common.Logic> GetLogicIfon()
+        public static async System.Threading.Tasks.Task<Common.Logic> GetLogicIfon(ZigBee.Device.DoorLock doorLock)
         {
             Common.Logic logic = null;
             var Idlist = await Send.GetLogicId(3);
@@ -773,34 +819,72 @@
                 //榛樿鍙栫涓�涓�昏緫ID(鏃舵晥鎬у彧鏈変竴鏉¢�昏緫)
                 int exist = Idlist[0];
                 logic = await Send.GetLogic(exist, 3);
+                if (!ExistLogic(logic, doorLock))
+                {
+                    logic = null;
+                }
             }
             return logic;
         }
 
         ///<summary>
-        ///鍒犻櫎鎵�鏈夋椂鏁堟�ц嚜鍔ㄥ寲
+        ///鍒犻櫎璇ラ棬閿佹墍鏈夋椂鏁堟�ц嚜鍔ㄥ寲
         /// 杩斿洖鍊硷細true鎴愬姛;false澶辫触;
         /// </summary>
-        public static async System.Threading.Tasks.Task<bool> GetLogicAll()
+        public static async System.Threading.Tasks.Task<bool> DelAllLogic(ZigBee.Device.DoorLock doorLock)
         {
             bool _if = false;
             var Idlist = await Send.GetLogicId(3);
             if (Idlist.Count != 0)
             {
-                _if = true;
-
                 for (int i = 0; i < Idlist.Count; i++)
                 {
                     int id = Idlist[i];
-                    //鏈潵鍙湁涓�鏉℃椂鏁堟�ц嚜鍔ㄥ寲锛�
-                    //闃叉鐗规畩鎯呭喌,鎵惧埌灏卞垹闄ゆ帀;
-                    Send.DelLogic(id);
+                    var logic = await Send.GetLogic(id, 3);
+                    if (logic != null)
+                    {
+                        if (ExistLogic(logic, doorLock))
+                        {
+                            //鏈潵鍙湁涓�鏉℃椂鏁堟�ц嚜鍔ㄥ寲锛�
+                            //闃叉鐗规畩鎯呭喌,鎵惧埌灏卞垹闄ゆ帀;
+                            //var valueInt = await Send.DelLogic(id);
+                            //if (valueInt == 0)
+                            //{
+                            //    _if = true;
+                            //}
+                            //(鑰冭檻鎬ц兘榛樿鍒犻櫎鎴愬姛锛岀洿鎺ヨ繑鍥炴垚鍔熺粨鏋渢rue)
+                            _if = true;
+                            Send.DelLogic(id);
+                           
+
+                        }
+                    }
                 }
             }
             return _if;
         }
 
-    
+        /// <summary>
+        /// 鏌ユ壘杩欎竴鏉¤嚜鍔ㄥ寲鏄惁灞炰簬璇ラ棬閿�
+        /// </summary>
+        /// <returns></returns>
+        public static bool ExistLogic(Common.Logic logic, ZigBee.Device.DoorLock doorLock)
+        {
+            for (int j = 0; j < logic.Accounts.Count; j++)
+            {
+                //Option4鏄澶噈ac锛�
+                if (logic.Accounts[j]["Option4"].ToString() == doorLock.DeviceAddr)
+                {
+                    //鏌ユ壘鏄惁鏄偅涓棬閿侊紱
+                    //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
+                    return true;
+                }
+
+            }
+            return false;
+        }
+
+  
 
     }
 }

--
Gitblit v1.8.0