From cb7fd6a89ad9fcd9cf575025ab43873f17bf17c8 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 16:46:59 +0800
Subject: [PATCH] 2020-12-31-1
---
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | 187 +++++++++++-----------------------------------
1 files changed, 46 insertions(+), 141 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
index 11d924f..51f2bcd 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -12,7 +12,7 @@
/// 閫変腑璇ヨ澶囧姛鑳戒綔涓烘潯浠舵垨鑰呯洰鏍囩殑瑙嗗浘鏂规硶
/// </summary>
/// <param name="common">Common.</param>
- public static void CurrentDeviceView(FrameLayout flMain, CommonDevice common, bool edit, string str,int intValue)
+ public static void CurrentDeviceView(FrameLayout flMain, CommonDevice common, bool edit, string str, int intValue)
{
#region -------鐣岄潰甯冨眬閮ㄥ垎
//涓嶈褰撳墠鐣岄潰婊戝姩
@@ -33,19 +33,14 @@
mFunView openView = new mFunView();
openView.frameLayout.Y = Application.GetRealHeight(140 + 20);
- //completeView.Show(l).AddChidren(openView.Show());
openView.titleBtn.TextID = MyInternationalizationString.open;
mFunView closeView = new mFunView();
- closeView.frameLayout.Y = Application.GetRealHeight(140 + 20+160);
- // closeView.frameLayout.Y = openView.frameLayout.Bottom;
- //completeView.Show(l).AddChidren(closeView.Show());
+ closeView.frameLayout.Y = Application.GetRealHeight(140 + 20 + 160);
closeView.titleBtn.TextID = MyInternationalizationString.close;
mFunView takebackView = new mFunView();
- takebackView.frameLayout.Y = Application.GetRealHeight(140+20+160+160);
- // takebackView.frameLayout.Y = closeView.frameLayout.Bottom;
- //completeView.Show(l).AddChidren(takebackView.Show());
+ takebackView.frameLayout.Y = Application.GetRealHeight(140 + 20 + 160 + 160);
takebackView.titleBtn.TextID = MyInternationalizationString.onoff;
takebackView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
#region -------杩涘害鏉℃帶浠�
@@ -69,8 +64,9 @@
ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- ProgressTextSize = 9,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�12
- SeekBarViewHeight = Application.GetRealHeight(5),//杩涘害鏉＄殑楂樺害10
+ ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�12
+ SeekBarViewHeight = Application.GetRealHeight(6),//杩涘害鏉＄殑楂樺害10
+ SeekBarPadding = 30,
};
#endregion
#endregion
@@ -94,10 +90,10 @@
actionsInfo.Add("TaskList", taskListInfo);
List<Dictionary<string, string>> TaskList = null;
#endregion
- var _if=str.Split('_');
+ var _if = str.Split('_');
if (edit)
{
- if (_if[0]== "condition")
+ if (_if[0] == "condition")
{
var deviceinfo = Common.Logic.CurrentLogic.Conditions[intValue];
if (deviceinfo["Type"] == "1")
@@ -120,7 +116,7 @@
TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
}
}
-
+
}
}
#endregion
@@ -131,6 +127,7 @@
///鐏厜
case DeviceType.OnOffOutput:
{
+
if (_if[0] == "condition")
{
l = 2;
@@ -279,6 +276,8 @@
}
}
}
+
+
}
break;
case DeviceType.IASZone:
@@ -304,11 +303,11 @@
closeView.selectedIconBtn.Visible = false;
if (iASZonedevice.IasDeviceType == 13)
{
-
+
closeView.selectedIconBtn.Visible = true;
}
Send.dictionary(deviceConditionsInfo, "Range", "5");
- Send.dictionary(deviceConditionsInfo, "AttriButeData1", "1");
+ Send.dictionary(deviceConditionsInfo, "AttriButeData1", "3");//鏀寔1鍜�2;1+2=3
};
///鐐瑰嚮鍙栨秷浜嬩欢
closeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
@@ -318,9 +317,9 @@
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
openView.selectedIconBtn.Visible = false;
closeView.selectedIconBtn.Visible = true;
- Send.dictionary(deviceConditionsInfo, "Range", "1");
- Send.dictionary(deviceConditionsInfo, "AttriButeData1", "0");
- if (iASZonedevice.IasDeviceType == 13|| iASZonedevice.IasDeviceType == 541)
+ Send.dictionary(deviceConditionsInfo, "Range", "8");//1
+ Send.dictionary(deviceConditionsInfo, "AttriButeData1", "3");//0
+ if (iASZonedevice.IasDeviceType == 13 || iASZonedevice.IasDeviceType == 541)
{
SelectedDeviceStatus = "";
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
@@ -489,13 +488,13 @@
{
if (devices["AttriButeId"] == "1281")
{
- if (devices.ContainsKey("IgnoreTime"))
+ if (devices.ContainsKey("IgnoreTime") && devices["IgnoreTime"] != "0")
{
timeValue = int.Parse(devices["IgnoreTime"]);
}
else
{
- if (devices["AttriButeData1"] == "1")
+ if (devices["Range"] == "5")
{
openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
@@ -514,7 +513,7 @@
}
-
+
}
}
@@ -548,7 +547,7 @@
}
break;
case DeviceType.DoorLock:
- {
+ {
flMain.RemoveFromParent();
var memberList = new MemberList();
@@ -560,132 +559,36 @@
break;
case DeviceType.TemperatureSensor:
{
- l = 4;
- string current = Language.StringByID(MyInternationalizationString.current);
- completeView.Show(l);
- var temperatureSensor = common as TemperatureSensor;
- SelectedDeviceStatus = "TemperatureSensor";
- #region 甯冨眬View
- var PickerViewfra = new FrameLayout
+ //缂栬緫鏃剁殑鐘舵�佸��
+ string str1 = "";
+ string str2 = "";
+ if (edit && devices != null)
{
- Y = Application.GetRealHeight(140),
- Height = Application.GetRealHeight(640),
- };
- completeView.Show(l).AddChidren(PickerViewfra);
- var mUIPickerView = new UIPickerView
- {
- Height = Application.GetRealHeight(640 - 5),
- };
- PickerViewfra.AddChidren(mUIPickerView);
+ //娓╁害鍊�
+ str1 = devices["AttriButeData1"];
+ //姣旇緝鍏崇郴鍊�
+ str2 = devices["Range"];
- var mList1 = new List<string> { ">", "<", "=", "鈮�", "鈮�" };
- var mList2 = new List<string>();
- var mList3 = new List<string>();
- for (int i = 1; i <= 100; i++)
- {
- mList2.Add(i.ToString());
}
+ var temperatureSensor = common as TemperatureSensor;
if (temperatureSensor.SensorDiv == 1)
{
- mList3.Add("鈩�");
Send.dictionary(deviceConditionsInfo, "Cluster_ID", "1026");
- Send.dictionary(deviceConditionsInfo, "AttriButeId", "0");
- Send.dictionary(deviceConditionsInfo, "Range", "1");//1:绛変簬AttriButeData1鏃惰Е鍙戝姩浣�
- Send.dictionary(deviceConditionsInfo, "AttriButeData1", "5000");//榛樿娓╁害鍊�50鈩�
- Send.dictionary(deviceConditionsInfo, "AttriButeData2", "0");
}
else
{
- mList3.Add("%");
Send.dictionary(deviceConditionsInfo, "Cluster_ID", "1029");
- Send.dictionary(deviceConditionsInfo, "AttriButeId", "0");
- Send.dictionary(deviceConditionsInfo, "Range", "1");//1:绛変簬AttriButeData1鏃惰Е鍙戝姩浣�
- Send.dictionary(deviceConditionsInfo, "AttriButeData1", "5000");//榛樿婀垮害鍊�50%
- Send.dictionary(deviceConditionsInfo, "AttriButeData2", "0");
}
- mUIPickerView.setNPicker(mList1, mList2, mList3);
-
- #endregion
-
- mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) =>
+ Send.dictionary(deviceConditionsInfo, "AttriButeId", "0");
+ Send.dictionary(deviceConditionsInfo, "AttriButeData2", "0");
+ completeView.Show(4);
+ PublicInterface publicInterface = new PublicInterface();
+ publicInterface.TemperatureShow(completeView.fraView, common, str2, str1, (relationValueStr, tempValueStr) =>
{
- ///娓╁害杩涚巼杞崲*100
- var strValue = (int.Parse(mList2[s2]) * 100).ToString();
SelectedDeviceStatus = "TemperatureSensor";
- Send.dictionary(deviceConditionsInfo, "AttriButeData1", strValue);
- switch (mList1[s1])
- {
- case ">":
- {
- Send.dictionary(deviceConditionsInfo, "Range", "0");
- }
- break;
- case "<":
- {
- Send.dictionary(deviceConditionsInfo, "Range", "2");
- }
- break;
- case "=":
- {
- Send.dictionary(deviceConditionsInfo, "Range", "1");
- }
- break;
- case "鈮�":
- {
- Send.dictionary(deviceConditionsInfo, "Range", "6");
- }
- break;
- case "鈮�":
- {
- Send.dictionary(deviceConditionsInfo, "Range", "7");
- }
- break;
- }
- };
-
- //榛樿=,50
- int index1 = 2, index2 = 49;
- if (edit && devices != null)
- {
- SelectedDeviceStatus = "";
- string s = "";
- switch (devices["Range"])
- {
- case "0":
- {
- s = ">";
- }
- break;
- case "1":
- {
- s = "=";
- }
- break;
- case "2":
- {
- s = "<";
- }
- break;
- case "6":
- {
- s = "鈮�";
- }
- break;
- case "7":
- {
- s = "鈮�";
- }
- break;
- }
- //鏌ユ壘绱㈠紩
- index1 = mList1.IndexOf(s);
- //杞崲娓╁害鍊�/100
- var dd = (int.Parse(devices["AttriButeData1"])/100).ToString();
- index2 = mList2.IndexOf(dd);
-
- }
- ///鏇存柊鏈�鏂扮姸鎬侊紱
- mUIPickerView.setCurrentItems(index1, index2, 0);
+ Send.dictionary(deviceConditionsInfo, "AttriButeData1", tempValueStr);
+ Send.dictionary(deviceConditionsInfo, "Range", relationValueStr);
+ });
}
break;
@@ -699,7 +602,7 @@
taskListInfo.Add(switchdictionary);
completeView.Show(l).AddChidren(openView.Show());
openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
-
+
horizontalSeekBarRowLien.Y = openView.frameLayout.Bottom;
horizontalSeekBarVol.Y = openView.frameLayout.Bottom;
completeView.Show(l).AddChidren(horizontalSeekBarRowLien);
@@ -1257,7 +1160,8 @@
};
}
break;
- case DeviceType.ColorTemperatureLight: {
+ case DeviceType.ColorTemperatureLight:
+ {
flMain.RemoveFromParent();
var nightlight = new Nightlight();
UserView.HomePage.Instance.AddChidren(nightlight);
@@ -1270,13 +1174,13 @@
{
nightlight.Show(common, edit, _if[1]);
}
-
+
}
break;
}
completeView.Btncomplete.MouseUpEventHandler += (sender, e) =>
{
- //UserView.HomePage.Instance.ScrollEnabled = true;
+ UserView.HomePage.Instance.ScrollEnabled = true;
if (SelectedDeviceStatus != "")
{
if (_if[0] == "condition")
@@ -1299,7 +1203,7 @@
{
if (!edit)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -1338,11 +1242,12 @@
}
break;
}
-
+
};
}
+
/// <summary>
/// 绌鸿皟妯″紡鐨勭姸鎬�
/// </summary>
--
Gitblit v1.8.0