1.导入全视通dll，增加全视通相关初始化、监听、访客、退出登录等方法 2.增加访客管理入口 3.增加全局判断是否支持全视通 4.增加自研判断 5.为...

chenqiyang

2022-05-16 bc8e768831cca0097a28d52a107d4edf00c3713a

1.导入全视通dll，增加全视通相关初始化、监听、访客、退出登录等方法 2.增加访客管理入口 3.增加全局判断是否支持全视通 4.增加自研判断 5.为全视通时隐藏通话记录界面

 DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll

Binary files differ

 HDL-ON_Android/Assets/Language.ini

@@ -1659,7 +1659,8 @@
530=为防止开关门的误触点击，保证家庭安全，请输入您的门锁开门密码。
531=五分钟内免密码开锁
532=设备离线中，暂时无法操作
 
533=访客管理

1000=室内湿度
1001=童锁
1002=负离子

 HDL-ON_Android/Resources/Resource.designer.cs

@@ -14,7 +14,7 @@
{
    
    
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.4.160")]
    public partial class Resource
    {
        

 HDL-ON_iOS/AppDelegate.cs

@@ -92,6 +92,14 @@

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

            //NSDictionary test = new NSDictionary(new NSString("123"), new NSString("test"));
            //NSError error;
            //NSData dicD = NSJsonSerialization.Serialize(test, NSJsonWritingOptions.PrettyPrinted,out error); ;
            //NSString str = new NSString(dicD,NSStringEncoding.UTF8);

            //new Alert("", str, "取消", "确定").Show();

            // Has the token changed?
            if (string.IsNullOrEmpty(oldDeviceToken) || !oldDeviceToken.Equals(DeviceToken))
@@ -123,6 +131,14 @@
        public override void DidReceiveRemoteNotification(UIApplication application, NSDictionary userInfo, Action<UIBackgroundFetchResult> completionHandler)
        {
            Console.WriteLine("DidReceiveRemoteNotification:" + application.ApplicationState.ToString());

            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();

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

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

            Console.WriteLine("OnResignActivation");
            UserInfo.Current.unlockTime = DateTime.Now;
        }

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

            //SharedMethod.SharedMethod.IsBackground = true;
            //MainPage.IsEnterBackground = true;
            ////进入后台mqtt正在连接重置状态
@@ -203,6 +225,9 @@

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

            Console.WriteLine("OnActivated");
            base.OnActivated(application);
            //HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
@@ -250,6 +275,10 @@

        public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
        {

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

            Console.WriteLine("111111111111");
            SetCurrentLanguage();
            //Shared.Application.FontSize = 12;
@@ -307,6 +336,7 @@
                    var messageType = "";
                    var expantContent = "";
                    var homeId = "";

                    if (userInfo.ContainsKey(new NSString("expandData")))
                    {
                        var expandDataStr = userInfo["expandData"] as NSString;
@@ -333,6 +363,7 @@
                                    Utlis.WriteLine("homeId: " + homeId);
                                }


                            }
                        }
                        else

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -59,6 +59,7 @@
        <MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CodesignProvision>OnPro220307-2-Dev</CodesignProvision>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
        <DebugType>none</DebugType>
@@ -105,10 +106,13 @@
          <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath>
        </Reference>
        <Reference Include="Shared.IOS.HDLLinphoneSDK">
          <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
          <HintPath>..\..\HDLLinphoneSDK_IOS\Shared.IOS.HDLLinphoneSDK\Shared.IOS.HDLLinphoneSDK\bin\Debug\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
        </Reference>
        <Reference Include="Shared.IOS.HDLSceneSiri">
          <HintPath>..\..\HDLXamarinSceneSiri\Shared.IOS.HDLSceneSiri\Shared.IOS.HDLSceneSiri\bin\Release\Shared.IOS.HDLSceneSiri.dll</HintPath>
          <HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.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>

 HDL-ON_iOS/HDL-ON_iOS.sln

New file
@@ -0,0 +1,31 @@


Microsoft Visual Studio Solution File, Format Version 12.00

# Visual Studio Version 16

VisualStudioVersion = 16.0.810.22

MinimumVisualStudioVersion = 10.0.40219.1

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HDL-ON_iOS", "HDL-ON_iOS.csproj", "{D998E133-F0DD-4760-BE3C-461632F54DA4}"

EndProject

Global

    GlobalSection(SolutionConfigurationPlatforms) = preSolution

        Debug|iPhoneSimulator = Debug|iPhoneSimulator

        Release|iPhoneSimulator = Release|iPhoneSimulator

        Debug|iPhone = Debug|iPhone

        Release|iPhone = Release|iPhone

    EndGlobalSection

    GlobalSection(ProjectConfigurationPlatforms) = postSolution

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhone.ActiveCfg = Debug|iPhone

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhone.Build.0 = Debug|iPhone

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhone.ActiveCfg = Release|iPhone

        {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhone.Build.0 = Release|iPhone

    EndGlobalSection

    GlobalSection(SolutionProperties) = preSolution

        HideSolutionNode = FALSE

    EndGlobalSection

    GlobalSection(ExtensibilityGlobals) = postSolution

        SolutionGuid = {C02ACC50-5824-46E9-9734-E66C965E2174}

    EndGlobalSection

EndGlobal


 HDL-ON_iOS/Resources/Language.ini

@@ -1659,7 +1659,9 @@
530=为防止开关门的误触点击，保证家庭安全，请输入您的门锁开门密码。
531=五分钟内免密码开锁
532=设备离线中，暂时无法操作
 
533=访客管理


1000=室内湿度
1001=童锁
1002=负离子

 HDL-ON_iOS/mono_crash.824c6d50c.0.json

New file
@@ -0,0 +1,406 @@
{
  "protocol_version" : "0.0.6",
  "configuration" : {
    "version" : "(6.12.0.174) (2020-02/adf1bc4335d)",
    "tlc" : "normal",
    "sigsgev" : "altstack",
    "notifications" : "kqueue",
    "architecture" : "amd64",
    "disabled_features" : "none",
    "smallconfig" : "disabled",
    "bigarrays" : "disabled",
    "softdebug" : "enabled",
    "interpreter" : "enabled",
    "llvm_support" : "0",
    "suspend" : "hybrid"
  },
  "memory" : {
    "Resident Size" : "181948416",
    "Virtual Size" : "36274827264",
    "minor_gc_time" : "5825386",
    "major_gc_time" : "297980436",
    "minor_gc_count" : "11",
    "major_gc_count" : "1669",
    "major_gc_time_concurrent" : "0"
 },
  "threads" : [
 {
    "is_managed" : false,
    "offset_free_hash" : "0x0",
    "offset_rich_hash" : "0x0",
    "crashed" : false,
    "native_thread_id" : "0x11765a600",
    "thread_info_addr" : "0x7fd13b015000",
    "thread_name" : "tid_103",
    "ctx" : {
      "IP" : "0x7ff805bd19ce",
      "SP" : "0x7ff7b6f54158",
      "BP" : "0x7ff7b6f541d0"
  },
    "unmanaged_frames" : [
  {
      "is_managed" : "false",
      "native_address" : "0x10905c776",
      "native_offset" : "0x00000"
   }
,
  {
      "is_managed" : "false",
      "native_address" : "0x1091f7fe5",
      "native_offset" : "0x00000"
   }
,
  {
      "is_managed" : "false",
      "native_address" : "0x1091f7d17",
      "native_offset" : "0x00000"
   }
,
  {
      "is_managed" : "false",
      "native_address" : "0x1090c8860",
      "native_offset" : "0x00000"
   }
,
  {
      "is_managed" : "false",
      "native_address" : "0x7ff805c23dfd",
      "native_offset" : "0x00000"
   }
,
  {
      "is_managed" : "false",
      "native_address" : "0x92",
      "native_offset" : "0x00000"
   }
,
  {
      "is_managed" : "false",
      "native_address" : "0x109238c47",
      "native_offset" : "0x00000"
   }
,
  {
      "is_managed" : "false",
      "native_address" : "0x108fbf0da",
      "native_offset" : "0x00000"
   }
,
  {
      "is_managed" : "false",
      "native_address" : "0x109021d36",
      "native_offset" : "0x00000"
   }
,
  {
      "is_managed" : "false",
      "native_address" : "0x108fade18",
      "native_offset" : "0x00000"
   }
,
  {
      "is_managed" : "false",
      "native_address" : "0x1175df51e",
      "native_offset" : "0x00000"
   }

  ]
 },
 {
    "is_managed" : true,
    "offset_free_hash" : "0x824c6d50c",
    "offset_rich_hash" : "0x824c6d599",
    "crashed" : true,
    "native_thread_id" : "0x700003e72000",
    "thread_info_addr" : "0x7fd13b030800",
    "thread_name" : "Finalizer",
    "ctx" : {
      "IP" : "0x7ff805c21189",
      "SP" : "0x700003e71a30",
      "BP" : "0x700003e71a30"
  },
    "managed_frames" : [
  {
      "is_managed" : "false",
      "native_address" : "unregistered"
   }
,
  {
      "is_managed" : "true",
      "guid" : "81C889A3-FDAF-408A-ACAC-8A870695982B",
      "token" : "0x00000",
      "native_offset" : "0x0",
      "filename" : "System.dll",
      "sizeofimage" : "0x290000",
      "timestamp" : "0xff396c70",
      "il_offset" : "0x0000c"
   }
,
  {
      "is_managed" : "true",
      "guid" : "81C889A3-FDAF-408A-ACAC-8A870695982B",
      "token" : "0x600429c",
      "native_offset" : "0x0",
      "filename" : "System.dll",
      "sizeofimage" : "0x290000",
      "timestamp" : "0xff396c70",
      "il_offset" : "0x00000"
   }
,
  {
      "is_managed" : "true",
      "guid" : "0E2013AB-6B94-4E00-8349-D8DCD759AB4D",
      "token" : "0x60040a5",
      "native_offset" : "0x0",
      "filename" : "mscorlib.dll",
      "sizeofimage" : "0x472000",
      "timestamp" : "0xf9ace8b0",
      "il_offset" : "0x00003"
   }
,
  {
      "is_managed" : "true",
      "guid" : "0E2013AB-6B94-4E00-8349-D8DCD759AB4D",
      "token" : "0x60040a4",
      "native_offset" : "0x0",
      "filename" : "mscorlib.dll",
      "sizeofimage" : "0x472000",
      "timestamp" : "0xf9ace8b0",
      "il_offset" : "0x00000"
   }
,
  {
      "is_managed" : "true",
      "guid" : "81C889A3-FDAF-408A-ACAC-8A870695982B",
      "token" : "0x6002f52",
      "native_offset" : "0x0",
      "filename" : "System.dll",
      "sizeofimage" : "0x290000",
      "timestamp" : "0xff396c70",
      "il_offset" : "0x00041"
   }
,
  {
      "is_managed" : "true",
      "guid" : "81C889A3-FDAF-408A-ACAC-8A870695982B",
      "token" : "0x6002f38",
      "native_offset" : "0x0",
      "filename" : "System.dll",
      "sizeofimage" : "0x290000",
      "timestamp" : "0xff396c70",
      "il_offset" : "0x00013"
   }
,
  {
      "is_managed" : "true",
      "guid" : "81C889A3-FDAF-408A-ACAC-8A870695982B",
      "token" : "0x6002f37",
      "native_offset" : "0x0",
      "filename" : "System.dll",
      "sizeofimage" : "0x290000",
      "timestamp" : "0xff396c70",
      "il_offset" : "0x00000"
   }
,
  {
      "is_managed" : "true",
      "guid" : "0E2013AB-6B94-4E00-8349-D8DCD759AB4D",
      "token" : "0x00000",
      "native_offset" : "0x0",
      "filename" : "mscorlib.dll",
      "sizeofimage" : "0x472000",
      "timestamp" : "0xf9ace8b0",
      "il_offset" : "0x0002a"
   }

  ],
  "unmanaged_frames" : [
 {
    "is_managed" : "false",
    "native_address" : "0x10905c776",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x1091f7fe5",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x1091f865a",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x1090c9927",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x10906140e",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x1090c37d6",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x7ff805c21189",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x7ff81090d60b",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x7ff81090be79",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x7ff81090ceb1",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x7ff81090b25c",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x110dbcdad",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "true",
    "guid" : "81C889A3-FDAF-408A-ACAC-8A870695982B",
    "token" : "0x00000",
    "native_offset" : "0x0",
    "filename" : "System.dll",
    "sizeofimage" : "0x290000",
    "timestamp" : "0xff396c70",
    "il_offset" : "0x00000"
  }
,
 {
    "is_managed" : "true",
    "guid" : "81C889A3-FDAF-408A-ACAC-8A870695982B",
    "token" : "0x600429c",
    "native_offset" : "0x0",
    "filename" : "System.dll",
    "sizeofimage" : "0x290000",
    "timestamp" : "0xff396c70",
    "il_offset" : "0x00000"
  }
,
 {
    "is_managed" : "true",
    "guid" : "(null)",
    "token" : "0x00000",
    "native_offset" : "0x0",
    "filename" : "(null)",
    "sizeofimage" : "0x0",
    "timestamp" : "0x0",
    "il_offset" : "0x00000"
  }
,
 {
    "is_managed" : "true",
    "guid" : "(null)",
    "token" : "0x00000",
    "native_offset" : "0x0",
    "filename" : "(null)",
    "sizeofimage" : "0x0",
    "timestamp" : "0x0",
    "il_offset" : "0x00000"
  }
,
 {
    "is_managed" : "true",
    "guid" : "81C889A3-FDAF-408A-ACAC-8A870695982B",
    "token" : "0x6002f38",
    "native_offset" : "0x0",
    "filename" : "System.dll",
    "sizeofimage" : "0x290000",
    "timestamp" : "0xff396c70",
    "il_offset" : "0x00000"
  }
,
 {
    "is_managed" : "true",
    "guid" : "81C889A3-FDAF-408A-ACAC-8A870695982B",
    "token" : "0x6002f37",
    "native_offset" : "0x0",
    "filename" : "System.dll",
    "sizeofimage" : "0x290000",
    "timestamp" : "0xff396c70",
    "il_offset" : "0x00000"
  }
,
 {
    "is_managed" : "true",
    "guid" : "0E2013AB-6B94-4E00-8349-D8DCD759AB4D",
    "token" : "0x00000",
    "native_offset" : "0x0",
    "filename" : "mscorlib.dll",
    "sizeofimage" : "0x472000",
    "timestamp" : "0xf9ace8b0",
    "il_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x109238879",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x1092579bc",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x10923a75c",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x1091f8c2d",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x7ff805c0e4e1",
    "native_offset" : "0x00000"
  }
,
 {
    "is_managed" : "false",
    "native_address" : "0x7ff805c09f6b",
    "native_offset" : "0x00000"
  }

 ]
}
]
}

 HDL_APP_Project.sln

@@ -18,6 +18,10 @@
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

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.IOS.HDLLinphoneSDK", "..\HDLLinphoneSDK_IOS\Shared.IOS.HDLLinphoneSDK\Shared.IOS.HDLLinphoneSDK\Shared.IOS.HDLLinphoneSDK.csproj", "{9D978BB5-0B26-40BA-A7EC-C629B808D2BE}"

EndProject

Global

    GlobalSection(SharedMSBuildProjectFiles) = preSolution

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

@@ -119,6 +123,30 @@
        {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

        {9D978BB5-0B26-40BA-A7EC-C629B808D2BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

        {9D978BB5-0B26-40BA-A7EC-C629B808D2BE}.Debug|Any CPU.Build.0 = Debug|Any CPU

        {9D978BB5-0B26-40BA-A7EC-C629B808D2BE}.Debug|iPhone.ActiveCfg = Debug|Any CPU

        {9D978BB5-0B26-40BA-A7EC-C629B808D2BE}.Debug|iPhone.Build.0 = Debug|Any CPU

        {9D978BB5-0B26-40BA-A7EC-C629B808D2BE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU

        {9D978BB5-0B26-40BA-A7EC-C629B808D2BE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU

        {9D978BB5-0B26-40BA-A7EC-C629B808D2BE}.Release|Any CPU.ActiveCfg = Release|Any CPU

        {9D978BB5-0B26-40BA-A7EC-C629B808D2BE}.Release|Any CPU.Build.0 = Release|Any CPU

        {9D978BB5-0B26-40BA-A7EC-C629B808D2BE}.Release|iPhone.ActiveCfg = Release|Any CPU

        {9D978BB5-0B26-40BA-A7EC-C629B808D2BE}.Release|iPhone.Build.0 = Release|Any CPU

        {9D978BB5-0B26-40BA-A7EC-C629B808D2BE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU

        {9D978BB5-0B26-40BA-A7EC-C629B808D2BE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU

    EndGlobalSection

    GlobalSection(SolutionProperties) = preSolution

        HideSolutionNode = FALSE


 HDL_ON/Common/ApiUtlis.cs

@@ -284,7 +284,8 @@

                    //======================获取可视对讲设备列表====================
                    bool isInterphoneType_HDL = false;//是否为HDLLinphone可视对讲
                    var videoInfo= VideoSend.GetVideoInfoList();
                    bool isInterphoneType_FREEVIEW = false;//是否为全视通可视对讲
                    var videoInfo = VideoSend.GetVideoInfoList();
                    if (videoInfo.Code == StateCode.SUCCESS)
                    {
                        string videoList = videoInfo.Data.ToString();
@@ -299,6 +300,17 @@
                                isInterphoneType_HDL = true;
                                DB_ResidenceData.Instance.SupportFacePass = true;
                                DB_ResidenceData.Instance.SaveResidenceData();

                                Entity.DB_ResidenceData.Instance.SupportFVDevice = true;

                            }
                            else if (video.interphoneType == InterphoneType.FREEVIEW.ToString())
                            {//为全视通可视对讲
                                Entity.DB_ResidenceData.Instance.SupportVisitorManage = true;
                                Entity.DB_ResidenceData.Instance.SupportFVDevice = true;

                                isInterphoneType_FREEVIEW = true;

                            }
                        }
                    }
@@ -311,15 +323,25 @@
                        {
                            //HDLLinphone可视对讲,获取Sip账号并初始化SDK
                            HDLLinphone.Current.GetHDLSipInfoAndInitSDK(DB_ResidenceData.Instance.CurrentRegion.id);

                        }
                        else
                        {
                            Utlis.WriteLine("当前住宅不支持HDL可视对讲,退出登录所有账号");
                            //当前住宅不支持HDL可视对讲
                            HDLLinphone.Current.LogoutAllAccount();

                        }
                    }

                    //======================登录全视通====================
                    if (isInterphoneType_FREEVIEW)
                    {
                        //登录全视通
                        Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id);
                    }


                    //======================安防====================
                    GetSecurityList();


 HDL_ON/Common/HDLCommon.cs

@@ -330,12 +330,15 @@
                        }
                        else if (interphoneTypeEnum == InterphoneType.HDL.ToString())
                        {

                            //HDL Linphone 狄耐克
                            eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
                            eSVideoInfo.callId = json["callId"].ToString();
                            eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
                            eSVideoInfo.DeviceName = json["deviceName"].ToString();
                            eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString();
                            eSVideoInfo.spk = json["spk"].ToString();

                            //ShowAlert("狄耐克门口机呼叫");
                            //打开呼叫页面
                            HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo);
@@ -427,8 +430,11 @@
                    DB_ResidenceData.Instance.EixtAccount();
                    //4.注销HDLSIP账号登录 2021-08-20
                    HDLLinphone.Current.LogoutAllAccount();

#if __IOS__
                    //5.清空Siri共享数据信息
                    //5.全视通登出
                    Shared.IOS.HDLFVSDK.Video.Logout();
                    //6.清空Siri共享数据信息
                    new Other.SkipControl().SetData(false, "", "", "","");
                    var sDM = new SiriKit.SceneDateManager();
                    Console.WriteLine($"IsLogin:{sDM.IsLgoin};accessToken:{sDM.AccessToken};refreshToken:{sDM.RefreshToken};RegionUrl:{sDM.RegionUrl};HomeId:{sDM.HomeId}");

 HDL_ON/Common/R.cs

@@ -4,7 +4,10 @@
{
    public static class StringId
    {

        /// <summary>
        /// 访客管理
        /// </summary>
        public const int VisitorManage = 533;
        /// <summary>
        /// 设备离线中，暂时无法操作
        /// </summary>

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -5,6 +5,7 @@
using System.Text;
using HDL_ON.Entity;
using Newtonsoft.Json.Linq;
using Shared;

namespace HDL_ON.DAL.Server
{
@@ -1030,7 +1031,7 @@
                //是否生产模式
                bool isProduce = true;
#if DEBUG
                isProduce = false;
                isProduce = true;
#endif

                if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken))
@@ -1057,9 +1058,15 @@

                //var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
                var mAddpushinfoJson = HttpUtil.GetSignRequestJson(mAddpushinfoObj);

                Utlis.WriteLine("mAddpushinfoJson: " + mAddpushinfoJson);

                //new Alert("", , "取消", "确定").Show();
                var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_AddToken, mAddpushinfoJson);
                if (revertObj.Code == StateCode.SUCCESS)
                {
                    //new Alert("", "提交pushToken成功" + OnAppConfig.Instance.PushDeviceToken, "取消", "确定").Show();

                    if (revertObj.Data != null)
                    {
                        var pushId = revertObj.Data.ToString();
@@ -1068,7 +1075,7 @@
                            OnAppConfig.Instance.PushId = pushId;
                            OnAppConfig.Instance.SaveConfig();
                            Utlis.WriteLine("PushId: " + pushId);

                            //new Alert("","提交pushToken成功"+ OnAppConfig.Instance.PushDeviceToken, "取消","确定").Show();
                            return true;
                        }
                    }
@@ -1076,7 +1083,7 @@
                }
                else
                {
                    //Utlis.WriteLine("AddToken 失败");
                    Utlis.WriteLine("AddToken 失败");
                }
                return false;
            }

 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/DAL/Server/NewApiRes.cs

@@ -1474,7 +1474,14 @@
        /// 扩展数据内容
        /// </summary>
        public string expantContent = "";
        
        /// <summary>
        /// spk标志，值为door.gate时表示自研
        /// </summary>
        public string spk="";
        /// <summary>
        /// sip账号
        /// </summary>
        public string sipAccount;

    }


 HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs

