From 9c2f7a430c9b475123ac0c4889074911d4e5a01e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期六, 09 五月 2020 17:58:07 +0800
Subject: [PATCH] 2020-05-09-1
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 17 +-
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 6
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 9 +
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 4
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 35 +-----
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 91 +++++++++++++++++-
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 2
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
.DS_Store | 0
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 122 ++++++++++++++----------
11 files changed, 191 insertions(+), 103 deletions(-)
diff --git a/.DS_Store b/.DS_Store
index 54726f6..dc97961 100644
--- a/.DS_Store
+++ b/.DS_Store
Binary files differ
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index 8b3b296..f8ececc 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,29 +1,17 @@
锘�<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/Device/Logic/SkipView.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs">
<Files>
- <File FileName="Shared/Phone/Category/SelectFloorForm.cs" Line="149" Column="1" IsPinned="True" />
- <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="24" Column="23" />
- <File FileName="Shared/Phone/Device/Logic/LogicView/TipView.cs" Line="99" Column="61" />
- <File FileName="Shared/Phone/Device/Logic/SoneLogicList.cs" Line="24" Column="21" />
- <File FileName="Shared/Phone/Device/Logic/AddLogicPage.cs" />
- <File FileName="Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs" Line="1066" Column="15" />
- <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="1265" Column="28" />
- <File FileName="Shared/Phone/Device/Logic/OneLogic.cs" Line="190" Column="43" />
- <File FileName="Shared/Phone/Device/Logic/Method.cs" Line="658" Column="10" />
- <File FileName="Shared/Phone/Category/CategoryMainForm.cs" Line="58" Column="13" />
+ <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/ZigBee/Device/DoorLock.cs" Line="2757" Column="81" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
- <Node name="GateWay.Droid" expanded="True">
- <Node name="Assets" expanded="True" />
- </Node>
- <Node name="Home.IOS" expanded="True">
- <Node name="Resources" expanded="True" />
- </Node>
<Node name="Shared" expanded="True">
<Node name="Common" expanded="True" />
<Node name="Phone" expanded="True">
@@ -31,21 +19,12 @@
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True">
<Node name="LogicView" expanded="True" />
- <Node name="SkipView.cs" selected="True" />
</Node>
</Node>
<Node name="UserCenter" expanded="True">
- <Node name="CommonBase" expanded="True">
- <Node name="Common" expanded="True" />
- <Node name="Controls" expanded="True">
- <Node name="BaseCommonControl" expanded="True">
- <Node name="Base" expanded="True" />
- </Node>
- <Node name="MessageControls" expanded="True" />
- </Node>
+ <Node name="DoorLock" expanded="True">
+ <Node name="DoorLockCommonInfo.cs" selected="True" />
</Node>
- <Node name="DoorLock" expanded="True" />
- <Node name="Residence" expanded="True" />
</Node>
<Node name="ZigBee" expanded="True">
<Node name="Common" expanded="True" />
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 19a1b7e..9796d95 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/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
old mode 100755
new mode 100644
index 7c8bd89..2812dda
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -264,8 +264,8 @@
accounts.Add("Account", Config.Instance.Guid);
accounts.Add("AccountName",accountName);
///mac+绔彛鏄负璇嗗埆鏄偅涓棬閿�;
- accounts.Add("MacAddr", Send.CurrentDoorLock.DeviceAddr);
- accounts.Add("Epoint", Send.CurrentDoorLock.DeviceEpoint.ToString());
+ accounts.Add("Option4", Send.CurrentDoorLock.DeviceAddr);
+ accounts.Add("Option2", Send.CurrentDoorLock.DeviceEpoint.ToString());
accounts.Add("UserId", userId);
if (SelectedDeviceStatuscondition != "")
{
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
old mode 100755
new mode 100644
index c593a35..742b6f6
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -21,17 +21,27 @@
this.AddChidren(view.TopRowView());
view.toptitleNameBtn.TextID = MyInternationalizationString.linkageevent;
view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
+ //鍔犲ぇ鐐瑰嚮鐑敭
+ var addiocnclick = new Button
+ {
+ Width = Application.GetRealWidth(108+58),
+ Height = Application.GetRealHeight(72+20),
+ X = Application.GetRealWidth(1080 - 108 - 58),
+ Y = Application.GetRealHeight(184 - 72),
+ };
+ view.topRowLayout.AddChidren(addiocnclick);
var addiocn = new Button
{
- Width = Application.GetRealWidth(72),
- Height = Application.GetRealHeight(72),
+ Width = Application.GetMinRealAverage(72),
+ Height = Application.GetMinRealAverage(72),
X = Application.GetRealWidth(1080 - 108 - 58),
UnSelectedImagePath = "ZigeeLogic/lockadd.png",
Y = Application.GetRealHeight(184 - 72 - 20),
};
view.topRowLayout.AddChidren(addiocn);
- addiocn.MouseUpEventHandler += (sender, e) =>
+
+ EventHandler<MouseEventArgs> addclick = (sender, e) =>
{
//new涓�涓柊閫昏緫瀵硅薄锛�
Common.Logic.CurrentLogic = new Common.Logic();
@@ -44,6 +54,10 @@
UserView.HomePage.Instance.PageIndex += 1;
lockLogicCommunalPage.Show(() => { });
};
+
+ addiocnclick.MouseUpEventHandler += addclick;
+ addiocn.MouseUpEventHandler += addclick;
+
#endregion
middle = new VerticalRefreshLayout
{
@@ -68,8 +82,12 @@
/// </summary>
public async void Read()
{
+
+
+
+
CommonPage.Loading.Start();
- if (Common.Logic.LockLogicList.Count == 0)
+ if (!BoolExist())
{
var Idlist = await Send.GetLogicId(1);
if (Idlist.Count != 0)
@@ -86,7 +104,8 @@
bool yes = false;
for (int a = 0; a < logic.Accounts.Count; a++)
{
- if (logic.Accounts[a]["MacAddr"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[a]["Epoint"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
+ //Option4鏄澶噈ac锛汷ption2鏄澶囩鍙ｏ紱
+ if (logic.Accounts[a]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[a]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
{
//鏌ユ壘鏄惁鏄偅涓棬閿侊紱
//濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
@@ -117,7 +136,8 @@
{
middle.RemoveAll();
- if (Common.Logic.LockLogicList.Count == 0)
+ //if (Common.Logic.LockLogicList.Count == 0)
+ if (!BoolExist())
{
//灏辨槸涓轰簡鏄剧ず寮曞娣诲姞鍥炬爣;
var noFrameLayout = new FrameLayout
@@ -156,6 +176,11 @@
for (int i = 0; i < Common.Logic.LockLogicList.Count; i++)
{
var logic = Common.Logic.LockLogicList[i];
+ if (!Exist(logic))
+ {
+ continue;
+ }
+
var logicRowlayout = new RowLayout
{
Width = Application.GetRealWidth(1080),
@@ -259,5 +284,59 @@
}
}
+
+
+ /// <summary>
+ /// 鏌ユ壘璇ラ棬閿佹槸鍚﹀瓨鍦ㄨ嚜鍔ㄥ寲
+ /// </summary>
+ /// <returns></returns>
+ private bool BoolExist()
+ {
+ bool yes = false;
+ for (int i = 0; i < Common.Logic.LockLogicList.Count; i++)
+ {
+ var logic = Common.Logic.LockLogicList[i];
+ if (logic.LogicType != 1)
+ {
+ continue;
+ }
+
+ if (Exist(logic))
+ {
+ yes = true;
+ //瀛樺湪灏遍��鍑�
+ break;
+ }
+ }
+ return yes;
+ }
+
+ /// <summary>
+ /// 鏌ユ壘杩欎竴鏉¤嚜鍔ㄥ寲鏄惁灞炰簬璇ラ棬閿�
+ /// </summary>
+ /// <returns></returns>
+ private bool Exist(Common.Logic logic)
+ {
+ bool yes = false;
+ for (int j = 0; j < logic.Accounts.Count; j++)
+ {
+ //Option4鏄澶噈ac锛汷ption2鏄澶囩鍙ｏ紱
+ if (logic.Accounts[j]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[j]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
+ {
+ //鏌ユ壘鏄惁鏄偅涓棬閿侊紱
+ //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
+ yes = false;
+ break;
+ }
+ if (logic.Accounts[j]["Account"].ToString() == Config.Instance.Guid)
+ {
+ //鏌ユ壘鑷繁璐﹀彿涓嬬殑鍒涘缓鑱斿姩浜嬩欢锛�
+ yes = true;
+ break;
+ }
+
+ }
+ return yes;
+ }
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
index e45f7e8..a555e0c 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
@@ -81,7 +81,7 @@
TextAlignment = TextAlignment.Center,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
TextSize = 14,
- Height = Application.GetRealHeight(127),
+ //Height =Application.GetRealHeight(127),
Width = Application.GetRealWidth(397),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
TextID = R.MyInternationalizationString.cancel,
@@ -95,7 +95,7 @@
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
TextSize = 14,
X = cancelBtn.Right,
- Height = Application.GetRealHeight(127),
+ //Height =Application.GetRealHeight(127),
Width = bottomFrame.Width - cancelBtn.Width,
BackgroundColor = ZigbeeColor.Current.LogicBtnTypeColor,
TextID = R.MyInternationalizationString.confrim,
@@ -223,7 +223,7 @@
TextAlignment = TextAlignment.Center,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
TextSize = 14,
- Height = Application.GetRealHeight(127),
+ // Height = Application.GetRealHeight(127),
Width = Application.GetRealWidth(397),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
TextID = R.MyInternationalizationString.cancel,
@@ -236,7 +236,7 @@
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
TextSize = 14,
X = cancelBtn.Right,
- Height = Application.GetRealHeight(127),
+ //Height = Application.GetRealHeight(127),
Width = bottomFrame.Width - cancelBtn.Width,
BackgroundColor = ZigbeeColor.Current.LogicBtnTypeColor,
TextID = R.MyInternationalizationString.confrim,
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 9b3974a..b1b086f 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -499,6 +499,15 @@
["AccountName"] = dictionary["AccountName"],
};
+
+ if (dictionary.ContainsKey("Option4"))
+ {
+ accounts1.Add("Option4",dictionary["Option4"]);
+ }
+ if (dictionary.ContainsKey("Option2"))
+ {
+ accounts1.Add("Option2", int.Parse(dictionary["Option2"]));
+ }
accounts.Add(accounts1);
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index ef19807..4a4eb39 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -759,7 +759,7 @@
}
return exist;
}
-
+
///<summary>
///鑾峰彇閫昏緫淇℃伅
/// 杩斿洖鍊硷細null涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
@@ -799,7 +799,9 @@
}
return _if;
}
-
+
+
+
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index 0927e3a..fa90f8c 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -3,12 +3,12 @@
using Shared.Common;
using Shared.R;
using Shared;
+using Shared.Phone.UserCenter.DoorLock;
namespace Shared.Phone.Device.Logic
{
public class SoneLogicList : FrameLayout
{
-
public static SoneLogicList soneLogicList;
public SoneLogicList()
{
@@ -16,7 +16,7 @@
soneLogicList = this;
}
/// 缁欏緪姊呭埛鏂扮晫闈㈢敤鐨�
- public Action<bool> action;
+ public Action<bool> action;
///绗簩鍧楃涓�绾х埗鎺т欢
FrameLayout fLayout = new FrameLayout();
///甯稿紑妯″紡鍥炬爣
@@ -32,7 +32,6 @@
public async void Show()
{
-
#region 鐣岄潰鐨勫竷灞�浠ｇ爜
UserView.HomePage.Instance.ScrollEnabled = false;//閿佷綇宸︽粦
TopView view = new TopView();
@@ -41,10 +40,6 @@
view.clickBtn.MouseDownEventHandler += (sender, e) =>
{
UserView.HomePage.Instance.ScrollEnabled = true;
- if (updateThread != null && updateThread.IsAlive)
- {
- updateThread.Abort();
- }
//鎶婇潤鎬佸彉閲忕殑杩欎釜涓滆タ缃┖
soneLogicList = null;
this.RemoveFromParent();
@@ -213,7 +208,7 @@
/// </summary>
public async void ModeView()
{
-
+
if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
{
/// 鏌ユ壘鏄惁瀛樺湪鏃舵晥鎬ц嚜鍔ㄥ寲锛涙湁鐨勮瘽灏辫繑鍥炶嚜鍔ㄥ寲瀵硅薄;
@@ -242,23 +237,35 @@
button1.MouseUpEventHandler = async (sender, e) =>
{
- var result = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
- if (result)
+ CommonPage.Loading.Start();
+ try
{
- if (logic != null)
+ var result = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
+ if (result)
{
- ///鏈夊彲鑳藉彧鏈夊父寮�妯″紡锛屾病鏈夋椂鏁堟�ц嚜鍔ㄥ寲
- ///娌℃湁鍒ゆ柇鐨勮瘽锛岄�昏緫浼氫负绌猴紝鎶涘嚭寮傚父;
- Send.DelLogic(logic.LogicId);
+ if (logic != null)
+ {
+ ///鏈夊彲鑳藉彧鏈夊父寮�妯″紡锛屾病鏈夋椂鏁堟�ц嚜鍔ㄥ寲
+ ///娌℃湁鍒ゆ柇鐨勮瘽锛岄�昏緫浼氫负绌猴紝鎶涘嚭寮傚父;
+ Send.DelLogic(logic.LogicId);
+ }
+ Send.CurrentDoorLock.IsDoorLockNormallyMode = false;
+ ModeView();
}
- Send.CurrentDoorLock.IsDoorLockNormallyMode = false;
- ModeView();
+ else
+ {
+ LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.closeFailed));
+ }
}
- else
+ catch { }
+ finally
{
- LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.closeFailed));
- }
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ });
+ }
};
if (logic != null)
{
@@ -271,21 +278,11 @@
button2.TextSize = 15;
button2.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
- }
- else
- {
- button2.Width = Application.GetRealWidth(0);
- button2.Height = Application.GetRealHeight(0);
- }
- ///鏃舵晥鎬у父寮�鍙湁涓�涓潯浠�;
- try
- {
-
var y = DateTime.Now.Year.ToString();//閭ｄ竴骞�
var m = DateTime.Now.Month.ToString();//閭ｄ竴鏈�
var d = DateTime.Now.ToString("dd");//閭ｄ竴澶�
var h = int.Parse(DateTime.Now.ToString("HH"));//褰撳墠绯荤粺鏃堕棿
- var timeInt = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
+ var timeInt = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
int dayInt = (h + timeInt) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
int hour = (h + timeInt) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
int days = int.Parse(d) + dayInt;
@@ -296,7 +293,13 @@
string text5 = Language.StringByID(MyInternationalizationString.executeSone);
button2.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
}
- catch { }
+ else {
+ button2.Y = Application.GetRealHeight(0);
+ button2.X = Application.GetRealWidth(0);
+ button2.Width = Application.GetRealWidth(0);
+ button2.Height = Application.GetRealHeight(0);
+ }
+
}
else
@@ -332,6 +335,7 @@
button2.UnSelectedImagePath = "ZigeeLogic/nextIconSone.png";
button2.TextSize = 15;
button2.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
+ button2.Text ="";
button2.MouseUpEventHandler = (sender, e) =>
{
@@ -340,9 +344,11 @@
{///鍐嶆纭
LogicView.TipView.ShowInputTip(true, async (str) =>
{///纭鍙戦�佸懡浠�
+ CommonPage.Loading.Start();
try
{
///xm
+
var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
if (!result)
{
@@ -365,11 +371,20 @@
Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
ModeView();
+
}
}
catch
{
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+
+ });
}
});
@@ -597,30 +612,33 @@
}
}
+
+ //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();
- }
+ //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/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
old mode 100755
new mode 100644
index 7a4303f..53de6e4
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -13,7 +13,7 @@
/// <summary>
/// 鏇存柊鈥滈�昏緫甯稿紑鈥濈晫闈㈢殑鍥炶皟
/// </summary>
- public static Action<bool> LogicAction = null;
+ public static Action<bool> LogicAction= null;
/// <summary>
/// 缃戝叧锛堥棬閿侊級鎵�鍦ㄧ殑鏃堕棿
/// </summary>
@@ -324,8 +324,8 @@
};
}
-
-/// <summary>
+
+ /// <summary>
/// 鍒犻櫎甯稿紑妯″紡
/// </summary>
/// <param name="doorLock">褰撳墠闂ㄩ攣</param>
@@ -349,10 +349,10 @@
return true;
}
return false;
- }
-
-
- /// <summary>
+ }
+
+
+ /// <summary>
/// 璁剧疆甯稿紑妯″紡
/// </summary>
/// <param name="doorLock">褰撳墠闂ㄩ攣</param>
@@ -361,7 +361,7 @@
public static async System.Threading.Tasks.Task<bool> SetNormallyOpenModeFuncAsync(ZigBee.Device.DoorLock doorLock)
{
//app璁剧疆鈥滃父寮�妯″紡鈥濆け璐�
- var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
+ var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
if (result == null || result.defaultControlResponseData == null || result.defaultControlResponseData.status != 0)
{
return false;
@@ -1220,6 +1220,7 @@
var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
contr.Show();
});
+
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index be90ed2..e30ad3e 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -1056,7 +1056,7 @@
UserView.HomePage.Instance.AddChidren(addLogicPage);
UserView.HomePage.Instance.PageIndex += 1;
addLogicPage.Show();
- addLogicPage.UpdateModeIcon();
+
addLogicPage.action += (w) =>
{
doorLock.IsDoorLockNormallyMode = w;
--
Gitblit v1.8.0