From e22fdb94322e6cec38e5e4a9aec13d431a133fde Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期二, 28 四月 2020 16:32:35 +0800 Subject: [PATCH] 上传合并后的代码 --- ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 137 ++++++++++++++++++++++++++++----------------- 1 files changed, 84 insertions(+), 53 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs index 0dc5e74..4bd8639 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs @@ -59,20 +59,6 @@ btnAddDeviceIcon.InitControl(); btnAddDeviceIcon.ButtonClickEvent += (sender, e) => { - ZbGateway realWay = null; - if (GatewayResourse.NowSelectGateway == null || HdlGatewayLogic.Current.GetRealGateway(ref realWay, GatewayResourse.NowSelectGateway) == false) - { - //缃戝叧瀵硅薄寮傚父,璇烽噸鏂伴�夋嫨缃戝叧 - string msg = Language.StringByID(R.MyInternationalizationString.uGatewayIsErrorAndReSelect); - this.ShowMassage(ShowMsgType.Error, msg, () => - { - var form2 = new GatewayManage.GatewayListForm(); - form2.AddForm(); - }); - return; - } - GatewayResourse.NowSelectGateway = realWay; - var form = new DeviceDirection.AddDeviceTypeListForm(); form.AddForm(); }; @@ -92,8 +78,9 @@ this.ClearBodyFrame(); //鍒濆鍖栫綉鍏宠鎺т欢 - GatewayResourse.NowSelectGateway = HdlGatewayLogic.Current.GetLocalGateway(GatewayResourse.AppOldSelectGatewayId); - this.gatewayViewRow = new MyGatewayControl(GatewayResourse.NowSelectGateway); + GatewayResourse.NowSelectGatewayId = GatewayResourse.AppOldSelectGatewayId; + var nowGateway = HdlGatewayLogic.Current.GetLocalGateway(GatewayResourse.AppOldSelectGatewayId); + this.gatewayViewRow = new MyGatewayControl(nowGateway); bodyFrameLayout.AddChidren(gatewayViewRow); gatewayViewRow.InitControl(); @@ -156,9 +143,8 @@ private void InitDeviceListControl() { //鑾峰彇璁惧鍒楄〃 - string gwID = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway); - var listDevice = Common.LocalDevice.Current.GetDeviceByGatewayID(gwID); - var listSpecialOta = Common.LocalDevice.Current.GetSpecialOtaDevice(gwID); + var listDevice = Common.LocalDevice.Current.GetDeviceByGatewayID(GatewayResourse.NowSelectGatewayId); + var listSpecialOta = Common.LocalDevice.Current.GetSpecialOtaDevice(GatewayResourse.NowSelectGatewayId); listDevice.AddRange(listSpecialOta); this.dicRowInfo.Clear(); @@ -190,11 +176,14 @@ //娣诲姞璁惧鐨勮彍鍗曡 this.AddDeviceMenuRow(macAddress); } - - //寮�鍚綉鍏冲湪绾跨洃娴嬬殑绾跨▼ - this.StartGatewayOnlieCheckThread(); - //妫�娴嬭澶囨柊鐗堟湰 - this.CheckDeviceNewVersion(listOta); + //濡傛灉褰撳墠涓嶆槸铏氭嫙浣忓畢 + if (Common.Config.Instance.Home.IsVirtually == false) + { + //寮�鍚綉鍏冲湪绾跨洃娴嬬殑绾跨▼ + this.StartGatewayOnlieCheckThread(); + //妫�娴嬭澶囨柊鐗堟湰 + this.CheckDeviceNewVersion(listOta); + } }); } @@ -384,8 +373,12 @@ rowDevice.HideMenu(); //鐣岄潰璺宠浆,璁板綍褰撳墠鐨勬鍦ㄦ搷浣滅殑璁惧鐨凪ac鍦板潃 this.nowActionDeviceMac = device.DeviceAddr; - //鏄剧ず璁惧鍔熻兘閰嶇疆鐣岄潰 - this.ShowDeviceFunctionSettionForm(device, deviceEnumInfo); + //濡傛灉褰撳墠浣忓畢涓嶆槸铏氭嫙浣忓畢 + if (Common.Config.Instance.Home.IsVirtually == false) + { + //鏄剧ず璁惧鍔熻兘閰嶇疆鐣岄潰 + this.ShowDeviceFunctionSettionForm(device, deviceEnumInfo); + } }; //宸︽粦鑿滃崟浜嬩欢 rowDevice.OpenMenuAction += () => @@ -448,8 +441,17 @@ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir) { //鏂规偊鏂伴闈㈡澘鐨勬寜閿厤缃� - var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm(); - form.AddForm(device); + //骞叉帴鐐� + if (device.Type == DeviceType.FreshAir) + { + var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm(); + form.AddForm(device); + } + else + { + var form = new DeviceFunctionSettionForm(); + form.AddForm(device, true); + } } //鏂规偊闈㈡澘 else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo @@ -591,12 +593,25 @@ /// </summary> private async void ListViewBeginHeaderRefreshing() { + //濡傛灉褰撳墠浣忓畢鏄櫄鎷熺殑 + if (Common.Config.Instance.Home.IsVirtually == true) + { + //灏辨樉绀轰竴涓壒鏁堣�屽凡 + System.Threading.Thread.Sleep(2000); + HdlThreadLogic.Current.RunMain(() => + { + //闅愯棌涓嬫媺鍒锋柊鐗规晥 + listView.EndHeaderRefreshing(); + }); + return; + } //濡傛灉鏄湪绾跨殑 - if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(GatewayResourse.NowSelectGateway) == true) + var nowGateway = HdlGatewayLogic.Current.GetLocalGateway(GatewayResourse.NowSelectGatewayId); + if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(nowGateway) == true) { //妫�娴嬪箍鎾埌鐨勮繖涓綉鍏虫槸鍚︽嫢鏈変綇瀹匢D ZbGateway realWay = null; - if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, GatewayResourse.NowSelectGateway) == true) + if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, nowGateway) == true) { //閲嶆柊璁剧疆浣忓畢ID(杩欎釜搴旇鏄笉缁忚繃APP,鐩存帴鎶婄綉鍏虫仮澶嶄簡鍑哄巶璁剧疆) if (HdlGatewayLogic.Current.HomeIdIsEmpty(realWay.getGatewayBaseInfo.HomeId) == true) @@ -619,7 +634,7 @@ } //鑾峰彇鍏ㄩ儴璁惧 - int result = LocalDevice.Current.SetDeviceToMemmoryByGateway(GatewayResourse.NowSelectGateway); + int result = LocalDevice.Current.SetDeviceToMemmoryByGateway(nowGateway); if (this.Parent == null) { return; @@ -645,12 +660,7 @@ /// </summary> private void StartGatewayOnlieCheckThread() { - if (GatewayResourse.NowSelectGateway == null) - { - return; - } - - string selectGwId = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway); + string selectGwId = GatewayResourse.NowSelectGatewayId; HdlThreadLogic.Current.RunThread(() => { ZbGateway zbGateway = HdlGatewayLogic.Current.GetLocalGateway(selectGwId); @@ -722,7 +732,7 @@ private void StartCheckDeviceOnline() { //澶栭儴璋冪敤鐨勮瘽,涓嶅啀閲嶆柊鑾峰彇璁惧鐘舵�� - if (GatewayResourse.NowSelectGateway == null || this.reGetDeviceOnlineStatu == false) + if (this.reGetDeviceOnlineStatu == false) { return; } @@ -730,7 +740,7 @@ //娣诲姞鎺ユ敹璁惧鍦ㄧ嚎涓婃姤鐨勭洃鍚� HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceListFormReceivePushOnline", ReceiveComandDiv.A璁惧鍦ㄧ嚎涓婃姤, this.ReceiveDeviceStatu); - string gwId = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway); + string gwId = GatewayResourse.NowSelectGatewayId; HdlThreadLogic.Current.RunThread(() => { //杩欓噷涓昏鍙槸鑾峰彇鍦ㄧ嚎鐘舵�� @@ -1017,8 +1027,6 @@ HdlGatewayReceiveLogic.Current.RemoveEvent("DeviceListFormSensor"); HdlGatewayReceiveLogic.Current.RemoveEvent("DeviceListFormReceivePushOnline"); - GatewayResourse.NowSelectGateway = null; - base.CloseFormBefore(); } @@ -1082,7 +1090,10 @@ public MyGatewayControl(ZbGateway i_zbGateway) { this.UseClickStatu = false; - this.zbGatewayId = HdlGatewayLogic.Current.GetGatewayId(i_zbGateway); + if (i_zbGateway != null) + { + this.zbGatewayId = HdlGatewayLogic.Current.GetGatewayId(i_zbGateway); + } this.BackgroundColor = UserCenterColor.Current.White; this.Height = Application.GetRealHeight(173); } @@ -1096,16 +1107,32 @@ ZbGateway zbway = HdlGatewayLogic.Current.GetLocalGateway(zbGatewayId); //鍥炬爣 var btnIcon = this.AddLeftIcon(81); - HdlGatewayLogic.Current.SetGatewayIcon(btnIcon, zbway); + if (zbway != null) + { + HdlGatewayLogic.Current.SetGatewayIcon(btnIcon, zbway); + } + else + { + btnIcon.UnSelectedImagePath = "Gateway/GatewayIcon1.png"; + } //鏄剧ず鏂囨湰 - btnName = this.AddLeftCaption(HdlGatewayLogic.Current.GetGatewayName(zbway), 700); + btnName = this.AddLeftCaption(string.Empty, 700); btnName.Height = Application.GetRealHeight(60); btnName.TextSize = 15; btnName.Y = Application.GetRealHeight(35); - if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway) == false) + if (zbway != null) { - btnName.TextColor = UserCenterColor.Current.TextGrayColor1; + btnName.Text = HdlGatewayLogic.Current.GetGatewayName(zbway); + if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway) == false) + { + btnName.TextColor = UserCenterColor.Current.TextGrayColor1; + } + } + else + { + //铏氭嫙缃戝叧 + btnName.Text = Language.StringByID(R.MyInternationalizationString.uVirtualGateway); } //褰撳墠缃戝叧 @@ -1122,15 +1149,19 @@ var btnMament = this.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uGatewayManagement), 300); btnMament.Name = "btnMament"; - this.ButtonClickEvent += (sernder, e) => + //褰撳墠涓嶆槸铏氭嫙浣忓畢鐨勮瘽 + if (Common.Config.Instance.Home.IsVirtually == false) { - if (string.IsNullOrEmpty(((View)sernder).Name) == false) + this.ButtonClickEvent += (sernder, e) => { - //鎵撳紑缃戝叧鍒楄〃鐣岄潰 - var form = new GatewayManage.GatewayListForm(); - form.AddForm(); - } - }; + if (string.IsNullOrEmpty(((View)sernder).Name) == false) + { + //鎵撳紑缃戝叧鍒楄〃鐣岄潰 + var form = new GatewayManage.GatewayListForm(); + form.AddForm(); + } + }; + } } /// <summary> -- Gitblit v1.8.0