2019-12-11-1

WJC

2019-12-11 1c7e1305f637ef910ccc5cd691255c34296c846b

2019-12-11-1

 .DS_Store

Binary files differ

 ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs

@@ -84,9 +84,9 @@
            middle.AddChidren(textBox);
            textBox.HideSoftInput();

             var btnsave = new Button
            var btnsave = new Button
            {
                Y= middle.Height-Application.GetRealHeight(260),
                Y = middle.Height - Application.GetRealHeight(260),
                X = Application.GetRealWidth(85),
                Height = Application.GetRealHeight(130),
                Width = Application.GetRealWidth(910),
@@ -94,20 +94,19 @@
                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                TextID = MyInternationalizationString.confrim,
                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
                 TextSize = 16,
             };
                TextSize = 16,
            };
            middle.AddChidren(btnsave);

                     

            middle.AddChidren(btnsave);
            btnsave.MouseUpEventHandler += (sender, e) =>
             {
                 Common.Logic.CurrentLogic.LogicCustomPushText = textBox.Text.Trim();
                 if (Common.Logic.CurrentLogic.LogicId != 0)
                 {
                     ///只改推送内容；
                     Send.LogicControlSwitch(Common.Logic.CurrentLogic);
                 }
                 else {
                     Send.AddModifyLogic(Common.Logic.CurrentLogic);
                 }
                 RemoveFromParent();


 ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs

@@ -244,7 +244,6 @@
                        foolrname.Text = btnfoolrname.Text;
                        flMain.RemoveFromParent();
                        var list = Send.GetRoomList(btnfoolrname.Tag.ToString());

                        AllRoomView(list, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
                    };
                    foolrRowLayout.MouseUpEventHandler += foolrnameclick;
@@ -285,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];

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs

@@ -697,6 +697,7 @@
            };
            flMain.AddChidren(devicefra);
            devicefra.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);

            #region  -------取消   完成
            var timetype = new RowLayout
            {
@@ -746,7 +747,6 @@
            };
            timetype.AddChidren(Btncomplete);
            #endregion


            string SelectedDeviceStatusaction = "no";
            actionsInfo.Add("LinkType", 0);
@@ -1141,7 +1141,7 @@
                        #endregion

                        int Progressvalue = 100;
                      EventHandler<int> progressclick = (sender, e) =>
                        EventHandler<int> progressclick = (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            Progressvalue = horizontalSeekBarVol.Progress;
@@ -1745,7 +1745,6 @@
                        }
                    }
                    break;

                case DeviceType.Thermostat:
                    {

@@ -2070,7 +2069,6 @@


            }

            Btncomplete.MouseUpEventHandler += (sender, e) =>
            {


 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs

@@ -711,8 +711,31 @@
        public static List<Common.Room> GetRoomList(string floorId)
        {
            return Common.Room.Lists.FindAll((obj) => obj.FloorId == floorId);

            //var list1 = new List<Common.Room>();
            /////找到某楼层房间列表；
            //var list = Common.Room.Lists.FindAll((obj) => obj.FloorId == floorId);
            //for (int i = 0; i < list.Count; i++)
            //{
            //    if (str == "device")
            //    {
            //        if (list[i].DeviceUIList.Count != 0)
            //        {   ///过滤掉没有设备的房间
            //            list1.Add(list[i]);
            //        }
            //    }
            //    else
            //    {
            //        if (list[i].SceneUIList.Count != 0)
            //        {   ///过滤掉没有场景的房间
            //            list1.Add(list[i]);
            //        }
            //    }
            //}
            /////返回房间列表；
            //return list1;
        }

       
        #endregion

        #region  ----获取门锁

 ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs

@@ -139,7 +139,7 @@
            logicTextBox = new EditText
            {
                Y = Application.GetRealHeight(35),
                Width = Application.GetRealWidth(900),
                Width = Application.GetRealWidth(1080 - 58 - 300),
                Height = Application.GetRealHeight(60),
                X = text.Right,
                TextAlignment = TextAlignment.CenterLeft,