From f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 13:32:33 +0800
Subject: [PATCH] 2019-12-30-1

---
 ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs |  370 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 263 insertions(+), 107 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
old mode 100755
new mode 100644
index 4f71fa0..e297d7b
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -23,10 +23,11 @@
         FrameLayout clickframeLayout = new FrameLayout();
         Button clickbutton = new Button();
         Button clicktextcolcrbutton = new Button();
-
-        public void Show()
+       
+        public  void Show()
         {
 
+     
             UserView.HomePage.Instance.ScrollEnabled = false;
             this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
             #region  鏈�涓婇潰鐨勫竷灞�浠g爜
@@ -40,14 +41,15 @@
 
             var titleName = new Button
             {
-                TextSize = 16,
+                TextSize = 17,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 X = Application.GetRealWidth(160),
-                Width = Application.GetRealWidth(300),
+                Width = Application.GetRealWidth(600),
                 Height = Application.GetRealHeight(69),
                 Y = Application.GetRealHeight(92),
                 TextID = MyInternationalizationString.devicestate,
+                IsBold = true,
             };
             topRowLayout.AddChidren(titleName);
 
@@ -90,6 +92,7 @@
                 Y = Application.GetRealHeight(92),
                 //TextID = MyInternationalizationString.customroom,
                 Text = Config.Instance.Home.GetCurrentFloorName,
+                TextSize = 14,
             };
             topRowLayout.AddChidren(foolrname);
             var dropdown = new Button
@@ -121,15 +124,6 @@
             };
             this.AddChidren(roomhorizontalScrol);
 
-            var devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
-            {
-                Width = Application.GetRealWidth(1080 - 58 - 200),
-                Height = Application.GetRealHeight(280),
-                Y = roomhorizontalScrol.Bottom,
-                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                X = Application.GetRealWidth(58 + 200),
-            };
-            this.AddChidren(devicetypehorizontalScrol1);
             ///璁惧绫诲瀷婊戝姩鎺т欢
             var devicetypehorizontalScrol = new HorizontalScrolViewLayout()
             {
@@ -138,25 +132,27 @@
                 Y = roomhorizontalScrol.Bottom,
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                 X = Application.GetRealWidth(58),
-                Radius = (uint)Application.GetRealHeight(50),
+               // Radius = (uint)Application.GetRealHeight(50),
 
             };
             this.AddChidren(devicetypehorizontalScrol);
+            devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerBottomLeft);
 
             middle = new VerticalScrolViewLayout();
             middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
-            middle.Height = Application.GetRealHeight(1920) - devicetypehorizontalScrol.Y;
+            middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
             middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
             middle.X = Application.GetRealWidth(58);
-            middle.Radius = (uint)Application.GetRealHeight(50);
+            //middle.Radius = (uint)Application.GetRealHeight(50);
             this.AddChidren(middle);
-
+            middle.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft);
             ///鐩墠鏀寔鐨勮澶�
             var deviceTypeList = new List<DeviceType> {
                 DeviceType.IASZone,
                 DeviceType.OnOffSwitch,
                 DeviceType.OnOffOutput,//妤兼鐏�
-                DeviceType.DoorLock
+                DeviceType.DoorLock,
+                DeviceType.TemperatureSensor,
             };
 
             ///妤煎眰鐐瑰嚮浜嬩欢
@@ -169,41 +165,79 @@
                 {
                     flMain.RemoveFromParent();
                 };
+                var foolrbjicon = new FrameLayout
+                {
+
+                    Width = Application.GetRealWidth(450),
+                    Height = Application.GetRealHeight(780),
+                    X = Application.GetRealWidth(1080 - 468 - 35),
+                    Y = Application.GetRealHeight(184),
+                    BackgroundImagePath = "Item/SelectFloor_Right.png",
+                };
+                flMain.AddChidren(foolrbjicon);
+
+                var btnfoolrtext = new Button
+                {
+                    Width = Application.GetRealWidth(450),
+                    Height = Application.GetRealHeight(150),
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                    X = Application.GetRealWidth(80),
+                    TextID = MyInternationalizationString.selecfoolr,
+                    TextSize = 14,
+                };
+                foolrbjicon.AddChidren(btnfoolrtext);
+
                 var foolrbj = new VerticalScrolViewLayout
                 {
 
-                    Width = Application.GetRealWidth(400),
-                    Height = Application.GetRealHeight(600),
-                    X = Application.GetRealWidth(1080 - 400 - 60),
-                    Y = Application.GetRealHeight(184 + 50),
-                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                    Radius = (uint)Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(450),
+                    Height = foolrbjicon.Height - btnfoolrtext.Height,
+                    X = Application.GetRealWidth(80),
+                    Y = btnfoolrtext.Bottom,
                 };
