.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,25 +1,17 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-000929D421E8802E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs"> <Files> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="275" Column="53" /> <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="30" Column="10" /> <File FileName="HDL-ON_Android/Assets/Language.ini" /> <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="637" Column="53" /> <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs" Line="402" Column="64" /> <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1521" Column="7" /> <File FileName="HDL-ON_Android/Assets/Language.ini" Line="467" Column="1" /> <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="341" Column="46" /> <File FileName="HDL_ON/UI/MainPage.cs" Line="275" Column="45" /> <File FileName="HDL_ON/UI/UI2/UserPageBLL.cs" Line="6" Column="26" /> <File FileName="HDL_ON/UI/UI2/UserPage.cs" Line="571" Column="7" /> <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="101" Column="16" /> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="599" Column="27" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" Line="249" Column="22" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="238" Column="25" /> <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" Line="94" Column="26" /> <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="123" Column="1" /> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="16" Column="22" /> <File FileName="HDL_ON/Entity/Room.cs" Line="111" Column="43" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="244" Column="1" /> <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" Line="186" Column="39" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs" Line="142" Column="50" /> <File FileName="HDL_ON/Common/R.cs" Line="8" Column="15" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs" Line="229" Column="64" /> <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" Line="156" Column="50" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="242" Column="69" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -32,17 +24,45 @@ </Node> <Node name="Entity" expanded="True" /> <Node name="UI" expanded="True"> <Node name="CSS" expanded="True" /> <Node name="UI0-Public" expanded="True" /> <Node name="UI0-Stan" expanded="True"> <Node name="Form" expanded="True"> <Node name="Base" expanded="True" /> </Node> </Node> <Node name="UI2" expanded="True"> <Node name="3-Intelligence" expanded="True"> <Node name="Automation" expanded="True"> <Node name="AddLogic.cs" selected="True" /> </Node> <Node name="2-Classification" expanded="True"> <Node name="ClassificationPage.cs" selected="True" /> </Node> <Node name="3-Intelligence" expanded="True" /> <Node name="4-PersonalCenter" expanded="True"> <Node name="RoomListManage" expanded="True" /> </Node> <Node name="FuntionControlView" expanded="True"> <Node name="Electrical" expanded="True" /> </Node> </Node> </Node> </Node> <Node name="HDL-ON_Android" expanded="True"> <Node name="Assets" expanded="True"> <Node name="Phone" expanded="True"> <Node name="Classification" expanded="True" /> <Node name="FunctionIcon" expanded="True"> <Node name="IrFan" expanded="True" /> </Node> </Node> </Node> </Node> <Node name="HDL-ON_iOS" expanded="True"> <Node name="Resources" expanded="True" /> <Node name="Resources" expanded="True"> <Node name="Phone" expanded="True"> <Node name="Classification" expanded="True"> <Node name="Room" expanded="True" /> </Node> </Node> </Node> </Node> </Node> </State> @@ -62,10 +82,8 @@ <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/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/4-PersonalCenter/PersonalDataPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" line="546" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Common/ApiUtlis.cs" relfile="HDL_ON/Common/ApiUtlis.cs" line="117" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" line="255" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" line="327" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" line="191" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" relfile="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" line="213" column="1" /> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" relfile="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" line="232" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> HDL-ON_Android/Assets/Language.ini
@@ -463,6 +463,9 @@ 474=Swing up and down 475=Swing left and right 476=Add residence 477=Swing 478=Pattern 479=Air volume 1000=Room Humidity 1001=V-chip @@ -1519,6 +1522,9 @@ 474=上下扫风 475=左右扫风 476=添加住宅 477=摆动 478=模式 479=风量 1000=室内湿度 HDL-ON_Android/Assets/Phone/Classification/Room/AllCloseIcon2.png
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/FanIcon.png
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/HeadSwingingIcon.png
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/HeadSwingingIconOn.png
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PatternIcon.png
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PatternIconOn.png
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PowerIcon.png
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/PowerIconOn.png
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/SpeedIcon.png
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/SpeedIconOn.png
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/TimingIcon.png
HDL-ON_Android/Assets/Phone/FunctionIcon/IrFan/TimingIconOn.png
HDL-ON_Android/HDL-ON_Android.csproj
@@ -408,6 +408,18 @@ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconUD.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconUDOn.png" /> <AndroidAsset Include="Assets\Phone\Public\ScanGrey.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\FanIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\HeadSwingingIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\HeadSwingingIconOn.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PatternIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PatternIconOn.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PowerIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PowerIconOn.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\TimingIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\TimingIconOn.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\SpeedIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\SpeedIconOn.png" /> <AndroidAsset Include="Assets\Phone\Classification\Room\AllCloseIcon2.png" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\BindScene.png" /> @@ -1295,6 +1307,9 @@ <ItemGroup> <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorLock.png" /> </ItemGroup> <ItemGroup> <Folder Include="Assets\Phone\FunctionIcon\IrFan\" /> </ItemGroup> <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -27,7 +27,7 @@ <MtouchDebug>true</MtouchDebug> <CodesignKey>iPhone Developer</CodesignKey> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs> <CodesignProvision>On+Dev-20210428-1</CodesignProvision> <CodesignProvision>On+Dev-20210616-1</CodesignProvision> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' "> <DebugType>none</DebugType> @@ -450,6 +450,7 @@ <Folder Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\" /> <Folder Include="Resources\Phone\FunctionIcon\EnvirSensor\" /> <Folder Include="Resources\Phone\FunctionIcon\Energy\" /> <Folder Include="Resources\Phone\FunctionIcon\IrFan\" /> </ItemGroup> <ItemGroup> <InterfaceDefinition Include="LaunchScreen.storyboard" /> @@ -1291,6 +1292,18 @@ <BundleResource Include="Resources\Phone\FunctionIcon\AC\SweepIconUD.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\AC\SweepIconUDOn.png" /> <BundleResource Include="Resources\Phone\Public\ScanGrey.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\FanIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\PatternIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\PatternIconOn.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\PowerIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\PowerIconOn.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\TimingIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\TimingIconOn.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\SpeedIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\SpeedIconOn.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\HeadSwingingIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\HeadSwingingIconOn.png" /> <BundleResource Include="Resources\Phone\Classification\Room\AllCloseIcon2.png" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> HDL-ON_iOS/Resources/Language.ini
@@ -463,6 +463,9 @@ 474=Swing up and down 475=Swing left and right 476=Add residence 477=Swing 478=Pattern 479=Air volume 1000=Room Humidity 1001=V-chip @@ -1519,6 +1522,9 @@ 474=上下扫风 475=左右扫风 476=添加住宅 477=摆动 478=模式 479=风量 1000=室内湿度 HDL-ON_iOS/Resources/Phone/Classification/Room/AllCloseIcon2.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/FanIcon.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/HeadSwingingIcon.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/HeadSwingingIconOn.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PatternIcon.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PatternIconOn.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PowerIcon.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/PowerIconOn.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/SpeedIcon.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/SpeedIconOn.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/TimingIcon.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/IrFan/TimingIconOn.png
HDL_ON/Common/OnAppConfig.cs
@@ -46,6 +46,11 @@ public string SetLanguage = ""; /// <summary> /// 分类界面是否显示大图 /// </summary> public bool IsShowBigPicture = true; /// <summary> /// 最后一位登录的账号的ID /// </summary> public string LastLoginUserId = ""; HDL_ON/Common/R.cs
@@ -5,6 +5,18 @@ public static class StringId { /// <summary> /// 风量 /// </summary> public const int AirVolume = 479; /// <summary> /// 摆动 /// </summary> public const int Pattern = 478; /// <summary> /// 摆动 /// </summary> public const int HeadSwinging = 477; /// <summary> /// 添加住宅 /// </summary> public const int AddResidence = 476; HDL_ON/Common/UserInfo.cs
@@ -23,41 +23,41 @@ { get { //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", }; } return m_Current; } 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", }; } return m_Current; } try { HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -152,6 +152,10 @@ var clothesHangerpage = new ClothesHangerPage(); clothesHangerpage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor); break; case SPK.FanIr: var fanIr = new IrFanPage(); fanIr.AddForm(function, btnCollectionIcon, btnName, btnFromFloor); break; case SPK.AcIr: case SPK.AcStandard: var acPage = new AcControlPage(); HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -184,16 +184,22 @@ /// <summary> /// 显示方式切换按钮 /// </summary> //btnSwitchDipaly = new Button() //{ // X = Application.GetRealWidth(335), // Y = Application.GetRealHeight(12), // Width = Application.GetMinRealAverage(28), // Height = Application.GetMinRealAverage(28), // UnSelectedImagePath = "Classification/ToggleDisplayThumbnail.png",//缩略图 // SelectedImagePath = "Classification/ToggleDisplayLarge.png", //}; //roomFloorChangeView.AddChidren(btnSwitchDipaly); btnSwitchDipaly = new Button() { X = Application.GetRealWidth(335), Y = Application.GetRealHeight(12), Width = Application.GetMinRealAverage(28), Height = Application.GetMinRealAverage(28), UnSelectedImagePath = "Classification/ToggleDisplayThumbnail.png",//缩略图 SelectedImagePath = "Classification/ToggleDisplayLarge.png", IsSelected = OnAppConfig.Instance.IsShowBigPicture }; roomFloorChangeView.AddChidren(btnSwitchDipaly); btnSwitchDipaly.MouseUpEventHandler = (sender, e) => { OnAppConfig.Instance.IsShowBigPicture = !OnAppConfig.Instance.IsShowBigPicture; btnSwitchDipaly.IsSelected = OnAppConfig.Instance.IsShowBigPicture; LoadRoomRows(true); }; #endregion /// <summary> @@ -216,181 +222,406 @@ /// <summary> /// 加载房间列表区域 /// </summary> void LoadRoomRows() /// <param name="animationEffect">动画效果</param> void LoadRoomRows(bool animationEffect = false) { roomListView.RemoveAll(); foreach (var room in roomsShowed) if (animationEffect) { var roomView = new FrameLayout() ///移动方向 var runDirection = OnAppConfig.Instance.IsShowBigPicture ? 1 : -1; for (int i = 0; i < roomListView.ChildrenCount; i++) { Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(343), Height = Application.GetRealWidth(192),//2020-12-01 房间图片比例改回16:9 Radius = (uint)Application.GetRealWidth(12), Tag = room.roomId, }; roomListView.AddChidren(roomView); var childView = roomListView.GetChildren(i); var roomViewbg = new ImageView() { Width = Application.GetRealWidth(343), Height = Application.GetRealWidth(192),//2020-12-01 房间图片比例改回16:9 //ImagePath = room.backgroundImage, Radius = (uint)Application.GetRealWidth(12), }; roomView.AddChidren(roomViewbg); //2020-12-03 修改图片加载方法 ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg); var roomViewbgColor = new Button() { Radius = (uint)Application.GetRealWidth(12), BackgroundColor = 0x19333333, }; roomView.AddChidren(roomViewbgColor); var btnFloorAndRoomName = new Button() { X = Application.GetRealWidth(16), Y = Application.GetRealHeight(12 - 2), Width = Application.GetRealWidth(266), Height = Application.GetRealHeight(22 + 2 + 2), Text = room.floorName + room.roomName, TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.MainBackgroundColor, TextSize = CSS_FontSize.SubheadingFontSize, }; roomView.AddChidren(btnFloorAndRoomName); #region 环境数据 //var environmentalView = new FrameLayout() //{ // Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom, // Height = Application.GetRealHeight(32), // Tag = "EnvironmentalView", //}; //roomView.AddChidren(environmentalView); //Button btnTempIcon = new Button() //{ // X = Application.GetRealWidth(12), // Gravity = Gravity.CenterVertical, // Width = Application.GetMinRealAverage(16), // Height = Application.GetMinRealAverage(16), // UnSelectedImagePath = "Public/DeviceInfoIcon/TempIcon.png", //}; //environmentalView.AddChidren(btnTempIcon); //var btnTempValues = new Button() //{ // X = btnTempIcon.Right + Application.GetRealWidth(4), // Width = Application.GetRealWidth(30), // Gravity = Gravity.CenterVertical, // TextColor = CSS_Color.MainBackgroundColor, // TextSize = CSS_FontSize.PromptFontSize_FirstLevel, // Text = "--°", // TextAlignment = TextAlignment.CenterLeft, // Tag = "TempValues" //}; //environmentalView.AddChidren(btnTempValues); //Button btnHumidityIcon = new Button() //{ // X = btnTempValues.Right + Application.GetRealWidth(2), // Gravity = Gravity.CenterVertical, // Width = Application.GetMinRealAverage(16), // Height = Application.GetMinRealAverage(16), // UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png", //}; //environmentalView.AddChidren(btnHumidityIcon); //var btnHumidityValues = new Button() //{ // X = btnHumidityIcon.Right + Application.GetRealWidth(4), // Width = Application.GetRealWidth(30), // Gravity = Gravity.CenterVertical, // TextColor = CSS_Color.MainBackgroundColor, // TextSize = CSS_FontSize.PromptFontSize_FirstLevel, // Text = "--%", // TextAlignment = TextAlignment.CenterLeft, // Tag = "HumidityValues" //}; //environmentalView.AddChidren(btnHumidityValues); //Button btnPm25Icon = new Button() //{ // X = btnHumidityValues.Right + Application.GetRealWidth(2), // Gravity = Gravity.CenterVertical, // Width = Application.GetMinRealAverage(16), // Height = Application.GetMinRealAverage(16), // UnSelectedImagePath = "Public/DeviceInfoIcon/Pm25Icon.png", //}; //environmentalView.AddChidren(btnPm25Icon); //var btnPm25Values = new Button() //{ // X = btnPm25Icon.Right + Application.GetRealWidth(4), // Width = Application.GetRealWidth(30), // Gravity = Gravity.CenterVertical, // TextColor = CSS_Color.MainBackgroundColor, // TextSize = CSS_FontSize.PromptFontSize_FirstLevel, // Text = "--", // TextAlignment = TextAlignment.CenterLeft, // Tag = "Pm25Values" //}; //environmentalView.AddChidren(btnPm25Values); //roomView.AddChidren(environmentalView); #endregion var btnAllClose = new Button() { X = Application.GetRealWidth(282), Y = Application.GetRealWidth(126), Width = Application.GetMinRealAverage(58), Height = Application.GetMinRealAverage(58), UnSelectedImagePath = "Classification/Room/AllCloseIcon.png", Tag = "AllClose", Visible = false }; roomView.AddChidren(btnAllClose); LoadEvent_CloseAllFunction(btnAllClose, room); var btn = new Button() { Height = Application.GetRealWidth(20), }; roomListView.AddChidren(btn); roomViewbgColor.MouseUpEventHandler += (sender, e) => { Action ReloadRoomName = () => if (childView.GetType() == typeof(FrameLayout)) { btnFloorAndRoomName.Text = room.floorName + room.roomName; }; var roomView = childView as FrameLayout; //房间删除事件 Action deleteAction = () => //大图显示 if (OnAppConfig.Instance.IsShowBigPicture) { LoadBigPirtureRoomRow(roomView, roomsShowed[i/2]); } else//无图显示 { LoadSmallPirtureRoomRow(roomView, roomsShowed[i/2]); } } new System.Threading.Thread(() => { roomView.RemoveFromParent(); }; //需要移动的高度 var runHeight = Application.GetRealWidth(i / 2 * 142); //房间背景图修改事件回调 Action modifyImageAction = () => int runCount = 0; //循环次数,动画效果需要在1秒 (10次)内完成 while (runCount == 9) { System.Threading.Thread.Sleep(100); Application.RunOnMainThread(() => { if (childView.GetType() == typeof(FrameLayout)) { childView.Height += Application.GetRealWidth(14) * runDirection; } if (i > 0) { childView.Y += runDirection * Application.GetRealWidth(14 * i / 2); } }); runCount++; } Application.RunOnMainThread(() => { childView.Y += runHeight * runDirection; if (childView.GetType() == typeof(FrameLayout)) { if (runDirection == 1) { childView.Height = Application.GetRealWidth(192); } else { childView.Height = Application.GetRealWidth(70); } } }); }) { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start(); //if (childView.GetType() == typeof(Button)) //{ // new System.Threading.Thread(() => { // //循环次数,动画效果需要在1秒 (10次)内完成 // int runCount = 9; // //需要移动的高度 // var runHeight = i / 2 * Application.GetRealWidth(142); // while (runCount == 0) // { // System.Threading.Thread.Sleep(100); // Application.RunOnMainThread(() => // { // childView.Height += Application.GetRealWidth(14) * runDirection; // }); // } // Application.RunOnMainThread(() => // { // if (runDirection == 1) // { // childView.Height = Application.GetRealWidth(192 + 20); // } // else // { // childView.Height = Application.GetRealWidth(70 + 20); // } // }); // }) // { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start(); //} } } else { roomListView.RemoveAll(); foreach (var room in roomsShowed) { //大图显示 if (OnAppConfig.Instance.IsShowBigPicture) { //roomViewbg.ImagePath = room.backgroundImage; ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg); }; roomFloorChangeView.BackgroundColor = roomListView.BackgroundColor = CSS_Color.MainBackgroundColor; var roomView = new FrameLayout() { Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(343), Height = Application.GetRealWidth(192 + 20),//2020-12-01 房间图片比例改回16:9 Radius = (uint)Application.GetRealWidth(12), Tag = room.roomId, }; roomListView.AddChidren(roomView); var view = new RoomPage(room, ReloadRoomName, deleteAction, modifyImageAction); MainPage.BasePageView.AddChidren(view); view.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; LoadBigPirtureRoomRow(roomView, room); } else//无图显示 { roomFloorChangeView.BackgroundColor = roomListView.BackgroundColor = CSS_Color.BackgroundColor; var roomView = new FrameLayout() { Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(343), Height = Application.GetRealWidth(70 + 20), Radius = (uint)Application.GetRealWidth(12), Tag = room.roomId, BackgroundColor = CSS_Color.BackgroundColor, }; roomListView.AddChidren(roomView); LoadSmallPirtureRoomRow(roomView, room); } } } } /// <summary> /// 加载大图房间row /// </summary> /// <param name="roomView"></param> /// <param name="room"></param> void LoadBigPirtureRoomRow(FrameLayout roomView, Room room) { roomView.RemoveAll(); roomFloorChangeView.BackgroundColor = roomListView.BackgroundColor = CSS_Color.MainBackgroundColor; var roomViewbg = new ImageView() { Width = Application.GetRealWidth(343), Height = Application.GetRealWidth(192),//2020-12-01 房间图片比例改回16:9 Radius = (uint)Application.GetRealWidth(12), }; roomView.AddChidren(roomViewbg); //2020-12-03 修改图片加载方法 ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg); var btnFloorAndRoomName = new Button() { X = Application.GetRealWidth(16), Y = Application.GetRealHeight(12 - 2), Width = Application.GetRealWidth(266), Height = Application.GetRealHeight(22 + 2 + 2), Text = room.floorName + room.roomName, TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.MainBackgroundColor, TextSize = CSS_FontSize.SubheadingFontSize, }; roomView.AddChidren(btnFloorAndRoomName); #region 环境数据 //var environmentalView = new FrameLayout() //{ // Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom, // Height = Application.GetRealHeight(32), // Tag = "EnvironmentalView", //}; //roomView.AddChidren(environmentalView); //Button btnTempIcon = new Button() //{ // X = Application.GetRealWidth(12), // Gravity = Gravity.CenterVertical, // Width = Application.GetMinRealAverage(16), // Height = Application.GetMinRealAverage(16), // UnSelectedImagePath = "Public/DeviceInfoIcon/TempIcon.png", //}; //environmentalView.AddChidren(btnTempIcon); //var btnTempValues = new Button() //{ // X = btnTempIcon.Right + Application.GetRealWidth(4), // Width = Application.GetRealWidth(30), // Gravity = Gravity.CenterVertical, // TextColor = CSS_Color.MainBackgroundColor, // TextSize = CSS_FontSize.PromptFontSize_FirstLevel, // Text = "--°", // TextAlignment = TextAlignment.CenterLeft, // Tag = "TempValues" //}; //environmentalView.AddChidren(btnTempValues); //Button btnHumidityIcon = new Button() //{ // X = btnTempValues.Right + Application.GetRealWidth(2), // Gravity = Gravity.CenterVertical, // Width = Application.GetMinRealAverage(16), // Height = Application.GetMinRealAverage(16), // UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png", //}; //environmentalView.AddChidren(btnHumidityIcon); //var btnHumidityValues = new Button() //{ // X = btnHumidityIcon.Right + Application.GetRealWidth(4), // Width = Application.GetRealWidth(30), // Gravity = Gravity.CenterVertical, // TextColor = CSS_Color.MainBackgroundColor, // TextSize = CSS_FontSize.PromptFontSize_FirstLevel, // Text = "--%", // TextAlignment = TextAlignment.CenterLeft, // Tag = "HumidityValues" //}; //environmentalView.AddChidren(btnHumidityValues); //Button btnPm25Icon = new Button() //{ // X = btnHumidityValues.Right + Application.GetRealWidth(2), // Gravity = Gravity.CenterVertical, // Width = Application.GetMinRealAverage(16), // Height = Application.GetMinRealAverage(16), // UnSelectedImagePath = "Public/DeviceInfoIcon/Pm25Icon.png", //}; //environmentalView.AddChidren(btnPm25Icon); //var btnPm25Values = new Button() //{ // X = btnPm25Icon.Right + Application.GetRealWidth(4), // Width = Application.GetRealWidth(30), // Gravity = Gravity.CenterVertical, // TextColor = CSS_Color.MainBackgroundColor, // TextSize = CSS_FontSize.PromptFontSize_FirstLevel, // Text = "--", // TextAlignment = TextAlignment.CenterLeft, // Tag = "Pm25Values" //}; //environmentalView.AddChidren(btnPm25Values); //roomView.AddChidren(environmentalView); #endregion var roomViewbgColor = new Button() { Radius = (uint)Application.GetRealWidth(12), BackgroundColor = 0x19333333, }; roomView.AddChidren(roomViewbgColor); var btnAllClose = new Button() { X = Application.GetRealWidth(282), Y = Application.GetRealWidth(126), Width = Application.GetMinRealAverage(48), Height = Application.GetMinRealAverage(48), UnSelectedImagePath = "Classification/Room/AllCloseIcon.png", Tag = "AllClose", Visible = false }; roomView.AddChidren(btnAllClose); LoadEvent_CloseAllFunction(btnAllClose, room); var btn = new Button() { Y = Application.GetRealWidth(192), Height = Application.GetRealWidth(20), BackgroundColor = CSS_Color.MainBackgroundColor, }; roomView.AddChidren(btn); roomViewbgColor.MouseUpEventHandler += (sender, e) => { Action ReloadRoomName = () => { btnFloorAndRoomName.Text = room.floorName + room.roomName; }; //房间删除事件 Action deleteAction = () => { roomView.RemoveFromParent(); }; //房间背景图修改事件回调 Action modifyImageAction = () => { //roomViewbg.ImagePath = room.backgroundImage; ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg); }; var view = new RoomPage(room, ReloadRoomName, deleteAction, modifyImageAction); MainPage.BasePageView.AddChidren(view); view.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; } /// <summary> /// 记载小图房间row /// </summary> void LoadSmallPirtureRoomRow(FrameLayout roomView, Room room) { roomView.RemoveAll(); roomFloorChangeView.BackgroundColor = roomListView.BackgroundColor = CSS_Color.BackgroundColor; var btnRoomName = new Button() { X = Application.GetRealWidth(16), Y = Application.GetRealHeight(12 - 2), Width = Application.GetRealWidth(266), Height = Application.GetRealHeight(52), Text = room.roomName, TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.TextFontSize, }; roomView.AddChidren(btnRoomName); var btnFloorName = new Button() { X = Application.GetRealWidth(16), Y = Application.GetRealHeight(42), Width = Application.GetRealWidth(266), Height = Application.GetRealHeight(46), Text = room.floorName, TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.PromptingColor1, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, }; roomView.AddChidren(btnFloorName); var roomViewbg = new ImageView() { Width = Application.GetRealWidth(343), Height = Application.GetRealWidth(70), Radius = (uint)Application.GetRealWidth(12), }; roomView.AddChidren(roomViewbg); var btnAllClose = new Button() { X = Application.GetRealWidth(288), Gravity = Gravity.CenterVertical, Width = Application.GetMinRealAverage(58), Height = Application.GetMinRealAverage(58), UnSelectedImagePath = "Classification/Room/AllCloseIcon2.png", Tag = "AllClose", Visible = false }; roomView.AddChidren(btnAllClose); LoadEvent_CloseAllFunction(btnAllClose, room); var btn = new Button() { Y = Application.GetRealWidth(70), Height = Application.GetRealWidth(20), BackgroundColor = CSS_Color.MainBackgroundColor, }; roomView.AddChidren(btn); roomViewbg.MouseUpEventHandler += (sender, e) => { Action ReloadRoomName = () => { btnFloorName.Text = room.floorName; btnRoomName.Text = room.roomName; }; //房间删除事件 Action deleteAction = () => { roomView.RemoveFromParent(); }; Action action = () => { }; var view = new RoomPage(room, ReloadRoomName, deleteAction, action); MainPage.BasePageView.AddChidren(view); view.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; } /// <summary> /// 加载功能列表界面 /// </summary> void LoadFunctionPageView() HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -237,16 +237,18 @@ //体验模式 if(MainPage.NoLoginMode) { Button btnExit = new Button() { Y = Application.GetRealHeight(58) + personalInfoView.Bottom, Height = Application.GetRealHeight(50), Y = Application.GetRealHeight(258) + personalInfoView.Bottom, Gravity = Gravity.CenterHorizontal, Height = Application.GetRealHeight(60), Width = Application.GetRealWidth(330), TextAlignment = TextAlignment.Center, SelectedTextColor = CSS_Color.MainColor, TextColor = CSS_Color.BackgroundColor, TextColor = CSS_Color.WarningColor, TextSize = CSS_FontSize.SubheadingFontSize, TextID = StringId.NextStep, Radius = 10, BackgroundColor = CSS_Color.MainBackgroundColor, SelectedBackgroundColor = CSS_Color.MainBackgroundColor, }; @@ -262,7 +264,7 @@ { HDLCommon.Current.Logout(); }; bodyView.AddChidren(btnExit); return; } HDL_ON/UI/UI2/FuntionControlView/Electrical/ClothesHangerPage.cs
@@ -451,15 +451,16 @@ /// </summary> public bool Lighting = false; public ClothesHangerControl(string iconPath1, string iconPath2, string title, string time) public ClothesHangerControl(string unSelectedIconPath, string selectedIconPath, string title, string time) { btnIcon = new Button() { Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(28), Height = Application.GetRealWidth(28), UnSelectedImagePath = iconPath1, SelectedImagePath = iconPath2, UnSelectedImagePath = unSelectedIconPath, SelectedImagePath = selectedIconPath, }; this.AddChidren(btnIcon); HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs
@@ -1,10 +1,239 @@ using System; namespace HDL_ON.UI.UI2.FuntionControlView.Electrical using System.Collections.Generic; using HDL_ON.DriverLayer; using HDL_ON.Entity; using HDL_ON.Stan; using HDL_ON.UI.CSS; using Shared; namespace HDL_ON.UI { public class IrFanPage public class IrFanPage : DeviceFunctionCardCommonForm { public IrFanPage() #region ■ 变量声明___________________________ /// <summary> /// 图标 /// </summary> private Button btnIcon = null; #endregion #region ■ 初始化_____________________________ /// <summary> /// 初始化白色区域的内容 /// </summary> public override void InitFrameWhiteContent() { base.ShowColltionButton = false; base.SetTitleText(Language.StringByID(StringId.Electric)); //初始化第一个索引页的内容 this.InitFrameWhiteContent1(); ; } /// <summary> /// 初始化第一个索引页的内容 /// </summary> private void InitFrameWhiteContent1() { btnIcon = new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(88), Width = Application.GetRealWidth(134), Height = Application.GetRealHeight(134), UnSelectedImagePath = "FunctionIcon/IrFan/FanIcon.png", }; FrameWhiteCentet1.AddChidren(btnIcon); var patternView = new IrFanControl("FunctionIcon/IrFan/PatternIcon.png", "FunctionIcon/IrFan/PatternIconOn.png", Language.StringByID(StringId.Mode), ""); patternView.Y = Application.GetRealHeight(263); patternView.X = Application.GetRealWidth(57); patternView.Width = Application.GetRealWidth(96); patternView.Height = Application.GetRealHeight(74); FrameWhiteCentet1.AddChidren(patternView); EventHandler<MouseEventArgs> mode_EventHandler = (sender, e) => { Dictionary<string, string> d = new Dictionary<string, string>(); d.Add("mode", ""); Control.Ins.SendWriteCommand(device, d); }; patternView.SetThouchEvent(mode_EventHandler); var swingView = new IrFanControl("FunctionIcon/IrFan/HeadSwingingIcon.png", "FunctionIcon/IrFan/HeadSwingingIconOn.png", Language.StringByID(StringId.HeadSwinging), ""); swingView.Y = Application.GetRealHeight(263); swingView.X = Application.GetRealWidth(216); swingView.Width = Application.GetRealWidth(96); swingView.Height = Application.GetRealHeight(74); FrameWhiteCentet1.AddChidren(swingView); EventHandler<MouseEventArgs> swing_EventHandler = (sender, e) => { Dictionary<string, string> d = new Dictionary<string, string>(); d.Add("swing", ""); Control.Ins.SendWriteCommand(device, d); }; swingView.SetThouchEvent(swing_EventHandler); var timingView = new IrFanControl("FunctionIcon/IrFan/TimingIcon.png", "FunctionIcon/IrFan/TimingIconOn.png", Language.StringByID(StringId.Timing), ""); timingView.Y = Application.GetRealHeight(366); timingView.X = Application.GetRealWidth(57); timingView.Width = Application.GetRealWidth(96); timingView.Height = Application.GetRealHeight(74); FrameWhiteCentet1.AddChidren(timingView); EventHandler<MouseEventArgs> timing_EventHandler = (sender, e) => { Dictionary<string, string> d = new Dictionary<string, string>(); d.Add("timer", ""); Control.Ins.SendWriteCommand(device, d); }; timingView.SetThouchEvent(timing_EventHandler); var airVolumeView = new IrFanControl("FunctionIcon/IrFan/SpeedIcon.png", "FunctionIcon/IrFan/SpeedIconOn.png", Language.StringByID(StringId.AirVolume), ""); airVolumeView.Y = Application.GetRealHeight(263); airVolumeView.X = Application.GetRealWidth(216); airVolumeView.Width = Application.GetRealWidth(96); airVolumeView.Height = Application.GetRealHeight(74); FrameWhiteCentet1.AddChidren(airVolumeView); EventHandler<MouseEventArgs> speed_EventHandler = (sender, e) => { Dictionary<string, string> d = new Dictionary<string, string>(); d.Add("speed", ""); Control.Ins.SendWriteCommand(device, d); }; airVolumeView.SetThouchEvent(speed_EventHandler); Button btnPower = new Button() { Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(468), Width = Application.GetRealWidth(32), Height = Application.GetRealWidth(32), UnSelectedImagePath = "FunctionIcon/IrFan/PowerIcon.png", SelectedImagePath = "FunctionIcon/IrFan/PowerIconOn.png" }; FrameWhiteCentet1.AddChidren(btnPower); btnPower.MouseDownEventHandler = (sender, e) => { btnPower.IsSelected = true; }; btnPower.MouseUpEventHandler = (sender, e) => { new System.Threading.Thread(() => { Dictionary<string, string> d = new Dictionary<string, string>(); d.Add(FunctionAttributeKey.OnOff, ""); Control.Ins.SendWriteCommand(device, d); System.Threading.Thread.Sleep(500); Application.RunOnMainThread(() => { btnPower.IsSelected = false; }); }) { IsBackground = true }.Start(); }; } #endregion #region ■ 设备状态反馈_______________________ /// <summary> /// 设备状态反馈 /// </summary> /// <param name="i_LocalDevice"></param> public override void DeviceStatuPush(Function i_LocalDevice) { } #endregion } } public class IrFanControl : FrameLayout { private Button btnIcon; private Button btnTitle; public bool Lighting = false; public IrFanControl(string unSelectedIconPath, string selectedIconPath, string title, string time) { btnIcon = new Button() { Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(28), Height = Application.GetRealWidth(28), UnSelectedImagePath = unSelectedIconPath, SelectedImagePath = selectedIconPath, }; this.AddChidren(btnIcon); btnTitle = new Button() { Gravity = Gravity.Center, Text = title, Height = Application.GetRealHeight(42), TextColor = CSS_Color.TextualColor, SelectedTextColor = CSS_Color.MainColor, TextSize = CSS_FontSize.PromptFontSize_FirstLevel, }; this.AddChidren(btnTitle); } public void SetViewStatus(bool state) { btnIcon.IsSelected = btnTitle.IsSelected = Lighting = state; } /// <summary> /// 设置点击事件 /// </summary> public void SetThouchEvent(EventHandler<MouseEventArgs> eventHandler) { btnIcon.MouseUpEventHandler = eventHandler; btnTitle.MouseUpEventHandler = eventHandler; btnIcon.MouseDownEventHandler = (sender, e) => { btnIcon.IsSelected = true; }; btnTitle.MouseDownEventHandler = (sender, e) => { btnIcon.IsSelected = true; }; btnIcon.MouseUpEventHandler += (sender, e) => { new System.Threading.Thread(() => { System.Threading.Thread.Sleep(500); Application.RunOnMainThread(() => { btnIcon.IsSelected = true; }); }) { IsBackground = true }.Start(); }; btnTitle.MouseUpEventHandler += (sender, e) => { new System.Threading.Thread(() => { System.Threading.Thread.Sleep(500); Application.RunOnMainThread(() => { btnIcon.IsSelected = true; }); }) { IsBackground = true }.Start(); }; } } }