@@ -110,6 +110,15 @@
            {
                //HDLLinphone 狄耐克
                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo);
                ////全视通
                //NSDictionary deviceInfo = new NSDictionary("deviceCode","3-1-11-2", "deviceName", mESVideoInfo.DeviceName);
                //Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo);
            } else if (interphoneType == InterphoneType.FREEVIEW.ToString())
            {
                //全视通监视
                NSDictionary deviceInfo = new NSDictionary("deviceCode",mESVideoInfo.deviceCode, "deviceName", mESVideoInfo.DeviceName);
                Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo);
                //HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo);
            }
            else
            {
@@ -822,6 +831,16 @@
        /// 设备sip账号 interphoneType是HDL时才会有值
        /// </summary>
        public string deviceSipAccount;
        /// <summary>
        /// spk
        /// </summary>
        public string spk="";

        //========================全视通==========================
        /// <summary>
        /// 设备编号，相当于全视通的LocalDirectory字段
        /// </summary>
        public string deviceCode;
    }


@@ -865,7 +884,10 @@
        /// 狄耐克 HDL Linphone
        /// </summary>
        HDL,

        /// <summary>
        /// 全视通对讲
        /// </summary>
        FREEVIEW,

    }
}

 HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs

@@ -57,6 +57,10 @@
        /// </summary>
        public bool IsEnable = false;
        /// <summary>
        /// 当前视频通话是否为自研
        /// </summary>
        public bool IsSelfResearch = false;
        /// <summary>
        /// 是否自动跳转呼叫页面,
        /// false：收到推送并且已经收到sip呼叫才跳转呼叫页面
        /// true：原生收到呼叫马上跳转呼叫页面，不等待推送过来
