.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,47 +1,35 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/1-HomePage/HomePage.cs"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.26569F89-0BA9-4C06-81F2-764A3AF2E1B7" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_Android/Application.cs"> <Files> <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="1062" Column="62" /> <File FileName="HDL_ON/UI/UI0-Public/TopViewDiv.cs" Line="151" Column="14" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" /> <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" /> <File FileName="HDL_ON/Common/FileUtlis.cs" /> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" /> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" /> <File FileName="HDL_ON/Entity/Function/Scene.cs" Line="176" Column="1" /> <File FileName="HDL_ON/Common/ApiUtlis.cs" /> <File FileName="HDL_ON/UI/UI0-Public/AppUnlockPage.cs" Line="8" Column="31" /> <File FileName="HDL-ON_Android/Application.cs" Line="329" Column="58" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL_ON" expanded="True"> <Node name="Common" expanded="True" /> <Node name="DAL" expanded="True"> <Node name="Server" expanded="True" /> </Node> <Node name="Entity" expanded="True"> <Node name="ResponseEntity" expanded="True" /> </Node> <Node name="DAL" expanded="True" /> <Node name="Entity" expanded="True" /> <Node name="UI" expanded="True"> <Node name="UI0-Public" expanded="True" /> <Node name="UI0-Stan" expanded="True"> <Node name="Form" expanded="True" /> </Node> <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="1-HomePage" expanded="True"> <Node name="HomePage.cs" selected="True" /> </Node> <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="PirDevice" expanded="True" /> </Node> <Node name="FuntionControlView" expanded="True"> <Node name="AC" expanded="True" /> <Node name="Curtain" expanded="True" /> <Node name="Electrical" expanded="True" /> <Node name="FoolHeating" expanded="True" /> <Node name="Light" expanded="True" /> </Node> </Node> </Node> </Node> <Node name="HDL-ON_Android" expanded="True"> <Node name="Application.cs" selected="True" /> </Node> <Node name="HDL-ON_iOS" expanded="True" /> </Node> @@ -55,12 +43,13 @@ <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String> <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" /> <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/UI2/3-Intelligence/Scene/SceneAddPage.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs" line="822" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> HDL_ON/Common/ApiUtlis.cs
@@ -187,34 +187,37 @@ { 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);//操作完的数据清理掉，剩下的就是新增的功能 } } //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(); //处理剩下的新增功能 foreach (var tempScene in sceneList) { HDL_ON/Entity/Function/Scene.cs
@@ -84,6 +84,11 @@ /// </summary> public bool collect = false; /// <summary> /// 创建该场景的用户ID /// </summary> public string userId = ""; ///// <summary> ///// 场景背景 ///// </summary> @@ -138,13 +143,14 @@ sTimeSpan = arry[0].ToString("X2") + arry[1].ToString("X2") + arry[2].ToString("X2") + arry[3].ToString("X2"); if (sTimeSpan.Length > 8) if (sTimeSpan.Length >= 8) { sTimeSpan = sTimeSpan.Substring(0, 8); } else { sTimeSpan = "00000000"; sTimeSpan = Guid.NewGuid().ToString().Substring(0, 8); //sTimeSpan = "00000000"; } sceneId = sOidBeginsWith + sTimeSpan; HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -199,13 +199,13 @@ //return; if (b) { //etAccount.Text = "13375012446"; etAccount.Text = "13375012446";//测试服务器 //etAccount.Text = "1033326940@qq.com"; //etAccount.Text = "18022428438";//wjc //etAccount.Text = "13602944661";//kx //etAccount.Text = "13226233133";//豆豆 //etAccount.Text = "18316672920";//lcg "18316672920";//hzx;// "13415629083"//cf;; etAccount.Text = "18316120654";//tujie //etAccount.Text = "18316120654";//tujie // "15622703419"lwn;// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568 } else HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -738,7 +738,7 @@ SelectedImagePath = "Collection/CollectionWhiteIcon.png", UnSelectedImagePath = "Collection/CollectionIcon.png", }; //view.AddChidren(btnCollection); view.AddChidren(btnCollection); //2020-12-16 如果是成员隐藏收藏功能 //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //{ @@ -1012,10 +1012,10 @@ Width = Application.GetRealWidth(32), UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png", }; //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //{ // view.AddChidren(btnSettingIcon); //} if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) { view.AddChidren(btnSettingIcon); } Button btnName; btnName = new Button() @@ -1057,7 +1057,7 @@ SelectedImagePath = "Collection/CollectionWhiteIcon.png", UnSelectedImagePath = "Collection/CollectionIcon.png", }; //view.AddChidren(btnCollection); view.AddChidren(btnCollection); //2020-12-16 如果是成员隐藏收藏功能 //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //{ HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -189,7 +189,7 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = scene.collect }; //bodyDiv.AddChidren(btnCollectionIcon); bodyDiv.AddChidren(btnCollectionIcon); //2020-12-16 如果是成员隐藏收藏功能 //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //{ HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -130,7 +130,7 @@ Height = Application.GetMinRealAverage(28), UnSelectedImagePath = "Public/AddIcon.png", }; if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) { topView.AddChidren(btnAddIconBg); } @@ -140,7 +140,7 @@ Width = Application.GetMinRealAverage(28+30), Height = Application.GetMinRealAverage(28+29), }; if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) { topView.AddChidren(btnAddIcon); } @@ -396,7 +396,7 @@ Width = Application.GetRealWidth(32), UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png", }; if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) if (scene.userId == UserInfo.Current.ID) { view.AddChidren(btnSettingIcon); } HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
@@ -802,6 +802,7 @@ } /// <summary> /// 创建场景 /// 完成按钮点击事件 /// </summary> void LoadEvent_CompleteEvent() HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -135,7 +135,7 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = function.collect }; //controlView.AddChidren(btnCollection); controlView.AddChidren(btnCollection); //2020-12-16 如果是成员隐藏收藏功能 //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //{ HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
@@ -109,7 +109,7 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = function.collect }; //controlView.AddChidren(btnCollection); controlView.AddChidren(btnCollection); //2020-12-16 如果是成员隐藏收藏功能 //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //{ HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
@@ -127,7 +127,7 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = function.collect }; //controlView.AddChidren(btnCollection); controlView.AddChidren(btnCollection); //2020-12-16 如果是成员隐藏收藏功能 //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //{ HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
@@ -127,7 +127,7 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = function.collect }; //controlView.AddChidren(btnCollection); controlView.AddChidren(btnCollection); //2020-12-16 如果是成员隐藏收藏功能 //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //{ HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
@@ -102,7 +102,7 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = function.collect }; //controlView.AddChidren(btnCollection); controlView.AddChidren(btnCollection); //2020-12-16 如果是成员隐藏收藏功能 //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //{ HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
@@ -101,7 +101,7 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = function.collect }; //controlView.AddChidren(btnCollection); controlView.AddChidren(btnCollection); //2020-12-16 如果是成员隐藏收藏功能 //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //{ HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
@@ -117,14 +117,14 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = function.collect }; //controlView.AddChidren(btnCollection); controlView.AddChidren(btnCollection); //2020-12-16 如果是成员隐藏收藏功能 //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //{ // controlView.AddChidren(btnCollection); //} #region 轮盘控制区域 topMenuView = new FrameLayout() HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
@@ -131,7 +131,7 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = function.collect }; //controlView.AddChidren(btnCollection); controlView.AddChidren(btnCollection); //2020-12-16 如果是成员隐藏收藏功能 //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //{ HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs
@@ -130,7 +130,7 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = function.collect }; //controlView.AddChidren(btnCollection); controlView.AddChidren(btnCollection); //2020-12-16 如果是成员隐藏收藏功能 //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //{ HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
@@ -124,7 +124,7 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = function.collect }; //controlView.AddChidren(btnCollection); controlView.AddChidren(btnCollection); //2020-12-16 如果是成员隐藏收藏功能 //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //{ HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -139,7 +139,7 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = function.collect }; //controlView.AddChidren(btnCollection); controlView.AddChidren(btnCollection); //2020-12-16 如果是成员隐藏收藏功能 //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //{ HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
@@ -123,7 +123,7 @@ UnSelectedImagePath = "Collection/CollectionGrayIcon.png", IsSelected = function.collect }; //controlView.AddChidren(btnCollection); controlView.AddChidren(btnCollection); //2020-12-16 如果是成员隐藏收藏功能 //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare) //{
