From 26cee91cc3332e09db5cadb9faf76612b1b0c081 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 五月 2020 11:22:34 +0800
Subject: [PATCH] 2020-05-11-1
---
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 29 ++++++--------
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 1
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 47 ++++++++---------------
4 files changed, 30 insertions(+), 47 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index f8ececc..d601123 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,34 +1,31 @@
锘�<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
- <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/ZigBee/Device/ZbGateway.cs">
<Files>
- <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1441" Column="43" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="10" Column="36" />
- <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="12" Column="40" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="772" Column="10" />
+ <File FileName="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs" Line="151" Column="49" />
+ <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="31" Column="46" />
<File FileName="Shared/Phone/ZigBee/Device/DoorLock.cs" Line="2757" Column="81" />
+ <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="876" Column="49" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="78" Column="45" />
+ <File FileName="Shared/Phone/UserView/HomePage.cs" Line="44" Column="56" />
+ <File FileName="Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs" Line="712" Column="50" />
+ <File FileName="Shared/Phone/ZigBee/Device/ZbGateway.cs" Line="215" Column="7" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
<Node name="Shared" expanded="True">
- <Node name="Common" expanded="True" />
<Node name="Phone" expanded="True">
- <Node name="Category" expanded="True" />
<Node name="Device" expanded="True">
- <Node name="Logic" expanded="True">
- <Node name="LogicView" expanded="True" />
- </Node>
- </Node>
- <Node name="UserCenter" expanded="True">
- <Node name="DoorLock" expanded="True">
- <Node name="DoorLockCommonInfo.cs" selected="True" />
- </Node>
+ <Node name="Logic" expanded="True" />
</Node>
<Node name="ZigBee" expanded="True">
- <Node name="Common" expanded="True" />
- <Node name="Device" expanded="True" />
+ <Node name="Device" expanded="True">
+ <Node name="ZbGateway.cs" selected="True" />
+ </Node>
</Node>
</Node>
</Node>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 9796d95..976f4ab 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index fa90f8c..54c93b3 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -29,7 +29,6 @@
FrameLayout listLogicFl = new FrameLayout();
///甯稿紑鑷姩鍖栧垪琛ㄤ笂涓嬫粦鍔ㄧ殑鎺т欢
VerticalRefreshLayout verticalRefresh = new VerticalRefreshLayout();
-
public async void Show()
{
#region 鐣岄潰鐨勫竷灞�浠ｇ爜
@@ -141,7 +140,7 @@
var addIconclickBtn = new Button
{
- Width = Application.GetRealWidth(90+69+63),
+ Width = Application.GetRealWidth(90 + 69 + 63),
Height = Application.GetRealHeight(69),
X = Application.GetRealWidth(800),
Y = Application.GetRealHeight(60),
@@ -202,6 +201,21 @@
};
Read(true);
#endregion
+
+ DoorLockCommonInfo.LogicAction = (_bool) =>
+ {
+
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ Send.CurrentDoorLock.IsDoorLockNormallyMode = _bool;
+ ModeView();
+ });
+ }
+ catch { }
+ };
+
}
/// <summary>
/// 甯稿紑妯″紡寮�鍏冲垏鎹㈠浘鏍囩晫闈�
@@ -611,35 +625,6 @@
};
}
}
-
-
- //public static Action<bool> action1=DoorLockCommonInfo.LogicAction;
-
-
- /// <summary>
- /// 瀹氭椂鏇存柊甯稿紑妯″紡(闃叉閫氳繃闂ㄩ攣鍏抽棴娌″強鏃跺埛鏂扮姸鎬�)
- /// </summary>
- //System.Threading.Thread updateThread;
- //public void UpdateModeIcon()
- //{
- // updateThread = new System.Threading.Thread(() =>
- // {
- // while (this.Parent != null)
- // {
- // System.Threading.Thread.Sleep(1000);
- // Application.RunOnMainThread(() =>
- // {
- // try
- // {
- // ModeView();
- // }
- // catch { }
- // });
- // }
- // });
- // updateThread.Start();
- //}
-
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index e30ad3e..d0818b5 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -770,6 +770,7 @@
/// </summary>
public void ClickHandle()
{
+
//闂ㄩ攣鏍囬
btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
--
Gitblit v1.8.0