@@ -93,6 +97,7 @@
            Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().IsAutoJumpCallView = IsAutoJumpCallView;
            //设置Listener监听
            mOnHDLLinphoneCallDelegate = new OnHDLLinphoneCallDelegate(this);
            Console.WriteLine(UserInfo.Current.ID);
            Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().HdlLinphoneCallDelegate = mOnHDLLinphoneCallDelegate;
#else
            HDLLinphoneKit.Instance.InitLinphone(Application.Activity);
@@ -428,6 +433,7 @@
            mHDLCallVideoInfo.DeviceName = mESVideoInfo.DeviceName;
            mHDLCallVideoInfo.InterphoneType = InterphoneType.HDL.ToString();
            mHDLCallVideoInfo.DeviceSipAccount = mESVideoInfo.deviceSipAccount;
            mHDLCallVideoInfo.spk = mESVideoInfo.spk;
            InitCallInfo(mHDLCallVideoInfo);

            //当前呼叫来电的住宅和之前注册登录的住宅一致的情况下
@@ -460,20 +466,30 @@
        /// <param name="mESVideoInfo"></param>
        public void CheckCallStateAndGotoPage()
        {
            //如果开启了自动跳转方案，则无需继续下面处理、无需手动跳转
            if (IsAutoJumpCallView) return;
            //先结束掉之前的线程
            EndCheckIncomingCallThread();
            //检测是否来电了如果是直接调整呼叫页面如果不是则开启线程等待判断
            if (IsIncomingReceivedCallState()) {
                Utlis.WriteLine("CALL 已经来电了。。。打开呼叫页面");
                GoToHDLLinphoneIntercomActivity();
            }
            else
            if (mHDLCallVideoInfo.spk == "door.gate")
            {
                //如果还没来电 开启线程检测
                StartCheckIncomingCallThread();
                //自研可视对讲
                HDLLinPhoneSDK.Instance().GotoHDLSRLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName,mHDLCallVideoInfo.DeviceSipAccount);
           }
            else {
                //狄耐克可视对讲
                //如果开启了自动跳转方案，则无需继续下面处理、无需手动跳转
                if (IsAutoJumpCallView) return;
                //先结束掉之前的线程
                EndCheckIncomingCallThread();
                //检测是否来电了如果是直接调整呼叫页面如果不是则开启线程等待判断
                if (IsIncomingReceivedCallState())
                {
                    Utlis.WriteLine("CALL 已经来电了。。。打开呼叫页面");
                    GoToHDLLinphoneIntercomActivity();
                }
                else
                {
                    //如果还没来电 开启线程检测
                    StartCheckIncomingCallThread();
                }
            }


        }

