.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,22 +1,50 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs"> <Files> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="242" Column="42" /> <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="88" Column="86" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs" Line="45" Column="48" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="65" Column="23" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs" Line="43" Column="21" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="21" Column="25" /> <File FileName="HDL_ON/Entity/Function/Function.cs" /> <File FileName="HDL_ON/Entity/FunctionList.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" Line="199" Column="1" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControl.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL_ON" expanded="True"> <Node name="DAL" expanded="True"> <Node name="Mqtt" expanded="True" /> </Node> <Node name="UI" expanded="True"> <Node name="UI2" expanded="True"> <Node name="4-PersonalCenter" expanded="True"> <Node name="PirDevice" expanded="True"> <Node name="Matching.cs" selected="True" /> </Node> </Node> </Node> </Node> </Node> <Node name="HDL-ON_Android" expanded="True"> <Node name="Assets" expanded="True"> <Node name="Phone" expanded="True" /> </Node> </Node> <Node name="HDL-ON_iOS" expanded="True"> <Node name="Resources" expanded="True" /> </Node> </Node> </State> </Pad> </Pads> </MonoDevelop.Ide.Workbench> <MonoDevelop.Ide.DebuggingService.PinnedWatches /> <DisabledProjects> @@ -27,7 +55,11 @@ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore /> <BreakpointStore> <Breakpoint file="/Users/hdl/Desktop/wjc/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" line="199" column="1" /> <Breakpoint file="/Users/hdl/Desktop/wjc/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" line="195" column="1" /> <Breakpoint file="/Users/hdl/Desktop/wjc/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" line="188" column="1" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> </Properties> HDL-ON_Android/Assets/Language.ini
@@ -1207,8 +1207,6 @@ 6012=红外遥控 6013=设备管理 6014=添加遥控器 6015=在线 6016=离线 6017=版本号 HDL-ON_Android/HDL-ON_Android.csproj
@@ -830,6 +830,12 @@ <AndroidAsset Include="Assets\Phone\PirIcon\icon2.png" /> <AndroidAsset Include="Assets\Phone\PirIcon\succeed.png" /> <AndroidAsset Include="Assets\Phone\LogicIcon\selected+.png" /> <AndroidAsset Include="Assets\Phone\PirIcon\1.png" /> <AndroidAsset Include="Assets\Phone\PirIcon\2.png" /> <AndroidAsset Include="Assets\Phone\PirIcon\3.png" /> <AndroidAsset Include="Assets\Phone\PirIcon\4.png" /> <AndroidAsset Include="Assets\Phone\PirIcon\left.png" /> <AndroidAsset Include="Assets\Phone\PirIcon\right.png" /> </ItemGroup> <ItemGroup> <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" /> HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1057,6 +1057,16 @@ <BundleResource Include="Resources\Phone\PirIcon\adddevice.png" /> <BundleResource Include="Resources\Phone\PirIcon\next.png" /> <BundleResource Include="Resources\Phone\LogicIcon\selected+.png" /> <BundleResource Include="Resources\Phone\PirIcon\1.png" /> <BundleResource Include="Resources\Phone\PirIcon\2.png" /> <BundleResource Include="Resources\Phone\PirIcon\3.png" /> <BundleResource Include="Resources\Phone\PirIcon\4.png" /> <BundleResource Include="Resources\Phone\PirIcon\failed.png" /> <BundleResource Include="Resources\Phone\PirIcon\icon1.png" /> <BundleResource Include="Resources\Phone\PirIcon\icon2.png" /> <BundleResource Include="Resources\Phone\PirIcon\left.png" /> <BundleResource Include="Resources\Phone\PirIcon\right.png" /> <BundleResource Include="Resources\Phone\PirIcon\succeed.png" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> HDL-ON_iOS/Resources/Language.ini
@@ -1211,6 +1211,63 @@ 6012=红外遥控 6013=设备管理 6014=添加遥控器 6015=在线 6016=离线 6017=版本号 6018=请输入遥控器名称 6019=提示：遥控器创建后可在功能-电器分类{\r\n}查找使用 6020=推荐按键 6021=请输入按键名称 6022=下一步 6023=电源 6024=音量+ 6025=音量- 6026=频道+ 6027=频道- 6028=上 6029=下 6030=左 6031=右 6032=静音 6034=确认 6035=播放 6037=退出 6038=菜单 6039=暂停 6040=返回 6041=停止 6042=主页 6043=快进 6044=快退 6045=定时 6046=复制遥控功能 6047=对准遥控器中心按下相同按键 6048=智能遥控器 6049=添加按键 6050=*长按可进行自定义排序 6051=完成 6052=添加成功 6053=可到分类-功能-电器操作使用 6054=所属分类 6055=遥控器名称 6056=所属区域 6057=继续添加 6058=电器 6059=添加失败 6060=重试 6061=匹配遥控器 6062=请点击以下按钮 6063=确认设备是否有响应 6064=控制失败 6065=控制成功 6066=电源开 6067=模式制冷 6068=风速中风 6069=温度26℃ 6070=删除设备 6071=修改名字 6072=确认删除 6073=取消
@@ -196,11 +196,11 @@ var library = libraryList[index]; var control = GetControl(spk, testBtn.TextID, library); Method method = new Method(); method.ThreadAddControl(control, this,(control1) => { method.ThreadAddControl(control, this,(cont) => { MainPage.BasePageView.RemoveViewByTag("PirView"); AddControlComplete addControlComplete = new AddControlComplete(); MainPage.BasePageView.AddChidren(addControlComplete); addControlComplete.Show(control1,true); addControlComplete.Show(cont,true); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }); @@ -288,8 +288,6 @@ for (int arrayStr = 0; arrayStr < strings.Length; arrayStr++) { //var intValue = Convert.ToInt32(strings[arrayStr],16); //intValue //control.library1.Add((uint)intValue); control.library.Add(strings[arrayStr].Replace("0x","")); }
