From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayLinuxInfoForm.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayLinuxInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayLinuxInfoForm.cs
index 40787ed..f0cb4b0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayLinuxInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayLinuxInfoForm.cs
@@ -86,7 +86,7 @@
 
             //闀滃儚ID
             row1.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uImageId), 300);
-            row1.AddMostRightView(zbGateway.getGwInfo.LinuxImageType.ToString(), 400);
+            row1.AddMostRightView(zbGateway.LinuxImageType.ToString(), 400);
             row1.AddBottomLine();
         }
 
@@ -105,7 +105,7 @@
 
             //鍥轰欢鐗堟湰
             row1.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uFirmwareVersion), 300);
-            row1.AddMostRightView(Common.LocalDevice.Current.AppendVersion(zbGateway.getGwInfo.LinuxFWVersion), 400);
+            row1.AddMostRightView(Common.LocalDevice.Current.AppendVersion(zbGateway.LinuxFirmwareVersion), 400);
             row1.AddBottomLine();
         }
 
@@ -124,7 +124,7 @@
 
             //鍥轰欢鏃ユ湡
             row1.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uHardwareDate), 300);
-            row1.AddMostRightView(zbGateway.getGwInfo.AppVersion.ToString(), 400);
+            row1.AddMostRightView(zbGateway.GwVersionDate.ToString(), 400);
             row1.AddBottomLine();
         }
 
@@ -143,7 +143,7 @@
 
             //纭欢鐗堟湰
             row1.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uHardwareVersion), 300);
-            row1.AddMostRightView(zbGateway.getGwInfo.LinuxHWVersion.ToString(), 400);
+            row1.AddMostRightView(zbGateway.LinuxHardVersion.ToString(), 400);
         }
 
         #endregion

--
Gitblit v1.8.0