-                flMain.AddChidren(foolrbj);
+                foolrbjicon.AddChidren(foolrbj);
+
                 foreach (var foolr in Config.Instance.Home.FloorDics)
                 {
-
-                    var foolrRowLayout = new FrameLayout
+                    var foolrRowLayout = new RowLayout
                     {
                         Height = Application.GetRealHeight(150),
+                        LineColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
                     };
                     foolrbj.AddChidren(foolrRowLayout);
+
+                    var btnfoolricon = new Button
+                    {
+                        Width = Application.GetRealWidth(81),
+                        Height = Application.GetRealHeight(81),
+                        UnSelectedImagePath = "Floor/Floor.png",
+                        Gravity = Gravity.CenterVertical,
+                    };
+                    foolrRowLayout.AddChidren(btnfoolricon);
+
 
                     var btnfoolrname = new Button
                     {
                         Width = Application.GetRealWidth(250),
-                        Height = Application.GetRealHeight(160),
+                        Height = Application.GetRealHeight(150),
                         Text = foolr.Value,
-                        TextAlignment = TextAlignment.Center,
-                        TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                        //SelectedTextColor=0xfffc744b,
+                        TextAlignment = TextAlignment.CenterLeft,
+                        TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                         Tag = foolr.Key,
+                        X = btnfoolricon.Right + Application.GetRealWidth(12),
+                        TextSize = 14,
                     };
                     foolrRowLayout.AddChidren(btnfoolrname);
-
+                    if (foolrname.Text == foolr.Value)
+                    {
+                        btnfoolricon.UnSelectedImagePath = "Floor/FloorSelected.png";
+                        btnfoolrname.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
+                    }
 
                     EventHandler<MouseEventArgs> foolrnameclick = (sender13, e13) =>
                     {
+
                         roomhorizontalScrol.RemoveAll();
                         devicetypehorizontalScrol.RemoveAll();
                         middle.RemoveAll();
@@ -224,7 +258,7 @@
             ///绗竴娆¤繘鏉�
             var roomlists = new List<Common.Room>();
             roomlists.Clear();
-            if (Config.Instance.Home.FloorDics.Count < 1)
+            if (Config.Instance.Home.FloorDics.Count < 2)
             {
                 foolrname.Visible = false;
                 dropdown.Visible = false;
@@ -250,6 +284,7 @@
         /// </summary>
         void AllRoomView(List<Common.Room> roomlist, List<DeviceType> deviceTypeList, HorizontalScrolViewLayout roomhorizontalScrol, HorizontalScrolViewLayout devicetypehorizontalScrol)
         {
+            
             for (int i = 0; i < roomlist.Count; i++)
             {
                 var room = roomlist[i];
@@ -267,20 +302,20 @@
                     Width = Application.GetRealWidth(255),
                     UnSelectedImagePath = "ZigeeLogic/iconBackgroundColor.png",
                     SelectedImagePath = "ZigeeLogic/iconSelectedBackgroundColor.png",
-                    Y=Application.GetRealHeight(21),
+                    Y = Application.GetRealHeight(21),
                 };
                 fra.AddChidren(roombjBtn);
 
-                var roomnameBtn= new Button
+                var roomnameBtn = new Button
                 {
 
-                    Height = Application.GetRealHeight(152-26-20),
-                    Width = Application.GetRealWidth(255-20-50),
+                    Height = Application.GetRealHeight(152 - 26 - 20),
+                    Width = Application.GetRealWidth(255 - 20 - 50),
                     Text = room.Name,
                     TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                     SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
-                    Y=Application.GetRealHeight(21 +13+10),
-                    X=Application.GetRealWidth(10+25),
+                    Y = Application.GetRealHeight(21 + 13 + 10),
+                    X = Application.GetRealWidth(10 + 25),
 
                 };
                 fra.AddChidren(roomnameBtn);
@@ -298,7 +333,8 @@
                     var list = new List<DeviceUI>();
                     foreach (var device in room.DeviceUIList)
                     {
-                        if (device.CommonDevice==null) {
+                        if (device.CommonDevice == null)
+                        {
                             continue;
                         }
                         if (!deviceTypeList.Contains(device.CommonDevice.Type))
@@ -307,6 +343,17 @@
                         }
                         list.Add(device);
                     }
+                    if (list.Count == 0)
+                    {
+                        devicetypehorizontalScrol.Height = 0;
+                        middle.Height = 0;
+                    }
+                    else
+                    {
+                        devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
+                        middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
+                    }
+
                     AllDeviceTypeView(list, devicetypehorizontalScrol);
 
                 }
@@ -327,7 +374,8 @@
                     var list = new List<DeviceUI>();
                     foreach (var device in room.DeviceUIList)
                     {
-                        if (device.CommonDevice==null) {
+                        if (device.CommonDevice == null)
+                        {
                             continue;
                         }
                         if (!deviceTypeList.Contains(device.CommonDevice.Type))
@@ -336,6 +384,18 @@
                         }
                         list.Add(device);
                     }
+
+                    if (list.Count == 0)
+                    {
+                        devicetypehorizontalScrol.Height = 0;
+                        middle.Height = 0;
+                    }
+                    else
+                    {
+                        devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
+                        middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
+                    }
+
                     AllDeviceTypeView(list, devicetypehorizontalScrol);
 
 
@@ -366,7 +426,7 @@
                 devicetypelist.Add(Language.StringByID(MyInternationalizationString.Curtains));
             }
 
-            var iASZonejosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.IASZone);
+            var iASZonejosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.IASZone || device.CommonDevice.Type == DeviceType.TemperatureSensor);
             if (iASZonejosn != null)
             {
                 devicetypelist.Add(Language.StringByID(MyInternationalizationString.sensor));
@@ -486,6 +546,7 @@
                     else if (devicetype == Language.StringByID(MyInternationalizationString.sensor))
                     {
                         list.Add(DeviceType.IASZone);
+                        list.Add(DeviceType.TemperatureSensor);
                     }
                     else if (devicetype == Language.StringByID(MyInternationalizationString.doorLock))
                     {
@@ -535,7 +596,7 @@
                     Height = Application.GetRealHeight(112),
                     X = Application.GetRealWidth(58),
                     Y = Application.GetRealHeight(30 + 9),
-                    Radius = (uint)Application.GetRealHeight(56),
+                   // Radius = (uint)Application.GetRealHeight(56),
                     BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
                 };
                 deviceFramelayout.AddChidren(bjFramelayout);
@@ -566,6 +627,7 @@
                     TextAlignment = TextAlignment.CenterLeft,
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                     SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
+                    TextSize = 14,
                 };
                 deviceRow.AddChidren(devicename);
                 switch (common.CommonDevice.Type)
