Merge branch 'dev-CQY' into dev 1.调整全视通与自研的逻辑 2.增加获取可视对讲第三方账号接口

chenqiyang

2022-05-18 da22725d616af0f3081670c76195eaf57794bc29

Merge branch 'dev-CQY' into dev
1.调整全视通与自研的逻辑 2.增加获取可视对讲第三方账号接口

 DLL/IOS/Shared.IOS.HDLFVSDK.dll

Binary files differ

 HDL-ON_iOS/AppDelegate.cs

@@ -10,7 +10,7 @@
using HDL_ON.UI;
using HDL_ON.DAL.Server;
using Intents;

using HDL_ON.Entity;
namespace SharedMethod
{
    public static class SharedMethod
@@ -92,7 +92,7 @@

            // Get previous device token
            var oldDeviceToken = NSUserDefaults.StandardUserDefaults.StringForKey("PushDeviceToken");
            new Alert("", DeviceToken, "取消", "确定").Show();
            //new Alert("", DeviceToken, "取消", "确定").Show();

            //NSDictionary test = new NSDictionary(new NSString("123"), new NSString("test"));
            //NSError error;
@@ -135,10 +135,10 @@
            Console.WriteLine("推送消息："+userInfo);
            //var test = new NSDictionary();
            //test.SetNilValueForKey(new NSString("test"));
            NSError error;
            NSData dicD = NSJsonSerialization.Serialize(userInfo, NSJsonWritingOptions.PrettyPrinted, out error); ;
            NSString str = new NSString(dicD, NSStringEncoding.UTF8);
            new Alert("", str, "取消", "确定").Show();
            //NSError error;
            //NSData dicD = NSJsonSerialization.Serialize(userInfo, NSJsonWritingOptions.PrettyPrinted, out error); ;
            //NSString str = new NSString(dicD, NSStringEncoding.UTF8);
            //new Alert("", str, "取消", "确定").Show();

            //读取推送信息
            UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
@@ -188,8 +188,12 @@

        public override void OnResignActivation(UIApplication application)
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
            if (DB_ResidenceData.Instance.SupportFVDevice)
            {
                //设置全视通状态
                Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
            }


            Console.WriteLine("OnResignActivation");
            UserInfo.Current.unlockTime = DateTime.Now;
@@ -197,8 +201,12 @@

        public override void DidEnterBackground(UIApplication application)
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
            if (DB_ResidenceData.Instance.SupportFVDevice)
            {
                //设置全视通状态
                Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
            }


            //SharedMethod.SharedMethod.IsBackground = true;
            //MainPage.IsEnterBackground = true;
@@ -225,8 +233,12 @@

        public override void OnActivated(UIApplication application)
        {
            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
            if (DB_ResidenceData.Instance.SupportFVDevice)
            {
                //设置全视通状态
                Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
            }


            Console.WriteLine("OnActivated");
            base.OnActivated(application);
@@ -279,9 +291,12 @@

        public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
        {
         
            if (DB_ResidenceData.Instance.SupportFVDevice) {
                //设置全视通状态
                Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());
            }

            //设置全视通状态
            Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());

            Console.WriteLine("111111111111");
            SetCurrentLanguage();

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -74,6 +74,7 @@
        <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
        <MtouchI18n>cjk</MtouchI18n>
        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
        <CodesignProvision>OnPro220307-1-Hoc</CodesignProvision>
    </PropertyGroup>
    <ItemGroup>
        <Reference Include="System" />
@@ -108,12 +109,12 @@
        <Reference Include="Shared.IOS.HDLSceneSiri">
          <HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.dll</HintPath>
        </Reference>
        <Reference Include="Shared.IOS.HDLFVSDK">
          <HintPath>..\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath>
        </Reference>
        <Reference Include="Shared.IOS.HDLLinphoneSDK">
          <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
        </Reference>
        <Reference Include="Shared.IOS.HDLFVSDK">
          <HintPath>..\..\..\HDLDemo\全视通\金茂全视通（onpro上用）\FVSDKNew\Shared.IOS.HDLFVSDK\Shared.IOS.HDLFVSDK\bin\Debug\Shared.IOS.HDLFVSDK.dll</HintPath>
        </Reference>
    </ItemGroup>
    <ItemGroup>
      <PackageReference Include="Newtonsoft.Json">

