.DS_StoreBinary files differ
.vs/HDL_APP_Project/xs/UserPrefs.xml
New file @@ -0,0 +1,49 @@ <Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs"> <Files> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="81" Column="14" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs" Line="37" Column="16" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs" Line="18" Column="23" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs" Line="142" Column="53" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs" Line="210" Column="54" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs" Line="212" Column="1" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" Line="125" Column="27" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL_ON" expanded="True"> <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_iOS" expanded="True"> <Node name="Resources" expanded="True"> <Node name="Phone" expanded="True" /> </Node> </Node> </Node> </State> </Pad> </Pads> </MonoDevelop.Ide.Workbench> <MonoDevelop.Ide.DebuggingService.PinnedWatches /> <DisabledProjects> <String>Shared.IOS.TBL/Shared.IOS.TBL.csproj</String> <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String> <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore /> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> </Properties> HDL-ON_Android/Resources/Resource.designer.cs
Diff too large HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1149,6 +1149,16 @@ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainswitch_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalracks_white.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irmodule.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/Phone/PirIcon/Infraredtreasure.pngHDL-ON_iOS/Resources/Phone/PirIcon/adddevice.pngHDL-ON_iOS/Resources/Phone/PirIcon/addlbuton.pngHDL-ON_iOS/Resources/Phone/PirIcon/air.pngHDL-ON_iOS/Resources/Phone/PirIcon/custom.pngHDL-ON_iOS/Resources/Phone/PirIcon/del.pngHDL-ON_iOS/Resources/Phone/PirIcon/delbuton.pngHDL-ON_iOS/Resources/Phone/PirIcon/dropdown.pngHDL-ON_iOS/Resources/Phone/PirIcon/dvd.pngHDL-ON_iOS/Resources/Phone/PirIcon/fan.pngHDL-ON_iOS/Resources/Phone/PirIcon/next.pngHDL-ON_iOS/Resources/Phone/PirIcon/offline.pngHDL-ON_iOS/Resources/Phone/PirIcon/online.pngHDL-ON_iOS/Resources/Phone/PirIcon/priequipment.pngHDL-ON_iOS/Resources/Phone/PirIcon/projector.pngHDL-ON_iOS/Resources/Phone/PirIcon/search.pngHDL-ON_iOS/Resources/Phone/PirIcon/stb.pngHDL-ON_iOS/Resources/Phone/PirIcon/tv.pngHDL_ON/DAL/Mqtt/MqttClient.cs
@@ -258,7 +258,7 @@ { return; } if(DB_ResidenceData.Instance.CurrentRegion == null || DB_ResidenceData.Instance.CurrentRegion.RegionID == null) if (DB_ResidenceData.Instance.CurrentRegion == null || DB_ResidenceData.Instance.CurrentRegion.RegionID == null) { return; } @@ -341,12 +341,14 @@ } #region 数据更新推送主题 //appHomeRefresh：住宅数据刷新通知 else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appHomeRefresh/up") { else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appHomeRefresh/up") { MainPage.Log("住宅数据刷新通知"); new HttpServerRequest().GetHomePager(); } //appRoomRefresh：房间数据刷新通知 else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appRoomRefresh/up"){ else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appRoomRefresh/up") { MainPage.Log("房间数据刷新通知"); var roomResult = new HttpServerRequest().GetRoomList(); if (roomResult.Code == StateCode.SUCCESS) @@ -367,7 +369,8 @@ } } //appDeviceRefresh：设备数据刷新通知 else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appDeviceRefresh/up") { else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.RegionID}/app/thing/event/appDeviceRefresh/up") { MainPage.Log("设备数据刷新通知"); var deviceResult = new HttpServerRequest().GetDeviceList(); if (deviceResult.Code == StateCode.SUCCESS) @@ -418,7 +421,7 @@ { var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, tuyaEncryptKey); var revString = Encoding.UTF8.GetString(bytes); Control.Ins.UpdataFunctionStatus(revString, null,true); Control.Ins.UpdataFunctionStatus(revString, null, true); } //一端口数据解析 else @@ -578,7 +581,7 @@ MqttInfoConfig.Current.Save(); mqttEncryptKey = MqttInfoConfig.Current.HomeGatewayInfo.aesKey; //解密密钥规则：已现有的住宅ID为基准,从右边一一获取值,最后如果不够16位,则往右补零 string aesKey = string.Empty; @@ -666,7 +669,7 @@ /// </summary> static void ReceiveNotifySqueezeAsync(string mMes) { if (mMes == PushSignStr ) return;//是自己的登录推送不处理//或者当前不是远程链接状态 if (mMes == PushSignStr) return;//是自己的登录推送不处理//或者当前不是远程链接状态 //测试账号，不挤下线 switch (UserInfo.Current.AccountString) { @@ -984,4 +987,4 @@ } } } HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs
@@ -218,7 +218,7 @@ { var page = new UI2.PersonalCenter.PirDevice.PirMain(); MainPage.BasePageView.AddChidren(page); page.Show(); page.Show(null); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }); }); HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -143,7 +143,7 @@ { var page = new UI2.PersonalCenter.PirDevice.PirMain(); MainPage.BasePageView.AddChidren(page); page.Show(); page.Show(device); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }); }); HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs
@@ -202,7 +202,7 @@ // this.RemoveFromParent(); MainPage.BasePageView.RemoveViewByTag("PirView"); //主界面 MainPage.BasePageView.RemoveViewByTag("PirMain"); //MainPage.BasePageView.RemoveViewByTag("PirMain"); }; #endregion HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/DeviceSet.cs
@@ -23,7 +23,9 @@ { action(); this.RemoveFromParent(); }; VerticalRefreshLayout vv = new VerticalRefreshLayout(); vv.Height = Application.GetRealHeight(667 - 64); vv.Y = Application.GetRealHeight(64); @@ -45,6 +47,21 @@ }; #endregion UIView(vv); topView.topIconBtn.MouseUpEventHandler += (sender, e) => { var form = new AddMiniRemoteControlDirection1Page(); form.AddForm(); form.AddDeviceEvent += (device) => { Pir pir = new Pir(); pir.name = device.name; pir.deviceId = device.deviceId; pir.sid = device.sid; Pir.pirDeviceList.Add(pir); UIView(vv); }; }; } /// <summary> HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -15,7 +15,7 @@ /// 临时储存设备类型列表 /// </summary> List<DeviceType> DeviceTypeList = new List<DeviceType>(); public void Show() public void Show(Entity.Function function) { #region 界面布局 this.BackgroundColor = CSS.CSS_Color.viewMiddle; @@ -79,8 +79,20 @@ if (Pir.pirDeviceList.Count != 0) { //if (function != null) //{ // Pir pir = new Pir(); // pir.name = function.name; // pir.deviceId = function.deviceId; // pir.sid = function.sid; // Pir.currPir = pir; //} //else //{ // Pir.currPir = Pir.pirDeviceList[0]; //} //默认第一个红外宝 Pir.currPir = Pir.pirDeviceList[0]; int sum = 0; for (int i = 0; i < Pir.pirDeviceList.Count; i++) { @@ -91,6 +103,7 @@ mainView.numberDeviceBtn.Text = Pir.pirDeviceList.Count.ToString() + Language.StringByID(StringId.ge); mainView.currDeviceNumberControlBtn.Text = sum.ToString() + Language.StringByID(StringId.ge); } ///设备管理的点击事件 mainView.clickBtn.MouseUpEventHandler += (sender, e) => { @@ -315,7 +328,7 @@ case 3: { //风扇 type = "fan-" + SPK.ElectricFan; // type = "fan-" + SPK.ElectricFan; } break; case 4: @@ -405,7 +418,7 @@ /// </summary> /// <param name="tag">标识要不要提示（true=提示）</param> /// <param name="action">回调函数</param> public void GetDeviceTypeList(bool tag, Action action) public void GetDeviceTypeList(bool tag, Action action) { PirSend.GetDeviceTypesList(this, (responsePackNew) => { @@ -443,7 +456,7 @@ /// <summary> /// 读取红外设备类型的品牌列表 /// </summary> public void GetBrandList(string id, Action<List<Brand>> actionBrand) public void GetBrandList(string id, Action<List<Brand>> actionBrand) { List<Brand> brandList = new List<Brand>(); PirSend.GetDeviceTypesList(this, (responsePackNew) => HdlBluWi/.DS_StoreBinary files differ
