Merge branch 'NewFilePath' into CJL

JLChen

2020-12-15 5d6626e390f7bccbbfbc0df1e95f8fb86a53af58

 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs

@@ -69,7 +69,7 @@
            };
            bodyView.AddChidren(topView);

            if (DB_ResidenceData.residenceData.GatewayType == 0)
            if (DB_ResidenceData.Instance.GatewayType == 0)
            {
                btnSceneTilte = new Button()
                {
@@ -200,7 +200,7 @@
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextAlignment = TextAlignment.CenterLeft,
                Text = DB_ResidenceData.residenceData.CurFoor,
                Text = DB_ResidenceData.Instance.CurFloor.roomName,
            };
            floorChangeView.AddChidren(btnFloor);

@@ -374,7 +374,6 @@
                    Action refreshAction = () => {
                        btnName.Text = scene.name;
                        btnZone.Text = scene.GetRoomListName();
                        //view.BackgroundImagePath = scene.ImagePath;
                        //2020-12-03 修改图片加载方法
                        ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, view);
                    };