From 51cd95b143cd928ea86a11e3618256a7d779c745 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 24 十二月 2019 13:22:53 +0800
Subject: [PATCH] 2019-12-24-1

---
 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs                                |    4 
 ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs                        |    2 
 ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs                          |   28 +++---
 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs          |   30 ++++---
 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml                                     |   15 +--
 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml                     |    2 
 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs |   32 ++++---
 ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs                   |   77 +++++++++---------
 8 files changed, 96 insertions(+), 94 deletions(-)

diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 6d56c5b..326ec16 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,13 +1,9 @@
 锘�<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default">
   <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
   <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.SelectDevice" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/MemberList.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/AddLogicPage.cs">
     <Files>
-      <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" Line="2094" Column="22" />
-      <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs" Line="2098" Column="1" />
-      <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="1433" Column="54" />
-      <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="624" Column="307" />
-      <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="12" Column="16" />
+      <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" Line="70" Column="1" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
@@ -24,10 +20,13 @@
               <Node name="Phone" expanded="True">
                 <Node name="Device" expanded="True">
                   <Node name="Logic" expanded="True">
-                    <Node name="DoorLockLogic" expanded="True" />
-                    <Node name="MemberList.cs" selected="True" />
+                    <Node name="AddLogicPage.cs" selected="True" />
                   </Node>
                 </Node>
+                <Node name="ZigBee" expanded="True">
+                  <Node name="Common" expanded="True" />
+                  <Node name="Device" expanded="True" />
+                </Node>
               </Node>
             </Node>
           </Node>
diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index ed16680..81506e2 100644
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019121001" android:installLocation="auto" android:versionName="1.0.1912101">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019122301" android:installLocation="auto" android:versionName="1.0.1912231">
 	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
 	<permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index 320f184..a628933 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -968,6 +968,8 @@
                 //璋冪敤鏂规硶锛岃烦杞〉闈�
                 GDMapKit.Show((mLatitude, mLongitude, mRadius, name) =>
                 {
+                    //鎴彇瀛楃涓插悗绗�6浣嶏紱
+                    //var len = name.Substring(name.Length - 6, 6);
 
                     //鐐瑰嚮淇濆瓨鎸夐挳锛屽洖璋冨綋鍓嶉�夋嫨鐨勭含搴︼紝缁忓害锛屽崐寰勮寖鍥�
                     var latitudW = (int)Math.Truncate(mLatitude * 1000000);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index 74ba416..f1a9a25 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -94,23 +94,13 @@
                 //鍏抽棴鍒锋柊View锛�
                 middle.EndHeaderRefreshing();
             };
-            //Read();
-            CommonPage.Loading.Start();
-            new System.Threading.Thread(() =>
-            {
-                Application.RunOnMainThread(() =>
-                {
-                    Read();
-                    CommonPage.Loading.Hide();
-                });
-            })
-            { IsBackground = true }.Start();
+            Read();
 
         }
         /// <summary>
         /// 璇诲彇褰撳墠闂ㄩ攣鐨勪簯绔暟鎹紱
         /// </summary>
