From ec34983e291d1c85284472a27109d55891f9a6b5 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 07 八月 2020 16:20:16 +0800
Subject: [PATCH] 不是新代码，别 合并
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
index ce4b49b..fb1d954 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
@@ -90,7 +90,8 @@
//璁惧绫诲瀷 (鍥哄畾鏅鸿兘缃戝叧)
caption = Language.StringByID(R.MyInternationalizationString.uDeviceType);
- var btnType = new FrameCaptionViewControl(caption, Language.StringByID(60004), listview.rowSpace / 2);
+ var infoContent = Common.LocalDevice.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();
@@ -329,12 +330,12 @@
private void CheckNewVersion(PicViewControl btnNewVersion)
{
//鑾峰彇缃戝叧鐗堟湰淇℃伅
- var result = 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 +345,7 @@
btnNewVersion.Visible = true;
}
}
- });
+ }, ShowErrorMode.NO);
}
#endregion
@@ -379,9 +380,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;
@@ -424,13 +425,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)
--
Gitblit v1.8.0