1.更新EZSDK.IOS.dll 2.集成萤石相关方法 3.删除不必要的测试代码

chenqiyang

2023-03-29 d5a7e0f0199959eac3a3a148624dfc58dbbe7a47

 HDL_ON/Common/HDLCommon.cs

@@ -7,7 +7,7 @@
using HDL_ON.Entity;
using System.Threading;
using HDL_ON.DriverLayer;

using Foundation;
namespace HDL_ON
{
    /// <summary>
@@ -304,9 +304,9 @@
                    }
                    else if (jpushMessageInfo.messageType.Contains(PushMessageType.HDL_INTERPHONE.ToString()))
                    {
                       

                        if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
                        

                        //字段兼容问题，只能直接取值了
                        var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
                        try
@@ -389,8 +389,18 @@
                    }
                    else if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
                    {
                        /////视频门锁
                        HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipRTVActivity();
                        try
                        {
                            if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
                            var expantContent = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.VideoDoorLock.ExpantContent>(jpushMessageInfo.expantContent);
                            if (expantContent == null)
                            {
                                return;
                            }
                            ///视频门锁
                            HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId,expantContent.spk,true);
                        }
                        catch { }
                    }
                }
            }
@@ -565,7 +575,7 @@


            //防止多次弹窗处理
            if (alarmPushConfirmDialog == null)
            if (alarmPushConfirmDialog == null) 
            {
                alarmPushConfirmDialog = new ConfirmDialog(isAlarm);
                alarmPushConfirmDialog.ShowDialog(Language.StringByID(StringId.Tip), jpushMessageInfo.Content, goAction, cancelAction, StringId.Cancel, StringId.LookOver);
@@ -693,8 +703,14 @@
                                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();
                                //NSObject[] types = new NSObject[1];
                                //types[0] = new NSString("DL30V");
                                //EZSDK.IOS.EZSDK.SharedInstance().ToEZDeviceListViewWithFilterTypes(types);

                                //EZSDK.IOS.EZDeviceInfo info = new EZSDK.IOS.EZDeviceInfo();
                                //info.de