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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

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

old mode 100755
new mode 100644
@@ -648,11 +648,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;
@@ -742,6 +743,7 @@
            {
                HidenFloor(true);
                ShowAutotion();

            }
        }

@@ -1430,6 +1432,8 @@
                        ShowSameTypeFunction(functionTypeIMG.ImageBtn, null);
                    }
                }


            }
        }

@@ -1494,7 +1498,7 @@
                    {
                        RefreshFunction(room);
                    }
                   

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

        }

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

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

                    };
                    deleteBtn.MouseUpEventHandler += delEvent;
                    //编辑场景
@@ -1819,12 +1823,11 @@
        #endregion

        #region ◆ 自动化__________________________

        /// <summary>
        /// 自动化
        /// </summary>
        private async void ShowAutotion()
        {

        {


            functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;

            var bjFrameLayout = new FrameLayout
@@ -2004,9 +2007,8 @@
            //自动化
            Automationview(logicScrolView);
            CommonPage.Loading.Hide();
            
        }

        }
        /// <summary>
        /// 自动化列表界面
        /// </summary>
@@ -2612,6 +2614,6 @@

        #endregion

   

    }
}