DLL/IOS/EZSDK.IOS.dllBinary files differ
HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -59,7 +59,6 @@ <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> HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@ <key>UIStatusBarStyle</key> <string>UIStatusBarStyleLightContent</string> <key>CFBundleShortVersionString</key> <string>1.6.602303293</string> <string>1.6.602303301</string> <key>CFBundleVersion</key> <string>1.6.603293</string> <string>1.6.603301</string> <key>NSAppleMusicUsageDescription</key> <string>App needs to access your music library to connect to an external player to play music.</string> <key>NSLocationAlwaysUsageDescription</key> @@ -142,7 +142,7 @@ <string>LC Video will be use</string> <key>NSLocationAlwaysAndWhenInUseUsageDescription</key> <string>LC Video will be use</string> <key>Custom Property</key> <string></string> <key>NSLocationWhenInUseUsageDescription</key> <string>EZ video will be use</string> </dict> </plist> HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
@@ -844,8 +844,15 @@ <navigationItem key="navigationItem" id="XkN-Um-DoE"/> <connections> <outlet property="addBtn" destination="b2S-tK-xqv" id="9pR-up-3TG"/> <outlet property="nameL" destination="bzO-cY-bUs" id="aYK-OL-VpJ"/> <outlet property="passwordLable" destination="BBf-mw-P8e" id="d3L-jP-uP1"/> <outlet property="processingIndicator" destination="YrL-E6-3kA" id="uPy-Af-flm"/> <outlet property="step1TipLable" destination="0PQ-gp-JOK" id="nAm-9N-DTh"/> <outlet property="stepThreeLable" destination="Q0X-wy-A5B" id="DWX-OJ-YK3"/> <outlet property="stepTwoLabel" destination="UGZ-ag-Osr" id="9F4-Kd-6rm"/> <outlet property="tipLable" destination="hz9-ZE-6rg" id="ptX-eG-7O7"/> <outlet property="toCopBtn" destination="iaq-GW-DZt" id="TnC-6F-kLV"/> <outlet property="toSetBtn" destination="hOb-L4-rkc" id="cYH-M0-bkA"/> <outlet property="wifiNameLabel" destination="SOG-Vj-m3m" id="uq7-f2-ZQ8"/> <outlet property="wifiPwdLabel" destination="gzp-iy-iES" id="Z9H-tO-3B5"/> <segue destination="2Wn-Wh-fVL" kind="push" identifier="go2WifiConfigResult" id="Csk-KC-bfz"/> @@ -986,7 +993,7 @@ <inferredMetricsTieBreakers> <segue reference="9TP-S2-hhI"/> <segue reference="Lmt-j9-vhw"/> <segue reference="VYk-37-nb6"/> <segue reference="ikM-Zn-H8f"/> </inferredMetricsTieBreakers> <resources> <image name="addDevice_success" width="320" height="185"/> HDL-ON_iOS/Resources/en.lproj/Localizable.strings
@@ -66,6 +66,7 @@ "device_password"="Password"; "device_account_pw_empty"="The user name or password is required."; "device_lan_preview_title"="Live View via LAN"; "device_add_device_qr_code"="Device QR Code"; "device_open"="Open"; "device_open_success"="Success to open the door!"; @@ -164,6 +165,25 @@ "wifi_device_start_ready"="The device is already started and it is the first time to configure with network."; "wifi_config_wifi_ago"="This device is configured with network before."; "wifi_config_seria_num"="9-digit serial number on the device body"; "wifi_config_verify_code"="Verification Code"; "wifi_config_connected"="Connected"; "wifi_config_select_set_param"="Select \"Set Parameters\""; "wifi_config_select_wifi"="Select \"Wi Fi\""; "wifi_config_net_work"="Configure Network"; "wifi_config_name"="Name:"; "wifi_config_copy_pwd"="Copy Pwd"; "wifi_config_to_setting"="To Setting"; "wifi_config_step_three"="Return to the app, wait for the device to connect, and automatically proceed to the next step after success."; "wifi_config_tip"="Please connect your phone to your device Wi Fi by following these steps:"; "wifi_config_step_three_tip"="(Note: If the device WIFI name is not prefixed with \"EZVIZ\", please copy the password and manually modify the password prefix based on the new prefix name and connect. For example, \"SoftAP_XXXXXXX\")"; "wifi_config_not_connected"="Not connected"; "wifi_config_step_2_tips"="The Wi Fi information of the devices to be connected is as follows:"; "wifi_config_step_2_tips"="If you are using a dual frequency router, please do not connect the camera to Wi Fi in the 5G frequency band"; "wifi_config_step_2_next_step"="Next Step"; "wifi_config_step_2_net"="Net:"; "wifi_config_step_2_password"="Pwd:"; "ui_last_update"="Last Updated:"; "ui_last_update_empty"="Last Updated: No record."; "ui_just_now"="Recently"; HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
@@ -66,6 +66,7 @@ "device_password"="密码"; "device_account_pw_empty"="帐号或密码不能为空"; "device_lan_preview_title"="局域网预览"; "device_add_device_qr_code"="设备二维码"; "device_open"="开门"; "device_open_success"="开门成功！"; @@ -165,6 +166,25 @@ "wifi_device_start_ready"="设备已启动好，且是第一次配置网络"; "wifi_config_wifi_ago"="这台设备以前配过网络"; "wifi_config_seria_num"="设备机身上的9位序列号"; "wifi_config_verify_code"="验证码"; "wifi_config_connected"="我已连接好"; "wifi_config_select_set_param"="选择\"设置参数\""; "wifi_config_select_wifi"="选择\"Wi-Fi\""; "wifi_config_net_work"="配置网络"; "wifi_config_name"="名称："; "wifi_config_copy_pwd"="复制密码"; "wifi_config_to_setting"="进入设置页面"; "wifi_config_step_three"="返回APP，等待与设备连接，成功后自动进入下一步操作。"; "wifi_config_tip"="请通过下列步骤将手机连接到设备Wi-Fi："; "wifi_config_step_three_tip"="(注意：如果设备WIFI名称不是“EZVIZ”前缀的，请复制密码后根据新的前缀名字，手动修改密码的前缀并连接即可。例如“SoftAP_XXXXXXX”)"; "wifi_config_not_connected"="尚未连接网络"; "wifi_config_step_1_tips"="待连接的设备Wi-Fi信息如下："; "wifi_config_step_2_tips"="如果你使用的是双频路由器，请不要让摄像机连接5G频段的Wi-Fi"; "wifi_config_step_2_next_step"="下一步"; "wifi_config_step_2_net"="网络："; "wifi_config_step_2_password"="密码："; "ui_last_update"="最后更新："; "ui_last_update_empty"="最后更新：无记录"; "ui_just_now"="刚刚"; HDL_APP_Project.sln
@@ -18,8 +18,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UMSdk", "UMSdk\UMSdk.csproj", "{5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ys", "..\ys\ys.csproj", "{DF065E3F-C3A1-4908-9582-000974B7C290}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution HDL_ON\HDL_ON.projitems*{09712674-2a38-407b-b1e2-560b2c352f9a}*SharedItemsImports = 4 @@ -121,18 +119,6 @@ {5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Release|iPhone.Build.0 = Release|Any CPU {5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {DF065E3F-C3A1-4908-9582-000974B7C290}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DF065E3F-C3A1-4908-9582-000974B7C290}.Debug|Any CPU.Build.0 = Debug|Any CPU {DF065E3F-C3A1-4908-9582-000974B7C290}.Debug|iPhone.ActiveCfg = Debug|Any CPU {DF065E3F-C3A1-4908-9582-000974B7C290}.Debug|iPhone.Build.0 = Debug|Any CPU {DF065E3F-C3A1-4908-9582-000974B7C290}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {DF065E3F-C3A1-4908-9582-000974B7C290}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {DF065E3F-C3A1-4908-9582-000974B7C290}.Release|Any CPU.ActiveCfg = Release|Any CPU {DF065E3F-C3A1-4908-9582-000974B7C290}.Release|Any CPU.Build.0 = Release|Any CPU {DF065E3F-C3A1-4908-9582-000974B7C290}.Release|iPhone.ActiveCfg = Release|Any CPU {DF065E3F-C3A1-4908-9582-000974B7C290}.Release|iPhone.Build.0 = Release|Any CPU {DF065E3F-C3A1-4908-9582-000974B7C290}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {DF065E3F-C3A1-4908-9582-000974B7C290}.Release|iPhoneSimulator.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE HDL_ON/Common/ApiUtlis.cs
@@ -140,6 +140,7 @@ // return; //} //return; try { @@ -236,7 +237,6 @@ //===================读取可视对讲数据========================== //判断是否有可视对讲数据，有则显示可视对讲icon //var flVideoInfo = HttpRequest.CheckFlVideo(); @@ -282,6 +282,7 @@ } } //======================获取Sip账号并且初始化SDK可视对讲设备列表==================== //如果检测线程没启动，才继续下面操作 因为App有可能刚启动马上收到推送了，然后才执行到这里 if (HDLLinphone.Current.CheckIncomingCallThreadIsNull()) @@ -297,6 +298,7 @@ } else if (isInterphoneType_FREEVIEW) { //HDLLinphone可视对讲,获取Sip账号并初始化SDK HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo(); callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id; @@ -310,6 +312,8 @@ HDLLinphone.Current.LogoutAllAccount(); } } //======================登录全视通==================== if (isInterphoneType_FREEVIEW) @@ -345,12 +349,13 @@ complateDevice = true; MainPage.Log($"============设备============完成" + FunctionList.List.Functions.Count); } //}) //{ IsBackground = true }.Start(); //}) //{ IsBackground = true }.Start(); ////===================场景========================== //new System.Threading.Thread(() => //{ ////===================场景========================== //new System.Threading.Thread(() => //{ try { complateScene = false; HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -544,7 +544,7 @@ var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoRes>>(resultObj.Data.ToString()); if (homeList == null || homeList.Count == 0) { if (DB_ResidenceData.Instance.CurrentRegion.id != "") if (DB_ResidenceData.Instance.CurrentRegion!=null && DB_ResidenceData.Instance.CurrentRegion.id != "") { Shared.Application.RunOnMainThread(() => { HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,8 @@ /// 固定域名,正式环境 /// 公共域名就近解析 /// </summary> public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; const string APP_KEY = "HDL-HOME-APP-TEST"; const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"; //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -242,7 +242,10 @@ } else { new Alert("", $"获取Sip账号信息失败.", "确定").Show(); //Application.RunOnMainThread(() => //{ // new Alert("", $"获取Sip账号信息失败.", "确定").Show(); //}); } } catch { } HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic; using Shared; using HDL_ON.DAL.Server; using Foundation; #if __IOS__ #else using Com.Videogo.Hdl; @@ -61,6 +62,9 @@ this.GetYingshiDeviceList(serials); }; EZSDK.IOS.EZSDK.SharedInstance().Delegate = ezsdkDelegate; NSObject[] nSObject = new NSObject[1]; nSObject[0] = new NSString("DP1"); EZSDK.IOS.EZSDK.SharedInstance().ConnectTipModels = nSObject; EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType(spk); #else HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
@@ -216,9 +216,15 @@ }; cellFrame.AddChidren(btnCell); #if __IOS__ btnCell.Width += 5; cellFrame.Width += 5; #else #endif //门锁状态 btnDoorLockIcon = new Button //门锁状态 btnDoorLockIcon = new Button { X = Application.GetRealWidth(65), Y = Application.GetRealHeight(108), @@ -371,12 +377,14 @@ private void CalculatedPosition() { this.btnCurrDeviceName.Width = this.btnCurrDeviceName.GetTextWidth(); this.btnCurrDeviceName.Width += 10; if (this.btnCurrDeviceName.GetTextWidth() > this.btnCollectIcon.X) { //重新计算宽度 this.btnCurrDeviceName.Width = this.btnCollectIcon.X + Application.GetRealWidth(-10); } this.btnCurrDeviceRoom.Width = this.btnCurrDeviceRoom.GetTextWidth(); this.btnCurrDeviceRoom.Width += 10; if (this.btnCurrDeviceRoom.GetTextWidth() > this.btnCollectIcon.X) { //重新计算宽度 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"; //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com"; public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com"; const string APP_KEY = "HDL-HOME-APP-TEST"; const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"; //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm SiriIntents/SiriIntents.csproj
@@ -79,7 +79,6 @@ <MtouchArch>ARM64</MtouchArch> <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler> <MtouchVerbosity></MtouchVerbosity> <CodesignProvision>OnProSiri230329-1-Dev</CodesignProvision> </PropertyGroup> <ItemGroup> <Reference Include="System" /> SiriIntentsUI/SiriIntentsUI.csproj
@@ -83,7 +83,6 @@ <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler> <MtouchVerbosity></MtouchVerbosity> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CodesignProvision>OnProSiriUI230329-1-Dev</CodesignProvision> </PropertyGroup> <ItemGroup> <Reference Include="System" />