@@ -587,6 +649,21 @@
                             deviceIconBtn.SelectedImagePath = $"ZigeeLogic/selectedsensor{iASZonedevice.IasDeviceType}.png";
 
 
+                        }
+                        break;
+                    case DeviceType.TemperatureSensor:
+                        {
+                            var temperatureSensor = common.CommonDevice as TemperatureSensor;
+                            if (temperatureSensor.SensorDiv == 1)
+                            {
+                                deviceIconBtn.UnSelectedImagePath = $"ZigeeLogic/temperature.png";
+                                deviceIconBtn.SelectedImagePath = $"ZigeeLogic/selectedtemperature.png";
+                            }
+                            else
+                            {
+                                deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/humidity.png";
+                                deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedhumidity.png";
+                            }
                         }
                         break;
                     case DeviceType.OnOffSwitch:
@@ -631,11 +708,11 @@
         /// 閫変腑璇ヨ澶囧姛鑳戒綔涓烘潯浠剁殑瑙嗗浘鏂规硶
         /// </summary>
         /// <param name="common">Common.</param>
-        public async static  void CurrentDeviceView(FrameLayout flMain, CommonDevice common, bool edit)
+        public async static void CurrentDeviceView(FrameLayout flMain, CommonDevice common, bool edit)
         {
             //涓嶈褰撳墠鐣岄潰婊戝姩
             UserView.HomePage.Instance.ScrollEnabled = false;
-            List<Dictionary<string, string>> doorlockConditionsInfo= new List<Dictionary<string, string>>();
+            List<Dictionary<string, string>> doorlockConditionsInfo = new List<Dictionary<string, string>>();
             Dictionary<string, string> deviceConditionsInfo = new Dictionary<string, string>();
             dictionary(deviceConditionsInfo, "Type", "1");
             dictionary(deviceConditionsInfo, "IsValid", "1");
@@ -646,18 +723,7 @@
             flMain.MouseUpEventHandler += (sender, e) =>
             {
                 flMain.RemoveFromParent();
-
-
             };
-
-            var devicefra1 = new FrameLayout
-            {
-                Width = Application.GetRealWidth(1080),
-                Height = Application.GetRealHeight(100),
-                Y = Application.GetRealHeight(1920 - 100),
-                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-            };
-            flMain.AddChidren(devicefra1);
 
             var devicefra = new FrameLayout
             {
@@ -666,9 +732,10 @@
                 Height = Application.GetRealHeight(530),
                 Y = Application.GetRealHeight(1920 - 530),
                 BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(60),
+               // Radius = (uint)Application.GetRealHeight(60),
             };
             flMain.AddChidren(devicefra);
+            devicefra.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);
 
             #region  -------鍙栨秷   瀹屾垚
             var timetype = new RowLayout
