From 1b565ce5fc003551b2db3a624f81221ac1df46b9 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 13:04:39 +0800
Subject: [PATCH] 同步 了全部的代码

---
 ZigbeeApp/Shared/Common/CommonPage.cs                                             |    2 +-
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs                |    6 +++---
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs                    |   17 +++++++++++++----
 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs                      |   19 ++++++++++++-------
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs |    9 ++++++++-
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs       |    4 ----
 6 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index 4dee823..320bd42 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -57,7 +57,7 @@
         /// <summary>
         /// 鐗堟湰鍙�
         /// </summary>
-        public static string CodeIDString = "1.0.19111401";
+        public static string CodeIDString = "1.0.19111801";
         /// <summary>
         /// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
         /// </summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
index 716b00b..44249b0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
@@ -986,10 +986,6 @@
         {
             HdlThreadLogic.Current.RunThread(async () =>
             {
-                //褰撳墠缃戝叧鐨勭増鏈�
-                var oldVersion = HdlGatewayLogic.Current.GetGwInfoAttribute(this.upDatezbGateway, "LinuxFWVersion");
-                int oldLinuxVersion = Convert.ToInt32(oldVersion);
-
                 //鍏堢瓑涓�120绉掑惂锛岀綉鍏冲崌绾у拰缃戝叧瀹屽叏閲嶅惎闇�瑕佸緢闀挎椂闂�
                 int count = 12;
                 for (int i = 0; i < count; i++)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
index 2d85f92..a62b4e1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
@@ -68,9 +68,9 @@
         private Com.Mediatek.Elian.ElianNative hdlWiFi = null;
 #endif
 
-#endregion
+        #endregion
 
-#region 鈻� 涓�鑸柟娉昣__________________________
+        #region 鈻� 涓�鑸柟娉昣__________________________
 
 #if Android
         /// <summary>
@@ -133,6 +133,6 @@
         }
 #endif
 
-#endregion
+        #endregion
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
index e714665..aa69336 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs
@@ -45,6 +45,10 @@
         /// </summary>
         private string gatewayId = string.Empty;
         /// <summary>
+        /// 鐪熷疄缃戝叧
+        /// </summary>
+        private ZbGateway realGateway = null;
+        /// <summary>
         /// 杩涘害鏉�
         /// </summary>
         private FrameLayout btnProgressBar = null;
@@ -73,6 +77,7 @@
             base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddDevice));
 
             this.gatewayId = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway);
+            HdlGatewayLogic.Current.GetRealGateway(ref this.realGateway, this.gatewayId);
 
             //鍒濆鍖栦腑閮ㄦ帶浠�
             this.InitMiddleFrame();
@@ -144,13 +149,13 @@
                         return;
                     }
                     //璁╃綉鍏冲厑璁稿叆缃�
-                    GatewayResourse.NowSelectGateway.AddNewDeviceToGateway(255);
+                    this.realGateway.AddNewDeviceToGateway(255);
                     System.Threading.Thread.Sleep(1000);
                 }
             });
 
             //娣诲姞鐩戣璁惧鏂颁笂鎶ョ殑浜嬩欢
-            GatewayResourse.NowSelectGateway.GwResDataAction += this.AdjustGatewayResultData;
+            this.realGateway.GwResDataAction += this.AdjustGatewayResultData;
         }
 
         #endregion
@@ -169,7 +174,7 @@
             if (result == -1)
             {
                 //鍋滄鎺ユ敹
-                GatewayResourse.NowSelectGateway.GwResDataAction -= this.AdjustGatewayResultData;
+                this.realGateway.GwResDataAction -= this.AdjustGatewayResultData;
 
                 Application.RunOnMainThread(() =>
                 {
@@ -206,7 +211,7 @@
 
                 //缁欐柊璁惧璁剧疆涓婚敭灞炴��
                 Common.LocalDevice.Current.SetNewDeviceMainKeys(device, jobject);
-                device.CurrentGateWayId = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway);
+                device.CurrentGateWayId = HdlGatewayLogic.Current.GetGatewayId(this.realGateway);
                 //灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
                 Common.LocalDevice.Current.SetDeviceInfoToMain(device, device);
 
@@ -261,7 +266,7 @@
                     this.waitDeviceTimeOut--;
                 }
                 //鍋滄鎺ユ敹
-                GatewayResourse.NowSelectGateway.GwResDataAction -= this.AdjustGatewayResultData;
+                this.realGateway.GwResDataAction -= this.AdjustGatewayResultData;
                 System.Threading.Thread.Sleep(500);
 
                 //鐩墠灏卞紕涓�涓�
@@ -516,13 +521,13 @@
         {
             base.CloseForm();
             //鍋滄鎺ユ敹
-            GatewayResourse.NowSelectGateway.GwResDataAction -= this.AdjustGatewayResultData;
+            this.realGateway.GwResDataAction -= this.AdjustGatewayResultData;
 
             HdlThreadLogic.Current.RunThread(() =>
             {
                 System.Threading.Thread.Sleep(1200);
                 //鍏抽棴鍏ョ綉妯″紡
-                GatewayResourse.NowSelectGateway.AddNewDeviceToGateway(0);
+                this.realGateway.AddNewDeviceToGateway(0);
             });
         }
 
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 891421a..3d299dd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -144,17 +144,26 @@
                 UnSelectedImagePath = "Item/Collection.png",
                 SelectedImagePath = "Item/CollectionSelected.png"
             };
-            midTopFrameLayout.AddChidren(btnCollect);
+            midTopFrameLayout.AddChidren(btnCollect);
+            var de = Shared.Common.Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == deviceUI.FileName);
+            if (de == null)
+            {
+                btnCollect.IsSelected = false;
+            }
+            else
+            {
+                btnCollect.IsSelected = true;
+            }
             btnCollect.MouseDownEventHandler += (sender, e) =>
             {
                 btnCollect.IsSelected = !btnCollect.IsSelected;
                 if (btnCollect.IsSelected)
                 {
-                    Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(deviceUI.FileName); //鍙栨秷鏀惰棌
+                    Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(deviceUI.FileName);//鏀惰棌
                 }
                 else
-                {
-                    Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(deviceUI.FileName);//鏀惰棌
+                {
+                    Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(deviceUI.FileName); //鍙栨秷鏀惰棌
                 }
             };
 
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs
index 832dbe1..e9cd431 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayGeneralInformationForm.cs
@@ -65,7 +65,14 @@
             rowSerial.UseClickStatu = false;
             listView.AddChidren(rowSerial);
             rowSerial.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uSerialNumber), 300);
-            rowSerial.AddMostRightView(string.IsNullOrEmpty(i_gateway.getGwInfo.GWSN) == false ? i_gateway.getGwInfo.GWSN : "000000000000", 600);
+            if (i_gateway.getGwInfo == null)
+            {
+                rowSerial.AddMostRightView("000000000000", 600);
+            }
+            else
+            {
+                rowSerial.AddMostRightView(string.IsNullOrEmpty(i_gateway.getGwInfo.GWSN) == false ? i_gateway.getGwInfo.GWSN : "000000000000", 600);
+            }
             rowSerial.AddBottomLine();
 
             //缃戝叧ID

--
Gitblit v1.8.0