From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成
---
ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs
index a718558..9811dc5 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs
@@ -12,8 +12,7 @@
/// </summary>
private FrameLayout bodyFrameLayout;
-
- public Action action;
+ public Action<string> action;
public CategorySceneSelectImgByLocal()
{
@@ -71,8 +70,8 @@
};
bodyFrameLayout.AddChidren(scrollView);
- int k = 1;
- for (int j = 0; j < 2; j++)
+ int k = 0;
+ for (int j = 0; j < 5; j++)
{
var itemView = new FrameLayout()
{
@@ -87,16 +86,17 @@
Width=Application.GetMinRealAverage(467),
Height=Application.GetMinRealAverage(311),
Gravity=Gravity.CenterVertical,
- UnSelectedImagePath = $"SceneIcon/{k}.png",
+ UnSelectedImagePath = $"SceneIcon/{k}.jpg",
};
itemView.AddChidren(icon);
+ icon.SetViewShadow(true);
k++;
EventHandler<MouseEventArgs> selectIcon = (sender, e) =>
{
//CategoryAddScene.ImagePath = icon.UnSelectedImagePath;
- Room.AddRoomScene.ImagePath = icon.UnSelectedImagePath;
- action?.Invoke();
+ //Room.AddRoomScene.ImagePath = icon.UnSelectedImagePath;
+ action?.Invoke(icon.UnSelectedImagePath);
action = null;
this.RemoveFromParent();
--
Gitblit v1.8.0