wjc
2023-03-30 f8d49e136e064fa8c14af7dd22be6635b245c763
Merge branch 'dev-cqy(1.5.9)' into wjc
4个文件已修改
62 ■■■■■ 已修改文件
DLL/IOS/EZSDK.IOS.dll 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/HDL-ON_iOS.csproj 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/en.lproj/Localizable.strings 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DLL/IOS/EZSDK.IOS.dll
Binary files differ
HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1289,30 +1289,6 @@
      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIconOn.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\SmartSpeaker.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Redistribution.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorLock.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue2.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockManager.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue1.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon2.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\CrearPswBackgroud.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Editor.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon1.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Connect.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\History.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Screen.png" />
      <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\UnConnect.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\More.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Mute.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Voice.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue1.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Hide.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" />
      <BundleResource Include="Resources\Phone\Public\BatteryEnough.png" />
      <BundleResource Include="Resources\Phone\Public\BatteryNot.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irpjt_blue.png" />
@@ -1569,6 +1545,38 @@
      <BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" />
      <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" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockManager.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\RTV.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue1.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon2.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\CrearPswBackgroud.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Editor.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon1.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Connect.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Cell.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\History.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLocking.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\HistoryList.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Screen.png" />
      <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" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Voice.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLocked.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue1.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Hide.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />
HDL-ON_iOS/Resources/en.lproj/Localizable.strings
@@ -201,3 +201,6 @@
//2021-01-27 新增
"Devicelist"="Device list";
"Logout"="Log Out";
//通用
"hdl_ez_common_no_data"="No Data";
HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
@@ -202,3 +202,6 @@
//2021-01-27 新增
"Devicelist"="设备列表";
"Logout"="注销";
//通用
"hdl_ez_common_no_data"="暂无数据";