From 2f1b0d944bd8feb7c6dca5126a4832228ba826ce Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 04 十二月 2020 14:00:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 72c5ce7..087c0d9 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -223,9 +223,11 @@
Width = Application.GetRealWidth(164),
Height = Application.GetRealWidth(122),
Tag = scene.sid,
- BackgroundImagePath = (scene as Scene).ImagePath,
+ //BackgroundImagePath = (scene as Scene).ImagePath,
};
rowView.AddChidren(functionView);
+ //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+ ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, functionView);
LoadSceneFunctionDiv(functionView, scene);
index++;
@@ -344,7 +346,9 @@
Action refreshAction = () => {
btnName.Text = scene.name;
btnZone.Text = scene.GetRoomListName();
- view.BackgroundImagePath = scene.ImagePath;
+ //view.BackgroundImagePath = scene.ImagePath;
+ //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+ ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, view);
};
var aep = new SceneEditPage(scene, backAction);
MainPage.BasePageView.AddChidren(aep);
--
Gitblit v1.8.0