 HDL_APP_Project.sln

@@ -18,6 +18,8 @@
EndProject

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UMSdk", "UMSdk\UMSdk.csproj", "{5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}"

EndProject

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.IOS.HDLFVSDK", "..\..\HDLDemo\全视通\金茂全视通（onpro上用）\FVSDKNew\Shared.IOS.HDLFVSDK\Shared.IOS.HDLFVSDK\Shared.IOS.HDLFVSDK.csproj", "{56776799-6E94-4016-B369-068B96C6ACDE}"

EndProject

Global

    GlobalSection(SharedMSBuildProjectFiles) = preSolution

        HDL_ON\HDL_ON.projitems*{09712674-2a38-407b-b1e2-560b2c352f9a}*SharedItemsImports = 4

@@ -119,6 +121,18 @@
        {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

        {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

        {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|Any CPU.Build.0 = Debug|Any CPU

        {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|iPhone.ActiveCfg = Debug|Any CPU

        {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|iPhone.Build.0 = Debug|Any CPU

        {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU

        {56776799-6E94-4016-B369-068B96C6ACDE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU

        {56776799-6E94-4016-B369-068B96C6ACDE}.Release|Any CPU.ActiveCfg = Release|Any CPU

        {56776799-6E94-4016-B369-068B96C6ACDE}.Release|Any CPU.Build.0 = Release|Any CPU

        {56776799-6E94-4016-B369-068B96C6ACDE}.Release|iPhone.ActiveCfg = Release|Any CPU

        {56776799-6E94-4016-B369-068B96C6ACDE}.Release|iPhone.Build.0 = Release|Any CPU

        {56776799-6E94-4016-B369-068B96C6ACDE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU

        {56776799-6E94-4016-B369-068B96C6ACDE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU

    EndGlobalSection

    GlobalSection(SolutionProperties) = preSolution

        HideSolutionNode = FALSE


 HDL_ON/Common/ApiUtlis.cs

@@ -330,6 +330,8 @@
                            Utlis.WriteLine("当前住宅不支持HDL可视对讲,退出登录所有账号");
                            //当前住宅不支持HDL可视对讲
                            HDLLinphone.Current.LogoutAllAccount();
                            //登录全视通（全视通不根据住宅id变化，退出登录会退出所有sip账号，所以此处需要重新登录全视通）
                            //Shared.IOS.HDLFVSDK.Video.Init("", UserInfo.Current.ID);

                        }
                    }
@@ -338,8 +340,24 @@
                    if (isInterphoneType_FREEVIEW)
                    {
#if __IOS__
                        //登录全视通
                        Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id);
                        //获取全视通账户信息
                        string FVUserId = Ins.HttpRequest.GetVideoThirdPartUserInfo();
                        if (FVUserId!=null)
                        {

                            //登录全视通
                            Shared.IOS.HDLFVSDK.Video.Init("", FVUserId);

                        }


#endif
                    }
                    else {
#if __IOS__
                        //不支持全视通（用于在ios app生命周期判断是否调用全视通方法）
                        Entity.DB_ResidenceData.Instance.SupportFVDevice = false;

#endif
                    }

@@ -489,7 +507,6 @@
        {
            var pack = Ins.HttpRequest.GetSecurityList();
        }


    }
}

 HDL_ON/Common/HDLCommon.cs

@@ -342,9 +342,14 @@
                            {
                                if (json["spk"].ToString() == "door.gate")
                                {
                                    //new PublicAssmebly().TipLinphoneCall("\""+ eSVideoInfo.DeviceName + "\"呼叫", eSVideoInfo);
#if __IOS__
                                    eSVideoInfo.spk = json["spk"].ToString();
                                    HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, false);
#else
                                    new PublicAssmebly().TipLinphoneCall("\""+ eSVideoInfo.DeviceName + "\"呼叫", eSVideoInfo);

                                    //HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo,true);
#endif
                                    return;
                                }
                                else

 HDL_ON/Common/R.cs

@@ -7,7 +7,7 @@
        /// <summary>
        /// 访客管理
        /// </summary>
        public const int VisitorManage = 533;
        public const int VisitorManage = 2533;
        /// <summary>
        /// 徘徊报警
        /// </summary>

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -404,7 +404,11 @@
                        }
                    }
                }

//#if __IOS__
//                //登录全视通
//                Shared.IOS.HDLFVSDK.Video.Init("", UserInfo.Current.ID);
//                //Shared.IOS.HDLFVSDK.Video.Init("", "466196456122637");
//#endif
                UserInfo.Current.SaveUserInfo();
                MainPage.Log("获取用户信息成功。");
            }
@@ -515,9 +519,9 @@
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_GetMemberInfoByAccount, requestJson);
        }

        #endregion
#endregion

        #region 住宅部分
