From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 01 七月 2021 15:50:43 +0800 Subject: [PATCH] Revert "1" --- HDL-ON_Android/HDL-ON_Android.csproj | 328 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 272 insertions(+), 56 deletions(-) diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj index 492ce63..f3aab45 100644 --- a/HDL-ON_Android/HDL-ON_Android.csproj +++ b/HDL-ON_Android/HDL-ON_Android.csproj @@ -33,11 +33,10 @@ <DefineConstants>DEBUG;TRACE;__Android__</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk> + <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk> <MandroidI18n>cjk</MandroidI18n> <AndroidDexTool>d8</AndroidDexTool> <AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent> - <AndroidLinkMode>None</AndroidLinkMode> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -52,6 +51,7 @@ <MandroidI18n>cjk</MandroidI18n> <AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent> <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime> + <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis> </PropertyGroup> <ItemGroup> <Reference Include="System" /> @@ -146,6 +146,18 @@ <Reference Include="videophone"> <HintPath>..\DLL\FL\Android\videophone.dll</HintPath> </Reference> + <Reference Include="Square.OkHttp3"> + <HintPath>..\DLL\EZvizMonitor\Square.OkHttp3.dll</HintPath> + </Reference> + <Reference Include="Square.OkIO"> + <HintPath>..\DLL\EZvizMonitor\Square.OkIO.dll</HintPath> + </Reference> + <Reference Include="ys"> + <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath> + </Reference> + <Reference Include="LC_SDK"> + <HintPath>..\DLL\LC\Android\LC_SDK.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="MainActivity.cs" /> @@ -163,6 +175,9 @@ <Compile Include="FengLinVideo\Form\MonitorFragment.cs" /> <Compile Include="FengLinVideo\Form\ReverseCallFragment.cs" /> <Compile Include="FengLinVideo\widget\TipDiaglog.cs" /> + <Compile Include="LeChengVideo\Form\MonitorFragment.cs" /> + <Compile Include="LeChengVideo\Form\ReverseCallFragment.cs" /> + <Compile Include="LeChengVideoActivity.cs" /> </ItemGroup> <ItemGroup> <None Include="Resources\AboutResources.txt" /> @@ -245,100 +260,178 @@ </Generator> </AndroidResource> <AndroidResource Include="Resources\drawable\answer.png"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\drawable\back_icon.png"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\drawable\dialog_background.xml"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\drawable\hangup.png"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\drawable\mic.png"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\drawable\screenshot_def.png"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\drawable\screenshot_sel.png"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\drawable\screenshot.xml"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\drawable\sure_background_def.xml"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\drawable\sure_background_sel.xml"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\drawable\tip_background.xml"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\drawable\unlock_def.png"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\drawable\unlock_sel.png"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\drawable\unlock.xml"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\drawable\video_background.png"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\layout\activity_video_phone.xml"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\layout\dialog_tip.xml"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\layout\fragment_call.xml"> - <SubType></SubType> - <Generator></Generator> + <SubType> + </SubType> + <Generator> + </Generator> </AndroidResource> <AndroidResource Include="Resources\layout\fragment_monitor.xml"> + <SubType> + </SubType> + <Generator> + </Generator> + </AndroidResource> + <AndroidResource Include="Resources\values-zh\strings.xml"> + <SubType> + </SubType> + <Generator> + </Generator> + </AndroidResource> + <AndroidResource Include="Resources\drawable\launchImage.xml"> <SubType></SubType> <Generator></Generator> </AndroidResource> - <AndroidResource Include="Resources\values-zh\strings.xml"> + <AndroidResource Include="Resources\mipmap-xhdpi\Loading.png"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\mipmap-hdpi\Loading.png"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\mipmap-mdpi\Loading.png"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\mipmap-xxhdpi\Loading.png"> + <SubType></SubType> + <Generator></Generator> + </AndroidResource> + <AndroidResource Include="Resources\mipmap-xxxhdpi\Loading.png"> <SubType></SubType> <Generator></Generator> </AndroidResource> </ItemGroup> <ItemGroup> - <Folder Include="Resources\drawable\" /> - <Folder Include="Resources\layout\" /> - <Folder Include="Assets\Phone\Intelligence\" /> - <Folder Include="Assets\Phone\DeviceIcon\" /> - <Folder Include="Other\" /> - <Folder Include="Other\JPush\" /> - <Folder Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\" /> - <Folder Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\" /> - <Folder Include="Assets\Phone\PirIcon\" /> - <Folder Include="Assets\Phone\VideoIcon\" /> - <Folder Include="Assets\Phone\FunctionIcon\Energy\" /> + <AndroidAsset Include="Assets\Phone\Public\MsgIcon\TipSuccessIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconLR.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconLROn.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconNull.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconNullOn.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconUD.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconUDOn.png" /> + <AndroidAsset Include="Assets\Phone\Public\ScanGrey.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\FanIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\HeadSwingingIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\HeadSwingingIconOn.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PatternIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PatternIconOn.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PowerIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PowerIconOn.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\TimingIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\TimingIconOn.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\SpeedIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\SpeedIconOn.png" /> + <AndroidAsset Include="Assets\Phone\Classification\Room\AllCloseIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irfan_blue.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irfan_white.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irfan.png" /> </ItemGroup> - <ItemGroup /> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\BindScene.png" /> + </ItemGroup> <ItemGroup> <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" /> <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" /> @@ -361,9 +454,6 @@ </PackageReference> <PackageReference Include="XamarinLibrary.Xamarin.Android.Manual.JPush"> <Version>3.7.0</Version> - </PackageReference> - <PackageReference Include="Bugly"> - <Version>4.3.1</Version> </PackageReference> <PackageReference Include="Xamarin.Android.Support.Constraint.Layout"> <Version>1.1.0</Version> @@ -523,7 +613,6 @@ <AndroidAsset Include="Assets\Phone\FunctionIcon\Music\MusicIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Music\MusicOnIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanIconBg.png" /> - <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TVIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanThinIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanIconOnBg.png" /> @@ -831,7 +920,6 @@ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\AirCleanerThiinIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobotThinIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\MuteSelect.png" /> - <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\Battery.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\ControlRight.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\AreaMode.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\AutoMode.png" /> @@ -1106,10 +1194,138 @@ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\airFreshjinmao.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_blue.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_white.png" /> + <AndroidAsset Include="Assets\Phone\Public\RightSlideBackIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\SecurityCenterFunctionBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\DisasterAlarmIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\InDefenseBigIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\AddDefenseIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\HouseDefenseIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\HolidayDefenseIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\AtHomeDefenseIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\AtHomeDefenseIconOn.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\NoDefenseBigIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\HolidayDefenseIconOn.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\HouseDefenseIconOn.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\BurglarAlarmIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\HistoryIcon.png" /> + <AndroidAsset Include="Assets\Phone\LogicIcon\shiwaitianqi.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainDownIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainDownIconOn.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainUpIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainUpIconOn.png" /> + <AndroidAsset Include="Assets\Phone\PersonalCenter\SmartSpeaker.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irpjt.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irstb.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irpjt_blue.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irpjt_white.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irstb_blue.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irstb_white.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Energy\EnergyDrodUpIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensormegahealth.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIconDown.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIconLeft.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIconRight.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIconUp.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIconOk.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irtvxm.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irtvxm_blue.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irtvxm_white.png" /> + <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\SenesorMegahealthBg.png" /> + <AndroidAsset Include="Assets\Phone\Public\Scan.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\SomeoneFellBgIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\SomeoneInBgIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\UnderProtectionBgIcon.png" /> </ItemGroup> <ItemGroup> <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" /> <AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libconfigsdk.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libGMCrypto.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libgnustl_shared.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libjninetsdk.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libLCOpenApiClient.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libLechangeSDK.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libnetsdk.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libSmartConfig.so" /> + <AndroidNativeLibrary Include="libs\armeabi-v7a\libSoftAPConfig.so" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Connect.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Delete.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Editor.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Hide.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\More.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Mute.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\NormallyOpenIcon1.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\NormallyOpenIcon2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Redistribution.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Screen.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Shard.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnConnect.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnLockManager.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Voice.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Public\BatteryEnough.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\Public\BatteryNot.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\LockPictrue1.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\LockPictrue2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnLockPictrue1.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\CrearPswBackgroud.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\History.png" /> + </ItemGroup> + <ItemGroup> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorLock.png" /> + </ItemGroup> + <ItemGroup> + <Folder Include="Assets\Phone\FunctionIcon\IrFan\" /> </ItemGroup> <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> -- Gitblit v1.8.0