Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs

@@ -316,7 +316,7 @@
            functionSceneBodyView.Height = functionSceneAutoBodyView.Height - roomSwitchContr.Bottom;

            functionSceneAutoBodyView.AddChidren(functionSceneBodyView);



            //执行初始化 
            //执行初始化

            roomSwitchContr.InitControl();

        }



@@ -640,7 +640,7 @@
                listview2 = new VerticalListControl();

                functionSceneBodyView.AddChidren(listview2);

            }

          


            foreach (var scene in listScene)

            {

                //场景卡片控件