#region 住宅部分
        /// <summary>
        /// 获取住宅列表
        /// </summary>
@@ -790,7 +794,7 @@
            return result != null && result.Code == StateCode.SUCCESS;
        }

        #region 新数据分享
#region 新数据分享
        /// <summary>
        /// 添加分享
        /// </summary>
@@ -831,7 +835,7 @@
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Share_GetList, requestJson);
        }

        #endregion
#endregion

        ///// <summary>
        ///// 获取住宅下子账号的共享数据列表
@@ -987,7 +991,7 @@



        #endregion
#endregion
        /// <summary>
        /// 获取MQTT远程连接信息接口
        /// </summary>
@@ -1017,7 +1021,7 @@
            }
        }

        #region 推送
#region 推送
        /// <summary>
        /// 提交推送需要的关键标识信息
        /// </summary>
@@ -1036,7 +1040,13 @@
                bool isProduce = true;
                if (HttpUtil.GlobalRequestHttpsHost == "https://test-gz.hdlcontrol.com")
                {
#if __IOS__
                    isProduce = true;

#else
                    isProduce = false;

#endif
                }
                if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken))
                {
@@ -1336,9 +1346,9 @@
            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_GetNoticeInfo, requestJson);
        }
        #endregion
#endregion

        #region 检测更新
#region 检测更新
        /// <summary>
        /// 
        /// </summary>
@@ -1356,9 +1366,9 @@



        #endregion
#endregion

        #region 获取天气部分
#region 获取天气部分
        /// <summary>
        /// 获取指定经纬度的城市信息天气信息
        /// </summary>
@@ -1479,10 +1489,10 @@
        //}


        #endregion
#endregion


        #region 备份部分
#region 备份部分
        ///// <summary>
        ///// 获取住宅备份列表
        ///// </summary>
@@ -1953,10 +1963,10 @@
        }
        */

        #endregion
#endregion


        #region Kaede --设备功能——————————————————————————————————
#region Kaede --设备功能——————————————————————————————————
        /// <summary>
        /// 获取设备列表
        /// </summary>
@@ -2191,9 +2201,9 @@
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectDevice, requestJson);
        }

        #endregion
#endregion

        #region Kaede --场景功能--------------------------
#region Kaede --场景功能--------------------------
        /// <summary>
        /// 获取场景列表
        /// 房间ID可空，默认查询住宅下所有房间
@@ -2325,9 +2335,9 @@
            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectScene, requestJson).Code;
        }
        #endregion
#endregion

        #region Kaede --房间功能--------------------------
#region Kaede --房间功能--------------------------
        /// <summary>
        /// 获取房间列表
        /// </summary>
@@ -2402,10 +2412,10 @@
            return pack;
        }

        #endregion
#endregion


        #region Kaede -- 安防接口____________________________
#region Kaede -- 安防接口____________________________
        /// <summary>
        /// 获取安防列表
        /// </summary>
@@ -2569,10 +2579,10 @@
            return pack;
        }

        #endregion
#endregion


        #region Kaede --第三方品牌功能--------------------------
#region Kaede --第三方品牌功能--------------------------
        /// <summary>
        /// 获取第三方品牌列表
        /// </summary>
@@ -2597,9 +2607,9 @@
            return pack;
        }

        #endregion
#endregion

        #region ■ 萤石云SDK相关接口_________________________
#region ■ 萤石云SDK相关接口_________________________
        /// <summary>
        /// 河东获取萤石云子账号token的接口
        /// 2021-07-07 新方案接口调整对接
@@ -2612,10 +2622,10 @@
            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_EZ_GetChildToken, requestJson);
        }
        #endregion
#endregion


        #region ■ 可视对讲_________________________
#region ■ 可视对讲_________________________
        /// <summary>
        /// 检查住宅是否绑定丰林
        /// </summary>
@@ -2645,9 +2655,9 @@

        }

        #endregion
#endregion

        #region ■ 门锁相关____________________________
#region ■ 门锁相关____________________________

        /// <summary>
        /// 获取门锁历史记录(按日期降序)
@@ -2716,8 +2726,8 @@
            return listSortLog;
        }

        #endregion
        #region ■ 音箱语言控制相关_________________________
#endregion
#region ■ 音箱语言控制相关_________________________
        /// <summary>
        /// 获取已授权的音箱列表
        /// </summary>
@@ -2781,7 +2791,7 @@
            var requestJson = HttpUtil.GetSignRequestJson(updateSpeakerDeviceListObj);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_DeviceList_Update, requestJson);
        }
        #endregion
