From e22fdb94322e6cec38e5e4a9aec13d431a133fde Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 16:32:35 +0800
Subject: [PATCH] 上传合并后的代码
---
ZigbeeApp/Shared/Phone/MainPage/SelectLocalDeviceImageForm.cs | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/SelectLocalDeviceImageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/SelectLocalDeviceImageForm.cs
similarity index 77%
rename from ZigbeeApp/Shared/Phone/MainPage/Controls/SelectLocalDeviceImageForm.cs
rename to ZigbeeApp/Shared/Phone/MainPage/SelectLocalDeviceImageForm.cs
index 3cdfc7b..6b03468 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/SelectLocalDeviceImageForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/SelectLocalDeviceImageForm.cs
@@ -3,7 +3,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone.MainPage.Controls
+namespace Shared.Phone.MainPage
{
/// <summary>
/// 閫夋嫨鏈湴璁惧鍥剧墖鐨勭晫闈�
@@ -16,6 +16,10 @@
/// 缁撴潫閫夋嫨鐨勪簨浠�(鍥剧墖鍚嶅瓧)
/// </summary>
public Action<string> FinishSelectEvent = null;
+ /// <summary>
+ /// 褰撳墠閫夋嫨鐨勫浘鏍囨帶浠�
+ /// </summary>
+ private PicViewControl selectContr = null;
#endregion
@@ -29,7 +33,7 @@
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame();
//璁剧疆澶撮儴淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.LocalPicture));
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.SelectIcon));
}
/// <summary>
@@ -63,7 +67,7 @@
listView.AddChidren(frameRow);
}
//鑳屾櫙
- var frameBack = new FrameLayoutControl();
+ var frameBack = new FrameLayoutStatuControl();
frameBack.UseClickStatu = false;
frameBack.Height = backWidth;
frameBack.Width = backWidth;
@@ -82,17 +86,28 @@
frameBack.ButtonClickEvent += (sender, e) =>
{
- //缁撴潫閫夋嫨鐨勪簨浠�
- //this.FinishSelectEvent?.Invoke(btnIcon.ImagePath);
- this.CloseForm();
+ btnIcon.IsSelected = !btnIcon.IsSelected;
+ if (this.selectContr != null && this.selectContr.UnSelectedImagePath != btnIcon.UnSelectedImagePath)
+ {
+ //鍙栨秷鎺夊墠涓�涓�
+ this.selectContr.IsSelected = false;
+ }
+ this.selectContr = btnIcon;
};
}
- //淇濆瓨
+ //纭畾
var btnSave = new BottomClickButton();
- btnSave.TextID = R.MyInternationalizationString.uSave;
+ btnSave.TextID = R.MyInternationalizationString.uConfirm1;
+ bodyFrameLayout.AddChidren(btnSave);
btnSave.ButtonClickEvent += (sender, e) =>
{
+ if (this.selectContr != null && this.selectContr.IsSelected == true)
+ {
+ //璋冪敤鍥炶皟鍑芥暟
+ this.FinishSelectEvent?.Invoke(this.selectContr.UnSelectedImagePath);
+ }
+ this.CloseForm();
};
//璋冩暣妗屽竷楂樺害
--
Gitblit v1.8.0