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

chenqiyang

2023-03-29 d5a7e0f0199959eac3a3a148624dfc58dbbe7a47

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

 DLL/IOS/EZSDK.IOS.dll

Binary files differ

 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>
@@ -706,9 +706,11 @@
                                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

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -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/UI/UI2/4-PersonalCenter/PersonalDataPage.cs

@@ -824,14 +824,10 @@
            //跳转服务器信息
            Action selectAction = () =>
            {
                //var myServerInfoPage = new MyServerInfoPage();
                //MainPage.BasePageView.AddChidren(myServerInfoPage);
                //myServerInfoPage.LoadPage();
                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
#if __IOS__
                //萤石临时密码
                EZSDK.IOS.EZSDK.SharedInstance().ToTemPassView("1638782606240137218");
#endif
                var myServerInfoPage = new MyServerInfoPage();
                MainPage.BasePageView.AddChidren(myServerInfoPage);
                myServerInfoPage.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

            };
            myServerInfoCellView.GoAction = selectAction;
@@ -849,14 +845,10 @@
            //注销账号界面
            Action logOffAction = () =>
            {
                //var myServerInfoPage = new CancelAccountPage();
                //MainPage.BasePageView.AddChidren(myServerInfoPage);
                //myServerInfoPage.LoadPage();
                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
#if __IOS__
                //萤石历史记录
                EZSDK.IOS.EZSDK.SharedInstance().ToDeviceMsgListView("1638782606240137218");
#endif
                var myServerInfoPage = new CancelAccountPage();
                MainPage.BasePageView.AddChidren(myServerInfoPage);
                myServerInfoPage.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            logOffView.GoAction = logOffAction;
            logOffView.BtnTilte.Text = Language.StringByID(StringId.CancelAccount);

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs

@@ -439,15 +439,11 @@
        {
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                ////我的二维码
                //var aep = new MyQRCodePage();
                //MainPage.BasePageView.AddChidren(aep);
                //aep.LoadPage();
                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
#if __IOS__
                //萤石跳转视频页
                EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial("J92513662", "1638782606240137218", "security.door.ezviz");
#endif
                //我的二维码
                var aep = new MyQRCodePage();
                MainPage.BasePageView.AddChidren(aep);
                aep.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            _QRcodeView.MouseUpEventHandler = eventHandler;
            btnQRcode.MouseUpEventHandler = eventHandler;
@@ -499,34 +495,27 @@
        {
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                //Action<string> action = (phone) =>
                //{
                //    btnUserPhoneInfo.Text = GetBindAccountText(phone);
                Action<string> action = (phone) =>
                {
                    btnUserPhoneInfo.Text = GetBindAccountText(phone);

//};
                };

//if (CheckIfUnbound(btnUserPhoneInfo.Text))
//{
//    //未绑定,跳转新绑定页面
//    var aep = new NewBindAccountPage();
//    MainPage.BasePageView.AddChidren(aep);
//    aep.LoadPage(action, true);
//    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
//}
//else
//{
//    var aep = new AccountBindInfoPage();
//    MainPage.BasePageView.AddChidren(aep);
//    aep.LoadPage(action, 2, StringId.PhoneInfo);
//    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
//}
#if __IOS__
                //萤石跳转设备列表
                NSObject[] types = new NSObject[1];
                types[0] = new NSString("DL30V");
                EZSDK.IOS.EZSDK.SharedInstance().ToEZDeviceListViewWithFilterTypes(types);
#endif

                if (CheckIfUnbound(btnUserPhoneInfo.Text))
                {
                    //未绑定,跳转新绑定页面
                    var aep = new NewBindAccountPage();
                    MainPage.BasePageView.AddChidren(aep);
                    aep.LoadPage(action, true);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                }
                else
                {
                    var aep = new AccountBindInfoPage();
                    MainPage.BasePageView.AddChidren(aep);
                    aep.LoadPage(action, 2, StringId.PhoneInfo);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                }

            };
            btnUserPhoneInfo.MouseUpEventHandler = eventHandler;
@@ -560,19 +549,15 @@
        {
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                ////var page = new ResetPasswordOptionPage();
                ////MainPage.BasePageView.AddChidren(page);
                ////page.LoadPage();
                ////MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                //var page = new ResetPasswordOptionPage();
                //MainPage.BasePageView.AddChidren(page);
                //page.LoadPage();
                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

//var vcp = new ResetPasswordPage();
//MainPage.BasePageView.AddChidren(vcp);
//vcp.LoadPage();
//MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
#if __IOS__
                //萤石添加设备
                EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType("security.door.ezviz");
#endif
                var vcp = new ResetPasswordPage();
                MainPage.BasePageView.AddChidren(vcp);
                vcp.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

            };
            btnResetPasswordRight.MouseUpEventHandler = eventHandler;

 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs

@@ -39,7 +39,7 @@

        }

        #region  --------- 跳转到Android那边的方法(萤石视频门锁) --------
        #region  --------- 跳转到Android，ios那边的方法(萤石视频门锁) --------
        /// <summary>
        /// android,ios源生添加设备到云端成功后回调方法
        /// 再读取云端的上萤石设备列表
@@ -59,6 +59,21 @@
                    });
                }