@@ -685,6 +752,7 @@
                 Width = Application.GetRealWidth(200),
                 X = Application.GetRealWidth(80),
                 TextAlignment = TextAlignment.CenterLeft,
+                TextSize = 14,
             };
             timetype.AddChidren(Btncancel);
             Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -698,9 +766,9 @@
                 TextID = MyInternationalizationString.security,
                 TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
                 Height = Application.GetRealHeight(140),
-                Width = Application.GetRealWidth(320),
+                Width = Application.GetRealWidth(420),
                 TextAlignment = TextAlignment.Center,
-                X = Btncancel.Right + Application.GetRealWidth(100),
+                X = Btncancel.Right + Application.GetRealWidth(50),
                 TextSize = 16,
                 Text = common.DeviceEpointName,
             };
@@ -712,7 +780,8 @@
                 Height = Application.GetRealHeight(140),
                 Width = Application.GetRealWidth(200),
                 TextAlignment = TextAlignment.CenterRight,
-                X = Btntitle.Right + Application.GetRealWidth(100),
+                X = Btntitle.Right + Application.GetRealWidth(50),
+                TextSize = 14,
 
             };
             timetype.AddChidren(Btncomplete);
@@ -773,6 +842,7 @@
                             TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         openrowlayout.AddChidren(btnopen);
 
@@ -803,6 +873,7 @@
                             Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         closerowlayout.AddChidren(btnclose);
 
@@ -898,6 +969,7 @@
                             Height = Application.GetRealHeight(180),
                             //SelectedBackgroundColor = 0xfffe5e00,
                             TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                            TextSize = 14,
                         };
                         openrowlayout.AddChidren(btnopen);
 
@@ -928,6 +1000,7 @@
                             Width = Application.GetRealWidth(300),
                             Height = Application.GetRealHeight(180),
                             TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                            TextSize = 14,
                         };
                         closerowlayout.AddChidren(btnclose);
 
@@ -1024,6 +1097,7 @@
                             TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         openrowlayout.AddChidren(btnopen);
 
@@ -1054,6 +1128,7 @@
                             Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         closerowlayout.AddChidren(btnclose);
 
@@ -1097,7 +1172,7 @@
                             dictionary(deviceConditionsInfo, "AttriButeData1", "0");
                             if (iASZonedevice.IasDeviceType == 13)
                             {
-                                SelectedDeviceStatuscondition = "no";
+                                SelectedDeviceStatuscondition = "";
                                 btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                 btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                 openBtnSelected.Visible = false;
@@ -1165,6 +1240,7 @@
                                         Width = Application.GetRealWidth(600),
                                         TextAlignment = TextAlignment.CenterLeft,
                                         TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                                        TextSize = 14,
                                     };
                                     timeoutrowlayout.AddChidren(btntimeout);
 
