From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
index 127a3d1..e9459e7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
@@ -100,7 +100,7 @@
//褰撳墠鍥轰欢鐗堟湰
var btnTitle = new NormalViewControl(700, 65, true);
- btnTitle.X = ControlCommonResourse.XXLeft;
+ btnTitle.X = HdlControlResourse.XXLeft;
btnTitle.Y = Application.GetRealHeight(30);
btnTitle.TextID = R.MyInternationalizationString.uNowFirmwareVersion;
btnTitle.TextSize = 15;
@@ -182,7 +182,7 @@
//鏈�鏂板浐浠剁増鏈�
var btnTitle = new NormalViewControl(700, 65, true);
- btnTitle.X = ControlCommonResourse.XXLeft;
+ btnTitle.X = HdlControlResourse.XXLeft;
btnTitle.Y = Application.GetRealHeight(30);
btnTitle.TextID = R.MyInternationalizationString.uNewFirmwareVersion;
btnTitle.TextSize = 15;
@@ -200,7 +200,7 @@
rowLinux.UseClickStatu = false;
listView.AddChidren(rowLinux);
rowLinux.AddLeftCaption("Linux", 300);
- rowLinux.AddMostRightView(Common.LocalDevice.Current.AppendVersion(listVersionInfo[0].FirmwareVersion), 300);
+ rowLinux.AddMostRightView(HdlDeviceCommonLogic.Current.AppendVersion(listVersionInfo[0].FirmwareVersion), 300);
rowLinux.AddBottomLine();
}
@@ -211,7 +211,7 @@
rowCoordinator.UseClickStatu = false;
listView.AddChidren(rowCoordinator);
rowCoordinator.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoordinator), 500);
- rowCoordinator.AddMostRightView(Common.LocalDevice.Current.AppendVersion(listVersionInfo[1].FirmwareVersion), 300);
+ rowCoordinator.AddMostRightView(HdlDeviceCommonLogic.Current.AppendVersion(listVersionInfo[1].FirmwareVersion), 300);
rowCoordinator.AddBottomLine();
}
@@ -222,7 +222,7 @@
rowVirtual.UseClickStatu = false;
listView.AddChidren(rowVirtual);
rowVirtual.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uVirtualDrive), 500);
- rowVirtual.AddMostRightView(Common.LocalDevice.Current.AppendVersion(listVersionInfo[2].FirmwareVersion), 300);
+ rowVirtual.AddMostRightView(HdlDeviceCommonLogic.Current.AppendVersion(listVersionInfo[2].FirmwareVersion), 300);
rowVirtual.AddBottomLine();
}
@@ -254,14 +254,14 @@
#endregion
- #region 鈻� 鍙充笂瑙掕彍鍗昣________________________
+ #region 鈻� 鍙充笂瑙掕彍鍗昣________________________
/// <summary>
/// 鍒濆鍖栧彸涓婅鑿滃崟
- /// </summary>
+ /// </summary>
private void InitTopRightMenu()
{
- if (UserCenterResourse.HideOption.DeviceHistory != 1)
+ if (HdlUserCenterResourse.HideOption.DeviceHistory != 1)
{
return;
}
@@ -278,7 +278,7 @@
/// <summary>
/// 鏄剧ず鍙充笂瑙掕彍鍗曠晫闈�
- /// </summary>
+ /// </summary>
private void ShowTopRightMenu()
{
var frame = new TopRightMenuControl(1, 2);
@@ -313,7 +313,7 @@
/// <summary>
/// 娣诲姞鍥轰欢浠嬬粛琛�
/// </summary>
- /// <param name="listContent">鍒楄〃鎺т欢</param>
+ /// <param name="listContent">鍒楄〃鎺т欢</param>
private void AddUpdateContent(VerticalListControl listContent)
{
//淇敼鍐呭
@@ -321,7 +321,7 @@
frameContent.Height = Application.GetRealHeight(87);
listContent.AddChidren(frameContent);
var btnContent = new NormalViewControl(500, 87, true);
- btnContent.X = ControlCommonResourse.XXLeft;
+ btnContent.X = HdlControlResourse.XXLeft;
btnContent.Y = Application.GetRealHeight(28);
btnContent.TextID = R.MyInternationalizationString.uEditorContent;
btnContent.TextSize = 12;
@@ -406,12 +406,12 @@
{
//鍗囩骇瀵硅薄
string gwId = realway.GwId;
- if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(gwId) == true
- && FirmwareUpdateResourse.dicUpdateList[gwId].IsFinishUpdate == true)
+ if (HdlFirmwareUpdateResourse.dicUpdateList.ContainsKey(gwId) == true
+ && HdlFirmwareUpdateResourse.dicUpdateList[gwId].IsFinishUpdate == true)
{
//濡傛灉缃戝叧宸茬粡鍗囩骇瀹屾垚锛岀晫闈㈠叧闂椂锛屽垯绉婚櫎鍐呭瓨
- FirmwareUpdateResourse.dicUpdateList[gwId].Dispose();
- FirmwareUpdateResourse.dicUpdateList.Remove(gwId);
+ HdlFirmwareUpdateResourse.dicUpdateList[gwId].Dispose();
+ HdlFirmwareUpdateResourse.dicUpdateList.Remove(gwId);
}
};
}
--
Gitblit v1.8.0