From dce6c3481a37216292724013ff9d2b75ceb82f86 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期三, 10 六月 2020 15:47:28 +0800 Subject: [PATCH] 添加小度的代码 --- ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs | 86 +++++++------------------------------------ 1 files changed, 14 insertions(+), 72 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs index c399fee..7af7f6f 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs @@ -49,17 +49,9 @@ /// </summary> private ZbGateway realGateway = null; /// <summary> - /// 杩涘害鏉� + /// 杩涘害鏉℃帶浠� /// </summary> - private FrameLayout btnProgressBar = null; - /// <summary> - /// 杩涘害鍊兼樉绀烘枃鏈殑鏁翠綋 - /// </summary> - private FrameLayout frameProgress = null; - /// <summary> - /// 杩涘害鍊肩殑鏄剧ず鏂囨湰 - /// </summary> - private NormalViewControl btnProgressView = null; + private ProgressRowBar btnProgressBar = null; /// <summary> /// 缃戝叧鏄惁鍏佽鍏ョ綉鐨勬爣璇� /// </summary> @@ -113,36 +105,11 @@ bodyFrameLayout.AddChidren(btnSearch); //杩涘害鏉� - var btnProRow = new FrameLayout(); - btnProRow.Gravity = Gravity.CenterHorizontal; - btnProRow.Y = Application.GetRealHeight(861); - btnProRow.Width = Application.GetRealWidth(559); - btnProRow.Height = Application.GetRealHeight(29); - btnProRow.BackgroundColor = 0xffe6e6e6; - btnProRow.Radius = (uint)Application.GetRealHeight(29) / 2; - bodyFrameLayout.AddChidren(btnProRow); - this.btnProgressBar = new FrameLayout(); - btnProgressBar.Width = 0; - btnProgressBar.Height = btnProRow.Height; - btnProgressBar.BackgroundColor = 0xfffb744a; - btnProgressBar.Radius = (uint)Application.GetRealHeight(29) / 2; - btnProRow.AddChidren(btnProgressBar); - - //杩涘害鍊兼枃鏈� - this.frameProgress = new FrameLayout(); - frameProgress.Width = Application.GetRealWidth(84); - frameProgress.Height = Application.GetRealHeight(60); - frameProgress.Y = Application.GetRealHeight(772); - bodyFrameLayout.AddChidren(frameProgress); - frameProgress.X = btnProRow.X + btnProgressBar.Right - frameProgress.Width / 2; - var btnProgressPic = new PicViewControl(84, 60); - btnProgressPic.UnSelectedImagePath = "Item/ProgressMsg.png"; - frameProgress.AddChidren(btnProgressPic); - this.btnProgressView = new NormalViewControl(84, 32, true); - btnProgressView.TextSize = 10; - btnProgressView.TextAlignment = TextAlignment.Center; - btnProgressView.Text = "0%"; - frameProgress.AddChidren(btnProgressView); + this.btnProgressBar = new ProgressRowBar(559, 29); + btnProgressBar.Gravity = Gravity.CenterHorizontal; + btnProgressBar.Y = Application.GetRealHeight(861); + bodyFrameLayout.AddChidren(btnProgressBar); + btnProgressBar.StartMode1(true); if (this.realGateway != null) { @@ -206,7 +173,7 @@ //缁欐柊璁惧璁剧疆涓婚敭灞炴�� Common.LocalDevice.Current.SetNewDeviceMainKeys(device, jobject); - device.CurrentGateWayId = HdlGatewayLogic.Current.GetGatewayId(this.realGateway); + device.CurrentGateWayId = this.realGateway.GwId; //灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑 Common.LocalDevice.Current.SetDeviceInfoToMain(device, device); @@ -402,7 +369,7 @@ return 0; } //缃戝叧鍛婄煡瀹㈡埛绔湁璁惧澹版槑 - this.SetDeviceProgressValue(1); + this.btnProgressBar.SetValue(1, 6); return 2; } else if (topic == gatewayId + "/Device/DeviceGetActiveEP_Respon") @@ -419,7 +386,7 @@ return 2; } //璁剧疆杩涘害鍊� - this.SetDeviceProgressValue(2); + this.btnProgressBar.SetValue(2, 6); return 2; } else if (topic == gatewayId + "/Device/DeviceGetActiveEPSimpleDesc_Respon") @@ -436,7 +403,7 @@ return 2; } //璁剧疆杩涘害鍊� - this.SetDeviceProgressValue(3); + this.btnProgressBar.SetValue(3, 6); return 2; } else if (topic == gatewayId + "/Device/DeviceGetDefaultBind_Respon") @@ -453,7 +420,7 @@ return 2; } //璁剧疆杩涘害鍊� - this.SetDeviceProgressValue(4); + this.btnProgressBar.SetValue(4, 6); return 2; } else if (topic == gatewayId + "/Device/DeviceAutoBindZBCoord_Respon") @@ -470,42 +437,17 @@ return 2; } //璁剧疆杩涘害鍊� - this.SetDeviceProgressValue(5); + this.btnProgressBar.SetValue(5, 6); return 2; } else if (topic == gatewayId + "/DeviceInComingRespon") { this.topTimeOut = topMaxTime; //缃戝叧鏈�缁堜笂鎶ヨ妭鐐硅澶囦俊鎭� - this.SetDeviceProgressValue(6); + this.btnProgressBar.SetValue(6, 6); return 1; } return 0; - } - - /// <summary> - /// 璁剧疆璁惧鐨勮繘搴﹀�� - /// </summary> - /// <param name="value"></param> - private void SetDeviceProgressValue(decimal value) - { - Application.RunOnMainThread(() => - { - //杩涘害鏉� - decimal result = value / 6; - int width = (int)(result * Application.GetRealWidth(559)); - if (btnProgressBar.Width >= width) - { - //鏈変簺璁惧浼氫笂鎶ヤ袱娆�,杩欓噷涓嶈兘璁╁畠鐨勮繘搴︽潯寰�鍥炶蛋 - return; - } - btnProgressBar.Width = width; - - //鏂囨湰鏄剧ず - btnProgressView.Text = ((int)(result * 100)) + "%"; - //鏂囨湰鏄剧ず鐨勯偅涓浘鐗囨绉诲姩 - frameProgress.X = Application.GetRealWidth(262) + btnProgressBar.Right - frameProgress.Width / 2; - }); } /// <summary> -- Gitblit v1.8.0