From 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 八月 2020 17:06:36 +0800
Subject: [PATCH] 20200813
---
HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
index e329801..9fbc8f9 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
@@ -57,7 +57,7 @@
return;
}
}
- room.sid = Guid.NewGuid().ToString();
+
DB_ResidenceData.residenceData.rooms.Add(room);
DB_ResidenceData.residenceData.SaveResidenceData();
backAction();
@@ -183,26 +183,29 @@
/// </summary>
void LoadEvent_SkipSharedRoomFunctionPage()
{
- EventHandler<MouseEventArgs> eHandler = (sender, e) =>
+ if (pageTitleId != StringId.AddRoom)
{
- List<ShareData> sds = new List<ShareData>();
- foreach (var f in room.functions)
+ EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
- var sd = new ShareData();
- sd.ShareName = f.sid;
- sd.HouseDistributedMark = DB_ResidenceData.residenceData.residecenInfo.RegionID;
- sd.ShareDataBytes = DAL.CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(f));
+ List<ShareData> sds = new List<ShareData>();
+ foreach (var f in room.functions)
+ {
+ var sd = new ShareData();
+ sd.ShareName = f.sid;
+ sd.HouseDistributedMark = DB_ResidenceData.residenceData.residecenInfo.RegionID;
+ sd.ShareDataBytes = DAL.CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(f));
//ssdd.SubAccountDistributedMark = memberInfo.SubAccountDistributedMark;
sds.Add(sd);
- }
- var mmp = new MemberFunctionPermissionPage(room, sds);
- MainPage.BasePageView.AddChidren(mmp);
- mmp.LoadPage(StringId.ChooseSharedFunction);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
- btnSharedRight.MouseUpEventHandler = eHandler;
- sharedView.MouseUpEventHandler = eHandler;
- btnSharedTitle.MouseUpEventHandler = eHandler;
+ }
+ var mmp = new MemberFunctionPermissionPage(room, sds);
+ MainPage.BasePageView.AddChidren(mmp);
+ mmp.LoadPage(StringId.ChooseSharedFunction);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ btnSharedRight.MouseUpEventHandler = eHandler;
+ sharedView.MouseUpEventHandler = eHandler;
+ btnSharedTitle.MouseUpEventHandler = eHandler;
+ }
}
/// <summary>
/// 鍔犺浇鑳屾櫙鍥鹃�夋嫨鍖哄煙浜嬩欢鍒楄〃
@@ -229,8 +232,8 @@
{
if (imagePath != null)
{
- btnRoomBg.UnSelectedImagePath = imagePath.ToString();
- room.backgroundImage = btnRoomBg.UnSelectedImagePath;
+ btnRoomBg.ImagePath = imagePath.ToString();
+ room.backgroundImage = btnRoomBg.ImagePath;
MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
}
}, pid.ToString(), 16, 9);
@@ -252,8 +255,8 @@
{
if (imagePath != null)
{
- btnRoomBg.UnSelectedImagePath = imagePath.ToString();
- room.backgroundImage = btnRoomBg.UnSelectedImagePath;
+ btnRoomBg.ImagePath = imagePath.ToString();
+ room.backgroundImage = btnRoomBg.ImagePath;
MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + imagePath);
#if DEBUG
new Tip() { CloseTime = 5, Text = imagePath }.Show(MainPage.BasePageView);
--
Gitblit v1.8.0