-        public async void Read()
+        public void Read()
         {
             bool d = false;
             string macport = Send.CurrentDoorLock.DeviceAddr + "_" + Send.CurrentDoorLock.DeviceEpoint.ToString();
@@ -126,11 +116,23 @@
             CommonPage.Loading.Start();
             if (!d)
             {
-                var allMemberslist = await Send.AllMembers(macport);
-                Send.LockList.AddRange(allMemberslist);
+
+                CommonPage.Loading.Start();
+                new System.Threading.Thread(async () =>
+                {
+                    var allMemberslist = await Send.AllMembers(macport);
+                    Send.LockList.AddRange(allMemberslist);
+                    Application.RunOnMainThread(() =>
+                    {
+                        CommonPage.Loading.Hide();
+                    });
+                })
+                { IsBackground = true }.Start();
+
             }
             UserAllView(macport);
             CommonPage.Loading.Hide();
+
         }
         /// <summary>
         /// 鏄剧ず鎵�鏈夌敤鎴�
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
index 709e32d..c5c855c 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -871,20 +871,24 @@
                                 //鏈湴娌℃湁瀛樺湪;
                                 if (sceneinof == null)
                                 {
-                                    //鍦ㄧ綉鍏虫煡鎵捐鍦烘櫙;
-                                    sceneinof = await Send.GetScene(int.Parse(actions["DeviceAddr"].ToString()));
-                                    //缃戝叧娌℃湁瀛樺湪;
-                                    if (sceneinof == null)
-                                    {
-
-                                        //娉ㄨВ:鏈湴鍜岀綉鍏抽兘涓嶅瓨鍦ㄨ鍦烘櫙,鐣岄潰灏嗕笉浼氭樉绀鸿鍦烘櫙;
-                                        //sceneinof = new SceneUI();
-                                        //绉婚櫎璇ュ満鏅暟鎹�;
-                                        Common.Logic.CurrentLogic.Actions.Remove(actions);
-                                        //绉婚櫎璇ュ満鏅鍥�;
-                                        devicesFrameLayout.RemoveFromParent();
-                                        continue;
-                                    }
+                                    //瀹炵幇鐩殑:鏄剧ず鍑烘潵璁╁彲浠ヨ嚜宸辨槸鍚﹀垹闄�
+                                    sceneinof = new SceneUI();
+                                    #region -----
+                                    ////鍦ㄧ綉鍏虫煡鎵捐鍦烘櫙;
+                                    ////鏍囪闂:缃戠粶璇锋眰锛屽瓨鍦ㄨ鍥惧姞杞藉揩鎱㈢殑闂锛�
+                                    //sceneinof = await Send.GetScene(int.Parse(actions["DeviceAddr"].ToString()));
+                                    ////缃戝叧娌℃湁瀛樺湪;
+                                    //if (sceneinof == null)
+                                    //{
+                                    //    //娉ㄨВ:鏈湴鍜岀綉鍏抽兘涓嶅瓨鍦ㄨ鍦烘櫙,鐣岄潰灏嗕笉浼氭樉绀鸿鍦烘櫙;
+                                    //    //sceneinof = new SceneUI();
+                                    //    //绉婚櫎璇ュ満鏅暟鎹�;
+                                    //    Common.Logic.CurrentLogic.Actions.Remove(actions);
+                                    //    //绉婚櫎璇ュ満鏅鍥�;
+                                    //    devicesFrameLayout.RemoveFromParent();
+                                    //    continue;
+                                    //}
+                                    #endregion
                                 }
 
 
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index 7844d53..e5b4078 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -79,12 +79,7 @@
                 action();
                 RemoveFromParent();
             };
-
-
-
             #endregion
-
-            
 
             var middle = new VerticalScrolViewLayout
             {
@@ -93,7 +88,26 @@
                 BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
             };
             this.AddChidren(middle);
