From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 17 十二月 2020 09:07:13 +0800 Subject: [PATCH] 新云端Ver1.3 --- ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs | 223 +++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 142 insertions(+), 81 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs index ff1fb33..1973ec7 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs @@ -70,27 +70,33 @@ string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote); string nameValue = HdlGatewayLogic.Current.GetGatewayName(zbGateway); var btnNote = new FrameCaptionInputControl(caption, nameValue, listview.rowSpace / 2); + btnNote.txtInput.MaxByte = 32;//闄愬埗鍙兘杈撳叆32涓瓧鑺� listview.AddChidren(btnNote); btnNote.InitControl(); //鍒掔嚎 btnNote.AddBottomLine(); - btnNote.txtInput.FinishInputEvent += () => + //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶈兘缂栬緫 + if (Common.Config.Instance.Home.IsShowTemplate == false) { - string oldName = HdlGatewayLogic.Current.GetGatewayName(zbGateway); - if (btnNote.Text == string.Empty) + btnNote.txtInput.FinishInputEvent += () => { - btnNote.Text = oldName; - } - if (oldName != btnNote.Text) - { - //淇敼鍚嶅瓧 - this.SetGatewayName(btnNote.Text, false); - } - }; + string oldName = HdlGatewayLogic.Current.GetGatewayName(zbGateway); + if (btnNote.Text == string.Empty) + { + btnNote.Text = oldName; + } + if (oldName != btnNote.Text) + { + //淇敼鍚嶅瓧 + this.SetGatewayName(btnNote.Text, false); + } + }; + } //璁惧绫诲瀷 (鍥哄畾鏅鸿兘缃戝叧) caption = Language.StringByID(R.MyInternationalizationString.uDeviceType); - var btnType = new FrameCaptionViewControl(caption, Language.StringByID(60004), listview.rowSpace / 2); + var infoContent = HdlDeviceCommonLogic.Current.GetDeviceModelIdNameInfo("1"); + var btnType = new FrameCaptionViewControl(caption, infoContent != null ? infoContent.A绫诲瀷鍚嶅瓧 : string.Empty, listview.rowSpace / 2); btnType.UseClickStatu = false; listview.AddChidren(btnType); btnType.InitControl(); @@ -106,8 +112,13 @@ rowBeloneArea.SelectRoomEvent += (roomKeys) => { //鍙樻洿缃戝叧鎴块棿 - HdlGatewayLogic.Current.ChangedGatewayRoom(this.zbGateway, roomKeys); + HdlRoomLogic.Current.ChangedGatewayRoom(this.zbGateway.GwId, roomKeys); }; + //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶈兘缂栬緫 + if (Common.Config.Instance.Home.IsShowTemplate == true) + { + rowBeloneArea.CanClick = false; + } //鎵�灞炰綇瀹� caption = Language.StringByID(R.MyInternationalizationString.uBelongResidence); @@ -122,12 +133,12 @@ var linuxImageType = this.zbGateway.LinuxImageType; if (linuxImageType == 11) { - var listDevice = Common.LocalDevice.Current.GetDeviceByGatewayID(this.zbGateway.GwId); + var listDevice = HdlDeviceCommonLogic.Current.GetDeviceByGatewayID(this.zbGateway.GwId); CommonDevice miniDevice = null; foreach (var device in listDevice) { //鑾峰彇杩欎釜缃戝叧涓嬬殑灏忓鐏澶� - if (Common.LocalDevice.Current.IsMiniLight(device) == true) + if (HdlDeviceCommonLogic.Current.IsMiniLight(device) == true) { miniDevice = device; break; @@ -144,11 +155,15 @@ rowFunction.frameTable.AddRightArrow(); //搴曠嚎 rowFunction.frameTable.AddBottomLine(); - rowFunction.frameTable.ButtonClickEvent += (sender, e) => + //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶈兘缂栬緫 + if (Common.Config.Instance.Home.IsShowTemplate == false) { - var form = new DeviceLight.MiniNightLightFunctionSettionForm(); - form.AddForm(miniDevice); - }; + rowFunction.frameTable.ButtonClickEvent += (sender, e) => + { + var form = new DeviceLight.MiniNightLightFunctionSettionForm(); + form.AddForm(miniDevice); + }; + } } } @@ -160,11 +175,15 @@ rowData.frameTable.AddRightArrow(); //搴曠嚎 rowData.frameTable.AddBottomLine(); - rowData.frameTable.ButtonClickEvent += (sender, e) => + //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶈兘缂栬緫 + if (Common.Config.Instance.Home.IsShowTemplate == false) { - var form = new GatewayUploadAndDownLoadForm(); - form.AddForm(this.zbGateway.GwId); - }; + rowData.frameTable.ButtonClickEvent += (sender, e) => + { + var form = new GatewayUploadAndDownLoadForm(); + form.AddForm(this.zbGateway.GwId); + }; + } //閫氱敤淇℃伅 var btnGeneral = new FrameRowControl(listview.rowSpace / 2); @@ -210,6 +229,11 @@ var btnFinish = new BottomClickButton(); btnFinish.TextID = R.MyInternationalizationString.uSave; bodyFrameLayout.AddChidren(btnFinish); + //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶈兘缂栬緫 + if (Common.Config.Instance.Home.IsShowTemplate == true) + { + btnFinish.CanClick = false; + } btnFinish.ButtonClickEvent += (sender, e) => { string oldName = HdlGatewayLogic.Current.GetGatewayName(zbGateway); @@ -229,11 +253,15 @@ } }; - HdlThreadLogic.Current.RunThread(() => + //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶉渶瑕佹娴� + if (Common.Config.Instance.Home.IsShowTemplate == false) { - //妫�娴嬫柊鐗堟湰 - this.CheckNewVersion(btnNewVersion); - }); + HdlThreadLogic.Current.RunThread(() => + { + //妫�娴嬫柊鐗堟湰 + this.CheckNewVersion(btnNewVersion); + }); + } } #endregion @@ -245,6 +273,11 @@ /// </summary> private void InitTopRightMenu() { + //濡傛灉鏄睍绀烘ā鏉跨殑璇�,涓嶈兘缂栬緫 + if (Common.Config.Instance.Home.IsShowTemplate == true) + { + return; + } var btnIcon = new MostRightIconControl(69, 69); btnIcon.UnSelectedImagePath = "Item/More.png"; topFrameLayout.AddChidren(btnIcon); @@ -261,8 +294,29 @@ /// </summary> private void ShowTopRightMenu() { - bool flage = UserCenterResourse.DicActionForm.ContainsKey("NewGateWayMenuSelectForm"); - var frame = new TopRightMenuControl(flage == true ? 1 : 3, 1); + //鎼滅储缃戝叧鐨勬椂鍊�,涓嶈兘鍒犻櫎,涓嶇粰浠栧垏鎹�,鍙湁瀹氫綅鍔熻兘 + bool isSearchGw = HdlFormLogic.Current.IsFormOpen("NewGateWayMenuSelectForm"); + int menuCount = isSearchGw == true ? 1 : 3; + + bool canAddReplaceMenu = false; + //鑾峰彇鏈湴缃戝叧 + var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway(); + foreach (var gw in listGateway) + { + if (gw.GwId != this.zbGateway.GwId && gw.LinuxImageType == this.zbGateway.LinuxImageType) + { + //濡傛灉鏄悓涓�绉嶇被鍨嬬殑缃戝叧,鍏佽鍑虹幇鏇挎崲鑿滃崟 + canAddReplaceMenu = true; + break; + } + } + if (canAddReplaceMenu == true + && Common.Config.Instance.Home.IsShowTemplate == false + && Common.Config.Instance.Home.IsVirtually == false) + { + //menuCount++; + } + var frame = new TopRightMenuControl(menuCount, 1); //瀹氫綅 string MenuName = Language.StringByID(R.MyInternationalizationString.uFixedPosition); frame.AddRowMenu(MenuName, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () => @@ -270,53 +324,60 @@ //鍙戦�佸畾浣嶅姛鑳� HdlGatewayLogic.Current.SetFixedPositionCommand(zbGateway); }); - if (flage == true) - { - //鎼滅储缃戝叧鐨勬椂鍊�,涓嶈兘鍒犻櫎,涓嶇粰浠栧垏鎹� - return; - } - //鍒囨崲 - MenuName = Language.StringByID(R.MyInternationalizationString.uSwitch1); - string strWayId = this.zbGateway.GwId; - if (strWayId == GatewayResourse.AppOldSelectGatewayId) + //鎼滅储缃戝叧鐨勬椂鍊�,涓嶈兘鍒犻櫎,涓嶇粰浠栧垏鎹� + if (isSearchGw == false) { - MenuName = Language.StringByID(R.MyInternationalizationString.uRefresh); - } - frame.AddRowMenu(MenuName, "Item/GwSwitchIcon.png", "Item/GwSwitchIconSelected.png", () => - { - string nameValue = HdlGatewayLogic.Current.GetGatewayName(zbGateway); - //鏄惁鍒囨崲鍒皗0}缃戝叧? - string msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToSwitchTheGateway), "[" + nameValue + "]"); - if (strWayId == GatewayResourse.AppOldSelectGatewayId) + //鍒囨崲 + MenuName = Language.StringByID(R.MyInternationalizationString.uSwitch1); + string strWayId = this.zbGateway.GwId; + if (strWayId == HdlGatewayResourse.AppOldSelectGatewayId) { - //鏄惁閲嶆柊鍒锋柊{0}缃戝叧? - msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToRefreshTheGateway), "[" + nameValue + "]"); + MenuName = Language.StringByID(R.MyInternationalizationString.uRefresh); } - this.ShowMassage(ShowMsgType.Confirm, msg, () => + frame.AddRowMenu(MenuName, "Item/GwSwitchIcon.png", "Item/GwSwitchIconSelected.png", () => { - HdlThreadLogic.Current.RunThread(() => + string nameValue = HdlGatewayLogic.Current.GetGatewayName(zbGateway); + //鏄惁鍒囨崲鍒皗0}缃戝叧? + string msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToSwitchTheGateway), "[" + nameValue + "]"); + if (strWayId == HdlGatewayResourse.AppOldSelectGatewayId) { - //鎵ц鍒囨崲缃戝叧鎿嶄綔 - this.DoSwitchGateway(); + //鏄惁閲嶆柊鍒锋柊{0}缃戝叧? + msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToRefreshTheGateway), "[" + nameValue + "]"); + } + this.ShowMassage(ShowMsgType.Confirm, msg, () => + { + HdlThreadLogic.Current.RunThread(() => + { + //鎵ц鍒囨崲缃戝叧鎿嶄綔 + this.DoSwitchGateway(); + }); }); }); - }); - //鍒犻櫎 - MenuName = Language.StringByID(R.MyInternationalizationString.uDelete); - frame.AddRowMenu(MenuName, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () => - { - //濡傜Щ闄ょ綉鍏筹紝璇ョ綉鍏崇粦瀹氱殑璁惧鍒楄〃{0}灏嗘竻绌猴紝纭缁х画鎵ц璇ユ搷浣滐紵 - string msg = Language.StringByID(R.MyInternationalizationString.uUnBindedMsg); - if (msg.Contains("{0}") == true) + //鍒犻櫎 + MenuName = Language.StringByID(R.MyInternationalizationString.uDelete); + frame.AddRowMenu(MenuName, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () => { - msg = string.Format(msg, "\r\n"); - } - this.ShowMassage(ShowMsgType.Confirm, msg, () => - { - this.DeleteGateway(strWayId); + //濡傜Щ闄ょ綉鍏筹紝璇ョ綉鍏崇粦瀹氱殑璁惧鍒楄〃{0}灏嗘竻绌猴紝纭缁х画鎵ц璇ユ搷浣滐紵 + string msg = Language.StringByID(R.MyInternationalizationString.uUnBindedMsg); + if (msg.Contains("{0}") == true) + { + msg = string.Format(msg, "\r\n"); + } + this.ShowMassage(ShowMsgType.Confirm, msg, () => + { + this.DeleteGateway(strWayId); + }); }); - }); + } + //if (canAddReplaceMenu == true) + //{ + // //鏇挎崲 + // MenuName = Language.StringByID(R.MyInternationalizationString.uReplace); + // frame.AddRowMenu(MenuName, null, "Item/ReplaceIconSelected.png", () => + // { + // }); + //} } #endregion @@ -326,15 +387,15 @@ /// 妫�娴嬫柊鐗堟湰 /// </summary> /// <param name="btnNewVersion">鎻愮ず鏈夋柊鐗堟湰鐨勬帶浠�</param> - private async void CheckNewVersion(PicViewControl btnNewVersion) + private void CheckNewVersion(PicViewControl btnNewVersion) { //鑾峰彇缃戝叧鐗堟湰淇℃伅 - var result = await HdlGatewayLogic.Current.GetGatewayAllNewVersion(this.zbGateway); + var result = HdlGatewayLogic.Current.GetGatewayAllNewVersion(this.zbGateway, ShowErrorMode.NO); if (result == null) { return; } - Application.RunOnMainThread(() => + HdlThreadLogic.Current.RunMain(() => { if (this.Parent != null) { @@ -344,7 +405,7 @@ btnNewVersion.Visible = true; } } - }); + }, ShowErrorMode.NO); } #endregion @@ -355,10 +416,10 @@ /// 璁剧疆缃戝叧鍚嶅瓧 /// </summary> /// <param name="gatewayName">缃戝叧鍚嶇О</param> - private async void SetGatewayName(string gatewayName, bool closeForm) + private void SetGatewayName(string gatewayName, bool closeForm) { //淇敼缃戝叧鍚� - var result = await HdlGatewayLogic.Current.ReName(zbGateway, gatewayName); + var result = HdlGatewayLogic.Current.ReName(zbGateway, gatewayName); //缃戝叧淇敼澶辫触 if (result == false) { @@ -379,9 +440,9 @@ /// </summary> /// <param name="gatewayId"></param> /// <param name="online"></param> - private async void DoSwitchGateway() + private void DoSwitchGateway() { - var result = await HdlGatewayLogic.Current.DoSwitchGateway(zbGateway.GwId); + var result = HdlGatewayLogic.Current.DoSwitchGateway(zbGateway.GwId); if (result == false) { return; @@ -393,13 +454,13 @@ this.CloseForm(); //鍏抽棴鎸囧畾鐣岄潰(缃戝叧鎼滅储) - this.CloseFormByFormName("GatewaySearchListForm"); - this.CloseFormByFormName("NewGateWayMenuSelectForm"); + HdlFormLogic.Current.CloseFormByFormName("GatewaySearchListForm"); + HdlFormLogic.Current.CloseFormByFormName("NewGateWayMenuSelectForm"); //鍏抽棴鎸囧畾鐣岄潰(缃戝叧缂栬緫) - this.CloseFormByFormName("GatewayListForm"); + HdlFormLogic.Current.CloseFormByFormName("GatewayListForm"); - if (UserCenterResourse.DicActionForm.ContainsKey("DeviceListMainForm") == false) + if (HdlFormLogic.Current.IsFormOpen("DeviceListMainForm") == false) { //鍒锋柊涓荤敾闈� var form = new Device.DeviceListMainForm(); @@ -424,13 +485,13 @@ /// <param name="row"></param> private void DeleteGateway(string strWayId) { - HdlThreadLogic.Current.RunThread(async () => + HdlThreadLogic.Current.RunThread(() => { //鎵撳紑杩涘害鏉� this.ShowProgressBar(); //鍒犻櫎浜戠缃戝叧 - bool result = await HdlGatewayLogic.Current.DeleteGateway(strWayId); + bool result = HdlGatewayLogic.Current.DeleteGateway(strWayId); //鍏抽棴杩涘害鏉� this.CloseProgressBar(); if (result == false) @@ -438,7 +499,7 @@ return; } - if (strWayId == GatewayResourse.AppOldSelectGatewayId) + if (strWayId == HdlGatewayResourse.AppOldSelectGatewayId) { HdlGatewayLogic.Current.SaveGatewayIdToLocation(string.Empty); } -- Gitblit v1.8.0