@@ -813,6 +829,10 @@
        /// 类型
        /// </summary>
        public string InterphoneType;
        /// <summary>
        /// spk
        /// </summary>
        public string spk="";

    }


 HDL_ON/Entity/DB_ResidenceData.cs

@@ -155,6 +155,12 @@
            ///切换住宅清空前住宅缓存自动化列表；
            HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
            DAL.Mqtt.MqttClient.DisConnectRemote("退出登录，或者切换住宅");

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

        }
        /// <summary>
        /// 是否支持人脸通行
@@ -162,6 +168,16 @@
        public bool SupportFacePass = false;

        /// <summary>
        /// 是否支持访客管理
        /// </summary>
        public bool SupportVisitorManage = false;

        /// <summary>
        /// 是否支持全视通
        /// </summary>
        public bool SupportFVDevice = false;

        /// <summary>
        /// 网关详细信息
        /// </summary>
        public HomeGatewayInfo HomeGateway;

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

@@ -3,6 +3,7 @@
using HDL_ON.UI;
using HDL_ON.UI.CSS;
using Shared;
using Foundation;

namespace HDL_ON.UI
{
@@ -174,6 +175,17 @@
        Button btnFaceManagementText;
        #endregion

        #region 个人选项-访客管理
        /// <summary>
        /// 个人选项-访客管理
        ///
        /// </summary>
        FrameLayout visitorManagementView;
        /// <summary>
        /// 人脸通行管理文本isitor
        /// </summary>
        Button btnisitorVManagementText;
        #endregion

