DLL/IOS/Shared.IOS.HDLCNVRSDK.dllBinary files differ
DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dllBinary files differ
HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -59,6 +59,7 @@ <MtouchEnableSGenConc>false</MtouchEnableSGenConc> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CodesignProvision>OnPro230308-3-Dev</CodesignProvision> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' "> <DebugType>none</DebugType> @@ -86,20 +87,8 @@ <HintPath>..\DLL\Shared.IOS.TBL.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="MJRefresh_Xamarin"> <HintPath>..\DLL\IOS\MJRefresh_Xamarin.dll</HintPath> </Reference> <Reference Include="Shared.IOS.JLCountryCode"> <HintPath>..\DLL\IOS\Shared.IOS.JLCountryCode.dll</HintPath> </Reference> <Reference Include="EZSDK.IOS"> <HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath> </Reference> <Reference Include="Shared.IOS.ESVideoOnSDK"> <HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath> </Reference> <Reference Include="Shared.IOS.LCVideoOnSDK"> <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath> </Reference> <Reference Include="Shared.IOS.HDLSceneSiri"> <HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.dll</HintPath> @@ -107,14 +96,26 @@ <Reference Include="Shared.IOS.HDLLinphoneSDK"> <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath> </Reference> <Reference Include="Shared.IOS.HDLFVSDK"> <HintPath>..\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath> </Reference> <Reference Include="HDL.Shared.IOS.ScanQRCode"> <HintPath>..\DLL\IOS\HDL.Shared.IOS.ScanQRCode.dll</HintPath> </Reference> <Reference Include="Shared.IOS"> <HintPath>..\DLL\Shared.IOS.dll</HintPath> </Reference> <Reference Include="Shared.IOS.HDLFVSDK"> <HintPath>..\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath> </Reference> <Reference Include="Shared.IOS.ESVideoOnSDK"> <HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath> </Reference> <Reference Include="EZSDK.IOS"> <HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath> </Reference> <Reference Include="Shared.IOS.HDLCNVRSDK"> <HintPath>..\DLL\IOS\Shared.IOS.HDLCNVRSDK.dll</HintPath> </Reference> <Reference Include="Shared.IOS.LCVideoOnSDK"> <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -142,6 +143,12 @@ <PackageReference Include="Xamarin.Essentials"> <Version>1.7.0</Version> </PackageReference> <PackageReference Include="Xamarin.iOS.SwiftRuntimeSupport"> <Version>0.2.1</Version> </PackageReference> <PackageReference Include="Xamarin.iOS.MJRefresh"> <Version>3.2.2</Version> </PackageReference> </ItemGroup> <ItemGroup> <ImageAsset Include="Assets.xcassets\add_server1.imageset\add_server1.png" /> HDL-ON_iOS/Info.plist
@@ -42,7 +42,7 @@ <key>LSRequiresIPhoneOS</key> <true/> <key>MinimumOSVersion</key> <string>12.0</string> <string>12.2</string> <key>UIDeviceFamily</key> <array> <integer>1</integer> @@ -66,6 +66,8 @@ <key>UISupportedInterfaceOrientations</key> <array> <string>UIInterfaceOrientationPortrait</string> <string>UIInterfaceOrientationLandscapeRight</string> <string>UIInterfaceOrientationLandscapeLeft</string> </array> <key>UIAppFonts</key> <array> @@ -138,5 +140,7 @@ <array> <string>HDLRunSceneIntent</string> </array> <key>Custom Property</key> <string></string> </dict> </plist> HDL-ON_iOS/Resources/com.hri.hpc.mobile.ios.player.metallibBinary files differ
HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
@@ -28,6 +28,9 @@ "get_info_fail"="查询失败，网络不给力"; "ad_input_manual"="手动输入"; "ad_result_verify_local_lock"="请在2分钟之内校验已添加的主用户指纹、密钥或感应卡，校验完成请点击已校验按钮"; "ad_verified"="已校验"; "device_camera_list_title"="设备通道列表"; "device_input_vierify_code"="请输入设备验证码"; "device_verify_code_wrong"="验证码错误"; @@ -64,6 +67,44 @@ "device_account_pw_empty"="帐号或密码不能为空"; "device_lan_preview_title"="局域网预览"; "device_open"="开门"; "device_open_success"="开门成功！"; "device_temp_pass"="临时密码"; "device_temp_year"="年"; "device_temp_month"="月"; "device_temp_date"="日"; "device_temp_left"="剩余"; "device_temp_times"="次"; "device_temp_save"="保存"; "device_temp_user"="使用人"; "device_temp_valid_date"="有效期"; "device_temp_valid_begin"="开始"; "device_temp_valid_end"="结束"; "device_temp_use_times"="使用次数"; "device_temp_please_select"="请选择"; "device_temp_unlimited_times"="不限"; "device_temp_sure"="确认"; "device_temp_cancle"="取消"; "device_temp_please_input"="请输入"; "device_temp_input_use_count_describe"="输入1到100的整数， 为空表示不限次数"; "device_temp_input_pure_number"="请输入纯数字"; "device_temp_input_valid_number"="请输入1-100之间的数字"; "device_temp_unit_year"="年"; "device_temp_unit_month"="月"; "device_temp_unit_date"="日"; "device_temp_unit_hour"="时"; "device_temp_unit_minute"="分"; "device_temp_please_input_user_name"="请输入使用人"; "device_temp_please_select_begin_time"="请选择开始时间"; "device_temp_please_select_end_time"="请选择结束时间"; "device_temp_please_end_time_should_later"="结束时间不得早于开始时间"; "device_temp_unlimited_use_times"="不限次数"; "device_temp_total"="总数"; "device_temp_copied"="已复制"; "device_temp_long_tap_copy"="长按复制临时密码"; "device_temp_sure_to_delete"="确认删除临时密码吗？"; "dmessage_title"="消息"; "message_read"="标记已读"; "message_deleting"="正在删除，请稍候..."; HDL_ON/Common/ApiUtlis.cs
@@ -315,8 +315,8 @@ if (isInterphoneType_FREEVIEW) { #if __IOS__ //登录全视通 Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id); //登录全视通 Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id); #endif }
@@ -687,6 +687,10 @@ EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id); //2.设置萤石子账号的AccessToken到SDK EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(ezChildAccessToken); //Console.WriteLine("loginToken：" + UserInfo.Current.LoginTokenString); //Console.WriteLine("refreshToken：" + UserInfo.Current.RefreshToken); ////3.打开摄像头设备列表页面 EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();
@@ -17,8 +17,8 @@ /// 固定域名,正式环境 /// 公共域名就近解析 /// </summary> public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm /// <summary> /// RegionMark /// </summary> HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -98,7 +98,6 @@ } else if(interphoneType == InterphoneType.FLVI.ToString()) { ESOnMonitorViewController vc = new ESOnMonitorViewController(); vc.MESVideoID = mESVideoInfo.ESVideoUUID; vc.MESRoomID = roomID; @@ -106,13 +105,11 @@ //vc.RoomName = mESVideoInfo.RoomName; //vc.MESCallDelegate = new OnESCallDelegate(this); Shared.Application.currentVC.NavigationController.PushViewController(vc, true); }else if (interphoneType == InterphoneType.HDL.ToString()) } else if (interphoneType == InterphoneType.HDL.ToString()) { //HDLLinphone 狄耐克 HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, interphoneType); ////全视通 //NSDictionary deviceInfo = new NSDictionary("deviceCode","3-1-11-2", "deviceName", mESVideoInfo.DeviceName); //Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo); } else if (interphoneType == InterphoneType.FREEVIEW.ToString()) { //全视通监视 @@ -229,7 +226,6 @@ } else if (interphoneType == InterphoneType.FLVI.ToString()) { ESOnIntercomViewController vc = new ESOnIntercomViewController(); vc.MESVideoID = mESVideoInfo.ESVideoUUID; vc.MESRoomID = roomID; @@ -239,7 +235,8 @@ mOnESCallDelegate = new OnESCallDelegate(this); vc.MESCallDelegate = mOnESCallDelegate; Shared.Application.currentVC.NavigationController.PushViewController(vc, true); }else{ } else{ HDLUtils.WriteLine("未支持的可视对讲类型"); } HDL_ON/Entity/FunctionList.cs
@@ -77,6 +77,17 @@ if (_IpCamImou.Count > 0) { #if __IOS__ //初始化大华摄像头sdk Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().InitSDKWithAppKey("HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost); Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString; Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken; Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().HomeId = DB_ResidenceData.Instance.CurrentRegion.id; Console.WriteLine("token：" + UserInfo.Current.LoginTokenString); Console.WriteLine("token：" + UserInfo.Current.RefreshToken); Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshDeviceList(); #else Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost); Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id; HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -233,7 +233,20 @@ doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor); break; case SPK.IpCam_Imou: #if __IOS__ if (Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken==null) {//未初始化摄像头 Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().InitSDKWithAppKey("HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost); Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString; Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken; Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().HomeId = DB_ResidenceData.Instance.CurrentRegion.id; Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshDeviceList(); } //跳转大华摄像头 Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshDeviceList(); //Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().ToMonitorViewWithDeviceId(function.extDevId, function.name); Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().ToMonitorViewWithDeviceId(function.extDevId, function.name, Shared.Application.currentVC); #else FunctionList.List.GetIpCamImouList(); if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken)) @@ -259,6 +272,7 @@ Application.RunOnMainThread(() =>{ try { Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString(); Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId, function.name); } @@ -298,6 +312,7 @@ { try { Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId, function.name); } catch (Exception ex) HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -7,10 +7,40 @@ using HDL_ON.Entity; using HDL_ON.UI.CSS; using Shared; #if __IOS__ using Shared.IOS.HDLCNVRSDK; #endif namespace HDL_ON.UI { public class AddDevciePage : FrameLayout { #if __ANDROID__ public class dddxx { } #else hdlLCNVRSDKDelegate hdlLCNVRDelegate; public class hdlLCNVRSDKDelegate : HDLLCNVRSDKDelegate { Action act; public hdlLCNVRSDKDelegate(Action action) { act = action; } public override void AddDeviceFailWithErrorCode(string errorCode) { } public override void BackFromAddDeviceView() { act?.Invoke(); } } #endif FrameLayout bodyView; IntegratedBrand brand; VerticalRefreshLayout contentView; @@ -23,6 +53,7 @@ public void LoadPage(VerticalRefreshLayout refreshView) { new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice)).LoadTopView(); bodyView.BackgroundColor = CSS_Color.BackgroundColor; @@ -49,7 +80,8 @@ { var waitPage = new Loading(); waitPage.Start(); new System.Threading.Thread(() => { new System.Threading.Thread(() => { try { var pm = new HttpServerRequest(); @@ -122,7 +154,7 @@ Width = Application.GetRealWidth(32), Height = Application.GetRealWidth(32), Radius = (uint)Application.GetRealWidth(4), UnSelectedImagePath = $"FunctionIcon/Icon/{device.IconName}.png", UnSelectedImagePath = $"FunctionIcon/Icon/{device.IconName}.png", }; row.AddChidren(btnIcon); Button btnRight = new Button() @@ -146,11 +178,30 @@ }; row.AddChidren(btnName); btnName.MouseUpEventHandler = (sender, e) => { btnName.MouseUpEventHandler = (sender, e) => { switch (device.spk) { case SPK.IpCam_Imou: #if __ANDROID__ #if __IOS__ //初始化大华摄像头sdk Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().InitSDKWithAppKey("HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost); Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString; Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken; Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().HomeId = DB_ResidenceData.Instance.CurrentRegion.id; //跳转添加摄像头 hdlLCNVRDelegate = new hdlLCNVRSDKDelegate(() => {//添加成功返回事件 refreshView.BeginHeaderRefreshing(); this.RemoveFromParent(); }); Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().Delegate = hdlLCNVRDelegate; Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().ToAddDeviceView(); #else FunctionList.List.GetIpCamImouList(); if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken)) { @@ -183,6 +234,7 @@ Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id; Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken; Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString(); #if __ANDROID__ Application.RunOnMainThread(() => { @@ -333,24 +385,28 @@ case SPK.IrModule: var form = new AddMiniRemoteControlDirection1Page(); form.AddForm(); form.AddDeviceEvent = (functionObj) => { form.AddDeviceEvent = (functionObj) => { refreshView.BeginHeaderRefreshing(); }; }; break; case SPK.SenesorMegahealth: case SPK.SenesorMegahealth2: case SPK.SensorMmvPose: var form1 = new AddSenesorMegahealthDirection1Page(); form1.AddForm(device); form1.AddDeviceEvent = (functionObj) => { form1.AddDeviceEvent = (functionObj) => { refreshView.BeginHeaderRefreshing(); this.RemoveFromParent(); }; break; case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin: case SPK.SensorEnvironment: case SPK.SensorEnvironmentHailin: var form2 = new AddSensorEnvironmentPage(); form2.AddForm(device); form2.AddDeviceEvent = (functionObj) => { form2.AddDeviceEvent = (functionObj) => { refreshView.BeginHeaderRefreshing(); this.RemoveFromParent(); }; @@ -359,7 +415,8 @@ case SPK.SensorEnvironment3: var form3 = new AddQingpingSensorEnvirTipPage(); form3.AddForm(device); form3.AddDeviceEvent = (functionObj) => { form3.AddDeviceEvent = (functionObj) => { refreshView.BeginHeaderRefreshing(); this.RemoveFromParent(); }; HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -744,7 +744,7 @@ //刷新接口请求所需要的参数 Foundation.NSDictionary info = new Foundation.NSDictionary("regionUrl", HttpUtil.GlobalRequestHttpsHost, "token", UserInfo.Current.LoginTokenString, "appkey", "HDL-HOME-APP-TEST", "secret", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "refreshToken", UserInfo.Current.RefreshToken); Shared.IOS.HDLFVSDK.Video.RefreshInfo(info); //跳转访客管理界面 ////跳转访客管理界面 Shared.IOS.HDLFVSDK.Video.ShowVisitorManager(); #else var page = new VisitorQRCodePage(); SiriIntents/Server/HttpUtil.cs
@@ -16,8 +16,8 @@ /// 固定域名,正式环境 /// 公共域名就近解析 /// </summary> public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm /// <summary> /// RegionMark /// </summary> SiriIntents/SiriIntents.csproj
@@ -79,6 +79,7 @@ <MtouchArch>ARM64</MtouchArch> <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler> <MtouchVerbosity></MtouchVerbosity> <CodesignProvision>OnProSiri230308-2-Dev</CodesignProvision> </PropertyGroup> <ItemGroup> <Reference Include="System" /> SiriIntentsUI/SiriIntentsUI.csproj
@@ -83,6 +83,7 @@ <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler> <MtouchVerbosity></MtouchVerbosity> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CodesignProvision>OnProSiriUI230308-2-Dev</CodesignProvision> </PropertyGroup> <ItemGroup> <Reference Include="System" />