@@ -1179,7 +1255,7 @@
                                     timeoutrowlayout.AddChidren(timeoutBtnSelected);
                                     EventHandler<MouseEventArgs> timeoutclick = (sender, e) =>
                                     {
-                                        SelectedDeviceStatuscondition = "no";
+                                        SelectedDeviceStatuscondition = "";
                                         btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                         btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
                                         openBtnSelected.Visible = false;
@@ -1198,7 +1274,6 @@
                                     #endregion
                                 }
                                 break;
-
                             case 40:
                                 {
                                     devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
@@ -1238,7 +1313,6 @@
                                     openrowlayout.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
                                 }
                                 break;
-
                             case 277:
                                 {
                                     devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
@@ -1325,6 +1399,7 @@
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                             Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString(),
+                            TextSize = 14,
                             //SelectedBackgroundColor = 0xfffe5e00,
                         };
                         buttonRow.AddChidren(button);
@@ -1332,12 +1407,12 @@
                         var buttonSelected = new SelectedButton();
                         buttonRow.AddChidren(buttonSelected);
                         EventHandler<MouseEventArgs> buttonclick = (sender, e) =>
-                       {
-                           buttonSelected.Visible = true;
-                           SelectedDeviceStatuscondition = "OnOffSwitch";
-                           button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                        {
+                            buttonSelected.Visible = true;
+                            SelectedDeviceStatuscondition = "OnOffSwitch";
+                            button.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
 
-                       };
+                        };
                         buttonRow.MouseUpEventHandler += buttonclick;
                         button.MouseUpEventHandler += buttonclick;
                         buttonSelected.MouseUpEventHandler += buttonclick;
@@ -1353,50 +1428,131 @@
                     break;
                 case DeviceType.DoorLock:
                     {
-                        #region  ------
-                        var doorlockifonlist = Send.ReadDoorLockIfon("ccccccfffe300347");
-                        //var list = Send.ReadDoorLockIfon(common.DeviceAddr);
-                        var pra = new UserCenter.MemberListInfoPra();
-                        string result = await UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
-                        var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
-                        Send.UserList.Clear();
-                        for (int i = 0; i < listInfo.Count; i++)
-                        {
-                            var membership = new Send.MembershipIfon();
-                            var membershipifon = listInfo[i];
-                            for (int j = 0; j < doorlockifonlist.Count; j++)
-                            {
-                                ///鏌ユ壘鎴愬憳浠ュ強鎴愬憳闂ㄩ攣瑙﹀彂婧�(1鎸夐敭/3鍗�/15鎸囩汗)
-                                if (doorlockifonlist[j].CloudAccountId == membershipifon.SubAccountDistributedMark)
-                                {
-                                    membership.UserIdMode.Add(doorlockifonlist[j].UserIdMode);
-                                    membership.MembershipName = membershipifon.UserName;
-                                    membership.MembershipId = membershipifon.SubAccountDistributedMark;
 
-                                }
-
-                            }
-                            if (membership.UserIdMode.Count != 0)
-                            {
-                                ///杩囨护鎺夐噸澶嶆暟鎹紱
-                                var str = Send.UserList.Find((c) => { return c.MembershipId == membership.MembershipId; });
-                                if (str == null)
-                                {
-                                    Send.UserList.Add(membership);
-                                }
-                            }
-
-                        }
-                        #endregion
-
+                        flMain.RemoveFromParent();
                         var memberList = new MemberList();
                         UserView.HomePage.Instance.AddChidren(memberList);
                         UserView.HomePage.Instance.PageIndex += 1;
-                        MemberList.action += () => { flMain.RemoveFromParent(); };
+                        MemberList.edit = false;
                         memberList.Show(common);
                     }
                     break;
