From 404cdc88627f942df7944af04ee05b9d527752d6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 九月 2019 13:22:40 +0800
Subject: [PATCH] 合并了徐梅的按键面板绑定
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs | 806 +++++++++++++++++++++++++++++----------------------------
1 files changed, 408 insertions(+), 398 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index f4afb3d..cf487de 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 浣忓畢绠＄悊鐨勭敾闈⑩槄
/// </summary>
- public class ResidenceManagementForm : UserCenterCommonForm
+ public class ResidenceManagementForm : EditorCommonForm
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -26,456 +26,466 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- public void ShowForm()
- {
- //璁剧疆鏍囬淇℃伅
+ /// </summary>
+ public void ShowForm()
+ {
+ //璁剧疆鏍囬淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.ResidenceManagement));
if (UserCenterResourse.UserInfo.AuthorityNo == 1)
{
//鍙充笂娣诲姞鎸夐挳
- var btnTopIcon = new TopLayoutMostRightView();
+ var btnTopIcon = new MostRightIconControl(69, 69);
btnTopIcon.UnSelectedImagePath = "Item/Add.png";
- btnTopIcon.SelectedImagePath = "Item/AddSelected.png";
topFrameLayout.AddChidren(btnTopIcon);
- btnTopIcon.MouseUpEventHandler += (sender, e) =>
+ btnTopIcon.InitControl();
+ btnTopIcon.ButtonClickEvent += (sender, e) =>
{
- var info = new Common.ResponseEntity.ResidenceObj();
- this.ShowEditorForm(info);
+ //var info = new Common.ResponseEntity.ResidenceObj();
+ //this.ShowEditorForm(info);
};
- }
-
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄦ帶浠�
- /// </summary>
- private void InitMiddleFrame()
- {
- listView = new VerticalScrolViewLayout();
- listView.Height = bodyFrameLayout.Height;
- bodyFrameLayout.AddChidren(listView);
+ }
- new System.Threading.Thread(() =>
- {
- //璁剧疆浣忓畢淇℃伅
- this.SetResidenceInfo();
- })
- { IsBackground = true }.Start();
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ //this.InitMiddleFrame();
}
- /// <summary>
- /// 璁剧疆浣忓畢淇℃伅
- /// </summary>
- private async void SetResidenceInfo()
- {
- //寮�鍚繘搴︽潯
- this.ShowProgressBar();
+ ///// <summary>
+ ///// 鍒濆鍖栦腑閮ㄦ帶浠�
+ ///// </summary>
+ //private void InitMiddleFrame()
+ //{
+ // //娓呯┖bodyFrame
+ // this.ClearBodyFrame();
- Application.RunOnMainThread(() =>
- {
- this.listView.RemoveAll();
- });
- //鑾峰彇浣忓畢淇℃伅
- var Pra = new GetResidenceInfoPra();
- string resultData = await UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomePager", Pra);
- if (resultData == null)
- {
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar(ShowReLoadMode.YES);
- return;
- }
- this.dicResidenceData = new Dictionary<string, Common.ResponseEntity.ResidenceObj>();
+ // listView = new VerticalScrolViewLayout();
+ // listView.Height = bodyFrameLayout.Height;
+ // bodyFrameLayout.AddChidren(listView);
- var pageData = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.ResidenceRes>(resultData);
- foreach (Common.ResponseEntity.ResidenceObj info in pageData.PageData)
- {
- if (info.IsOthreShare == false)
- {
- //鏀堕泦璇ヨ处鍙锋墍鎷ユ湁鐨勮嚜宸辩殑浣忓畢鐨勬暟鎹�
- this.dicResidenceData[info.Id] = info;
- }
+ // new System.Threading.Thread(() =>
+ // {
+ // //璁剧疆浣忓畢淇℃伅
+ // this.SetResidenceInfo();
+ // })
+ // { IsBackground = true }.Start();
+ //}
- Application.RunOnMainThread(() =>
- {
- this.AddRowLayout(info);
- });
- }
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
- }
+ ///// <summary>
+ ///// 璁剧疆浣忓畢淇℃伅
+ ///// </summary>
+ //private async void SetResidenceInfo()
+ //{
+ // //寮�鍚繘搴︽潯
+ // this.ShowProgressBar();
+
+ // Application.RunOnMainThread(() =>
+ // {
+ // this.listView?.RemoveAll();
+ // });
+ // //鑾峰彇浣忓畢淇℃伅
+ // var Pra = new GetResidenceInfoPra();
+ // string resultData = await UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomePager", false, Pra);
+ // if (resultData == null)
+ // {
+ // //鍏抽棴杩涘害鏉�
+ // this.CloseProgressBar(ShowReLoadMode.YES);
+ // return;
+ // }
+ // this.dicResidenceData = new Dictionary<string, Common.ResponseEntity.ResidenceObj>();
+
+ // var pageData = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.ResidenceRes>(resultData);
+ // foreach (Common.ResponseEntity.ResidenceObj info in pageData.PageData)
+ // {
+ // if (info.IsOthreShare == false)
+ // {
+ // //鏀堕泦璇ヨ处鍙锋墍鎷ユ湁鐨勮嚜宸辩殑浣忓畢鐨勬暟鎹�
+ // this.dicResidenceData[info.Id] = info;
+ // }
+
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (this.Parent != null)
+ // {
+ // this.AddRowLayout(info);
+ // }
+ // });
+ // }
+ // //鍏抽棴杩涘害鏉�
+ // this.CloseProgressBar();
+ //}
#endregion
- #region 鈻� 娣诲姞浣忓畢鐨勮_______________________
+ //#region 鈻� 娣诲姞浣忓畢鐨勮_______________________
- /// <summary>
- /// 娣诲姞浣忓畢鐨勮
- /// </summary>
- /// <param name="info"></param>
- private void AddRowLayout(Common.ResponseEntity.ResidenceObj info)
- {
- var rowLayout = new RowLayout();
- rowLayout.Height = ControlCommonResourse.ListViewRowHeight;
- this.listView.AddChidren(rowLayout);
+ ///// <summary>
+ ///// 娣诲姞浣忓畢鐨勮
+ ///// </summary>
+ ///// <param name="info"></param>
+ //private void AddRowLayout(Common.ResponseEntity.ResidenceObj info)
+ //{
+ // if (info.IsOthreShare == true)
+ // {
+ // return;
+ // }
+ // var rowLayout = new RowLayout();
+ // rowLayout.Height = ControlCommonResourse.ListViewRowHeight;
+ // this.listView.AddChidren(rowLayout);
- //鍥炬爣
- var btnIcon = new RowLeftIconView();
- btnIcon.ChangedControlInPointMode();
- rowLayout.AddChidren(btnIcon);
+ // //鍥炬爣
+ // var btnIcon = new RowLeftIconView();
+ // btnIcon.ChangedControlInPointMode();
+ // rowLayout.AddChidren(btnIcon);
- //浣忓畢
- var txtResidence = new RowCenterView(true);
- txtResidence.Text = info.Name;
- rowLayout.AddChidren(txtResidence);
- txtResidence.X -= ControlCommonResourse.PointXXLeft;
+ // //浣忓畢
+ // var txtResidence = new RowCenterView(true);
+ // txtResidence.Text = info.Name;
+ // rowLayout.AddChidren(txtResidence);
+ // txtResidence.X -= ControlCommonResourse.PointXXLeft;
- //涓嶆槸鍒嗕韩杩囨潵鐨勪綇瀹�
- if (info.IsOthreShare == false)
- {
- //缂栬緫
- var btnEditor = new RowEditorButton();
- rowLayout.AddRightView(btnEditor);
- btnEditor.MouseUpEventHandler += (sender, e) =>
- {
- this.ShowEditorForm(info);
- };
+ // //涓嶆槸鍒嗕韩杩囨潵鐨勪綇瀹�
+ // if (info.IsOthreShare == false)
+ // {
+ // //缂栬緫
+ // var btnEditor = new RowEditorButton();
+ // rowLayout.AddRightView(btnEditor);
+ // btnEditor.MouseUpEventHandler += (sender, e) =>
+ // {
+ // this.ShowEditorForm(info);
+ // };
- //涓嶈兘鍒犻櫎褰撳墠姝ｅ湪鎿嶄綔鐨勪綇瀹�
- if (Common.Config.Instance.HomeId != info.Id)
- {
- //鍒犻櫎
- var btnDelete = new RowDeleteButton();
- rowLayout.AddRightView(btnDelete);
- btnDelete.MouseUpEventHandler += (sender, e) =>
- {
- //妫�娴嬭兘鍚﹀垹闄や綇瀹�
- if (this.CheckIsCanDeleteResidence(info) == false)
- {
- return;
- }
- //纭瑕佸垹闄ゅ悧锛�
- string msg = Language.StringByID(R.MyInternationalizationString.uShowDoDeleteMsg);
- this.ShowConfirmMsg(msg, "DeleteResidence", info);
- };
- }
- }
- //鎴愬憳鐨勭鐞嗗憳鏉冮檺,鍙兘缂栬緫锛屼笉鑳藉垹闄�
- if (info.AccountType == 1)
- {
- //缂栬緫
- var btnEditor = new RowEditorButton();
- rowLayout.AddRightView(btnEditor);
- btnEditor.MouseUpEventHandler += (sender, e) =>
- {
- this.ShowEditorForm(info);
- };
- }
- }
+ // //涓嶈兘鍒犻櫎褰撳墠姝ｅ湪鎿嶄綔鐨勪綇瀹�
+ // if (Common.Config.Instance.HomeId != info.Id)
+ // {
+ // //鍒犻櫎
+ // var btnDelete = new RowDeleteButton();
+ // rowLayout.AddRightView(btnDelete);
+ // btnDelete.MouseUpEventHandler += (sender, e) =>
+ // {
+ // //妫�娴嬭兘鍚﹀垹闄や綇瀹�
+ // if (this.CheckIsCanDeleteResidence(info) == false)
+ // {
+ // return;
+ // }
+ // //纭瑕佸垹闄ゅ悧锛�
+ // string msg = Language.StringByID(R.MyInternationalizationString.uShowDoDeleteMsg);
+ // this.ShowConfirmMsg(msg, "DeleteResidence", info);
+ // };
+ // }
+ // }
+ // //鎴愬憳鐨勭鐞嗗憳鏉冮檺,鍙兘缂栬緫锛屼笉鑳藉垹闄�
+ // //if (info.AccountType == 1)
+ // //{
+ // // //缂栬緫
+ // // var btnEditor = new RowEditorButton();
+ // // rowLayout.AddRightView(btnEditor);
+ // // btnEditor.MouseUpEventHandler += (sender, e) =>
+ // // {
+ // // this.ShowEditorForm(info);
+ // // };
+ // //}
+ //}
- #endregion
+ //#endregion
- #region 鈻� 鏄剧ず缂栬緫鐢婚潰_______________________
+ //#region 鈻� 鏄剧ず缂栬緫鐢婚潰_______________________
- /// <summary>
- /// 鏄剧ず缂栬緫鐢婚潰
- /// </summary>
- /// <param name="info"></param>
- private void ShowEditorForm(Common.ResponseEntity.ResidenceObj info)
- {
- //鐢熸垚涓�涓脊绐楃敾闈�
- var dialogForm = new DialogInputFrameControl(this, DialogFrameMode.OnlyInput);
+ ///// <summary>
+ ///// 鏄剧ず缂栬緫鐢婚潰
+ ///// </summary>
+ ///// <param name="info"></param>
+ //private void ShowEditorForm(Common.ResponseEntity.ResidenceObj info)
+ //{
+ // //鐢熸垚涓�涓脊绐楃敾闈�
+ // var dialogForm = new DialogInputFrameControl(this, DialogFrameMode.OnlyInput);
- if (string.IsNullOrEmpty(info.Name) == true)
- {
- //娣诲姞浣忓畢
- dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddResidence));
- }
- else
- {
- //缂栬緫浣忓畢
- dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorResidence));
- }
+ // if (string.IsNullOrEmpty(info.Name) == true)
+ // {
+ // //娣诲姞浣忓畢
+ // dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddResidence));
+ // }
+ // else
+ // {
+ // //缂栬緫浣忓畢
+ // dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorResidence));
+ // }
- //璇疯緭鍏ヤ綇瀹呭悕绉�
- dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInputResidenceName));
- if (info.Name != null)
- {
- dialogForm.InputText = info.Name;
- }
+ // //璇疯緭鍏ヤ綇瀹呭悕绉�
+ // dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInputResidenceName));
+ // if (info.Name != null)
+ // {
+ // dialogForm.InputText = info.Name;
+ // }
- //鎸変笅纭鎸夐挳
- dialogForm.ComfirmClickEvent += (()=>
- {
- string resiName = dialogForm.InputText;
- if (resiName == string.Empty)
- {
- //璇疯緭鍏ヤ綇瀹呭悕绉�
- string msg = Language.StringByID(R.MyInternationalizationString.uPleaseInputResidenceName);
- this.ShowErrorMsg(msg);
- return;
- }
- //鐢婚潰鍏抽棴
- dialogForm.CloseDialog();
+ // //鎸変笅纭鎸夐挳
+ // dialogForm.ComfirmClickEvent += (()=>
+ // {
+ // string resiName = dialogForm.InputText;
+ // if (resiName == string.Empty)
+ // {
+ // //璇疯緭鍏ヤ綇瀹呭悕绉�
+ // string msg = Language.StringByID(R.MyInternationalizationString.uPleaseInputResidenceName);
+ // this.ShowErrorMsg(msg);
+ // return;
+ // }
+ // //鐢婚潰鍏抽棴
+ // dialogForm.CloseDialog();
- if (info.Name != resiName)
- {
- //淇濆瓨浣忓畢
- this.SaveResidence(resiName, info, string.IsNullOrEmpty(info.Name) == false);
- }
- });
- }
+ // if (info.Name != resiName)
+ // {
+ // //淇濆瓨浣忓畢
+ // this.SaveResidence(resiName, info, string.IsNullOrEmpty(info.Name) == false);
+ // }
+ // });
+ //}
- #endregion
+ //#endregion
- #region 鈻� 淇濆瓨浣忓畢___________________________
+ //#region 鈻� 淇濆瓨浣忓畢___________________________
- /// <summary>
- /// 淇濆瓨浣忓畢
- /// </summary>
- /// <param name="ResidenceName"></param>
- /// <param name="info"></param>
- /// <param name="isEditor"></param>
- /// <returns></returns>
- private async void SaveResidence(string ResidenceName, Common.ResponseEntity.ResidenceObj info, bool isEditor)
- {
- //妫�娴嬭兘鍚︿繚瀛樹綇瀹�
- if (this.CheckIsCanSaveResidence(info.Id, ResidenceName, isEditor) == false)
- {
- return;
- }
- //寮�鍚繘搴︽潯
- this.ShowProgressBar();
+ ///// <summary>
+ ///// 淇濆瓨浣忓畢
+ ///// </summary>
+ ///// <param name="ResidenceName"></param>
+ ///// <param name="info"></param>
+ ///// <param name="isEditor"></param>
+ ///// <returns></returns>
+ //private async void SaveResidence(string ResidenceName, Common.ResponseEntity.ResidenceObj info, bool isEditor)
+ //{
+ // //妫�娴嬭兘鍚︿繚瀛樹綇瀹�
+ // if (this.CheckIsCanSaveResidence(info.Id, ResidenceName, isEditor) == false)
+ // {
+ // return;
+ // }
+ // //寮�鍚繘搴︽潯
+ // this.ShowProgressBar();
- if (isEditor == true)
- {
- var Pra = new EditorResidencePra();
- Pra.HomeId = info.Id;
- Pra.Name = ResidenceName;
- //缂栬緫浣忓畢
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", Pra);
- if (flage == false)
- {
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
- return;
- }
- //鍒锋柊鍐呭瓨鐨勪綇瀹呭悕
- House.EditorHouseByHouseId(info.Id, ResidenceName);
- //閲嶆柊鍒锋柊鍒楄〃
- this.SetResidenceInfo();
- }
- else
- {
- var Pra = new AddResidencePra();
- Pra.Name = ResidenceName;
- //娣诲姞浣忓畢
- string resultData = await UserCenterLogic.GetResponseDataByRequestHttps("App/AddHome", Pra);
- if (resultData == null)
- {
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
- return;
- }
+ // if (isEditor == true)
+ // {
+ // var Pra = new EditorResidencePra();
+ // Pra.HomeId = info.Id;
+ // Pra.Name = ResidenceName;
+ // //缂栬緫浣忓畢
+ // bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", false, Pra);
+ // if (flage == false)
+ // {
+ // //鍏抽棴杩涘害鏉�
+ // this.CloseProgressBar();
+ // return;
+ // }
+ // //鍒锋柊鍐呭瓨鐨勪綇瀹呭悕
+ // House.EditorHouseByHouseId(info.Id, ResidenceName);
+ // //閲嶆柊鍒锋柊鍒楄〃
+ // this.SetResidenceInfo();
+ // }
+ // else
+ // {
+ // var Pra = new AddResidencePra();
+ // Pra.Name = ResidenceName;
+ // //娣诲姞浣忓畢
+ // string resultData = await UserCenterLogic.GetResponseDataByRequestHttps("App/AddHome", false, Pra);
+ // if (resultData == null)
+ // {
+ // //鍏抽棴杩涘害鏉�
+ // this.CloseProgressBar();
+ // return;
+ // }
- var newInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<NewResidenceInfo>>(resultData);
+ // var newInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<NewResidenceInfo>>(resultData);
- House.AddHouse(newInfo[0].Id, ResidenceName, 0);
- //閲嶆柊鍒锋柊鍒楄〃
- this.SetResidenceInfo();
- }
- }
+ // House.AddHouse(newInfo[0].Id, ResidenceName, 0);
+ // //閲嶆柊鍒锋柊鍒楄〃
+ // this.SetResidenceInfo();
+ // }
+ //}
- #endregion
+ //#endregion
- #region 鈻� 鍒犻櫎浣忓畢___________________________
+ //#region 鈻� 鍒犻櫎浣忓畢___________________________
- /// <summary>
- /// 鍒犻櫎浣忓畢
- /// </summary>
- /// <param name="info"></param>
- public async void DeleteResidence(Common.ResponseEntity.ResidenceObj info)
- {
- //寮�鍚繘搴︽潯
- this.ShowProgressBar();
+ ///// <summary>
+ ///// 鍒犻櫎浣忓畢
+ ///// </summary>
+ ///// <param name="info"></param>
+ //public async void DeleteResidence(Common.ResponseEntity.ResidenceObj info)
+ //{
+ // //寮�鍚繘搴︽潯
+ // this.ShowProgressBar();
- var Pra = new DeleteResidencePra();
- Pra.HomeId = info.Id;
+ // var Pra = new DeleteResidencePra();
+ // Pra.HomeId = info.Id;
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/DelHome", Pra);
- if (result == false)
- {
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
- return;
- }
- House.DeleteHouseByHouseId(info.Id);
+ // bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/DelHome", false, Pra);
+ // if (result == false)
+ // {
+ // //鍏抽棴杩涘害鏉�
+ // this.CloseProgressBar();
+ // return;
+ // }
+ // House.DeleteHouseByHouseId(info.Id);
- this.SetResidenceInfo();
- }
+ // this.SetResidenceInfo();
+ //}
- #endregion
+ //#endregion
- #region 鈻� 涓�鑸柟娉昣__________________________
+ //#region 鈻� 涓�鑸柟娉昣__________________________
- /// <summary>
- /// 妫�娴嬭兘鍚﹀垹闄や綇瀹�
- /// </summary>
- /// <param name="info"></param>
- /// <returns></returns>
- private bool CheckIsCanDeleteResidence(Common.ResponseEntity.ResidenceObj info)
- {
- if (this.dicResidenceData.Count == 1)
- {
- //濡傛灉姝よ处鍙蜂笅鍙墿涓嬪敮涓�涓�涓嚜宸辩殑浣忓畢锛屽綋鍒犻櫎杩欎釜浣忓畢鏃讹紝鎻愮ず涓嶈兘鍒犻櫎
- //鍥犱负鏈�灏戣鏈変竴涓綇瀹�
- if (this.dicResidenceData.ContainsKey(info.Id) == true)
- {
- //涓嶈兘鍒犻櫎鏈�鍚庡敮涓�鐨勪綇瀹�
- string msg = Language.StringByID(R.MyInternationalizationString.uDoNotDeleteLastResidence);
- this.ShowErrorMsg(msg);
- return false;
- }
- }
- return true;
- }
+ ///// <summary>
+ ///// 妫�娴嬭兘鍚﹀垹闄や綇瀹�
+ ///// </summary>
+ ///// <param name="info"></param>
+ ///// <returns></returns>
+ //private bool CheckIsCanDeleteResidence(Common.ResponseEntity.ResidenceObj info)
+ //{
+ // if (this.dicResidenceData.Count == 1)
+ // {
+ // //濡傛灉姝よ处鍙蜂笅鍙墿涓嬪敮涓�涓�涓嚜宸辩殑浣忓畢锛屽綋鍒犻櫎杩欎釜浣忓畢鏃讹紝鎻愮ず涓嶈兘鍒犻櫎
+ // //鍥犱负鏈�灏戣鏈変竴涓綇瀹�
+ // if (this.dicResidenceData.ContainsKey(info.Id) == true)
+ // {
+ // //涓嶈兘鍒犻櫎鏈�鍚庡敮涓�鐨勪綇瀹�
+ // string msg = Language.StringByID(R.MyInternationalizationString.uDoNotDeleteLastResidence);
+ // this.ShowErrorMsg(msg);
+ // return false;
+ // }
+ // }
+ // return true;
+ //}
- /// <summary>
- /// 妫�娴嬭兘鍚︿繚瀛樹綇瀹�
- /// </summary>
- /// <param name="residenceId">浣忓畢ID</param>
- /// <param name="residenceName">浣忓畢鍚�</param>
- /// <param name="isEditor">isEditor</param>
- /// <returns></returns>
- private bool CheckIsCanSaveResidence(string residenceId, string residenceName, bool isEditor)
- {
- //浣忓畢鍚嶅瓧閲嶅妫�娴�
- foreach (string strId in this.dicResidenceData.Keys)
- {
- if (residenceId != strId && residenceName == this.dicResidenceData[strId].Name)
- {
- //浣忓畢鍚嶅瓧宸茬粡瀛樺湪
- int msgId = isEditor == true ? R.MyInternationalizationString.EditZigbeeHome_Exist : R.MyInternationalizationString.AddZigbeeHome_Exist;
- string msg = Language.StringByID(msgId);
- this.ShowErrorMsg(msg);
- return false;
- }
- }
- return true;
- }
+ ///// <summary>
+ ///// 妫�娴嬭兘鍚︿繚瀛樹綇瀹�
+ ///// </summary>
+ ///// <param name="residenceId">浣忓畢ID</param>
+ ///// <param name="residenceName">浣忓畢鍚�</param>
+ ///// <param name="isEditor">isEditor</param>
+ ///// <returns></returns>
+ //private bool CheckIsCanSaveResidence(string residenceId, string residenceName, bool isEditor)
+ //{
+ // //浣忓畢鍚嶅瓧閲嶅妫�娴�
+ // foreach (string strId in this.dicResidenceData.Keys)
+ // {
+ // if (residenceId != strId && residenceName == this.dicResidenceData[strId].Name)
+ // {
+ // //浣忓畢鍚嶅瓧宸茬粡瀛樺湪
+ // int msgId = isEditor == true ? R.MyInternationalizationString.EditZigbeeHome_Exist : R.MyInternationalizationString.AddZigbeeHome_Exist;
+ // string msg = Language.StringByID(msgId);
+ // this.ShowErrorMsg(msg);
+ // return false;
+ // }
+ // }
+ // return true;
+ //}
- #endregion
+ //#endregion
- #region 鈻� 缁撴瀯浣揰____________________________
+ //#region 鈻� 缁撴瀯浣揰____________________________
- /// <summary>
- /// 璁块棶浣忓畢淇℃伅鎺ュ彛鐨勫惎鍔ㄥ弬鏁�(鏌ヨ涓撶敤)
- /// </summary>
- public class GetResidenceInfoPra:IfacePraCommon
- {
- /// <summary>
- /// RequestVersion
- /// </summary>
- public string RequestVersion = Common.CommonPage.RequestVersion;
- /// <summary>
- /// ReqDto
- /// </summary>
- public TokenInfo ReqDto = new TokenInfo();
- }
+ ///// <summary>
+ ///// 璁块棶浣忓畢淇℃伅鎺ュ彛鐨勫惎鍔ㄥ弬鏁�(鏌ヨ涓撶敤)
+ ///// </summary>
+ //public class GetResidenceInfoPra:IfacePraCommon
+ //{
+ // /// <summary>
+ // /// RequestVersion
+ // /// </summary>
+ // public string RequestVersion = Common.CommonPage.RequestVersion;
+ // /// <summary>
+ // /// ReqDto
+ // /// </summary>
+ // public TokenInfo ReqDto = new TokenInfo();
+ //}
- /// <summary>
- /// 璁块棶浣忓畢淇℃伅鎺ュ彛鐨勫惎鍔ㄥ弬鏁�(鏌ヨ涓撶敤)
- /// </summary>
- public class TokenInfo
- {
- /// <summary>
- /// LoginAccessToken
- /// </summary>
- public string LoginAccessToken = Common.Config.Instance.Token;
- /// <summary>
- /// PageSetting
- /// </summary>
- public PageSettingInfo PageSetting = new PageSettingInfo()
- {
- Page = 1,
- PageSize = 500
- };
- }
+ ///// <summary>
+ ///// 璁块棶浣忓畢淇℃伅鎺ュ彛鐨勫惎鍔ㄥ弬鏁�(鏌ヨ涓撶敤)
+ ///// </summary>
+ //public class TokenInfo
+ //{
+ // /// <summary>
+ // /// LoginAccessToken
+ // /// </summary>
+ // public string LoginAccessToken = Common.Config.Instance.Token;
+ // /// <summary>
+ // /// PageSetting
+ // /// </summary>
+ // public PageSettingInfo PageSetting = new PageSettingInfo()
+ // {
+ // Page = 1,
+ // PageSize = 500
+ // };
+ //}
- /// <summary>
- /// 娣诲姞浣忓畢鐨勫惎鍔ㄥ弬鏁�
- /// </summary>
- public class AddResidencePra:IfacePraCommon
- {
- /// <summary>
- /// RequestVersion
- /// </summary>
- public string RequestVersion = Common.CommonPage.RequestVersion;
- /// <summary>
- /// LoginAccessToken
- /// </summary>
- public string LoginAccessToken = Common.Config.Instance.Token;
- /// <summary>
- /// Name
- /// </summary>
- public string Name = string.Empty;
- }
+ ///// <summary>
+ ///// 娣诲姞浣忓畢鐨勫惎鍔ㄥ弬鏁�
+ ///// </summary>
+ //public class AddResidencePra:IfacePraCommon
+ //{
+ // /// <summary>
+ // /// RequestVersion
+ // /// </summary>
+ // public string RequestVersion = Common.CommonPage.RequestVersion;
+ // /// <summary>
+ // /// LoginAccessToken
+ // /// </summary>
+ // public string LoginAccessToken = Common.Config.Instance.Token;
+ // /// <summary>
+ // /// Name
+ // /// </summary>
+ // public string Name = string.Empty;
+ //}
- /// <summary>
- /// 鏂颁綇瀹呯殑淇℃伅
- /// </summary>
- public class NewResidenceInfo
- {
- /// <summary>
- /// ZigbeeHomeGuid
- /// </summary>
- public string Id = string.Empty;
- }
+ ///// <summary>
+ ///// 鏂颁綇瀹呯殑淇℃伅
+ ///// </summary>
+ //public class NewResidenceInfo
+ //{
+ // /// <summary>
+ // /// 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;
- }
+ ///// <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;
+ //}
- /// <summary>
- /// 鍒犻櫎浣忓畢鐨勫惎鍔ㄥ弬鏁�
- /// </summary>
- public class DeleteResidencePra : 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 = "";
- }
- #endregion
+ ///// <summary>
+ ///// 鍒犻櫎浣忓畢鐨勫惎鍔ㄥ弬鏁�
+ ///// </summary>
+ //public class DeleteResidencePra : 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 = "";
+ //}
+ //#endregion
}
}
--
Gitblit v1.8.0