From 06696e6f225733a60b03eea4a7c6374053d92c1d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 14 四月 2020 14:15:35 +0800
Subject: [PATCH] 20200414

---
 HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs |   90 ++++++++++++++++++++++++++++-----------------
 1 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
index f24e54b..2d492b1 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
@@ -27,6 +27,16 @@
             {
                 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;
+                    }
                     foreach (var tempRoom in DB_ResidenceData.residenceData.rooms)
                     {
                         if (room.name == tempRoom.name)
@@ -121,7 +131,8 @@
         /// </summary>
         void LoadEvent_SkipEditFunctionList()
         {
-            EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+            {
                 var residentialManagePage = new RoomEditFunctionPage(room.sid);
                 MainPage.BasePageView.AddChidren(residentialManagePage);
                 residentialManagePage.LoadPage();
@@ -142,47 +153,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