HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/VideoDoorLockOpen1.pngHDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/VideoDoorlockClose.pngBinary files differ
HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/VideoDoorlockClose1.pngHDL-ON_Android/HDL-ON_Android.csproj
@@ -416,12 +416,12 @@ <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\VideoDoorlockClose.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen.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" /> </ItemGroup> <ItemGroup> <AndroidResource Include="Resources\values\colors.xml" /> HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1577,8 +1577,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" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockClose1.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen1.png" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorLockOpen1.pngHDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorlockClose1.pngHDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -16,6 +16,7 @@ /// </summary> public class CommonMethod { private Loading loading; /// <summary> /// 记录当前界面索引值 @@ -127,11 +128,12 @@ /// <param name="isDialog">是否需要弹框</param> public void SkipRTVActivity(string deviceSerial, string deviceId, string spk, bool isDialog) { this.Loading.Start(); this.InitializationAndroidData((isEzChildAccessToken) => { this.MainThread(() => { this.Loading.Hide(); if (isDialog) { Video.View.ShowDialog.Currnet.ClickBox(Language.StringByID(StringId.laizimenlinghujiao), (dialog) => @@ -214,7 +216,7 @@ public void InitializationAndroidData(Action<bool> action) { bool isBool = true; this.Loading.Start(); //this.Loading.Start(); this.SunThread(() => { try @@ -227,14 +229,21 @@ { //Token isBool = false; this.ShowTip("获取萤石云子账号token失败。"); //this.ShowTip("获取萤石云子账号token失败。"); return; } string appKey = "1aa98a90489b4838b966b57018b4b04b";//正式服务器 if (OnAppConfig.Instance.RequestHttpsHost == "https://test-gz.hdlcontrol.com") { appKey = "941b1b72b6294998acfd36c14931b675";//用在测试服务器推送的 } #if __IOS__ //iOS //初始化萤石云SDK，中文国内key、英文海外key 开发者账号使用应用包名申请的APPKEY，不同包名应用需配置不同的APPKEY EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b"); EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey(appKey, appKey); //1.设置所需河东的AccessToken和RefreshToken、域名地址 EZSDK.IOS.EZSDK.SharedInstance().SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken); EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id); @@ -246,7 +255,8 @@ //info.de //EZSDK.IOS.EZSDK.Play(info); #else HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id); HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, appKey, 1, DB_ResidenceData.Instance.CurrentRegion.id); #endif @@ -261,7 +271,7 @@ { this.MainThread(() => { this.Loading.Hide(); //this.Loading.Hide(); action?.Invoke(isBool); }); } @@ -398,11 +408,11 @@ if (comerom == Comerom.collect) { return "FunctionIcon/DoorLock/VideoDoorLockOpen.png"; return "FunctionIcon/DoorLock/VideoDoorLockOpen1.png"; } else { return "FunctionIcon/DoorLock/VideoDoorlockClose.png"; return "FunctionIcon/DoorLock/VideoDoorlockClose1.png"; } } HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
@@ -322,10 +322,26 @@ btnCollectIcon.IsSelected = this.device.collect = !btnCollectIcon.IsSelected; this.device.CollectFunction(); }; int delayTimeMaxValue = 0;// var startTime = DateTime.Now; //实时视频 this.rtvFL.SetClickListener((fl, btnStateImage, btnStateText) => { bool isDeyayClick = false; var clickTime = DateTime.Now; if ((clickTime - startTime).TotalMilliseconds > delayTimeMaxValue) { delayTimeMaxValue = 2*1000; startTime = clickTime; isDeyayClick = true; } if (!isDeyayClick) { return; } CommonMethod.Current.SkipRTVActivity(this.device.sid, this.device.deviceId, this.device.spk, false); }); //临时密码 this.pswFL.SetClickListener((fl, btnStateImage, btnStateText) => ys/Jars/hdl_ezvizsdk.aarBinary files differ
