派生自 ~xm/HomeApp
| ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/GateWay.Droid/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Home.Ios/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ZigbeeApp/Shared/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,28 +1,31 @@ <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/LogicIfon.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/MemberList.cs"> <Files> <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" Line="2098" Column="37" /> <File FileName="Shared/Common/ZigbeeColor.cs" Line="312" Column="60" /> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs" Line="2029" Column="21" /> <File FileName="Shared/Phone/Device/Logic/LogicIfon.cs" Line="130" Column="6" /> <File FileName="Shared/Phone/Device/Logic/LogicDevicePage.cs" Line="2094" Column="22" /> <File FileName="Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs" Line="2098" Column="1" /> <File FileName="Shared/Phone/Device/Logic/DeviceStateCondition.cs" Line="1433" Column="54" /> <File FileName="Shared/Phone/Device/Logic/LogicCommunalPage.cs" Line="624" Column="307" /> <File FileName="Shared/Phone/Device/Logic/MemberList.cs" Line="12" Column="16" /> </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="Home.IOS" expanded="True" /> <Node name="Shared" expanded="True"> <Node name="Common" expanded="True" /> <Node name="Phone" expanded="True"> <Node name="Device" expanded="True"> <Node name="Logic" expanded="True"> <Node name="DoorLockLogic" expanded="True" /> <Node name="LogicIfon.cs" selected="True" /> <Node name="MemberList.cs" selected="True" /> </Node> </Node> </Node> @@ -36,9 +39,7 @@ <MonoDevelop.Ide.DebuggingService.PinnedWatches /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> <Breakpoint file="/Users/hdl/Desktop/HomeApp/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs" relfile="Shared/Phone/Device/Logic/LogicIfon.cs" line="130" column="1" /> </BreakpointStore> <BreakpointStore /> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> </Properties> ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -372,8 +372,8 @@ 5105=请选择时间 5106=地理围栏 5107=位置模式 5108=离家 5109=在家 5108=离开地点 5109=到达地点 5110=天气条件 5111=地理位置 5112=报警 @@ -394,7 +394,7 @@ 5127=已有自动化条件 5128=开始时间 5129=提示 5130=开始时间大于结束时间，重新设置时间无效 5130=开始时间大于结束时间，请重新设置时间. 5131=结束时间 5132=请根据你的需要设置日程 5133=时间 @@ -608,6 +608,9 @@ 5371=请选择场景，否则无法执行下一步. 5372=请选择安防模式，否则无法执行下一步. 5373=自动化已执行. 5374=添加传感器 5375=添加开关/灯光 5376=应用
@@ -372,8 +372,8 @@ 5105=请选择时间 5106=地理围栏 5107=位置模式 5108=离家 5109=在家 5108=离开地点 5109=到达地点 5110=天气条件 5111=地理位置 5112=报警 @@ -394,7 +394,7 @@ 5127=已有自动化条件 5128=开始时间 5129=提示 5130=开始时间大于结束时间，重新设置时间无效 5130=开始时间大于结束时间，请重新设置时间. 5131=结束时间 5132=请根据你的需要设置日程 5133=时间 @@ -608,6 +608,9 @@ 5371=请选择场景，否则无法执行下一步. 5372=请选择安防模式，否则无法执行下一步. 5373=自动化已执行. 5374=添加传感器 5375=添加开关/灯光 5376=应用
@@ -783,7 +783,7 @@ #endregion #region ------在家 离家 #region ------在家 #region ------在家 var athomeFrameLayout = new FrameLayout { @@ -879,14 +879,18 @@ leavehomeSelected.MouseUpEventHandler += leavehomeclick; leavehomeRowLayout.MouseUpEventHandler += leavehomeclick; leavehomeFrameLayout.MouseUpEventHandler += leavehomeclick; double latitude = Config.Instance.Home.Latitude;//纬度 double longitude = Config.Instance.Home.Longitude;//经度 int r = 500;//半径 if (edit) { string guid = ""; foreach (var Locationifon in Common.Logic.CurrentLogic.Conditions) { if (Locationifon["Type"] == "7") { guid = Locationifon["WhoSiteUId"]; if (Locationifon["AtHome"] == "0") { strname = btnleavehome.Text; @@ -903,6 +907,18 @@ btnleavehome.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor; btnathome.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor; } break; } } foreach (var accounts in Common.Logic.CurrentLogic.Accounts) { if (accounts["Type"] == "7" && accounts["Account"] == guid) { latitude = Convert.ToDouble(accounts["Latitude"])/1000000.0; longitude = Convert.ToDouble(accounts["Longitude"]) / 1000000.0; r = int.Parse(accounts["Radius"]); break; } } @@ -948,14 +964,14 @@ } LocationConditionsInfo.Add("AtHome", "1"); } double a1 = Config.Instance.Home.Latitude, a2 = Config.Instance.Home.Longitude; //调用方法，跳转页面 GDMapKit.Show((mLatitude, mLongitude, mRadius, name) => { //点击保存按钮，回调当前选择的纬度，经度，半径范围 var latitud = (int)Math.Truncate(mLatitude * 1000000); var longitude = (int)Math.Truncate(mLongitude * 1000000); var latitudW = (int)Math.Truncate(mLatitude * 1000000); var longitudeH = (int)Math.Truncate(mLongitude * 1000000); Dictionary<string, string> accounts = new Dictionary<string, string>(); if (accounts.ContainsKey("Account")) { @@ -979,8 +995,8 @@ } accounts.Add("Account", Config.Instance.Guid); accounts.Add("Type", "7"); accounts.Add("Latitude", latitud.ToString()); accounts.Add("Longitude", longitude.ToString()); accounts.Add("Latitude", latitudW.ToString()); accounts.Add("Longitude", longitudeH.ToString()); accounts.Add("Radius", mRadius.ToString()); LogicIfon.Addaccounts(accounts); LogicIfon.AddLocationconditions(LocationConditionsInfo); @@ -988,7 +1004,7 @@ UserView.HomePage.Instance.AddChidren(logicCommunalPage); UserView.HomePage.Instance.PageIndex += 1; logicCommunalPage.Show(() => { }); }, strname, true, a1, a2, 500); }, strname, true, latitude, longitude, r); }; }
@@ -1005,23 +1005,11 @@ Gravity = Gravity.CenterVertical, }; pushswitchRowlayout.AddChidren(btnswitch); btnswitch.MouseUpEventHandler += (sender1, e1) => { btnswitch.IsSelected = !btnswitch.IsSelected; if (btnswitch.IsSelected) { } else { } }; var custompushFrameLayout = new FrameLayout { Height = Application.GetRealHeight(160), Height = Application.GetRealHeight(0), BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor, }; middle.AddChidren(custompushFrameLayout); @@ -1072,7 +1060,20 @@ #endregion btnswitch.MouseUpEventHandler += (sender1, e1) => { btnswitch.IsSelected = !btnswitch.IsSelected; if (btnswitch.IsSelected) { custompushFrameLayout.Height = Application.GetRealHeight(160); } else { custompushFrameLayout.Height = Application.GetRealHeight(0); } }; var saveFrameLayout = new FrameLayout { Y = middle.Bottom, ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -621,19 +621,19 @@ int second = int.Parse(conditions["IgnoreTime"]) % 60; if (minute != 0 && second != 0) { devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime); devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1); } else { if (minute == 0 && second != 0) { devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime); devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1); } if (minute != 0 && second == 0) { devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime); devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1); }
@@ -708,7 +708,7 @@ }); } // <summary> /// 通过设备找到区域(房间)名称 /// 通过设备找到区域(房间)名称 /// </summary> /// <param name="btnregionname">Btnregionname.</param> /// <param name="device">Device.</param> ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -301,7 +301,7 @@ Width = Application.GetRealWidth(300), Y = Application.GetRealHeight(45 + 30), TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor, TextID = MyInternationalizationString.addconditions, TextID = MyInternationalizationString.addsensor, X = Application.GetRealWidth(390), TextSize = 14, }; @@ -444,19 +444,19 @@ int second = int.Parse(conditions["IgnoreTime"]) % 60; if (minute != 0 && second != 0) { devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime); devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1); } else { if (minute == 0 && second != 0) { devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime); devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1); } if (minute != 0 && second == 0) { devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime); devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1); } @@ -615,7 +615,7 @@ Width = Application.GetRealWidth(300), Y = Application.GetRealHeight(45 + 30), TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor, TextID = MyInternationalizationString.addfunction, TextID = MyInternationalizationString.addlighting, X = Application.GetRealWidth(390), TextSize = 14, }; @@ -1139,23 +1139,12 @@ Gravity = Gravity.CenterVertical, }; pushswitchRowlayout.AddChidren(btnswitch); btnswitch.MouseUpEventHandler += (sender1, e1) => { btnswitch.IsSelected = !btnswitch.IsSelected; if (btnswitch.IsSelected) { } else { } }; var custompushFrameLayout = new FrameLayout { Height = Application.GetRealHeight(160), Height = Application.GetRealHeight(0), BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor, }; middle.AddChidren(custompushFrameLayout); @@ -1206,7 +1195,18 @@ #endregion btnswitch.MouseUpEventHandler += (sender1, e1) => { btnswitch.IsSelected = !btnswitch.IsSelected; if (btnswitch.IsSelected) { custompushFrameLayout.Height = Application.GetRealHeight(160); } else { custompushFrameLayout.Height = Application.GetRealHeight(0); } }; var saveFrameLayout = new FrameLayout { Y = middle.Bottom, @@ -1222,7 +1222,7 @@ Width = Application.GetRealWidth(910), Radius = (uint)Application.GetRealHeight(60), BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor, TextID = MyInternationalizationString.Save, TextID = MyInternationalizationString.application, TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor, }; saveFrameLayout.AddChidren(btnsave); ZigbeeApp/Shared/R.cs
@@ -17,7 +17,7 @@ public readonly static int Category = 2; /// <summary> /// Me. /// </summary> /// </summary>5307 public readonly static int Me = 3; /// <summary> /// 按键配置 @@ -578,6 +578,9 @@ public readonly static int scenetip = 5371; public readonly static int securitytip = 5372; public readonly static int defaulttext = 5373; public readonly static int addsensor = 5374; public readonly static int addlighting = 5375; public readonly static int application = 5376; #region 登录注册 /// <summary>
