From 7167334c0e89dd84827d59e726123d14776e3a09 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 六月 2020 11:14:13 +0800
Subject: [PATCH] 2020-06-16-1
---
HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs | 118 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 81 insertions(+), 37 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
index bf0edb7..1b17009 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
@@ -27,6 +27,26 @@
{
if (btnOption.TextID == StringId.Save)
{
+ if (string.IsNullOrEmpty(room.name))
+ {
+ new Tip()
+ {
+ CloseTime = 3,
+ Text = Language.StringByID(StringId.RoomNameCannotBeEmpty),
+ Direction = AMPopTipDirection.None,
+ }.Show(bodyView);
+ return;
+ }
+ if(string.IsNullOrEmpty( room.floor))
+ {
+ new Tip()
+ {
+ CloseTime = 3,
+ Text = Language.StringByID(StringId.PlsBindFloor),
+ Direction = AMPopTipDirection.None,
+ }.Show(bodyView);
+ return;
+ }
foreach (var tempRoom in DB_ResidenceData.residenceData.rooms)
{
if (room.name == tempRoom.name)
@@ -50,10 +70,11 @@
if (f.roomIdList.Contains(room.sid))
{
f.roomIdList.Remove(room.sid);
- room.sid = "";
}
}
+ room.sid = "";
DB_ResidenceData.residenceData.rooms.Remove(room);
+ DB_ResidenceData.residenceData.SaveResidenceData();
backAction();
this.RemoveFromParent();
};
@@ -80,6 +101,17 @@
{
Action<string> callBack = (str) =>
{
+ //鎴块棿鍚嶇О涓嶈兘涓虹┖
+ if (string.IsNullOrEmpty(str))
+ {
+ new Tip()
+ {
+ CloseTime = 3,
+ Text = Language.StringByID(StringId.RoomNameCannotBeEmpty),
+ Direction = AMPopTipDirection.None,
+ }.Show(bodyView);
+ return;
+ }
btnRoomName.Text = btnTipRoomName.Text = str;
room.name = str;
if (pageTitleId == StringId.EditRoomInfo)
@@ -89,7 +121,7 @@
};
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.name, callBack);
+ //new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.name, callBack);
};
btnEditRoomNameIcon.MouseUpEventHandler = eventHandler;
roomNameRow.MouseUpEventHandler = eventHandler;
@@ -121,8 +153,9 @@
/// </summary>
void LoadEvent_SkipEditFunctionList()
{
- EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
- var residentialManagePage = new RoomEditFunctionPage(room.sid);
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
+ var residentialManagePage = new RoomEditFunctionPage(room);
MainPage.BasePageView.AddChidren(residentialManagePage);
residentialManagePage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -142,47 +175,58 @@
pictureOptionView.RemoveFromParent();
};
- btnCancel.MouseUpEventHandler = (sender, e) => {
- //optionView.Animate = Animate.UpToDown;
- //btnCancel.Animate = Animate.UpToDown;
- //new System.Threading.Thread(() =>
- //{
- //System.Threading.Thread.Sleep(500);
- //Application.RunOnMainThread(() =>
- //{
- pictureOptionView.RemoveFromParent();
- //});
- //})
- //{ IsBackground = true }.Start();
+ btnCancel.MouseUpEventHandler = (sender, e) =>
+ {
+ pictureOptionView.RemoveFromParent();
};
-
- btnTakePicture.MouseUpEventHandler = (sender, e) => {
+ btnTakePicture.MouseDownEventHandler = (sender, e) => {
+ btnTakePicture.IsSelected = true;
+ };
+ btnTakePicture.MouseUpEventHandler = (sender, e) =>
+ {
+ btnTakePicture.IsSelected = false;
var pid = Guid.NewGuid();
- Camera.TakePicture((obj) => {
- if (obj == null)
- return;
- btnRoomBg.UnSelectedImagePath = pid.ToString();
- },pid.ToString(),false);
- if(pageTitleId == StringId.EditRoomInfo)
+ CropImage.TakePicture((imagePath) =>
{
- DB_ResidenceData.residenceData.SaveResidenceData();
- }
- };
-
- btnAlbum.MouseUpEventHandler = (sender, e) => {
- var pid = Guid.NewGuid();
- Camera.SelectPicture((obj) => {
- if (obj == null)
- return;
- btnRoomBg.UnSelectedImagePath = pid.ToString();
- }, pid.ToString(), false);
+ if (imagePath != null)
+ {
+ btnRoomBg.UnSelectedImagePath = imagePath.ToString();
+ room.backgroundImage = btnRoomBg.UnSelectedImagePath;
+ MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
+ }
+ }, pid.ToString(), 16, 9);
if (pageTitleId == StringId.EditRoomInfo)
{
DB_ResidenceData.residenceData.SaveResidenceData();
}
+ pictureOptionView.RemoveFromParent();
+ };
+ btnAlbum.MouseDownEventHandler = (sender, e) => {
+ btnAlbum.IsSelected = true;
};
-
+ btnAlbum.MouseUpEventHandler = (sender, e) =>
+ {
+ btnAlbum.IsSelected = false;
+ var pid = Guid.NewGuid();
+ CropImage.SelectPicture((imagePath) =>
+ {
+ if (imagePath != null)
+ {
+ btnRoomBg.UnSelectedImagePath = imagePath.ToString();
+ room.backgroundImage = btnRoomBg.UnSelectedImagePath;
+ MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
+#if DEBUG
+ new Tip() { CloseTime = 5, Text = imagePath }.Show(MainPage.BasePageView);
+#endif
+ }
+ }, pid.ToString(), 16, 9);
+ if (pageTitleId == StringId.EditRoomInfo)
+ {
+ DB_ResidenceData.residenceData.SaveResidenceData();
+ }
+ pictureOptionView.RemoveFromParent();
+ };
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0