.DS_StoreBinary files differ
HDL-ON_Android/.DS_StoreBinary files differ
HDL-ON_Android/Assets/Phone/.DS_StoreBinary files differ
HDL-ON_Android/HDL-ON_Android.csproj
@@ -125,6 +125,9 @@ <Reference Include="Shared.Droid.JLCountryCode"> <HintPath>..\DLL\Android\Shared.Droid.JLCountryCode.dll</HintPath> </Reference> <Reference Include="AndriodBluetoothLibrary"> <HintPath>..\DLL\Android\AndriodBluetoothLibrary.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> <Compile Include="MainActivity.cs" /> @@ -830,6 +833,15 @@ <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\Public\ProgressMsg.png" /> <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\UploadToClound.png" /> <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\NetConnectSelect.png" /> <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\ConnectSuccess.png" /> <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\ConnectSuccessSelect.png" /> <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\MiniRemoteControlBigPictrue.png" /> <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\UploadToCloundSelect.png" /> <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\MiniRemoteControlMenuIcon.png" /> <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\WifiAndPhoneConnect.png" /> </ItemGroup> <ItemGroup> <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" /> HDL-ON_Android/Resources/Resource.designer.cs
Diff too large HDL-ON_iOS/.DS_StoreBinary files differ
HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -47,14 +47,14 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <MtouchArch>ARM64</MtouchArch> <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey> <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey> <MtouchDebug>true</MtouchDebug> <MtouchI18n>cjk</MtouchI18n> <MtouchLink>SdkOnly</MtouchLink> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs> <MtouchEnableSGenConc>false</MtouchEnableSGenConc> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> <CodesignProvision>ComHdlOnProDevelopment20210225-1</CodesignProvision> <CodesignProvision>ComHdlOnProDevelopment20210305-1</CodesignProvision> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' "> <DebugType>none</DebugType> @@ -1057,16 +1057,19 @@ <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\Public\ProgressMsg.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\UploadToClound.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\NetConnectSelect.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\ConnectSuccess.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\ConnectSuccessSelect.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\MiniRemoteControlBigPictrue.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\UploadToCloundSelect.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\MiniRemoteControlMenuIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\WifiAndPhoneConnect.png" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> <ITunesArtwork Include="iTunesArtwork%402x" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\HdlBluWi\Blufi.csproj"> <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project> <Name>Blufi</Name> </ProjectReference> </ItemGroup> <ItemGroup> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" /> @@ -1102,6 +1105,12 @@ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960-1.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136-1.png" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\HdlBluWi\Blufi.csproj"> <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project> <Name>Blufi</Name> </ProjectReference> </ItemGroup> <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> <ProjectExtensions> HDL-ON_iOS/Resources/Language.ini
@@ -411,8 +411,6 @@ 426=Air dry time 427=Disinfect time 428=Anion Time 429=h 430=m 1002=Anion @@ -1091,8 +1089,6 @@ 426=风干时间 427=消毒时间 428=负离子时间 429=小时 430=分钟 1000=室内湿度 @@ -1145,6 +1141,33 @@ 1047=是否重置边刷 1048=是否重置滚刷 1049=是否重置滤网 1050=添加设备 1051=mini智能遥控器 1052=添加红外遥控 1053=长按红外遥控器按钮10秒，指示灯蓝色快闪 1054=请确保您的蓝牙已开启并处于可以被搜索状态 1055=下一步 1056=设备搜索中... 1057=没有发现红外遥控器 1058=1、请检查设备是否正常通电{0}2、请检查蓝牙功能是否正常开启{0}3、请检查指示灯是否蓝色快闪状态 1059=重新搜索 1060=连接WiFi 1061=目前只支持2.4G WiFi网络{0}暂不支持带有中文字符的WiFi名称 1062=密码 1063=正在连接中... 1064=请让红外遥控尽量接近WIFI路由器 1065=网络链接中 1066=上传到云 1067=连接成功 1068=1、请检查设备是否正常通电{0}2、请开启蓝牙功能{0}3、并长按按钮10s，指示灯常亮 1069=添加失败 1070=添加成功 1071=可以开始使用红外遥控功能！ 1072=开始使用 1073=请打开蓝牙 1074=位置信息(GBS)不可用 1075=网络不可用 1076=选择红外遥控器 5000=音乐 5001=组合 HDL-ON_iOS/Resources/Phone/PersonalCenter/AddDevice/ConnectSuccess.png
Binary files differ
HDL_ON/DAL/DriverLayer/Control.cs
@@ -603,7 +603,7 @@ } MainPage.Log($"局域网信息: {receiveObj.Topic}"); MainPage.Log($"内容: {res[1]}"); //验证有效数据长度 //if (res[1].Length != receiveObj.Length) @@ -613,13 +613,13 @@ //} receiveObj.BodyDataString = res[1]; var bodyJObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]); if (bodyJObj == null) { return receiveObj; } if (receiveObj.Topic == CommunicationTopic.SearchLoaclGatewayReply) { var bodyJObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]); if (bodyJObj == null) { return receiveObj; } var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString()); if (device.device_mac == DB_ResidenceData.Instance.residenceGatewayMAC) { @@ -644,6 +644,11 @@ //TODO 暂时不传正确的数据上去，如果后面要优化前面这些代码 UpdataFunctionStatus(receiveObj.BodyDataString, null); } else { //一些特殊的主题处理(为了执行速度,尽可能的别加耗时的操作) Stan.HdlCloudReceiveLogic.Current.CloudOverallMsgReceive(receiveObj.Topic, receiveObj.BodyDataString); } } return receiveObj; } HDL_ON/HDL_ON.projitems
@@ -358,6 +358,15 @@ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Electrical\ClothesHangerSetTimePage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\ArmSensor\ArmSensorHistroyPaging.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\AC\AcControlPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Stan\Logic\HdlAndroidBluetoothLogic.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Stan\Logic\HdlCloudReceiveLogic.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Stan\Logic\HdlWifiLogic.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Stan\Controls\CompoundControls\ProgressRowBar.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\AddMiniRemoteControlDirection3Page.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\AddMiniRemoteControlDirection1Page.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\AddMiniRemoteControlDirection2Page.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\AddMiniRemoteControlDirection4Page.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\AddThirdPartyDeviceMenuListPage.cs" /> </ItemGroup> <ItemGroup> <Folder Include="$(MSBuildThisFileDirectory)UI\" /> HDL_ON/UI/.DS_StoreBinary files differ
HDL_ON/UI/UI2/.DS_StoreBinary files differ
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs
@@ -61,8 +61,12 @@ //这个界面的背景需要白色 bodyFrameLayout.BackgroundColor = UI.CSS.CSS_Color.MainBackgroundColor; #if __IOS__ #endif #if __Android__ //添加接收蓝牙反馈的事件 HdlAndroidBluetoothLogic.Current.AddReceiveEvent(this.BluetoothReceiveEvent); #endif //添加云端反馈事件 HdlCloudReceiveLogic.Current.AddCloudReceiveEvent("AddMiniRemoteControlDirection4Page", this.CloudReceiveEvent); @@ -258,20 +262,21 @@ #endregion #region ■ 发送账号和密码给蓝牙_______________ #if __IOS__ #endif #if __Android__ /// <summary> /// 发送账号和密码给蓝牙 /// </summary> private void SendAccountAndPswToBluetooth() { #if __IOS__ #endif #if __Android__ //获取发送到蓝牙的数据 var sendData = this.GetSendToBluetoothData(); //不等待 HdlAndroidBluetoothLogic.Current.SendData(sendData); } #endif } #endregion @@ -394,7 +399,11 @@ public override void CloseFormBefore() { //摧毁蓝牙 #if __IOS__ #endif #if __Android__ HdlAndroidBluetoothLogic.Current.Dispone(); #endif HdlCloudReceiveLogic.Current.RemoveCloudReceiveEvent("AddMiniRemoteControlDirection4Page"); base.CloseFormBefore();
