Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs

old mode 100755
new mode 100644
@@ -55,7 +55,7 @@
        {

            this.FormID = "HomeMainPageForm";

            Instance = this;

            


            //先初始化左滑房间列表界面(在反射里面初始化)

            if (LeftListRoomViewFrom.Instance == null) { }



@@ -549,8 +549,9 @@


            var listDevice = new List<CommonDevice>();

            foreach (var mainkeys in HdlRoomLogic.Current.NowMainPageRoom.ListDevice)

            {

            {
                var device = LocalDevice.Current.GetDevice(mainkeys);



                //判断该设备能否显示在主页

                if (LocalDevice.Current.CanShowInHomeHomeMainPage(device) == false)

                {