+                case DeviceType.TemperatureSensor:
+                    {
+                        string current = Language.StringByID(MyInternationalizationString.current);
+                        devicefra.Y = Application.GetRealHeight(1920 - 140 - 600);
+                        devicefra.Height = Application.GetRealHeight(140 + 600);
+                        var temperatureSensor = common as TemperatureSensor;
+                        SelectedDeviceStatuscondition = "TemperatureSensor";
+                        #region  甯冨眬View
+                        var PickerViewfra = new FrameLayout
+                        {
+                            Y = Application.GetRealHeight(140),
+                            Height = Application.GetRealHeight(600),
+                        };
+                        devicefra.AddChidren(PickerViewfra);
 
+
+                        var mUIPickerView = new UIPickerView
+                        {
+                            Height = Application.GetRealHeight(600 - 5),
+                        };
+                        PickerViewfra.AddChidren(mUIPickerView);
+
+                        var mList1 = new List<string> { ">", "<", "=", "鈮�", "鈮�" };
+                        var mList2 = new List<string>();
+                        var mList3 = new List<string>();
+                        for (int i = 1; i <=100; i++)
+                        {
+                            mList2.Add(i.ToString());
+                        }
+                        if (temperatureSensor.SensorDiv == 1) {
+                            mList3.Add("鈩�");
+                            dictionary(deviceConditionsInfo, "Cluster_ID", "1026");
+                            dictionary(deviceConditionsInfo, "AttriButeId", "0");
+                            dictionary(deviceConditionsInfo, "Range", "1");//1:绛変簬AttriButeData1鏃惰Е鍙戝姩浣�
+                            dictionary(deviceConditionsInfo, "AttriButeData1", "50");//榛樿娓╁害鍊�50鈩�
+                            dictionary(deviceConditionsInfo, "AttriButeData2", "0");
+                        } else {
+                            mList3.Add("%");
+                            dictionary(deviceConditionsInfo, "Cluster_ID", "1029");
+                            dictionary(deviceConditionsInfo, "AttriButeId", "0");
+                            dictionary(deviceConditionsInfo, "Range", "1");//1:绛変簬AttriButeData1鏃惰Е鍙戝姩浣�
+                            dictionary(deviceConditionsInfo, "AttriButeData1", "50");//榛樿婀垮害鍊�50%
+                            dictionary(deviceConditionsInfo, "AttriButeData2", "0");
+                        }
+                        mUIPickerView.setNPicker(mList1, mList2, mList3);
+
+                        #endregion
+
+                        mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) =>
+                        {
+                            SelectedDeviceStatuscondition = "TemperatureSensor";
+                            dictionary(deviceConditionsInfo, "AttriButeData1", mList2[s2]);
+                            switch (mList1[s1])
+                            {
+                                case ">": {
+                                        dictionary(deviceConditionsInfo, "Range", "0");
+                                    } break;
+                                case "<": {
+                                        dictionary(deviceConditionsInfo, "Range", "2");
+                                    } break;
+                                case "=": {
+                                        dictionary(deviceConditionsInfo, "Range", "1");
+                                    } break;
+                                case "鈮�": {
+                                        dictionary(deviceConditionsInfo, "Range", "6");
+                                    } break;
+                                case "鈮�": {
+                                        dictionary(deviceConditionsInfo, "Range", "7");
+                                    } break;
+                            }
+                        };
+
+                        //榛樿=,50
+                        int index1 = 2, index2 = 49;
+                        if (edit && devices != null)
+                        {
+                            SelectedDeviceStatuscondition = "";
+                            string s = "";
+                            switch (devices["Range"])
+                            {
+                                case "0":
+                                    {
+                                        s = ">";
+                                    }
+                                    break;
+                                case "1":
+                                    {
+                                        s = "=";
+                                    }
+                                    break;
+                                case "2":
+                                    {
+                                        s = "<";
+                                    }
+                                    break;
+                                case "6":
+                                    {
+                                        s = "鈮�";
+                                    }
+                                    break;
+                                case "7":
+                                    {
+                                        s = "鈮�";
+                                    }
+                                    break;
+                            }
+                            //鏌ユ壘绱㈠紩
+                            index1 = mList1.IndexOf(s);
+                            index2 = mList2.IndexOf(devices["AttriButeData1"]);
+
+                        }
+                        ///鏇存柊鏈�鏂扮姸鎬侊紱
+                        mUIPickerView.setCurrentItems(index1, index2, 0);
+
+                    }
+                    break;
             }
 
             Btncomplete.MouseUpEventHandler += (sender2, e2) =>
@@ -1412,7 +1568,7 @@
                     {
                         var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                                Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
-                                               Language.StringByID(MyInternationalizationString.complete));
+                                               Language.StringByID(MyInternationalizationString.confrim));
                         alert.Show();
                         return;
                     }
@@ -1438,7 +1594,7 @@
             deviceConditionsInfo.Add(Key, Value);
         }
 
-        
+
 
     }
 }

--
Gitblit v1.8.0