wjc
2023-04-11 79a9debfcfd5e2d66bda84f5944575046e708417
Merge branch 'dev-cqy(1.5.9)' into wjc
3个文件已修改
1 文件已重命名
6 ■■■■ 已修改文件
DLL/IOS/EZSDK.IOS.dll 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/HDL-ON_iOS.csproj 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorlockClose.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/Mqtt/MqttClient.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DLL/IOS/EZSDK.IOS.dll
Binary files differ
HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1545,7 +1545,6 @@
      <BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
      <BundleResource Include="Resources\h5\static\font\SourceHanSansCN-Normal.otf" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Redistribution.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockClose.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorLock.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\OneOpenLock.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue2.png" />
@@ -1566,7 +1565,6 @@
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\BindScene.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Shard.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Delete.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnConnect.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\More.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Mute.png" />
@@ -1577,6 +1575,8 @@
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\securitydoorezviz.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockClose.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />
HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorlockClose.png

HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -852,7 +852,7 @@
        static void ReceiveNotifySqueezeAsync(string mMes)
        {
#if DEBUG
            return;
            //return;
#endif
            if (mMes == PushSignStr) return;//是自己的登录推送不处理//或者当前不是远程链接状态
            //测试账号,不挤下线