Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google

wxr

2024-09-11 a3dfbcd5218270f9a75e6e32807b08215270b657

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -27,7 +27,7 @@
        <MtouchDebug>true</MtouchDebug>
        <CodesignKey>iPhone Developer</CodesignKey>
        <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
        <CodesignProvision>OnPro2307291-Dev</CodesignProvision>
        <CodesignProvision>Automatic</CodesignProvision>
        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
        <MtouchI18n>cjk</MtouchI18n>
        <MtouchSdkVersion>17.5</MtouchSdkVersion>
@@ -61,7 +61,7 @@
        <MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CodesignProvision>0002-OnPro-240704-1-Dev</CodesignProvision>
<CodesignProvision>0002-OnPro-240905-1-Dev</CodesignProvision>
<MtouchSdkVersion>17.5</MtouchSdkVersion>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
@@ -101,9 +101,6 @@
        <Reference Include="HDL.Shared.IOS.ScanQRCode">
          <HintPath>..\DLL\IOS\HDL.Shared.IOS.ScanQRCode.dll</HintPath>
        </Reference>
        <Reference Include="Shared.IOS.HDLLinphoneSDK">
          <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
        </Reference>
        <Reference Include="Shared.IOS.LCVideoOnSDK">
          <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath>
        </Reference>
@@ -124,6 +121,9 @@
        </Reference>
        <Reference Include="Aliyun.Api.LogService">
          <HintPath>..\DLL\Aliyun.Api.LogService.dll</HintPath>
        </Reference>
        <Reference Include="Shared.IOS.HDLLinphoneSDK">
          <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
        </Reference>
    </ItemGroup>
    <ItemGroup>
@@ -517,6 +517,8 @@
        <Folder Include="Resources\Phone\FunctionIcon\Inverter\" />
        <Folder Include="Resources\Phone\FunctionIcon\Electrical\MechanicalArm\" />
        <Folder Include="Resources\Phone\FunctionIcon\GroupControl\" />
        <Folder Include="Resources\Phone\FunctionIcon\Acst\WaterHeater\" />
        <Folder Include="Resources\Phone\FunctionIcon\Acst\Inverter\" />
    </ItemGroup>
    <ItemGroup>
        <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -545,6 +547,7 @@
        <Compile Include="Other\JLCountrycode.cs" />
        <Compile Include="BlueWifi.cs" />
        <Compile Include="Other\SkipControl.cs" />
        <Compile Include="Other\SoundPlayer.cs" />
    </ItemGroup>
    <ItemGroup>
      <BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" />
@@ -1794,6 +1797,56 @@
      <BundleResource Include="Resources\Phone\LogicIcon\electricaltvhisense.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Pm10Bg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Pm10Icon.png" />
      <BundleResource Include="Resources\oldphone_mono.wav" />
      <BundleResource Include="Resources\ic_esvideo_on_answer.png" />
      <BundleResource Include="Resources\ic_esvideo_on_back.png" />
      <BundleResource Include="Resources\ic_esvideo_on_hangup_all.png" />
      <BundleResource Include="Resources\ic_esvideo_on_hangup.png" />
      <BundleResource Include="Resources\ic_esvideo_on_takephoto_select.png" />
      <BundleResource Include="Resources\ic_esvideo_on_takephoto_unselect.png" />
      <BundleResource Include="Resources\ic_esvideo_on_unlock_select.png" />
      <BundleResource Include="Resources\ic_esvideo_on_unlock_unselect.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\PowerOffIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\WaterHeater\ModeFree_False.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\WaterHeater\TempBg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\WaterHeater\Mode_Economic_On.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\WaterHeater\Mode_QuickHeat.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoBg_1.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoBg_2.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoBg_3.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoIcon_1.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoIcon_2.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoIcon_3.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\WaterHeater\NextIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\WaterHeater\PreIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\ElectricityConsumptionBg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\ElectricityGenerationBg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\ElectricityConsumptionIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\ElectricityGenerationIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\BatteryIconCharg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\BatteryIconDischarg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\BatteryIconFault.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\BatteryIconShutdown.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\EsIconCharg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\EsIconDischarge.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\EsIconFault.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\EsIconShutdown.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\PvBgDischarge.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\PvBgRun.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\PvIconFault.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\PvIconRun.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\PvIconStandby.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\SocialContributionInfoBg_Coal.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\SocialContributionInfoIcon_Coal.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\EnergyStorageStatusBg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\WaterHeater\Mode_Economic.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\WaterHeater\Mode_QuickHeat_On.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\WaterHeater\ModeFree_True.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\InverterJinmaoFunctionBg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\BatteryIconCharg100.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\BatteryIconDischarg100.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\BatteryIconFault100.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\BatteryIconShutdown100.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />