.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,29 +1,51 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <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/Common/HDLCommon.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/1-HomePage/HomePage.cs"> <Files> <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1104" Column="8" /> <File FileName="HDL_ON/Common/R.cs" /> <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" /> <File FileName="HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs" /> <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" /> <File FileName="HDL-ON_iOS/Info.plist" /> <File FileName="HDL_ON/UI/MainPage.cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs" Line="124" Column="46" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="616" Column="84" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs" Line="331" Column="15" /> <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="758" Column="56" /> <File FileName="HDL_ON/Common/HDLCommon.cs" Line="500" Column="21" /> <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" /> <File FileName="HDL_ON/DAL/Server/NewAPI.cs" /> <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs" Line="127" Column="67" /> <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" Line="326" Column="36" /> <File FileName="HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs" Line="14" Column="78" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/AC/AcControlPage.cs" Line="520" Column="18" /> <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="891" Column="49" /> <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" Line="174" Column="28" /> </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="HDLCommon.cs" selected="True" /> <Node name="DAL" expanded="True"> <Node name="DriverLayer" expanded="True" /> </Node> <Node name="Entity" expanded="True" /> <Node name="UI" expanded="True"> <Node name="UI0-Public" 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="FuntionControlView" expanded="True"> <Node name="AC" expanded="True" /> <Node name="Electrical" 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="FunctionIcon" expanded="True"> <Node name="Icon" expanded="True" /> </Node> </Node> </Node> </Node> </Node> </State> @@ -36,7 +58,7 @@ <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 /> HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202103094" android:versionName="1.1.202103094" package="com.hdl.onpro"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202103101" android:versionName="1.1.202103101" package="com.hdl.onpro"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" /> <!-- 定位权限--> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -444,6 +444,7 @@ <Folder Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\" /> <Folder Include="Resources\Phone\FunctionIcon\ArmSensor\" /> <Folder Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\" /> <Folder Include="Resources\Phone\FunctionIcon\Icon\" /> </ItemGroup> <ItemGroup> <InterfaceDefinition Include="LaunchScreen.storyboard" /> @@ -1058,6 +1059,88 @@ <BundleResource Include="Resources\Phone\PirIcon\next.png" /> <BundleResource Include="Resources\Phone\LogicIcon\selected+.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\AC\More.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irtv.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\acstandard.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\airFreshstandard.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\curtainroller.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\curtainshades.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\curtainswitch.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\curtaintrietex.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalai6HtccKFIw3dxo3.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalfan.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalkoiGhMKwLf2ZP81g.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalQ1RsefNf91tIXyyQ.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalracks.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalsocket.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricaltv.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricaltyqborgovyzytytz.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\floorHeatstandard.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irac.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irlearn.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightcct.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightdimming.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightrgb.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightrgbw.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightswitch.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\musicstandard.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorco2.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensordoorwindow.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorgas.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorhumidity.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorpir.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorpm25.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorsmoke.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensortemperature.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensortvoc.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorwater.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightrgbw_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irac_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricaltv_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalai6HtccKFIw3dxo3_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtaintrietex_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\floorHeatstandard_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\musicstandard_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalfan_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainswitch_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightdimming_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightrgbw_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricaltyqborgovyzytytz_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\airFreshstandard_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightrgb_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irtv_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irlearn_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\musicstandard_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalfan_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainshades_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalkoiGhMKwLf2ZP81g_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irac_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalkoiGhMKwLf2ZP81g_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\acstandard_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightcct_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalracks_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalai6HtccKFIw3dxo3_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightswitch_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtaintrietex_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\airFreshstandard_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\floorHeatstandard_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainshades_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalQ1RsefNf91tIXyyQ_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricaltyqborgovyzytytz_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightcct_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightrgb_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainroller_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainroller_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalQ1RsefNf91tIXyyQ_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irtv_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalsocket_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightswitch_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightdimming_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricaltv_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalsocket_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\acstandard_blue.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irlearn_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainswitch_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalracks_white.png" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> HDL-ON_iOS/Info.plist
@@ -104,9 +104,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.1.202103093</string> <string>1.1.202103101</string> <key>CFBundleVersion</key> <string>202103093</string> <string>202103101</string> <key>NSLocationWhenInUseUsageDescription</key> <string>Use geographic location to provide services such as weather</string> <key>NSAppleMusicUsageDescription</key> HDL-ON_iOS/Resources/Language.ini
@@ -417,6 +417,7 @@ 432=Other platform equipment is supported by third party service provider 433=Water valve 434=Time switch 435=Remote control 1002=Anion @@ -1100,6 +1101,7 @@ 432=其他平台设备均由第三方服务商提供支持 433=水阀 434=定时开关 435=遥控器 1000=室内湿度 HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/.DS_StoreBinary files differ
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/acstandard_blue.png
@@ -356,12 +356,15 @@ catch { } finally { #region 读取本地数据 //读取音乐信息 UI.Music.A31MusicModel.ReadMusicStates(); //搜索网关 DriverLayer.Control.Ins.SearchLoaclGateway(); #endregion if (DB_ResidenceData.Instance.CurrentRegion != null) { #region 读取本地数据 //读取音乐信息 UI.Music.A31MusicModel.ReadMusicStates(); //搜索网关 DriverLayer.Control.Ins.SearchLoaclGateway(); #endregion } } }) { IsBackground = true }.Start(); HDL_ON/Common/FileUtlis.cs
@@ -48,6 +48,10 @@ { get { if(DB_ResidenceData.Instance.CurrentRegion == null) { return AccountPath; } if (string.IsNullOrEmpty(regionPath) || !regionPath.Contains(DB_ResidenceData.Instance.CurrentRegion.RegionID )) { regionPath = Path.Combine(AccountPath, DB_ResidenceData.Instance.CurrentRegion.RegionID); @@ -305,6 +309,9 @@ } } }); }else { action?.Invoke(); } }
@@ -4,6 +4,7 @@ { public static class StringId { public const int RemoteControl = 435; public const int TimeSwitch = 434; public const int WaterValve = 433; public const int Use3tyBrandListTip = 432; HDL_ON/Common/Utlis.cs
@@ -42,6 +42,7 @@ { Text = mes, CloseTime = closeTime, MaxWidth = Application.GetRealWidth(300), Direction = AMPopTipDirection.None }; tip.Show(MainPage.BaseView); HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs
@@ -86,6 +86,17 @@ } } /// <summary> /// 本地控制红外设备功能主题 /// </summary> public string ControlIrFunctionTopic { get { return $"/base/${Control.Ins.GatewayId}/thing/property/down"; } } /// <summary> /// 读取功能状态 /// </summary> public string ReadStatus HDL_ON/Entity/Function/Function.cs
@@ -140,8 +140,16 @@ return true; } /// <summary> /// icon文件名称 /// </summary> public string IconName { get { return spk.Replace(".",""); } } /// <summary> /// 上一次打开的亮度 @@ -529,8 +537,6 @@ var sendDataObj = new AlinkFunctionStatusObj(); sendDataObj.id = Control.Ins.msg_id.ToString(); sendDataObj.time_stamp = Utlis.GetTimestamp(); var acd = new AlinkStatusData(); acd.sid = sid; foreach (var dic in commandDictionary) @@ -540,9 +546,7 @@ aca.value = dic.Value; acd.status.Add(aca); } sendDataObj.objects.Add(acd); return sendDataObj; } /// <summary> @@ -717,9 +721,22 @@ /// </summary> public const string FanSpeed = "fan"; /// <summary> /// 手动风向 /// </summary> public const string FanManual = "fan_manual"; /// <summary> /// 自动风向 /// </summary> public const string FanAuto = "fan_auto"; /// <summary> /// 设置温度 /// </summary> public const string SetTemp = "set_temp"; /// <summary> /// 温度加减 /// </summary> public const string SetTempStep = "set_temp_step"; /// <summary> /// 温度模式 /// 空调、地热//app自加 @@ -818,6 +835,10 @@ /// 打开登记(风扇) /// </summary> public const string OpenLevel = "openLevel"; /// <summary> /// 红外按键 /// </summary> public const string Key = "key"; #region tuya @@ -1004,6 +1025,10 @@ /// </summary> public const string ElectricTV = "electrical.tv"; /// <summary> /// 红外、电视 /// </summary> public const string IrTV = "ir.tv"; /// <summary> /// 家电、风扇 /// </summary> public const string ElectricFan = "electrical.fan"; @@ -1035,6 +1060,10 @@ /// 红外空调 /// </summary> public const string IrAC = "ir.ac"; /// <summary> /// 红外遥控器 /// </summary> public const string IrLearn = "ir.learn"; /// <summary> HDL_ON/Entity/FunctionList.cs
@@ -97,11 +97,21 @@ return Functions.FindAll((obj) => obj.spk == SPK.ElectricFan || obj.spk == SPK.ElectricTuyaFan || obj.spk == SPK.ElectricSocket || obj.spk == SPK.IrLearn || obj.spk == SPK.IrTV || obj.spk == SPK.ElectricTV || obj.spk == SPK.ElectricTuyaAirCleaner || obj.spk == SPK.ElectricTuyaWeepRobot || obj.spk == SPK.ElectricTuyaWaterValve || obj.spk == SPK.ClothesHanger); } /// <summary> /// 遥控器列表 /// </summary> /// <returns></returns> public List<Function> GetIrLearinList() { return Functions.FindAll((obj) => obj.spk == SPK.IrLearn); } /// <summary> /// 风扇列表 @@ -115,7 +125,7 @@ /// </summary> public List<Function> GetTVList() { return Functions.FindAll((obj) => obj.spk == SPK.ElectricTV); return Functions.FindAll((obj) => obj.spk == SPK.ElectricTV || obj.spk == SPK.IrTV); } /// <summary> /// 家电插座列表 HDL_ON/HDL_ON.projitems
@@ -360,6 +360,7 @@ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\Matching.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\PirNameView.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\BrandListPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Electrical\IrLearnPage.cs" /> </ItemGroup> <ItemGroup> <Folder Include="$(MSBuildThisFileDirectory)UI\" /> HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "1.1.0309"; public static string VersionString = "1.1.0310"; ///// <summary> ///// 客户端类型 ///// </summary> HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -75,6 +75,7 @@ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; break; case SPK.ElectricTV: case SPK.IrTV: var tvView = new TVPage(function); MainPage.BasePageView.AddChidren(tvView); tvView.LoadPage(btnCollectionIcon, btnName, btnFromFloor); @@ -138,6 +139,10 @@ var acPage = new AcControlPage(); acPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor); break; case SPK.IrLearn: var irLearinPage = new IrLearnPage(); irLearinPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor); break; } }; return eventHandler; HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
@@ -271,6 +271,7 @@ { CloseTime = 1, Direction = AMPopTipDirection.None, MaxWidth = Application.GetRealWidth(300), Text = Language.StringByID(StringId.IncorrectRepeatPassword) }.Show(bodyView); } HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
@@ -299,7 +299,8 @@ { CloseTime = 1, Direction = AMPopTipDirection.None, Text = Language.StringByID(StringId.IncorrectRepeatPassword) Text = Language.StringByID(StringId.IncorrectRepeatPassword), MaxWidth = Application.GetRealWidth(300), }.Show(bodyView); } else HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -877,58 +877,62 @@ }; view.AddChidren(btnSwitch); switch (function.Spk_Prefix) { //todo 增加设备，主页收藏图标 case FunctionCategory.Light: #region 灯光 Light btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightIcon.png"; btnIcon.SelectedImagePath = "FunctionIcon/Light/LightOnIcon.png"; UpdataFunctionStates(function); #endregion break; case FunctionCategory.AC: #region 空调 AC btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcIcon.png"; btnIcon.SelectedImagePath = "FunctionIcon/AC/AcOnIcon.png"; #endregion break; case FunctionCategory.FloorHeat: #region 地热 btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingIcon.png"; btnIcon.SelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingOnIcon.png"; #endregion break; case FunctionCategory.Electric: switch (function.spk) { case SPK.ElectricSocket: btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketIcon.png"; btnIcon.SelectedImagePath = "FunctionIcon/Socket/SocketOnIcon.png"; break; case SPK.ElectricFan: btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanIcon.png"; btnIcon.SelectedImagePath = "FunctionIcon/Electrical/FanOnIcon.png"; break; case SPK.ElectricTuyaAirCleaner: btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/AirCleanerIcon.png"; btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/AirCleanerIconOn.png"; break; case SPK.ElectricTuyaFan: btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/FanIcon.png"; btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/FanIconOn.png"; break; case SPK.ElectricTuyaWaterValve: btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/WaterValveIcon.png"; btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/WaterValveIconOn.png"; break; case SPK.ElectricTuyaWeepRobot: btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/WeepRobotIcon.png"; btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/WeepRobotIconOn.png"; break; } break; } btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png"; btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png"; //switch (function.Spk_Prefix) //{ // //todo 增加设备，主页收藏图标 // case FunctionCategory.Light: // #region 灯光 Light // btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightIcon.png"; // btnIcon.SelectedImagePath = "FunctionIcon/Light/LightOnIcon.png"; // UpdataFunctionStates(function); // #endregion // break; // case FunctionCategory.AC: // #region 空调 AC // btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcIcon.png"; // btnIcon.SelectedImagePath = "FunctionIcon/AC/AcOnIcon.png"; // #endregion // break; // case FunctionCategory.FloorHeat: // #region 地热 // btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingIcon.png"; // btnIcon.SelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingOnIcon.png"; // #endregion // break; // case FunctionCategory.Electric: // switch (function.spk) // { // case SPK.ElectricSocket: // btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketIcon.png"; // btnIcon.SelectedImagePath = "FunctionIcon/Socket/SocketOnIcon.png"; // break; // case SPK.ElectricFan: // btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanIcon.png"; // btnIcon.SelectedImagePath = "FunctionIcon/Electrical/FanOnIcon.png"; // break; // case SPK.ElectricTuyaAirCleaner: // btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/AirCleanerIcon.png"; // btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/AirCleanerIconOn.png"; // break; // case SPK.ElectricTuyaFan: // btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/FanIcon.png"; // btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/FanIconOn.png"; // break; // case SPK.ElectricTuyaWaterValve: // btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/WaterValveIcon.png"; // btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/WaterValveIconOn.png"; // break; // case SPK.ElectricTuyaWeepRobot: // btnIcon.SelectedImagePath = "FunctionIcon/HomePageIcon/WeepRobotIcon.png"; // btnIcon.UnSelectedImagePath = "FunctionIcon/HomePageIcon/WeepRobotIconOn.png"; // break; // } // break; //} LoadEvent_SwitchFunction(function, btnSwitch); } //取消收藏事件 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -61,6 +61,69 @@ } LoadDiv(); //switch (function.spk) //{ // case SPK.CurtainSwitch: // btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png"; // break; // case SPK.CurtainTrietex: // btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/MotorCurtainIcon.png"; // break; // case SPK.CurtainRoller: // btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/RollingShutterIcon.png"; // break; // case SPK.SensorPir: // btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorPirIcon.png"; // break; // case SPK.SensorWater: // btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorWaterImmersionIcon.png"; // break; // case SPK.SensorSmoke: // btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorSmokeIcon.png"; // break; // case SPK.SensorDoorWindow: // btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorDoorIcon.png"; // break; // case SPK.MusicStandard: // btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicThinIcon.png"; // break; // case SPK.ClothesHanger: // btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerGrayIcon.png"; // break; // case SPK.ElectricSocket: // btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png"; // break; // case SPK.ElectricFan: // case SPK.ElectricTuyaFan: // btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanThinIcon.png"; // break; // case SPK.ElectricTV: // btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png"; // break; // case SPK.ElectricTuyaAirCleaner: // btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/AirCleanerThiinIcon.png"; // break; // case SPK.ElectricTuyaWeepRobot: // btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobotThinIcon.png"; // break; // case SPK.ElectricTuyaWaterValve: // btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WaterValve/WaterValveIcon.png"; // break; // case SPK.AcStandard: // btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png"; // break; // case SPK.AcIr: // btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png"; // break; // case SPK.FloorHeatStandard: // btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png"; // break; // default: // btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png"; // break; //} btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png"; if (function.Spk_Prefix == FunctionCategory.Curtain//窗帘没有开关按钮 || function.Spk_Prefix == FunctionCategory.Music//音乐没有开关按钮 || function.Spk_Prefix == FunctionCategory.Sensor//传感器没有开关按钮 @@ -69,39 +132,10 @@ switch (function.Spk_Prefix) { case FunctionCategory.Curtain: switch (function.spk) { case SPK.CurtainSwitch: btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png"; break; case SPK.CurtainTrietex: btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/MotorCurtainIcon.png"; break; case SPK.CurtainRoller: btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/RollingShutterIcon.png"; break; } CurtainFragment(); break; case FunctionCategory.Sensor: switch (function.spk) { case SPK.SensorPir: btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorPirIcon.png"; break; case SPK.SensorWater: btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorWaterImmersionIcon.png"; break; case SPK.SensorSmoke: btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorSmokeIcon.png"; break; case SPK.SensorDoorWindow: btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorDoorIcon.png"; break; default: break; } var powerLowTipAttr = function.attributes.Find((obj) => obj.key == FunctionAttributeKey.BatteryState); if (powerLowTipAttr != null) { @@ -122,7 +156,6 @@ break; case FunctionCategory.Music: btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicThinIcon.png"; MusicFragment(); break; @@ -132,7 +165,6 @@ { if (function.spk == SPK.ClothesHanger)//晾衣架 { btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerGrayIcon.png"; ClothesHangerFragment(); } else @@ -181,60 +213,20 @@ switch (function.Spk_Prefix) { case FunctionCategory.AC: switch (function.spk) { case SPK.AcStandard: btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png"; LoadLastStatesButton(); break; } LoadLastStatesButton(); break; case FunctionCategory.IR: switch(function.spk) { case SPK.AcIr: btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png"; LoadLastStatesButton(); break; } LoadLastStatesButton(); break; case FunctionCategory.FloorHeat: switch (function.spk) { case SPK.FloorHeatStandard: btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png"; LoadLastStatesButton(); break; } LoadLastStatesButton(); break; case FunctionCategory.Light: btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png"; //btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png"; btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on"; LoadLightControl(); break; case FunctionCategory.Electric: switch (function.spk) { case SPK.ElectricSocket: btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png"; break; case SPK.ElectricFan: case SPK.ElectricTuyaFan: btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanThinIcon.png"; break; case SPK.ElectricTV: btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png"; break; case SPK.ElectricTuyaAirCleaner: btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/AirCleanerThiinIcon.png"; break; case SPK.ElectricTuyaWeepRobot: btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobotThinIcon.png"; break; case SPK.ElectricTuyaWaterValve: btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WaterValve/WaterValveIcon.png"; break; } btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on"; break; } HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs
@@ -26,6 +26,7 @@ { Y = Application.GetRealHeight(64), Height = Application.GetRealHeight(667 - 64), VerticalScrollBarEnabled = false, }; bodyView.AddChidren(contentView);
@@ -22,9 +22,13 @@ contentView = new FrameLayout() { Y = Application.GetRealHeight(64), Height = Application.GetRealHeight(603), }; AddChidren(contentView); bodyView.AddChidren(contentView); NotListTipView(); } @@ -78,10 +82,15 @@ Radius = (uint)Application.GetRealWidth(22), BorderColor = 0x00000000, BorderWidth = 0, TextID = StringId.Add, }; contentView.AddChidren(btnAdd); btnAdd.MouseUpEventHandler = (sender, e) => { Console.WriteLine("ddd"); }; } HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -504,7 +504,7 @@ Width = Application.GetRealWidth(64 + 48), Height = Application.GetRealWidth(64), }; residenceInfoView.AddChidren(residenceAddFunctionView); //residenceInfoView.AddChidren(residenceAddFunctionView); btnResidenceAddFunctionIcon = new Button { Gravity = Gravity.CenterHorizontal, HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -260,7 +260,7 @@ { EventHandler<MouseEventArgs> eventHandler = (sender, e) => { var page = new BrandListPage(); var page = new AddThirdPartyBrandListpage(); //new BrandListPage(); MainPage.BasePageView.AddChidren(page); page.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs
@@ -195,6 +195,7 @@ { CloseTime = 1, Direction = AMPopTipDirection.None, MaxWidth = Application.GetRealWidth(300), Text = Language.StringByID(StringId.IncorrectRepeatPassword) }.Show(bodyView); @@ -310,6 +311,7 @@ { CloseTime = 1, Direction = AMPopTipDirection.None, MaxWidth = Application.GetRealWidth(300), Text = Language.StringByID(StringId.IncorrectRepeatPassword) }.Show(bodyView); } HDL_ON/UI/UI2/FuntionControlView/AC/AcControlPage.cs
@@ -482,6 +482,104 @@ dialog.Close(); }; var bodyView = new FrameLayout() { Y = Application.GetRealHeight(463), Height = Application.GetRealHeight(375), BackgroundColor = CSS_Color.MainBackgroundColor, }; div.AddChidren(bodyView); var contentView = new FrameLayout() { Y = Application.GetRealHeight(16), Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(296), }; bodyView.AddChidren(contentView); var row = new FrameLayout() { Height = Application.GetRealHeight(60), }; contentView.AddChidren(row); int index = 0; foreach (var attr in device.attributes) { if (attr.key == FunctionAttributeKey.Mode || attr.key == FunctionAttributeKey.OnOff || attr.key == FunctionAttributeKey.SetTemp || attr.key == FunctionAttributeKey.SetTempStep || attr.key == FunctionAttributeKey.FanSpeed || attr.key == FunctionAttributeKey.FanManual || attr.key == FunctionAttributeKey.FanAuto ) { continue; } if (index != 0 && index % 3 == 0) { row = new FrameLayout() { Width = Application.GetRealWidth(200), Height = Application.GetRealHeight(56), }; contentView.AddChidren(row); } var btn = new Button() { Gravity = Gravity.CenterVertical, Width = Application.GetRealWidth(88), Height = Application.GetRealHeight(40), Radius = (uint)Application.GetRealHeight(18), BorderColor = CSS_Color.PromptingColor1, BorderWidth = (uint)Application.GetRealWidth(2), TextAlignment = TextAlignment.Center, TextSize = CSS_FontSize.TextFontSize, TextColor = CSS_Color.FirstLevelTitleColor, SelectedTextColor = CSS_Color.MainBackgroundColor, SelectedBackgroundColor = CSS_Color.MainColor, }; if (attr.value.Count > 0) { btn.Text = attr.value[0]; } if (index % 3 == 1) { btn.Gravity = Gravity.Center; } else if (index % 3 == 2) { btn.X = Application.GetRealWidth(208); } row.AddChidren(btn); btn.MouseUpEventHandler = (sender, e) => { System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); d.Add(FunctionAttributeKey.Key, attr.key); Control.Ins.SendWriteCommand(device, d); new System.Threading.Thread(() => { System.Threading.Thread.Sleep(2000); Application.RunOnMainThread(() => { btn.IsSelected = false; }); }) { IsBackground = true }.Start(); }; index++; }
New file @@ -0,0 +1,146 @@ using System; 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 IrLearnPage : DeviceFunctionCardCommonForm { #region ■ 变量声明___________________________ #endregion #region ■ 初始化_____________________________ /// <summary> /// 初始化白色区域的内容 /// </summary> public override void InitFrameWhiteContent() { base.ShowColltionButton = false; base.SetTitleText(Language.StringByID(StringId.RemoteControl)); //初始化第一个索引页的内容 this.InitFrameWhiteContent1(); } /// <summary> /// 初始化第一个索引页的内容 /// </summary> private void InitFrameWhiteContent1() { var contentView = new VerticalScrolViewLayout() { Y = Application.GetRealHeight(94), Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(296), Height = Application.GetRealHeight(376), }; FrameWhiteCentet1.AddChidren(contentView); var row = new FrameLayout() { //Width = Application.GetRealWidth(200), Height = Application.GetRealHeight(56), }; contentView.AddChidren(row); int index = 0; foreach(var attr in device.attributes) { if(index != 0 && index%3==0) { row = new FrameLayout() { Width = Application.GetRealWidth(200), Height = Application.GetRealHeight(56), }; contentView.AddChidren(row); } var btn = new Button() { Width = Application.GetRealWidth(88), Height = Application.GetRealHeight(40), Radius = (uint)Application.GetRealHeight(18), BorderColor = CSS_Color.PromptingColor1, BorderWidth = (uint)Application.GetRealWidth(2), TextAlignment = TextAlignment.Center, TextSize = CSS_FontSize.TextFontSize, TextColor = CSS_Color.FirstLevelTitleColor, SelectedTextColor = CSS_Color.MainBackgroundColor, SelectedBackgroundColor = CSS_Color.MainColor, }; if (attr.value.Count > 0) { btn.Text = attr.value[0]; } if (index % 3 == 1) { btn.Gravity = Gravity.CenterHorizontal; } else if (index % 3 == 2) { btn.X = Application.GetRealWidth(208); } row.AddChidren(btn); btn.MouseUpEventHandler = (sender, e) => { System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>(); d.Add(FunctionAttributeKey.Key, attr.key); Control.Ins.SendWriteCommand(device, d); new System.Threading.Thread(() => { System.Threading.Thread.Sleep(2000); Application.RunOnMainThread(() => { btn.IsSelected = false; }); }) { IsBackground = true }.Start(); }; index++; } } #endregion #region ■ 设备状态反馈_______________________ /// <summary> /// 设备状态反馈 /// </summary> /// <param name="i_LocalDevice"></param> public override void DeviceStatuPush(Function i_LocalDevice) { return; } #endregion #region ■ 发送各种命令_______________________ #endregion #region ■ 刷新界面状态_______________________ /// <summary> /// 刷新界面状态 /// </summary> private void RefreshFormStatu() { return; } #endregion } }
