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/LogicCommunalPage.cs | 176 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 109 insertions(+), 67 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index f0a810c..cdf1612 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -32,14 +32,15 @@
var titleName = new Button
{
- TextSize = 16,
+ TextSize = 17,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth(176),
- Width = Application.GetRealWidth(400),
+ Width = Application.GetRealWidth(600),
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.selection,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
if (Common.Logic.CurrentLogic.LogicId != 0)
@@ -83,7 +84,7 @@
#endregion
-
+
var middle = new VerticalScrolViewLayout
{
@@ -112,6 +113,7 @@
TextID = MyInternationalizationString.automationname,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
Y = Application.GetRealHeight(35),
+ TextSize = 15,
};
logicnamefl.AddChidren(text);
@@ -123,7 +125,7 @@
X = text.Right,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- TextSize = 13,
+ TextSize = 14,
Text = Common.Logic.CurrentLogic.LogicName,
//TextID=MyInternationalizationString.automation1,
};
@@ -166,7 +168,7 @@
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
Width = Application.GetRealWidth(300),
Height = Application.GetRealHeight(60),
- TextSize = 16,
+ TextSize = 15,
Gravity = Gravity.CenterVertical,
});
@@ -277,6 +279,7 @@
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
TextID = MyInternationalizationString.addconditions,
X = Application.GetRealWidth(390),
+ TextSize = 14,
};
addfl.AddChidren(addtextbtn);
@@ -343,6 +346,7 @@
TextAlignment = TextAlignment.CenterLeft,
Gravity = Gravity.CenterVertical,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextSize = 14,
};
conditionsRowLayout.AddChidren(timevalue);
@@ -354,6 +358,7 @@
Gravity = Gravity.CenterVertical,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
X = conditionsRowLayout.Width - Application.GetRealWidth(400),
+ TextSize = 14,
};
conditionsRowLayout.AddChidren(timeTxet);
@@ -454,6 +459,7 @@
Text = conditions["StartHour"] + ":" + s1 + "-" + conditions["StopHour"] + ":" + s2,
//TextColor = 0xff121212,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextSize = 14,
};
conditionsRowLayout.AddChidren(timevalue);
var timeTxet = new Button
@@ -464,6 +470,7 @@
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
X = conditionsRowLayout.Width - Application.GetRealWidth(400),
TextID = MyInternationalizationString.timeframe,
+ TextSize = 14,
};
conditionsRowLayout.AddChidren(timeTxet);
@@ -501,6 +508,7 @@
TextAlignment = TextAlignment.CenterLeft,
Text = deviceinof.DeviceEpointName,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 14,
};
conditionsRowLayout.AddChidren(btndevice);
@@ -529,7 +537,6 @@
deviceedit.MouseUpEventHandler += (sender, e) =>
{
-
if (deviceinof.Type != DeviceType.DoorLock)
{
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
@@ -542,7 +549,7 @@
UserView.HomePage.Instance.AddChidren(memberList);
UserView.HomePage.Instance.PageIndex += 1;
MemberList.edit = true;
- memberList.Show(deviceinof);
+ memberList.Show(deviceinof, conditions);
}
};
@@ -556,6 +563,7 @@
TextAlignment = TextAlignment.CenterRight,
X = Application.GetRealWidth(400),
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextSize = 14,
};
conditionsRowLayout.AddChidren(devicestatus);
@@ -610,14 +618,24 @@
{
int minute = int.Parse(conditions["IgnoreTime"]) / 60;
int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (second != 0)
+ if (minute != 0 && second != 0)
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
}
else
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+ if (minute == 0 && second != 0)
+ {
+ devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+ if (minute != 0 && second == 0)
+ {
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+
}
}
}
@@ -625,7 +643,6 @@
case 21:
case 22:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/doormagnetism.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.logicopen;
@@ -637,14 +654,24 @@
int minute = int.Parse(conditions["IgnoreTime"]) / 60;
int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (second != 0)
+ if (minute != 0 && second != 0)
{
devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
}
else
{
- devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+ if (minute == 0 && second != 0)
+ {
+ devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+ if (minute != 0 && second == 0)
+ {
+ devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+
}
}
@@ -657,7 +684,6 @@
break;
case 40:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/smoke.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.smokescreen;
@@ -667,7 +693,6 @@
break;
case 42:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/waterleakage.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.waterleakage;
@@ -680,7 +705,6 @@
break;
case 43:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/gas.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.gas;
@@ -690,7 +714,6 @@
break;
case 277:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/waterleakage.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.callthepolice;
@@ -700,7 +723,6 @@
break;
default:
{
- conditionIcon.UnSelectedImagePath = "ZigeeLogic/infraredsensor.png";
if (intvalue == "1")
{
devicestatus.TextID = MyInternationalizationString.callthepolice;
@@ -719,19 +741,39 @@
break;
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 = conditions["Account"];
+ devicestatus.Text = Common.Logic.CurrentLogic.Accounts[a]["Account"];
break;
}
}
}
+ }
+ break;
+ case DeviceType.TemperatureSensor:
+ // conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
+ var dev = deviceinof as TemperatureSensor;
+ if (conditions["Cluster_ID"]=="1026") {
+ dev.SensorDiv = 1;
+ } else {
+ dev.SensorDiv = 2;
+ }
+ if (conditions["Cluster_ID"] == "1026")
+ {
+ conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
+ devicestatus.Text = ">" + conditions["AttriButeData1"] + "鈩�";
+ }
+ else
+ {
+ conditionIcon.UnSelectedImagePath = "ZigeeLogic/humidity.png";
+ devicestatus.Text = "<" + conditions["AttriButeData1"] + "%";
}
break;
@@ -754,6 +796,7 @@
Gravity = Gravity.CenterVertical,
Text = logicinof.LogicName,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 14,
//TextColor = 0xff121212,
};
conditionsRowLayout.AddChidren(btnlogic);
@@ -784,6 +827,7 @@
TextAlignment = TextAlignment.CenterRight,
X = Application.GetRealWidth(500),
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextSize = 14,
};
conditionsRowLayout.AddChidren(logicstatus);
@@ -808,6 +852,7 @@
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
//TextColor = 0xff121212,
TextID = MyInternationalizationString.security,
+ TextSize = 14,
};
//conditionsRowLayout.AddChidren(btnsecurity);
@@ -840,6 +885,7 @@
Gravity = Gravity.CenterVertical,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextSize = 14,
};
conditionsRowLayout.AddChidren(securitystatus);
@@ -867,15 +913,16 @@
break;
case 7:
{
+
+ conditionIcon.UnSelectedImagePath = "ZigeeLogic/position.png";
var btnlocation = new Button
{
Width = Application.GetRealWidth(700),
TextAlignment = TextAlignment.CenterLeft,
Gravity = Gravity.CenterVertical,
- //Text = "鍦扮悊浣嶇疆",
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- //TextColor = 0xff121212,
+ TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
TextID = MyInternationalizationString.geographicalposition,
+ TextSize = 14,
};
conditionsRowLayout.AddChidren(btnlocation);
@@ -903,6 +950,7 @@
TextAlignment = TextAlignment.CenterRight,
X = Application.GetRealWidth(500),
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextSize = 14,
};
conditionsRowLayout.AddChidren(locationstatus);
foreach (var radius in Common.Logic.CurrentLogic.Accounts)
@@ -986,7 +1034,7 @@
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
Width = Application.GetRealWidth(300),
Height = Application.GetRealHeight(60),
- TextSize = 16,
+ TextSize = 15,
Gravity = Gravity.CenterVertical,
};
targetRowLayout.AddChidren(btntargettitle);
@@ -1056,6 +1104,7 @@
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
TextID = MyInternationalizationString.addfunction,
X = Application.GetRealWidth(390),
+ TextSize = 14,
};
addfl.AddChidren(addtextbtn);
EventHandler<MouseEventArgs> addfunctionclick = (sender, e) =>
@@ -1122,10 +1171,11 @@
{
Y = Application.GetRealHeight(20),
Height = Application.GetRealHeight(50),
- Width = Application.GetRealWidth(450),
+ Width = Application.GetRealWidth(400),
TextAlignment = TextAlignment.CenterLeft,
Text = deviceinof.DeviceEpointName,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 14,
};
actionsrowLayout.AddChidren(btndevicename);
@@ -1133,7 +1183,7 @@
var btnregionname = new Button
{
Y = btndevicename.Bottom + Application.GetRealHeight(10),
- Width = Application.GetRealWidth(450),
+ Width = Application.GetRealWidth(400),
TextAlignment = TextAlignment.CenterLeft,
Height = Application.GetRealHeight(50),
Text = "",//Language.StringByID(MyInternationalizationString.customroom),
@@ -1145,12 +1195,13 @@
///鏄剧ず璁惧鏉′欢鐘舵�佹帶浠�
var devicestatus = new Button
{
- Width = Application.GetRealWidth(350),
+ Width = Application.GetRealWidth(400),
Height = Application.GetRealHeight(130),
Gravity = Gravity.CenterVertical,
TextAlignment = TextAlignment.CenterRight,
- X = Application.GetRealWidth(450),
+ X = Application.GetRealWidth(400),
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextSize = 14,
};
actionsrowLayout.AddChidren(devicestatus);
@@ -1166,13 +1217,6 @@
///缂栬緫鐐瑰嚮浜嬩欢
deviceedit.MouseUpEventHandler += (sender, e) =>
{
- //var deviceStatePage = new DeviceStatePage();
- //UserView.HomePage.Instance.AddChidren(deviceStatePage);
- //UserView.HomePage.Instance.PageIndex += 1;
- //deviceStatePage.IsDeviceEditor = true;
- //deviceStatePage.Show(deviceinof);
-
- //ActionModifyDeviceStateView(deviceinof);
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
LogicDevicePage.CurrentDeviceStateView(flMain, deviceinof, true);
@@ -1321,26 +1365,23 @@
{
continue;
}
- string modetext = "", temperaturetext="", speedtext = "";
+ string modetext = "", temperaturetext = "", speedtext = "";
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:闄ゆ箍)
@@ -1399,7 +1440,7 @@
//4---璁剧疆鍔犵儹搴︽暟;5---璁剧疆鍒跺喎銆侀櫎婀垮害鏁�;7---璁剧疆鑷姩搴︽暟
else if (status["Data1"] == "4" || status["Data1"] == "5" || status["Data1"] == "7")
{
- var s = int.Parse(status["Data2"]) /100;
+ var s = int.Parse(status["Data2"]) / 100;
temperaturetext = s.ToString();
}
else if (status["Data1"] == "20")
@@ -1447,6 +1488,7 @@
TextAlignment = TextAlignment.CenterLeft,
Text = sceneinof.Name,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 14,
};
actionsrowLayout.AddChidren(btndevicename);
@@ -1485,6 +1527,7 @@
Gravity = Gravity.CenterVertical,
Text = logicinof.LogicName,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 14,
//TextColor = 0xff121212,
};
actionsrowLayout.AddChidren(btnlogic);
@@ -1516,6 +1559,7 @@
X = Application.GetRealWidth(1080 - 330),
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterRight,
+ TextSize = 14,
};
actionsrowLayout.AddChidren(logicstatus);
@@ -1539,6 +1583,7 @@
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
//TextColor = 0xff121212,
TextID = MyInternationalizationString.security,
+ TextSize = 14,
};
//actionsrowLayout.AddChidren(btnsecurity);
@@ -1567,6 +1612,7 @@
Gravity = Gravity.CenterVertical,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextSize = 14,
};
actionsrowLayout.AddChidren(securitystatus);
@@ -1614,6 +1660,7 @@
Width = Application.GetRealWidth(500),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextSize = 14,
};
actionsrowLayout.AddChidren(delaytimeBtn);
if (Minutes != 0)
@@ -1721,6 +1768,7 @@
Width = Application.GetRealWidth(300),
Height = Application.GetRealHeight(60),
Gravity = Gravity.CenterVertical,
+ TextSize = 14,
};
weekRowLayout.AddChidren(settxet);
var btnweektext = new Button
@@ -1733,6 +1781,7 @@
TextID = MyInternationalizationString.everyday,
Y = Application.GetRealHeight(35),
X = settxet.Right,
+ TextSize = 14,
};
weekRowLayout.AddChidren(btnweektext);
@@ -1793,6 +1842,7 @@
Height = Application.GetRealHeight(60),
Gravity = Gravity.CenterVertical,
TextID = MyInternationalizationString.pushswitch,
+ TextSize = 14,
};
pushswitchRowlayout.AddChidren(btnswitchtxet);
@@ -1845,6 +1895,7 @@
Width = Application.GetRealWidth(300),
Height = Application.GetRealHeight(60),
Gravity = Gravity.CenterVertical,
+ TextSize = 14,
};
custompushRowLayout.AddChidren(btncustompush);
@@ -1890,15 +1941,12 @@
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();
- //if (Common.Logic.CurrentLogic.Conditions.Count != 0 && Common.Logic.CurrentLogic.Actions.Count != 0)
- //{
- // AddChidren(btnsave);
- //}
if (string.IsNullOrEmpty(logicTextBox.Text.Trim()))
{
new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), Language.StringByID(MyInternationalizationString.Close)).Show();
@@ -1934,11 +1982,7 @@
CommonPage.Loading.Hide();
UserView.HomePage.Instance.RemoveViewByTag("Logic");
Category.Category.instance?.RefreshBodyView();
- //UserView.HomePage.Instance.RemoveAt("Logic1");
- //Category.Category category = new Category.Category();
- //UserView.HomePage.Instance.AddChidren(category);
- //UserView.HomePage.Instance.PageIndex += 1;
- //category.Show(2);
+
};
@@ -2214,14 +2258,7 @@
flMain.RemoveFromParent();
};
- var timetypeframelayout1 = new FrameLayout
- {
- Width = Application.GetRealWidth(1080),
- Height = Application.GetRealHeight(100),
- Y = Application.GetRealHeight(1920 - 100),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- };
- flMain.AddChidren(timetypeframelayout1);
+
var framelayout = new FrameLayout
{
Width = Application.GetRealWidth(1080),
@@ -2231,6 +2268,7 @@
Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(framelayout);
+ framelayout.SetCornerWithSameRadius(Application.GetRealHeight(58),HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
@@ -2247,6 +2285,7 @@
Width = Application.GetRealWidth(200),
X = Application.GetRealWidth(80),
TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 14,
};
timetype.AddChidren(Btncancel);
Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -2274,6 +2313,7 @@
Width = Application.GetRealWidth(200),
TextAlignment = TextAlignment.CenterRight,
X = Btntitle.Right + Application.GetRealWidth(100),
+ TextSize = 14,
};
timetype.AddChidren(Btncomplete);
@@ -2309,6 +2349,7 @@
TextID = MyInternationalizationString.Allconditions,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 14,
};
androw.AddChidren(andbtn);
@@ -2344,6 +2385,7 @@
TextID = MyInternationalizationString.anycondition,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 14,
};
orrow.AddChidren(orbtn);
--
Gitblit v1.8.0