Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/Shared/Phone/Device/Category/Category.cs

old mode 100755
new mode 100644
@@ -543,7 +543,7 @@
        /// <param name="selectedBtn">选中那个界面 0--功能 1--场景 2--自动化 </param>
        public void Show(int selectedBtn = 1)
        {
            

            ZbGateway.StatusList.Add(this);
            RemoveAll();

@@ -1037,7 +1037,7 @@
                                lightControl.action = RefreshBodyView;
                                lightControl.Show(deviceUI, room);
                            };
                            

                            var editBtn = new CommonForm.RowLayoutEditButton()
                            {
                                Tag = deviceUI,
@@ -1102,8 +1102,8 @@
                                zbGateway.ReportAction += UpdateDeviceControllStatu;
                                AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);

                                (send2 as CommonForm.SelectedStatuButton).IsSelected = !(send2 as CommonForm.SelectedStatuButton).IsSelected;
                                if ((send2 as CommonForm.SelectedStatuButton).IsSelected)
                                (send2 as Button).IsSelected = !(send2 as Button).IsSelected;
                                if ((send2 as Button).IsSelected)
                                {
                                    airSwitch.SwitchControl(1);
                                }
@@ -1201,8 +1201,8 @@
                                zbGateway.ReportAction += UpdateDeviceControllStatu;
                                AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);

                                (send2 as CommonForm.SelectedStatuButton).IsSelected = !(send2 as CommonForm.SelectedStatuButton).IsSelected;
                                if ((send2 as CommonForm.SelectedStatuButton).IsSelected)
                                (send2 as Button).IsSelected = !(send2 as Button).IsSelected;
                                if ((send2 as Button).IsSelected)
                                {
                                    dimmableLight.SwitchControl(1);
                                }
@@ -1463,7 +1463,7 @@
                    typeRowLayout.AddChidren(functionTypeIMG);

                    functionTypeIMG.ClickBtn.MouseUpEventHandler += ShowSameTypeFunction;
                   


                    if (deviceType == room.DeviceUIList[0].CommonDevice.Type)
                    {
@@ -1534,7 +1534,7 @@
                    {
                        RefreshFunction(room);
                    }
                   

                }
                roomBtn.MouseUpEventHandler += (sender, e) =>
                {
@@ -1555,7 +1555,7 @@
                    }
                };
            }
            

        }

        #endregion
@@ -1640,7 +1640,7 @@
                        Tag = scene
                    };
                    leftFL.AddChidren(collectionBtn);
                    

                    var sceneNameBtn = new Button()
                    {
                        Width = Application.GetRealWidth(176),
@@ -1789,7 +1789,7 @@
                                }
                            };
                        }
                        

                    };
                    deleteBtn.MouseUpEventHandler += delEvent;
                    //编辑场景
@@ -1854,7 +1854,7 @@
        {



            functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;

            


            var bjFrameLayout = new FrameLayout
            {
                Width = Application.GetRealWidth(1080 - 58),