From 05ce435c3b58e53eeab04c672affdeeab75f3036 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 15 十一月 2019 14:41:39 +0800
Subject: [PATCH] 2019.11.15-1
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs | 44 +++++++++++++-------------------------------
1 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
index c6f851d..99aac4c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
@@ -121,7 +121,7 @@
string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ResidenceSortFile);
UserCenterLogic.SaveFileContent(fullName, listResidenceSort);
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (this.Parent == null)
{
@@ -215,7 +215,7 @@
Room.InitAllRoom();
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
//閲嶆柊鍒锋柊鍒楄〃
this.listView.RemoveAll();
@@ -233,9 +233,9 @@
}
};
- if (info.IsOthreShare == true && info.AccountType != 1)
+ if (info.IsOthreShare == true)
{
- //鍒嗕韩鐨勶紝鍙堜笉鎷ユ湁绠＄悊鍛樻潈闄愮殑,涓嶈兘鏇存敼
+ //鍒嗕韩鐨�,涓嶈兘鏇存敼
return;
}
//鏇存敼
@@ -264,7 +264,8 @@
private void ShowEditorNameForm(Common.ResponseEntity.ResidenceObj info, NormalViewControl btnHome)
{
//鐢熸垚涓�涓脊绐楃敾闈�
- var dialogForm = new DialogInputFrameControl(this, DialogFrameMode.OnlyInput);
+ var dialogForm = new DialogInputForm();
+ dialogForm.AddForm(DialogFrameMode.OnlyInput);
//缂栬緫浣忓畢
dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uChangedName));
//璇疯緭鍏ヤ綇瀹呭悕绉�
@@ -282,7 +283,7 @@
return;
}
//鐢婚潰鍏抽棴
- dialogForm.CloseDialog();
+ dialogForm.CloseForm();
if (info.Name != textValue)
{
@@ -340,7 +341,8 @@
private void ShowAddNameForm()
{
//鐢熸垚涓�涓脊绐楃敾闈�
- var dialogForm = new DialogInputFrameControl(this, DialogFrameMode.OnlyInput);
+ var dialogForm = new DialogInputForm();
+ dialogForm.AddForm(DialogFrameMode.OnlyInput);
//鍒涘缓浣忓畢
dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uCreatResidence));
//璇疯緭鍏ヤ綇瀹呭悕绉�
@@ -356,7 +358,7 @@
return;
}
//鐢婚潰鍏抽棴
- dialogForm.CloseDialog();
+ dialogForm.CloseForm();
//淇濆瓨浣忓畢
this.AddNewResidence(textValue);
@@ -462,7 +464,10 @@
{
if (Config.Instance.HomeFilePathList.Contains($"House_{keys}.json") == false)
{
+ //淇濆瓨椤哄簭
listResidenceSort.Remove(keys);
+ Room.CurrentRoom.SaveFloorSort(listResidenceSort);
+
this.listView.RemoveAll();
//鏁版嵁宸茬粡鍙樻洿
HdlThreadLogic.Current.RunThread(() =>
@@ -542,29 +547,6 @@
/// ZigbeeHomeGuid
/// </summary>
public string Id = string.Empty;
- }
-
- /// <summary>
- /// 缂栬緫浣忓畢鐨勫惎鍔ㄥ弬鏁�
- /// </summary>
- public class EditorResidencePra : IfacePraCommon
- {
- /// <summary>
- /// RequestVersion
- /// </summary>
- public string RequestVersion = Common.CommonPage.RequestVersion;
- /// <summary>
- /// LoginAccessToken
- /// </summary>
- public string LoginAccessToken = Common.Config.Instance.Token;
- /// <summary>
- /// ZigbeeHomeId
- /// </summary>
- public string HomeId = "";
- /// <summary>
- /// Name
- /// </summary>
- public string Name = string.Empty;
}
#endregion
--
Gitblit v1.8.0