+            var saveFrameLayout = new FrameLayout
+            {
+                Y = middle.Bottom,
+                Height = Application.GetRealHeight(180),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(saveFrameLayout);
 
+            var btnsave = new Button
+            {
+                X = Application.GetRealWidth(85),
+                Height = Application.GetRealHeight(130),//194
+                Width = Application.GetRealWidth(910),
+                Radius = (uint)Application.GetRealHeight(60),
+                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
+                TextID = MyInternationalizationString.Save,
+                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+                TextSize = 16,
+            };
+            saveFrameLayout.AddChidren(btnsave);
 
             #region -----鑷姩鍖栧悕绉� 璁剧疆鍚嶇О-----
             var logicnamefl = new FrameLayout
@@ -1511,20 +1525,24 @@
                                 //鏈湴娌℃湁瀛樺湪;
                                 if (sceneinof == null)
                                 {
-                                    //鍦ㄧ綉鍏虫煡鎵捐鍦烘櫙;
-                                    sceneinof =await Send.GetScene(int.Parse(actions["DeviceAddr"].ToString()));
-                                    //缃戝叧娌℃湁瀛樺湪;
-                                    if (sceneinof == null)
-                                    {
-
-                                        //娉ㄨВ:鏈湴鍜岀綉鍏抽兘涓嶅瓨鍦ㄨ鍦烘櫙,鐣岄潰灏嗕笉浼氭樉绀鸿鍦烘櫙;
-                                        //sceneinof = new SceneUI();
-                                        //绉婚櫎璇ュ満鏅暟鎹�;
-                                        Common.Logic.CurrentLogic.Actions.Remove(actions);
-                                        //绉婚櫎璇ュ満鏅鍥�;
-                                        devicesFrameLayout.RemoveFromParent();
-                                        continue;
-                                    }
+                                    //瀹炵幇鐩殑:鏄剧ず鍑烘潵璁╁彲浠ヨ嚜宸辨槸鍚﹀垹闄�
+                                    sceneinof = new SceneUI();
+                                    #region --------
+                                    ////鍦ㄧ綉鍏虫煡鎵捐鍦烘櫙;
+                                    ////鏍囪闂:缃戠粶璇锋眰锛屽瓨鍦ㄨ鍥惧姞杞藉揩鎱㈢殑闂锛�
+                                    //sceneinof = await Send.GetScene(int.Parse(actions["DeviceAddr"].ToString()));
+                                    ////缃戝叧娌℃湁瀛樺湪;
+                                    //if (sceneinof == null)
+                                    //{
+                                    //    //娉ㄨВ:鏈湴鍜岀綉鍏抽兘涓嶅瓨鍦ㄨ鍦烘櫙,鐣岄潰灏嗕笉浼氭樉绀鸿鍦烘櫙;
+                                    //    //sceneinof = new SceneUI();
+                                    //    //绉婚櫎璇ュ満鏅暟鎹�;
+                                    //    Common.Logic.CurrentLogic.Actions.Remove(actions);
+                                    //    //绉婚櫎璇ュ満鏅鍥�;
+                                    //    devicesFrameLayout.RemoveFromParent();
+                                    //    continue;
+                                    //}
+                                    #endregion
                                 }
 
                                 actionsIcon.UnSelectedImagePath = "ZigeeLogic/scene.png";
@@ -1972,26 +1990,7 @@
             #endregion
 
 
-            var saveFrameLayout = new FrameLayout
-            {
-                Y = middle.Bottom,
-                Height = Application.GetRealHeight(180),
-                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
-            };
-            this.AddChidren(saveFrameLayout);
-
-            var btnsave = new Button
-            {
-                X = Application.GetRealWidth(85),
-                Height = Application.GetRealHeight(130),//194
-                Width = Application.GetRealWidth(910),
-                Radius = (uint)Application.GetRealHeight(60),
-                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
-                TextID = MyInternationalizationString.Save,
-                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
-                TextSize=16,
-            };
-            saveFrameLayout.AddChidren(btnsave);
+          
             btnsave.MouseUpEventHandler += async (sender, e) =>
             {
                 var name = logicTextBox.Text.Trim();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index 312084c..de49765 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -99,23 +99,12 @@
                 //鍏抽棴鍒锋柊View锛�
                 middle.EndHeaderRefreshing();
             };
-            //Read();
-
-            CommonPage.Loading.Start();
-            new System.Threading.Thread(() =>
-           {
-               Application.RunOnMainThread(() =>
-               {
-                   Read();
-                   CommonPage.Loading.Hide();
-               });
-           })
-            { IsBackground = true }.Start();
+            Read();
         }
         /// <summary>
         /// 璇诲彇褰撳墠闂ㄩ攣鐨勪簯绔暟鎹紱
         /// </summary>
-        public async void Read()
+        public void Read()
         {
 
             bool d = false;
@@ -132,8 +121,17 @@
             }
             if (!d)
             {
-                var allMemberslist = await Send.AllMembers(macport);
-                Send.LockList.AddRange(allMemberslist);
+                CommonPage.Loading.Start();
+                new System.Threading.Thread(async () =>
+                {
+                    var allMemberslist = await Send.AllMembers(macport);
+                    Send.LockList.AddRange(allMemberslist);
+                    Application.RunOnMainThread(() =>
+                    {
+                        CommonPage.Loading.Hide();
+                    });
+                })
+                { IsBackground = true }.Start();
             }
             UserList(macport);
         }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index bc6810c..ab23f9e 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -1016,7 +1016,6 @@
         /// <returns></returns>
         public static async System.Threading.Tasks.Task<string> WebClientAsync(int value, string url, Residential residential = null)
         {
-
             NameValueCollection postValues = new NameValueCollection();
 
             if (value == 0)
@@ -1046,9 +1045,8 @@
             byte[] responseArray = webClient.UploadValues(url, postValues);
             var s = System.Text.Encoding.UTF8.GetString(responseArray);
             return s;
-
         }
-
+        
         public class Residential
         {
             /// <summary>

--
Gitblit v1.8.0