        #endregion

@@ -266,10 +278,21 @@
            };
            bodyScrolView.AddChidren(optionListView);

            //根据需要添加行
            int addRow = 0;
            if(Entity.DB_ResidenceData.Instance.SupportFacePass)
            {
                optionListView.Height = Application.GetRealHeight(51 * (6 + 1));
                addRow += 1;
            }

            if (Entity.DB_ResidenceData.Instance.SupportVisitorManage)
            {
                addRow += 1;
            }

            //有全视通的情况
            optionListView.Height = Application.GetRealHeight(51 * (6 + addRow));


            #region 个人选项-名字区域
            /// <summary>
@@ -678,6 +701,46 @@

            }

            //访客管理
            #region 个人选项-访客管理
            optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });

            visitorManagementView = new FrameLayout()
            {
                Height = Application.GetRealHeight(50),
            };
            optionListView.AddChidren(visitorManagementView);

            var btnVisitorManagementRight = new Button()
            {
                X = Application.GetRealWidth(339),
                Gravity = Gravity.CenterVertical,
                Width = Application.GetMinRealAverage(16),
                Height = Application.GetMinRealAverage(16),
                UnSelectedImagePath = "Public/Right.png",
            };
            visitorManagementView.AddChidren(btnVisitorManagementRight);

            btnisitorVManagementText = new Button()
            {
                X = Application.GetRealWidth(16),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextID = StringId.VisitorManage,
            };
            visitorManagementView.AddChidren(btnisitorVManagementText);

            btnisitorVManagementText.MouseUpEventHandler = (sender, e) =>
            {
                //刷新接口请求所需要的参数
                NSDictionary info = new 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();
            };

            #endregion
            #endregion
            var topPaddingView2 = new FrameLayout()
            {

 HDL_ON/UI/UI2/FuntionControlView/Video/ObjectClass.cs

@@ -163,6 +163,10 @@
        ///  homeId
        /// </summary>
        public string homeId;
        /// <summary>
        ///  设备编号（目前用于全视通，相当于全视通LocalDirectory字段）
        /// </summary>
        public string deviceCode;
    }

    /// <summary>

 HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs

