From 203c3a3ffde6259413d9743f6a723b95b1e7989c Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 06 七月 2023 22:43:05 +0800 Subject: [PATCH] 门锁功能 --- HDL-ON_Android/HDL-ON_Android.csproj | 201 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 174 insertions(+), 27 deletions(-) diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj index c5915a1..69f535d 100644 --- a/HDL-ON_Android/HDL-ON_Android.csproj +++ b/HDL-ON_Android/HDL-ON_Android.csproj @@ -65,7 +65,7 @@ <AndroidSigningStorePass>85521566</AndroidSigningStorePass> <AndroidSigningKeyPass>85521566</AndroidSigningKeyPass> <AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias> - <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis> + <AndroidSupportedAbis>arm64-v8a</AndroidSupportedAbis> </PropertyGroup> <ItemGroup> <Reference Include="Shared.Droid.JPush"> @@ -163,28 +163,40 @@ <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="Shared.Droid.LCVideoSDK"> - <HintPath>..\DLL\LC\Android\Shared.Droid.LCVideoSDK.dll</HintPath> - </Reference> - <Reference Include="ys"> - <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath> - </Reference> <Reference Include="UMSdkDroid"> <HintPath>..\DLL\UMeng\UMSdkDroid.dll</HintPath> - </Reference> - <Reference Include="ScanSdk"> - <HintPath>..\DLL\Scan\ScanSdk.dll</HintPath> </Reference> <Reference Include="Shared.Droid.HDLLinphone"> <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath> </Reference> <Reference Include="Mono.Android.Export" /> + <Reference Include="ScanSdk"> + <HintPath>..\DLL\Scan\ScanSdk.dll</HintPath> + </Reference> + <Reference Include="Shared.Droid.LCVideoSDK"> + <HintPath>..\DLL\LC\Android\Shared.Droid.LCVideoSDK.dll</HintPath> + </Reference> + <Reference Include="LCDeviceAddModule"> + <HintPath>..\DLL\LC\Android\LCDeviceAddModule.dll</HintPath> + </Reference> + <Reference Include="LcDHMobileToolset"> + <HintPath>..\DLL\LC\Android\LcDHMobileToolset.dll</HintPath> + </Reference> + <Reference Include="LcDHScanner"> + <HintPath>..\DLL\LC\Android\LcDHScanner.dll</HintPath> + </Reference> + <Reference Include="LcPullToRefreshRecyclerView"> + <HintPath>..\DLL\LC\Android\LcPullToRefreshRecyclerView.dll</HintPath> + </Reference> + <Reference Include="ZxingSDK"> + <HintPath>..\DLL\LC\Android\ZxingSDK.dll</HintPath> + </Reference> + <Reference Include="LcVideoSdk"> + <HintPath>..\DLL\LC\Android\LcVideoSdk.dll</HintPath> + </Reference> + <Reference Include="HdlEzvizDroid"> + <HintPath>..\DLL\HdlEzvizDroid.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="MainActivity.cs" /> @@ -213,6 +225,9 @@ <Compile Include="AgreementActivity.cs" /> <Compile Include="Zxing\CustomCaptureActivity.cs" /> <Compile Include="Zxing\ScanActivity.cs" /> + <Compile Include="LeChengVideo\LeTest.cs" /> + <Compile Include="Other\LocationUtils.cs" /> + <Compile Include="Other\MyLocationListener_V2.cs" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\agconnect-services.json" /> @@ -265,8 +280,130 @@ <AndroidAsset Include="Assets\Phone\Public\IotCheckOnIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\BackIcon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\ThumbImage.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Inverter\Icon1.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Inverter\Icon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Inverter\Icon3.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\BgChooseScene.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\LvJianLogo.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\BgChooseMode.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\PowerIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeCoolIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHeatHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHeatIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHeatIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneAtHome2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeFanIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\TempAndHumiBack.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\CollectionIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\TopViewBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHeatHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeCoolIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneSleepIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneSleepIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeFanIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeDeHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneAtHome.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\ModeDeHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneAwayHomeIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\MsgViewBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\blue\SceneAwayHomeIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeCoolIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAtHome2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeFanIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\CollectionIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHeatHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeCoolIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\PowerOffIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneSleepIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneSleepIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\BgSubControlView.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeFanIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeDeHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAtHome.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\ModeDeHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAwayHomeIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\grey\SceneAwayHomeIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\PowerIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeCoolIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHeatHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHeatIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHeatIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneAtHome2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeFanIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\TempAndHumiBack.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\CollectionIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\TopViewBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHeatHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeCoolIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneSleepIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneSleepIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeFanIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeDeHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneAtHome.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\ModeDeHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneAwayHomeIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\MsgViewBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\purple\SceneAwayHomeIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\PowerIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeCoolIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHeatHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHeatIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHeatIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAtHome2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeFanIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\TempAndHumiBack.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\CollectionIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\TopViewBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHeatHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeCoolIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneSleepIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneSleepIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeFanIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeDeHumiIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAtHome.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\ModeDeHumiIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAwayHomeIcon2.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\MsgViewBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\orange\SceneAwayHomeIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensormmv_pose.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\MechanicalArmBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\MechanicalArmOnBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\MechanicalArmFunctionBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricalmechanical_arm.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalmechanical_arm_blue.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalmechanical_arm_white.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\securityipcamimou_blue.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\securityipcamimou_white.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\securityipcamimou.png" /> + <AndroidAsset Include="Assets\Phone\MusicIcon\currentPlayList.png" /> + <AndroidAsset Include="Assets\Phone\PersonalCenter\CombinedDimmingIcon.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\OneOpenLock.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\RTV.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnLocked.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnLocking.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\History.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Cell.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\VideoDoorLockFunctionBg.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\securitydoorezviz.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorlockClose1.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen1.png" /> + <AndroidAsset Include="Assets\Phone\LogicIcon\selectlocation.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorfulBar.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\GroupControl_blue.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\GroupControl_white.png" /> <AndroidAsset Include="Assets\h5\index.html" /> - <AndroidAsset Include="Assets\h5\static\index.b0707a6a.css" /> + <AndroidAsset Include="Assets\h5\static\index.63b34199.css" /> <AndroidAsset Include="Assets\h5\static\images\coal-save-ic.png" /> <AndroidAsset Include="Assets\h5\static\images\inverter-center.svg" /> <AndroidAsset Include="Assets\h5\static\images\equal-plant-ic.png" /> @@ -284,15 +421,17 @@ <AndroidAsset Include="Assets\h5\static\images\down-icon-unselect.png" /> <AndroidAsset Include="Assets\h5\static\images\co2-reduction-ic.png" /> <AndroidAsset Include="Assets\h5\static\images\left-icon.png" /> - <AndroidAsset Include="Assets\h5\static\js\chunk-vendors.c6df545a.js" /> - <AndroidAsset Include="Assets\h5\static\js\pages-index-index.86bf9f46.js" /> - <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.d05a76d6.js" /> - <AndroidAsset Include="Assets\h5\static\js\index.301c141f.js" /> - <AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.e47ab5d3.js" /> + <AndroidAsset Include="Assets\h5\static\js\chunk-vendors.56c88730.js" /> + <AndroidAsset Include="Assets\h5\static\js\pages-inverter-index.e5e9499f.js" /> + <AndroidAsset Include="Assets\h5\static\js\index.cf368d6e.js" /> + <AndroidAsset Include="Assets\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" /> + <AndroidAsset Include="Assets\h5\static\js\pages-index-index.cfb4b30d.js" /> <AndroidAsset Include="Assets\h5\static\img\inverter-center.18b181f4.png" /> <AndroidAsset Include="Assets\h5\static\img\co2-reduction-ic.9c75228c.png" /> <AndroidAsset Include="Assets\h5\static\img\equal-plant-ic.7ef6befa.png" /> <AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" /> + <AndroidAsset Include="Assets\h5\static\font\SourceHanSansCN-Normal.otf" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorlockUserManager.png" /> </ItemGroup> <ItemGroup> <AndroidResource Include="Resources\values\colors.xml" /> @@ -619,7 +758,7 @@ <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" /> <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" /> <PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" /> - <PackageReference Include="Xamarin.Essentials" Version="1.6.0" /> + <PackageReference Include="Xamarin.Essentials" Version="1.7.0" /> <PackageReference Include="Xamarin.Android.Support.v4"> <Version>28.0.0.3</Version> </PackageReference> @@ -641,14 +780,20 @@ <PackageReference Include="Xamarin.Android.Support.Constraint.Layout.Solver"> <Version>1.1.0</Version> </PackageReference> - <PackageReference Include="Microsoft.AppCenter"> - <Version>4.2.0</Version> - </PackageReference> <PackageReference Include="Microsoft.AppCenter.Crashes"> <Version>4.2.0</Version> </PackageReference> <PackageReference Include="Microsoft.AppCenter.Analytics"> <Version>4.2.0</Version> + </PackageReference> + <PackageReference Include="Microsoft.AppCenter"> + <Version>4.2.0</Version> + </PackageReference> + <PackageReference Include="Square.OkHttp3"> + <Version>3.14.4</Version> + </PackageReference> + <PackageReference Include="Bugly"> + <Version>4.3.1</Version> </PackageReference> </ItemGroup> <ItemGroup> @@ -1490,7 +1635,7 @@ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" /> </ItemGroup> <ItemGroup> - <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\History.png" /> + <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\HistoryList.png" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorLock.png" /> @@ -1501,6 +1646,8 @@ <Folder Include="Zxing\" /> <Folder Include="Assets\Phone\FunctionIcon\CAC\" /> <Folder Include="Assets\Phone\FunctionIcon\Panel\" /> + <Folder Include="Assets\Phone\FunctionIcon\Inverter\" /> + <Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" /> </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