#endregion

        /// <summary>
        /// 绑定source面板
@@ -2842,5 +2852,26 @@
            var requestJson = HttpUtil.GetSignRequestJson(d);
            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetCustomerInfo, requestJson);
        }

        /// <summary>
        /// 获取三方账户详情（可视对讲）
        /// </summary>
        /// <returns></returns>
        public string GetVideoThirdPartUserInfo()
        {
            Dictionary<string, object> d = new Dictionary<string, object>();
            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);

            var requestJson = HttpUtil.GetSignRequestJson(d);
            var resultObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_VideoDevice_Third_Account, requestJson);
            if (resultObj.Code == StateCode.SUCCESS)
            {
                var info = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfoThirdPartVideo>(resultObj.Data.ToString());
                return info.extUserId;
            }
            else {
                return "";
            }
        }
    }
}

 HDL_ON/DAL/Server/NewAPI.cs

@@ -719,6 +719,9 @@
        /// 住宅sip账号获取
        /// </summary>
        public const string API_POST_VideoDevice_GetSipAccount = "/home-wisdom/app/home/getSipAccount";
        /// 获取三方账号信息
        /// </summary>
        public const string API_POST_VideoDevice_Third_Account = "/community-wisdom/app/visitor/freeview/getExtMemberInfo";
        #endregion



 HDL_ON/DAL/Server/NewApiRes.cs

@@ -382,6 +382,27 @@
    }

    /// <summary>
    /// 获取三方账户信息（可视对讲）
    /// </summary>
    [System.Serializable]
    public class UserInfoThirdPartVideo
    {
        /// <summary>
        /// 第三方注册的userId
        /// </summary>
        public string extUserId;
        /// <summary>
        /// 第三方平台
        /// </summary>
        public string extPlatform;
        /// <summary>
        /// 住宅Id
        /// </summary>
        public string homeId;

    }

    /// <summary>
    /// 绑定认证(手机/邮箱)
    /// </summary>
    [System.Serializable]

 HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs

@@ -109,7 +109,7 @@
            }else if (interphoneType == InterphoneType.HDL.ToString())
            {
                //HDLLinphone 狄耐克
                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo);
                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo,false);
                ////全视通
                //NSDictionary deviceInfo = new NSDictionary("deviceCode","3-1-11-2", "deviceName", mESVideoInfo.DeviceName);
                //Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo);

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -156,10 +156,13 @@
            HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
            DAL.Mqtt.MqttClient.DisConnectRemote("退出登录，或者切换住宅");

#if __IOS__
            //退出全视通登录
            Shared.IOS.HDLFVSDK.Video.Logout();
            //重置默认不支持全视通
            Entity.DB_ResidenceData.Instance.SupportFVDevice = false;
#endif


        }
        /// <summary>
@@ -175,7 +178,8 @@
        /// <summary>
        /// 是否支持全视通
        /// </summary>
        public bool SupportFVDevice = false;
        [Newtonsoft.Json.JsonIgnore]
        public bool SupportFVDevice = true;

        /// <summary>
        /// 网关详细信息

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

@@ -1,9 +1,10 @@
    using System;
 using System;
using HDL_ON.DAL.Server;
using HDL_ON.UI;
using HDL_ON.UI.CSS;
using Shared;
using Foundation;
using HDL_ON.Entity;

namespace HDL_ON.UI
{
@@ -703,7 +704,7 @@

            //访客管理
            #region 个人选项-访客管理
            if (!Entity.DB_ResidenceData.Instance.SupportVisitorManage)//判断是否支持访客管理
            if (Entity.DB_ResidenceData.Instance.SupportVisitorManage)//判断是否支持访客管理
            {
                optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });

@@ -738,7 +739,7 @@
                {
#if __IOS__
                    //刷新接口请求所需要的参数
                    NSDictionary info = new NSDictionary("regionUrl", HttpUtil.GlobalRequestHttpsHost, "token", UserInfo.Current.LoginTokenString, "appkey", "HDL-HOME-APP-TEST", "secret", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "refreshToken", UserInfo.Current.RefreshToken);
                    NSDictionary info = new NSDictionary("homeId", DB_ResidenceData.Instance.CurrentRegion.id, "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();

 SiriIntentsUI/SiriIntentsUI.csproj

@@ -47,6 +47,7 @@
    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>

    <MtouchVerbosity></MtouchVerbosity>

    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

    <CodesignProvision>OnProSiriUI220307-1-Hoc</CodesignProvision>

  </PropertyGroup>

  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">

    <DebugType>pdbonly</DebugType>