| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Resources/Resource.designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/ApiUtlis.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/R.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/UserInfo.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/HttpUtil.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Entity/DB_ResidenceData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/MainPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI1-Login/LoginPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/1-HomePage/HomePage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,19 +1,60 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/Info.plist"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/R.cs"> <Files> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="8" Column="17" IsPinned="True" /> <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1809" Column="8" /> <File FileName="HDL-ON_Android/Assets/Language.ini" Line="1932" Column="1" /> <File FileName="HDL_ON/Common/R.cs" Line="1177" Column="43" /> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="150" Column="25" IsPinned="True" /> <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1963" Column="8" /> <File FileName="HDL-ON_Android/Assets/Language.ini" Line="1593" Column="1" /> <File FileName="HDL-ON_iOS/Info.plist" /> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="193" Column="26" /> <File FileName="HDL_ON/UI/UI1-Login/LoginPageBLL.cs" Line="175" Column="1" /> <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="31" Column="30" /> <File FileName="HDL_ON/Common/UserInfo.cs" Line="29" Column="34" /> <File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="569" Column="25" /> <File FileName="HDL_ON/UI/MainPage.cs" Line="174" Column="34" /> <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" Line="1" Column="1" /> <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="203" Column="38" /> <File FileName="HDL_ON/Common/R.cs" Line="8" Column="36" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL-ON_iOS" expanded="True"> <Node name="Info.plist" selected="True" /> <Node name="HDL_ON" expanded="True"> <Node name="Common" expanded="True"> <Node name="R.cs" selected="True" /> </Node> <Node name="DAL" expanded="True"> <Node name="DriverLayer" expanded="True" /> <Node name="Server" expanded="True" /> </Node> <Node name="Entity" expanded="True"> <Node name="Device" expanded="True" /> <Node name="Function" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="1-HomePage" expanded="True" /> <Node name="2-Classification" expanded="True" /> <Node name="3-Intelligence" expanded="True"> <Node name="Automation" expanded="True" /> </Node> <Node name="4-PersonalCenter" expanded="True"> <Node name="AddDevice" expanded="True"> <Node name="SenesorMegahealth" expanded="True" /> </Node> <Node name="AddFunction" expanded="True" /> <Node name="RoomListManage" expanded="True"> <Node name="AddRoom" expanded="True" /> </Node> </Node> <Node name="FuntionControlView" expanded="True"> <Node name="1ContorlPage" expanded="True" /> <Node name="AC" expanded="True" /> </Node> </Node> </Node> </Node> </Node> </State> @@ -26,13 +67,15 @@ <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String> <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" line="34" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" line="313" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/BindingResidence/BindingResidencePage.cs" relfile="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" line="121" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs" line="118" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/1-HomePage/HomePage.cs" relfile="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" line="198" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> HDL-ON_Android/Assets/Language.ini
@@ -439,6 +439,7 @@ 453=Alarm mute 454=Deployment information 455=The name can not be blank. 456=Canvas 457=Energy consumption 458=Date @@ -457,6 +458,7 @@ ' 470=Under protection 471=Millimeter wave sensor 472=Outdoor 1000=Room Humidity 1001=V-chip @@ -1508,6 +1510,7 @@ 469=有人进入 470=防护中 471=毫米波传感器 472=室外 1000=室内湿度 HDL-ON_Android/Resources/Resource.designer.cs
@@ -1,11 +1,10 @@ #pragma warning disable 1591 //------------------------------------------------------------------------------ // <auto-generated> // 此代码由工具生成。 // 运行时版本:4.0.30319.42000 // This code was generated by a tool. // // 对此文件的更改可能会导致不正确的行为，并且如果 // 重新生成代码，这些更改将会丢失。 // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // </auto-generated> //------------------------------------------------------------------------------ @@ -15,7 +14,7 @@ { [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] public partial class Resource {
@@ -458,6 +458,7 @@ ' 470=Under protection 471=Millimeter wave sensor 472=Outdoor 1000=Room Humidity 1001=V-chip @@ -1509,6 +1510,7 @@ 469=有人进入 470=防护中 471=毫米波传感器 472=室外 1000=室内湿度 HDL_ON/Common/ApiUtlis.cs
@@ -61,7 +61,7 @@ /// </summary> public void DownloadData() { if (MainPage.InternetStatus == 0) if (MainPage.InternetStatus == 0 || MainPage.NoLoginMode) return; //线程开始时间 var endTime = DateTime.Now.AddSeconds(5); @@ -187,35 +187,6 @@ { sceneList = new List<Scene>(); } //for (int i = 0; i < FunctionList.List.scenes.Count;) //{ // var localScene = FunctionList.List.scenes[i]; // if (localScene == null) // { // FunctionList.List.scenes.Remove(localScene); // continue; // } // var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId); // if (newScene == null)//如果云端最新数据没有该条数据，则本地需要删掉该数据记录 // { // FunctionList.List.DeleteScene(localScene, false); // } // else // { // i++; // if (localScene.modifyTime != newScene.modifyTime) // { // localScene.name = newScene.name; // localScene.collect = newScene.collect; // localScene.modifyTime = newScene.modifyTime; // localScene.roomIds = newScene.roomIds; // localScene.image = newScene.image; // localScene.SaveSceneFile(); // } // sceneList.Remove(newScene);//操作完的数据清理掉，剩下的就是新增的功能 // } //} FunctionList.List.scenes.Clear(); //处理剩下的新增功能 HDL_ON/Common/R.cs
@@ -4,7 +4,10 @@ { public static class StringId { /// <summary> /// 室外 /// </summary> public const int Outdoor = 472; /// <summary> /// 毫米波传感器 /// </summary> HDL_ON/Common/UserInfo.cs
@@ -5,6 +5,7 @@ using System.Drawing; using HDL_ON.DAL; using HDL_ON.DAL.Server; using Shared; namespace HDL_ON { @@ -24,6 +25,39 @@ { if (m_Current == null) { //Dome模式 if (MainPage.NoLoginMode) { if (Language.CurrentLanguage == "Chinese") { m_Current = new UserInfo() { ID = "1234567890", userName = "试用账号", AccountString = "试用账号", userMobileInfo = "试用账号", userEmailInfo = "试用账号", language = "Chinese", areaCode = "86", headImagePagePath = "LoginIcon/2.png", }; } else { m_Current = new UserInfo() { ID = "1234567890", userName = "Trial account", AccountString = "Trial account", userMobileInfo = "Trial account", userEmailInfo = "Trial account", language = "English", areaCode = "86", headImagePagePath = "LoginIcon/2.png", }; } } try { UserInfo temp = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>( HDL_ON/DAL/Server/HttpUtil.cs
@@ -16,6 +16,7 @@ /// <summary> /// 固定域名,正式环境 /// 公共域名就近解析 /// /// </summary> public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm @@ -145,6 +146,11 @@ /// <returns></returns> static ResponsePackNew RequestHttpsBase(Method method, string apiPath, string bodyParameterJson = null, Dictionary<string, object> queryDictionary = null, Dictionary<string, object> urlSegmentDictionary = null, string urlHead = "", string replaceToken = "", int mTimeout = 10) { //Dome模式登录 if(MainPage.NoLoginMode) { return new ResponsePackNew() { Code = "0" }; } #region HttpWebRequest try { HDL_ON/Entity/DB_ResidenceData.cs
@@ -30,7 +30,7 @@ { if (MainPage.NoLoginMode) { return new RegionInfoRes() { homeName = "本地模式" }; return new RegionInfoRes() { homeName = "HDL Home" ,id = "text000001"}; } else { HDL_ON/UI/MainPage.cs
@@ -171,6 +171,115 @@ /// <param name="pageShowEvent">主页显示之后触发的事件(没有住宅的话,则不会触发)</param> public static void GoUserPage(bool downloadData , bool isFirstOpen = false, Action pageShowEvent = null) { BaseView.RemoveAll(); #region 后退事件 BasePageView = new PageLayout(); BasePageView.ScrollEnabled = false; BasePageView.IsShowPoint = false; BasePageView.PageChange = (sender, e) => { if (e < BasePageView.ChildrenCount - 1) { BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent(); } try { ReturnRefreshAction?.Invoke(); ReturnRefreshAction = null; } catch (Exception ex) { Log($"后退事件异常:{ex.Message}"); } }; BaseView.AddChidren(BasePageView); var backView = new FrameLayout() { Y = Application.GetRealHeight(100), Width = Application.GetRealWidth(10), Height = Application.GetRealHeight(440), }; BaseView.AddChidren(backView); BtnBackIcon = new Button() { X = -Application.GetRealWidth(100), Gravity = Gravity.CenterVertical, Width = Application.GetRealWidth(88 / 2), Height = Application.GetRealHeight(56 / 2), UnSelectedImagePath = "Public/RightSlideBackIcon.png" }; BaseView.AddChidren(BtnBackIcon); backView.MouseMoveEventHandler = (sender, e) => { if (BasePageView.ChildrenCount <= 1) { return; } MainPage.Log($"move:{e.X}"); if (StartX == 0 && e.X < 30) { StartX = (int)e.X; } if (StartX < 30) { if (e.X < Application.GetRealWidth(100)) { BtnBackIcon.X = (int)e.X - Application.GetRealWidth(100); } } }; backView.MouseDownEventHandler = (sender, e) => { if (BasePageView.ChildrenCount <= 1) { return; } MainPage.Log($"down:{e.X}"); StartX = (int)e.X; BtnBackIcon.Y = (int)e.Y + Application.GetRealHeight(50); }; backView.MouseUpEventHandler = (sender, e) => { MainPage.Log($"up{e.X}"); StartX = 0; BtnBackIcon.X = -Application.GetRealWidth(100); if (e.X > 70) { if (BasePageView.ChildrenCount > 1) { BasePageView.PageIndex = BasePageView.ChildrenCount - 2; } } }; backView.MouseUpOutsideEventHandler = (sender, e) => { MainPage.Log($"up{e.X}"); StartX = 0; BtnBackIcon.X = -Application.GetRealWidth(100); if (e.X > 70) { if (BasePageView.ChildrenCount > 1) { BasePageView.PageIndex = BasePageView.ChildrenCount - 2; } } }; #endregion if (NoLoginMode) { //跳转页面---- var UserBasePage = new UserPage(); BasePageView.AddChidren(UserBasePage); UserBasePage.LoadPage(); BasePageView.PageIndex = 0; return; } //加载Loading效果 var waitPage = new Loading(); BaseView.AddChidren(waitPage); @@ -196,112 +305,12 @@ { waitPage.Hide(); waitPage.RemoveFromParent(); BaseView.RemoveAll(); BasePageView = new PageLayout(); BasePageView.ScrollEnabled = false; BasePageView.IsShowPoint = false; BasePageView.PageChange = (sender, e) => { if (e < BasePageView.ChildrenCount - 1) { BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent(); } try { ReturnRefreshAction?.Invoke(); ReturnRefreshAction = null; } catch (Exception ex) { Log($"后退事件异常:{ex.Message}"); } //while (e < BasePageView.ChildrenCount - 1) //{ // BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent(); //} }; BaseView.AddChidren(BasePageView); var backView = new FrameLayout() { Y = Application.GetRealHeight(100), Width = Application.GetRealWidth(10), Height = Application.GetRealHeight(440), }; BaseView.AddChidren(backView); BtnBackIcon = new Button() { X = -Application.GetRealWidth(100), Gravity = Gravity.CenterVertical, Width = Application.GetRealWidth(88/2), Height = Application.GetRealHeight(56/2), UnSelectedImagePath = "Public/RightSlideBackIcon.png" }; BaseView.AddChidren(BtnBackIcon); backView.MouseMoveEventHandler = (sender, e) => { if (BasePageView.ChildrenCount <= 1) { return; } MainPage.Log($"move:{e.X}"); if (StartX == 0 && e.X < 30) { StartX = (int)e.X; } if (StartX < 30 ) { if (e.X < Application.GetRealWidth(100)) { BtnBackIcon.X = (int)e.X - Application.GetRealWidth(100); } } }; backView.MouseDownEventHandler = (sender, e) => { if (BasePageView.ChildrenCount <= 1) { return; } MainPage.Log($"down:{e.X}"); StartX = (int)e.X; BtnBackIcon.Y = (int)e.Y + Application.GetRealHeight(50); }; backView.MouseUpEventHandler = (sender, e) => { MainPage.Log($"up{e.X}"); StartX = 0; BtnBackIcon.X = -Application.GetRealWidth(100); if (e.X > 70) { if (BasePageView.ChildrenCount > 1) { BasePageView.PageIndex = BasePageView.ChildrenCount - 2; } } }; backView.MouseUpOutsideEventHandler=(sender, e) => { MainPage.Log($"up{e.X}"); StartX = 0; BtnBackIcon.X = -Application.GetRealWidth(100); if (e.X > 70) { if (BasePageView.ChildrenCount > 1) { BasePageView.PageIndex = BasePageView.ChildrenCount - 2; } } }; //跳转页面---- var UserBasePage = new UserPage(); BasePageView.AddChidren(UserBasePage); UserBasePage.LoadPage(); BasePageView.PageIndex = 0; if (isFirstOpen) { @@ -320,16 +329,11 @@ { Application.RunOnMainThread(() => { if (downloadData) { ///初始化app数据 Common.ApiUtlis.Ins.DownloadData(); }; }); } }).Start(); HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs
@@ -31,7 +31,7 @@ } int tipHeight = Application.GetRealWidth(180 + btnTipNotY); this.Height = tipHeight + Application.GetRealHeight(17 ); this.Height = tipHeight + Application.GetRealHeight(17 +30); BtnTipNot = new Button() { @@ -49,7 +49,7 @@ //空空如也 Button btnTipNotText = new Button() { Y = tipHeight , Y = tipHeight + Application.GetRealHeight(10), Height = Application.GetRealHeight(17), Text = tipMsg, TextAlignment = TextAlignment.Center, HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -1,7 +1,9 @@ using System; using System.Collections.Generic; using System.Text.RegularExpressions; using System.Threading; using HDL_ON.DAL.Server; using HDL_ON.Entity; using HDL_ON.UI.CSS; using Shared; @@ -188,7 +190,32 @@ #if DEBUG btnIcon_bg.MouseUpEventHandler += (sender, e) => { //ESOnVideo.Current.Test(); MainPage.NoLoginMode = true; //楼层房间列表 var floor1 = new SpatialInfo("FLOOR") { roomName = "F1", parentId = DB_ResidenceData.Instance.CurrentRegion.id }; floor1.SaveRoomFile(); //处理房间列表 var room1 = new Room() { roomId = "r1", roomName = "客厅", parentId = "f1" }; room1.SaveRoomFile(); //功能 var light1 = new Function() { sid = "light1", deviceId = "light1", name = "RGB1", attributes = new List<FunctionAttributes>() { new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" }, new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="0",state = "0" }, new FunctionAttributes() { key = "rgb",value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" }, }, }; light1.SaveFunctionFile(); //场景 }; bool b = false; HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -200,11 +200,12 @@ Gravity = Gravity.CenterVertical, TextColor = CSS_Color.MainBackgroundColor, TextSize = CSS_FontSize.PromptFontSize_FirstLevel, TextID = StringId.InOutdoor, TextID = StringId.Outdoor, TextAlignment = TextAlignment.CenterLeft, }; if (tempSensorList.Count > 0 || humiSensorList.Count > 0) { btnEnvirValuesTitle.TextID = StringId.InOutdoor; btnEnvirValuesTitle.Width = Application.GetRealWidth(8)+ btnEnvirValuesTitle.GetTextWidth(); } environmentalView.AddChidren(btnEnvirValuesTitle); HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs
@@ -128,7 +128,7 @@ AddDeviceEvent?.Invoke(new Function()); this.CloseForm(); }); }else if(pack.Code == "10801") }else if(pack.Code == "10801" || pack.Code == "9") { var mes = ""; if (Language.CurrentLanguage == "Chinese")
