Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

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

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

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

@@ -653,11 +653,12 @@
        /// <param name="sender">Sender.</param>
        /// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
        private void AutomationBtn_MouseUpEventHandler(object sender, MouseEventArgs mouseEventArgs)
        {

            Common.Logic.LogicDviceList.Clear();

            if (Common.Logic.LogicDviceList.Count == 0)

            {

                Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());

        {
            ///第一次进来初始化设备列表；
            Common.Logic.LogicDviceList.Clear();
            if (Common.Logic.LogicDviceList.Count == 0)
            {
                Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
            }
            functionBtn.IsSelected = false;
            sceneBtn.IsSelected = false;
@@ -747,6 +748,7 @@
            {
                HidenFloor(true);
                ShowAutotion();

            }
        }

@@ -1421,6 +1423,8 @@
                        ShowSameTypeFunction(functionTypeIMG.ImageBtn, null);
                    }
                }


            }
        }

@@ -1485,7 +1489,7 @@
                    {
                        RefreshFunction(room);
                    }
                   

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

        }

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

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

                    };
                    deleteBtn.MouseUpEventHandler += delEvent;
                    //编辑场景
@@ -1802,7 +1806,7 @@
        /// 自动化
        /// </summary>
        private async void ShowAutotion()
        {

        {


            functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;

            var bjFrameLayout = new FrameLayout
@@ -1982,7 +1986,7 @@
            //自动化
            Automationview(logicScrolView);
            CommonPage.Loading.Hide();
            

        }

        /// <summary>
@@ -2590,6 +2594,6 @@

        #endregion

   

    }
}