From 097cc5c10057156872ce69b2b1576335b782c555 Mon Sep 17 00:00:00 2001 From: WJC <wjc@hdlchina.com.cn> Date: 星期五, 13 十二月 2019 15:33:20 +0800 Subject: [PATCH] 2019-12-13-1 --- ZigbeeApp/Home.Ios/MainViewController.cs | 5 ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs | 23 ++- ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs | 4 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 33 ++++-- ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs | 8 + ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 156 +++++++++++++++++------------- ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 42 +++++++- ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.jpg | 0 ZigbeeApp/Home.Ios/Resources/.DS_Store | 0 9 files changed, 173 insertions(+), 98 deletions(-) diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml index a246d9a..5a507a3 100644 --- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml +++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml @@ -1,29 +1,38 @@ 锘�<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default"> <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.SelectDevice" /> - <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs"> + <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/LogicDevicePage.cs"> <Files> - <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1908" Column="11" /> - <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="1435" Column="38" /> - <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="122" Column="20" /> - <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="798" Column="37" /> - <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs" Line="1" Column="1" /> + <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="20" Column="31" /> + <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="750" Column="59" /> + <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" Line="2059" Column="53" /> + <File FileName="Shared/Common/ZigbeeColor.cs" Line="315" Column="53" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="GateWay" expanded="True"> - <Node name="Home.IOS" expanded="True" /> + <Node name="Home.IOS" expanded="True"> + <Node name="Resources" expanded="True"> + <Node name="Phone" expanded="True" /> + </Node> + <Node name="MainViewController.cs" expanded="True" /> + </Node> <Node name="Shared" expanded="True"> <Node name="Common" expanded="True" /> <Node name="Phone" expanded="True"> <Node name="Device" expanded="True"> - <Node name="Category" expanded="True" /> <Node name="Logic" expanded="True"> - <Node name="DoorLockLogic" expanded="True"> - <Node name="AddCondition.cs" selected="True" /> - </Node> + <Node name="LogicDevicePage.cs" selected="True" /> </Node> + </Node> + <Node name="UserCenter" expanded="True"> + <Node name="Device" expanded="True"> + <Node name="Bind" expanded="True" /> + </Node> + </Node> + <Node name="ZigBee" expanded="True"> + <Node name="Device" expanded="True" /> </Node> </Node> </Node> @@ -32,7 +41,7 @@ </Pad> </Pads> </MonoDevelop.Ide.Workbench> - <MonoDevelop.Ide.ItemProperties.Home.IOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" /> + <MonoDevelop.Ide.ItemProperties.Home.IOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" /> <MonoDevelop.Ide.DebuggingService.PinnedWatches /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> diff --git a/ZigbeeApp/Home.Ios/MainViewController.cs b/ZigbeeApp/Home.Ios/MainViewController.cs index fec7566..7ce0061 100644 --- a/ZigbeeApp/Home.Ios/MainViewController.cs +++ b/ZigbeeApp/Home.Ios/MainViewController.cs @@ -40,7 +40,10 @@ public override void ViewWillAppear(bool animated) { - UIApplication.SharedApplication.StatusBarStyle = UIStatusBarStyle.LightContent; + //椤堕儴淇℃伅鏍忓瓧浣撻鑹蹭负榛戣壊锛� + UIApplication.SharedApplication.StatusBarStyle = UIStatusBarStyle.Default; + //椤堕儴淇℃伅鏍忓瓧浣撻鑹蹭负鐧借壊锛� + //UIApplication.SharedApplication.StatusBarStyle = UIStatusBarStyle.LightContent; //base.ViewWillAppear(animated); } diff --git a/ZigbeeApp/Home.Ios/Resources/.DS_Store b/ZigbeeApp/Home.Ios/Resources/.DS_Store index d2146ae..635dd30 100644 --- a/ZigbeeApp/Home.Ios/Resources/.DS_Store +++ b/ZigbeeApp/Home.Ios/Resources/.DS_Store Binary files differ diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.jpg index 2ca1843..8c77fdd 100755 --- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.jpg +++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.jpg Binary files differ diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs index e2355c2..e297d7b 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs @@ -1440,94 +1440,116 @@ case DeviceType.TemperatureSensor: { string current = Language.StringByID(MyInternationalizationString.current); - devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 * 2 - 20 - 50); - devicefra.Height = Application.GetRealHeight(140 + 160 * 2 + 20 + 50); + devicefra.Y = Application.GetRealHeight(1920 - 140 - 600); + devicefra.Height = Application.GetRealHeight(140 + 600); var temperatureSensor = common as TemperatureSensor; - var Btntemperaturevalue = new Button + SelectedDeviceStatuscondition = "TemperatureSensor"; + #region 甯冨眬View + var PickerViewfra = new FrameLayout { - TextColor = ZigbeeColor.Current.LogicBtnCancelColor, - Height = Application.GetRealHeight(60), - Width = Application.GetRealWidth(400), - TextAlignment = TextAlignment.CenterLeft, - X = Application.GetRealWidth(80), - Y = timetype.Bottom + Application.GetRealHeight(70), - TextSize = 14, + Y = Application.GetRealHeight(140), + Height = Application.GetRealHeight(600), }; - devicefra.AddChidren(Btntemperaturevalue); + devicefra.AddChidren(PickerViewfra); - var horizontalSeekBarVol = new DiyImageSeekBar + + var mUIPickerView = new UIPickerView { - Y = timetype.Bottom + Application.GetRealHeight(70 + 60 + 70), - X = Application.GetRealWidth(80), - Width = Application.GetRealWidth(920), - Height = Application.GetRealHeight(160), - IsProgressTextShow = false,//鏄剧ず鐧惧垎姣� - IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔� - ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉¢鑹� - ThumbImagePath = "ZigeeLogic/progressbtn_2.png",//杩涘害鏉℃寜閽浘鏍� - ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級 - ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//杩涘害鏉″師棰滆壊 - //ProgressTextSize = 13,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏� - SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉$殑楂樺害 + Height = Application.GetRealHeight(600 - 5), }; - devicefra.AddChidren(horizontalSeekBarVol); + PickerViewfra.AddChidren(mUIPickerView); - EventHandler<int> progressclick = (sender, e) => + var mList1 = new List<string> { ">", "<", "=", "鈮�", "鈮�" }; + var mList2 = new List<string>(); + var mList3 = new List<string>(); + for (int i = 1; i <=100; i++) { - - SelectedDeviceStatuscondition = "TemperatureSensor"; - if (temperatureSensor.SensorDiv == 1) - { - dictionary(deviceConditionsInfo, "AttriButeData1", horizontalSeekBarVol.Progress.ToString()); - - Btntemperaturevalue.Text = current + ">" + horizontalSeekBarVol.Progress.ToString() + "鈩�"; - - } - else - { - Btntemperaturevalue.Text = current + "<" + horizontalSeekBarVol.Progress.ToString() + "%"; - dictionary(deviceConditionsInfo, "AttriButeData1", horizontalSeekBarVol.Progress.ToString());//娓╁害鍊� - } - - }; - horizontalSeekBarVol.OnProgressChangedEvent += progressclick; - horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick; - - - if (temperatureSensor.SensorDiv == 1) - { + mList2.Add(i.ToString()); + } + if (temperatureSensor.SensorDiv == 1) { + mList3.Add("鈩�"); dictionary(deviceConditionsInfo, "Cluster_ID", "1026"); dictionary(deviceConditionsInfo, "AttriButeId", "0"); - dictionary(deviceConditionsInfo, "Range", "0");//0澶т簬AttriButeData1鏃惰Е鍙戝姩浣� - dictionary(deviceConditionsInfo, "AttriButeData1", "0"); + dictionary(deviceConditionsInfo, "Range", "1");//1:绛変簬AttriButeData1鏃惰Е鍙戝姩浣� + dictionary(deviceConditionsInfo, "AttriButeData1", "50");//榛樿娓╁害鍊�50鈩� dictionary(deviceConditionsInfo, "AttriButeData2", "0"); - Btntemperaturevalue.Text = current + ">0鈩�"; - - } - else - { - Btntemperaturevalue.Text = current + "<0%"; + } else { + mList3.Add("%"); dictionary(deviceConditionsInfo, "Cluster_ID", "1029"); dictionary(deviceConditionsInfo, "AttriButeId", "0"); - dictionary(deviceConditionsInfo, "Range", "2");//2灏忎簬AttriButeData1鏃惰Е鍙戝姩浣� - dictionary(deviceConditionsInfo, "AttriButeData1", "0");//娓╁害鍊� + dictionary(deviceConditionsInfo, "Range", "1");//1:绛変簬AttriButeData1鏃惰Е鍙戝姩浣� + dictionary(deviceConditionsInfo, "AttriButeData1", "50");//榛樿婀垮害鍊�50% dictionary(deviceConditionsInfo, "AttriButeData2", "0"); } + mUIPickerView.setNPicker(mList1, mList2, mList3); + #endregion + + mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) => + { + SelectedDeviceStatuscondition = "TemperatureSensor"; + dictionary(deviceConditionsInfo, "AttriButeData1", mList2[s2]); + switch (mList1[s1]) + { + case ">": { + dictionary(deviceConditionsInfo, "Range", "0"); + } break; + case "<": { + dictionary(deviceConditionsInfo, "Range", "2"); + } break; + case "=": { + dictionary(deviceConditionsInfo, "Range", "1"); + } break; + case "鈮�": { + dictionary(deviceConditionsInfo, "Range", "6"); + } break; + case "鈮�": { + dictionary(deviceConditionsInfo, "Range", "7"); + } break; + } + }; + + //榛樿=,50 + int index1 = 2, index2 = 49; if (edit && devices != null) { - horizontalSeekBarVol.Progress = int.Parse(devices["AttriButeData1"]); - if (temperatureSensor.SensorDiv == 1) + SelectedDeviceStatuscondition = ""; + string s = ""; + switch (devices["Range"]) { - - Btntemperaturevalue.Text = current + ">" + devices["AttriButeData1"] + "鈩�"; - + case "0": + { + s = ">"; + } + break; + case "1": + { + s = "="; + } + break; + case "2": + { + s = "<"; + } + break; + case "6": + { + s = "鈮�"; + } + break; + case "7": + { + s = "鈮�"; + } + break; } - else - { - Btntemperaturevalue.Text = current + "<" + devices["AttriButeData1"] + "%"; - } + //鏌ユ壘绱㈠紩 + index1 = mList1.IndexOf(s); + index2 = mList2.IndexOf(devices["AttriButeData1"]); + } + ///鏇存柊鏈�鏂扮姸鎬侊紱 + mUIPickerView.setCurrentItems(index1, index2, 0); } break; diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs index 0185dc3..155d207 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs @@ -1057,6 +1057,8 @@ openframelayout.AddChidren(horizontalSeekBarRow); var horizontalSeekBarVol = new DiyImageSeekBar { + Y = openrowlayout.Bottom, + X = Application.GetRealWidth(80), Width = Application.GetRealWidth(920), Height = Application.GetRealHeight(160), IsProgressTextShow = true,//鏄剧ず鐧惧垎姣� @@ -1068,7 +1070,7 @@ ProgressTextSize = 13,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏� SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉$殑楂樺害 }; - horizontalSeekBarRow.AddChidren(horizontalSeekBarVol); + openframelayout.AddChidren(horizontalSeekBarVol); #endregion @@ -1357,6 +1359,8 @@ openframelayout.AddChidren(horizontalSeekBarRow); var horizontalSeekBarVol = new DiyImageSeekBar { + Y = openrowlayout.Bottom, + X = Application.GetRealWidth(80), Width = Application.GetRealWidth(920), Height = Application.GetRealHeight(160), IsProgressTextShow = true,//鏄剧ず鐧惧垎姣� @@ -1368,7 +1372,7 @@ ProgressTextSize = 13,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏� SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉$殑楂樺害 }; - horizontalSeekBarRow.AddChidren(horizontalSeekBarVol); + openframelayout.AddChidren(horizontalSeekBarVol); #endregion diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs index cdf1612..bcfeb18 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs @@ -758,22 +758,54 @@ } break; case DeviceType.TemperatureSensor: - // conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png"; + // conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png"; var dev = deviceinof as TemperatureSensor; - if (conditions["Cluster_ID"]=="1026") { + if (conditions["Cluster_ID"] == "1026") + { dev.SensorDiv = 1; - } else { + } + else + { dev.SensorDiv = 2; + } + string s = ""; + switch (conditions["Range"]) + { + case "0": + { + s = ">"; + } + break; + case "1": + { + s = "="; + } + break; + case "2": + { + s = "<"; + } + break; + case "6": + { + s = "鈮�"; + } + break; + case "7": + { + s = "鈮�"; + } + break; } if (conditions["Cluster_ID"] == "1026") { conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png"; - devicestatus.Text = ">" + conditions["AttriButeData1"] + "鈩�"; + devicestatus.Text = s + conditions["AttriButeData1"] + "鈩�"; } else { conditionIcon.UnSelectedImagePath = "ZigeeLogic/humidity.png"; - devicestatus.Text = "<" + conditions["AttriButeData1"] + "%"; + devicestatus.Text = s + conditions["AttriButeData1"] + "%"; } break; diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs index c40ca3b..27130ce 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs @@ -1054,6 +1054,8 @@ openframelayout.AddChidren(horizontalSeekBarRow); var horizontalSeekBarVol = new DiyImageSeekBar { + Y = openrowlayout.Bottom, + X = Application.GetRealWidth(80), Width = Application.GetRealWidth(920), Height = Application.GetRealHeight(160), IsProgressTextShow = true,//鏄剧ず鐧惧垎姣� @@ -1061,12 +1063,12 @@ ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉¢鑹� ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍� ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級 - ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//杩涘害鏉″師棰滆壊 + ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor, ProgressTextSize = 13,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏� SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉$殑楂樺害 }; - horizontalSeekBarRow.AddChidren(horizontalSeekBarVol); + openframelayout.AddChidren(horizontalSeekBarVol); #endregion #region 鍏� @@ -1354,6 +1356,8 @@ openframelayout.AddChidren(horizontalSeekBarRow); var horizontalSeekBarVol = new DiyImageSeekBar { + Y = openrowlayout.Bottom, + X = Application.GetRealWidth(80), Width = Application.GetRealWidth(920), Height = Application.GetRealHeight(160), IsProgressTextShow = true,//鏄剧ず鐧惧垎姣� @@ -1363,9 +1367,9 @@ ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級 ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//杩涘害鏉″師棰滆壊 ProgressTextSize = 14,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏� - SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉$殑楂樺害 + SeekBarViewHeight = Application.GetRealHeight(10), }; - horizontalSeekBarRow.AddChidren(horizontalSeekBarVol); + openframelayout.AddChidren(horizontalSeekBarVol); #endregion @@ -1742,7 +1746,7 @@ } } break; - + ///绌鸿皟 case DeviceType.Thermostat: { @@ -1877,8 +1881,7 @@ var closeBtnSelected = new SelectedButton(); closerowlayout.AddChidren(closeBtnSelected); #endregion - - + mUIPickerView.OnSelectChangeEvent += (s1, s2, s3) => { @@ -1897,12 +1900,13 @@ } }; - - #endregion + + #endregion //榛樿26,鑷姩,涓 int indextemperature = 10, indexmode = 2, indexspeed = 1; if (edit && TaskList != null) { + foreach (var value in TaskList) { if (TaskList.Count == 1) @@ -2044,6 +2048,7 @@ ///鍙栨秷浜嬩欢 EventHandler<MouseEventArgs> closeclick = (sender, e) => { + //娓呴櫎涔嬪墠鏁版嵁锛� taskListInfo.Clear(); dictionary(modedictionary, "TaskType", "5"); diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs old mode 100755 new mode 100644 index 4953b41..6faa212 --- a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs +++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs @@ -669,7 +669,7 @@ try { - System.Console.WriteLine("Bind/GetDeviceBind_Actions 鍚姩" + "_" + System.DateTime.Now.ToString()); + // System.Console.WriteLine("Bind/GetDeviceBind_Actions 鍚姩" + "_" + System.DateTime.Now.ToString()); var jObject = new JObject { { "DeviceAddr", DeviceAddr }, { "Epoint", DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 5007 } }; mainGateway.Send("Bind/GetDeviceBind", jObject.ToString()); } @@ -689,7 +689,7 @@ d = new GetDeviceBindResponseAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" }; } mainGateway.Actions -= action; - System.Console.WriteLine("Bind/GetDeviceBind_Actions 閫�鍑�" + System.DateTime.Now.ToString()); + //System.Console.WriteLine("Bind/GetDeviceBind_Actions 閫�鍑�" + System.DateTime.Now.ToString()); return d; }); -- Gitblit v1.8.0