#if __IOS__
                //跳转添加萤石设备
                ezsdkDelegate = new IosIHdlInterface();
                ezsdkDelegate.mAction += (serials) => {
                    var list = VideDoorLockSend.Current.GetVideoDoorLockDeviceList(SPK.VideoDoorLock);
                    if (list.Count > 0)
                    {
                        var function = list.Find((o) => o.sid == serials);
                        if (function != null)
                        {
                            this.SaveFunctionFile(function);
                        }
                    }
                };
                EZSDK.IOS.EZSDK.SharedInstance().Delegate= ezsdkDelegate;
                EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType(spk);

#else
                HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity,spk);
@@ -116,7 +131,8 @@
                    {
                        dialog.Close();
#if __IOS__

                        //打开萤石视频界面
                        EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk);
#else
                    HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk);
#endif
@@ -128,6 +144,9 @@
                else
                {
#if __IOS__
                    //打开萤石视频界面
                    EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk);

#else
                    HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk);
#endif
@@ -148,6 +167,8 @@
            {

#if __IOS__
                //打开萤石历史记录界面
                EZSDK.IOS.EZSDK.SharedInstance().ToDeviceMsgListView(deviceId);
#else
                HDLEzvizSdk.Instance.JumpLockHistoryActivity(Application.Activity, deviceId);
#endif
@@ -172,6 +193,8 @@
                    });
                }
#if __IOS__
                //打开萤石临时密码界面
                EZSDK.IOS.EZSDK.SharedInstance().ToTemPassView(deviceId);
#else
                HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId);
#endif
@@ -447,26 +470,27 @@
        }

#if __IOS__
        ///// <summary>
        ///// 专门定义给Ios回调用着,没有特殊含义
        ///// </summary>
        //public class IosIHdlInterface : Shared.IOS.HDLLinphoneSDK.HDLLinphoneCallDelegate
        //{
        //    Action<bool, string> mAction;
        //    public IosIHdlInterface(Action<bool, string> action)
        //    {
        //        mAction = action;
        //    }
        //    /// <summary>
        //    /// 
        //    /// </summary>
        //    /// <param name="p0">true是入网成功(源生回调返回)</param>
        //    /// <param name="p1">设备的序列化(源生回调返回)</param>
        //    public void AddCallback(bool p0, string p1)
        //    {
        //        mAction?.Invoke(p0, p1);
        //    }
        //}
        IosIHdlInterface ezsdkDelegate;
        /// <summary>
        /// 专门定义给Ios回调用着,没有特殊含义
        /// </summary>
        public class IosIHdlInterface : EZSDK.IOS.EZSDKDelegate
        {
          public  Action<string> mAction;
            public IosIHdlInterface()
            {
             
            }
            /// <summary>
            /// 
            /// </summary>
            /// <param name="p0">true是入网成功(源生回调返回)</param>
            /// <param name="p1">设备的序列化(源生回调返回)</param>
            public override void AddDeviceSuccessed(string deviceSerial)
            {
                mAction?.Invoke(deviceSerial);
            }
        }
#else
        /// <summary>
        /// 专门定义给安卓回调用着,没有特殊含义

 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs

@@ -153,7 +153,7 @@
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
            d.Add("spk", spk);
            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_UserList, "获取萤石门锁设备列表");
            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_GetDevcieList, "获取萤石门锁设备列表");
            if (!this.DataChecking(responsePackNew, tipType))
            {
                return new List<Function>();