From 3291885285dfd5d4f665c20676307878dc3163bc Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 20 十二月 2019 16:28:53 +0800
Subject: [PATCH] 请合并最新代码（优化设备不支持的功能）
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | 101 ++++++++++++++++++--------------------------------
1 files changed, 36 insertions(+), 65 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
index ef89b3c..8c63dd5 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -40,6 +40,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.selection,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
if (Common.Logic.CurrentLogic.LogicId != 0)
@@ -193,11 +194,7 @@
///娣诲姞鏉′欢鐨勭偣鍑讳簨浠�
EventHandler<MouseEventArgs> conditionaddclick = (sender, e) =>
{
- var addCondition = new AddCondition();
- addCondition.conditionsIndex = -1;
- UserView.HomePage.Instance.AddChidren(addCondition);
- UserView.HomePage.Instance.PageIndex += 1;
- addCondition.Show();
+ AddCondition(-1);
};
conditionadd.MouseUpEventHandler += conditionaddclick;
conditionadd1.MouseUpEventHandler += conditionaddclick;
@@ -234,19 +231,14 @@
Y = Application.GetRealHeight(45 + 30),
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
TextID = MyInternationalizationString.selectunlockingmode,
- X = Application.GetRealWidth(390),
+ X = Application.GetRealWidth(290),
TextSize = 14,
};
addfl.AddChidren(addtextbtn);
EventHandler<MouseEventArgs> addconditionsclick = (sender, e) =>
{
- var addCondition = new AddCondition();
- ///璁板綍绱㈠紩
- addCondition.conditionsIndex = -1;
- UserView.HomePage.Instance.AddChidren(addCondition);
- UserView.HomePage.Instance.PageIndex += 1;
- addCondition.Show();
+ AddCondition(-1);
};
addbtn.MouseUpEventHandler += addconditionsclick;
addtextbtn.MouseUpEventHandler += addconditionsclick;
@@ -326,17 +318,14 @@
BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
Text = Language.StringByID(MyInternationalizationString.edit),
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
- Tag=i,
+ Tag = i,
};
conditionsRowLayout.AddRightView(deviceedit);
deviceedit.MouseUpEventHandler += (sender, e) =>
{
- var addCondition = new AddCondition();
- ///璁板綍绱㈠紩
- addCondition.conditionsIndex = int.Parse(deviceedit.Tag.ToString());
- UserView.HomePage.Instance.AddChidren(addCondition);
- UserView.HomePage.Instance.PageIndex += 1;
- addCondition.Show();
+
+ int intvalue = int.Parse(deviceedit.Tag.ToString());
+ AddCondition(intvalue);
};
///鏄剧ず璁惧鏉′欢鐘舵�佹帶浠�
@@ -357,39 +346,17 @@
case DeviceType.DoorLock:
{
conditionIcon.UnSelectedImagePath = "ZigeeLogic/doorlock.png";
- //for (int a = 0; a < Common.Logic.CurrentLogic.Accounts.Count; a++)
- //{
- // if (Common.Logic.CurrentLogic.Accounts[a]["Type"] == "1")
- // {
- // if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
- // {
- // devicestatus.Text = Common.Logic.CurrentLogic.Accounts["Account"];
- // break;
- // }
- // }
- //}
-
- //(0鎸夐敭/3鍗�/15鎸囩汗)
- switch (conditions["AttriButeId"])
+ for (int a = 0; a < Common.Logic.CurrentLogic.Accounts.Count; a++)
{
- case "0":
+ if (Common.Logic.CurrentLogic.Accounts[a]["Type"] == "1")
+ {
+ if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
{
- devicestatus.Text = Language.StringByID(MyInternationalizationString.lockpassword);
+ devicestatus.Text = Common.Logic.CurrentLogic.Accounts[a]["Account"];
+ break;
}
- break;
- case "3":
- {
- devicestatus.Text = Language.StringByID(MyInternationalizationString.ic);
- }
- break;
- case "15":
- {
- devicestatus.Text = Language.StringByID(MyInternationalizationString.fingerprint);
- }
- break;
-
+ }
}
-
}
break;
}
@@ -404,10 +371,8 @@
Text = Language.StringByID(MyInternationalizationString.del),
};
conditionsRowLayout.AddRightView(del);
-
del.MouseUpEventHandler += (sender, e) =>
{
-
var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
alert.ResultEventHandler += (sender1, e1) =>
@@ -643,7 +608,7 @@
///缂栬緫鐐瑰嚮浜嬩欢
deviceedit.MouseUpEventHandler += (sender, e) =>
{
-
+
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
LockAddDevice.CurrentDeviceStateView(flMain, deviceinof, true);
@@ -796,22 +761,19 @@
bool ifclose = false;
foreach (var status in TaskList)
{
- if (status["TaskType"].ToString() == "1")
+ if (TaskList.Count == 1)
{
- if (status["Data1"].ToString() == "0")
- {
- // devicestatus.Text = Language.StringByID(MyInternationalizationString.close);
-
- ifclose = false;
- }
- else if (status["Data1"].ToString() == "1")
- {
- //devicestatus.Text = Language.StringByID(MyInternationalizationString.open);
- ifclose = true;
- }
-
+ //鏁扮粍鍙湁涓�涓厓绱犺鏄庡綋鍓嶇┖璋冪姸鎬佷负鍏筹紱
+ ifclose = false;
+ //濡傛灉绌鸿皟鐘舵�佹槸鍏筹紱鐩存帴璺冲嚭for寰潖锛�
+ break;
}
- else if (status["TaskType"].ToString() == "5")
+ else
+ {
+ ifclose = true;
+ }
+
+ if (status["TaskType"].ToString() == "5")
{
if (status["Data1"] == "3")
{//3---璁剧疆宸ヤ綔妯″紡(1:鑷姩;3:鍒跺喎;4:鍒剁儹;7:閫侀;8:闄ゆ箍)
@@ -1156,5 +1118,14 @@
};
}
+ public void AddCondition(int value)
+ {
+ var addCondition = new AddCondition();
+ addCondition.conditionsIndex = value;
+ UserView.HomePage.Instance.AddChidren(addCondition);
+ UserView.HomePage.Instance.PageIndex += 1;
+ addCondition.Show();
+
+ }
}
}
--
Gitblit v1.8.0