@@ -34,7 +34,9 @@
            var view1 = new FrameLayout();
            pageView.AddChidren(view1);
            var view2 = new FrameLayout();
            pageView.AddChidren(view2);
            if (!Entity.DB_ResidenceData.Instance.SupportFVDevice) {//非全视通展示通话记录
                pageView.AddChidren(view2);
            }
            View1(view1, videoList);
            View2(view2, listCall, videoList);
            Button btn11 = new Button
@@ -46,7 +48,7 @@
                BackgroundColor = MusicColor.SelectedColor,
                Radius = (uint)Application.GetRealHeight(4),
            };
            view1.AddChidren(btn11);
            //view1.AddChidren(btn11);

            Button btn12 = new Button
            {
@@ -57,7 +59,13 @@
                BackgroundColor = 0x404484F4,
                Radius = (uint)Application.GetRealHeight(4),
            };
            view1.AddChidren(btn12);
            //view1.AddChidren(btn12);
            if (!Entity.DB_ResidenceData.Instance.SupportFVDevice)
            {//非全视通展示下方选择按钮
                view1.AddChidren(btn11);
                view1.AddChidren(btn12);
            }

            Button btn21 = new Button
            {
                X = Application.GetRealWidth(170),
@@ -307,8 +315,10 @@
                            Lc_Psk = video.deviceId,//2021-10-15 PSK字段不能取deviceName
                            Lc_PlayToken = video.playToken,
                            deviceSipAccount = video.deviceSipAccount,
                            HomeId = video.homeId
                            HomeId = video.homeId,
                            deviceCode=video.deviceCode
                        };
                        
                        ESOnVideo.Current.ShowESVideoMonitor(eSVideoInfo, video.interphoneType);
                    }
                };

 SiriIntents/SiriIntents.csproj

@@ -44,6 +44,7 @@
    <MtouchArch>ARM64</MtouchArch>

    <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>

    <MtouchVerbosity></MtouchVerbosity>

    <CodesignProvision>OnProSiri220307-1-Hoc</CodesignProvision>

  </PropertyGroup>

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

    <DebugType>pdbonly</DebugType>