2019.12.23

gxc

2019-12-23 ddb46a700775aacfb6cc82d9586302a38c8fa0a7

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

@@ -85,7 +85,7 @@
        /// <summary>
        /// 功能类型按钮
        /// </summary>
        private FunctionButton functionTypeIMG;
        //private FunctionButton functionTypeIMG;
        /// <summary>
        /// 功能类型
        /// </summary>
@@ -93,7 +93,7 @@
        /// <summary>
        /// 设备类型RowLayout
        /// </summary>
        private FrameLayout typeRowLayout;
        //private FrameLayout typeRowLayout;
        /// <summary>
        /// 楼层
        /// </summary>
@@ -911,9 +911,9 @@
                deviceListScrolView = new VerticalScrolViewLayout
                {
                    X = Application.GetRealWidth(CommonFormResouce.X_Left),
                    Y = Application.GetRealHeight(35+275),
                    Y = Application.GetRealHeight(35+279),
                    Width = Application.GetRealWidth(1028),
                    Height = Application.GetRealHeight(939),
                    Height = Application.GetRealHeight(942),
                    BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
                };
                functionSceneBodyView.AddChidren(deviceListScrolView);
@@ -924,13 +924,13 @@

                foreach (var deviceType in typeIdDic)
                {
                    typeRowLayout = new FrameLayout()
                    var typeRowLayout = new FrameLayout()
                    {
                        Width = Application.GetRealWidth(220),
                    };
                    functionTypeScrowView.AddChidren(typeRowLayout);

                    functionTypeIMG = new FunctionButton()
                    var functionTypeIMG = new FunctionButton()
                    {
                        Tag = deviceType.Key
                    };
@@ -943,7 +943,7 @@

                    functionTypeIMG.ClickBtn.MouseUpEventHandler += ShowSameTypeFunction;

                    if (typeRowLayout.ChildrenCount == 1)
                    if (functionTypeScrowView.ChildrenCount == 1)
                    {
                        ShowSameTypeFunction(functionTypeIMG.ImageBtn, null);
                    }
@@ -1670,7 +1670,6 @@
                    roomBtn.IsSelected = true;
                    this.curRoom = room;
                    curBtn = roomBtn;

                    if(sceneBtn.IsSelected)
                    {
                        RefreshScene(room);
@@ -1720,8 +1719,8 @@
        /// <param name="room"></param>
        public void RefreshScene(Common.Room room)
        {
            RefreshData(room);
            functionSceneBodyView.RemoveAll();
            var sceneList = room.SceneUIList;
            if (sceneList.Count == 0)
            {
                ShowNoSceneTip();