From 2e431231cf701802272f71bfe306a77f592ea084 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期五, 26 八月 2022 10:46:21 +0800
Subject: [PATCH] 修改全视通可视对讲ip地址及相关参数配置

---
 ZigbeeApp/Shared/DLL/IOS/Shared.IOS.HDLFVSDK.dll                        |    0 
 ZigbeeApp/GateWay.sln                                                   |   54 +++++++++++++-------------
 ZigbeeApp/Home.Ios/Home.IOS.csproj                                      |    4 +-
 ZigbeeApp/Home.Ios/Info.plist                                           |    2 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs |    1 
 5 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/ZigbeeApp/GateWay.sln b/ZigbeeApp/GateWay.sln
index 56ef649..53faef6 100644
--- a/ZigbeeApp/GateWay.sln
+++ b/ZigbeeApp/GateWay.sln
@@ -12,11 +12,11 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EzvizLib.ios", "..\..\..\HDLDemo\鍏ㄨ閫歕EzvizLib.ios\EzvizLib.ios.csproj", "{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.IOS.HDLFVSDK", "..\..\..\HDLDemo\鍏ㄨ閫歕FVSDK-xamarin\Shared.IOS.HDLFVSDK\Shared.IOS.HDLFVSDK\Shared.IOS.HDLFVSDK.csproj", "{56776799-6E94-4016-B369-068B96C6ACDE}"
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "AndriodBluetooth", "AndriodBluetooth\AndriodBluetooth.csproj", "{72F7636B-BDB8-4CD1-B8FC-EBDF7B95738D}"
 EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "AndriodBluetooth", "AndriodBluetooth\AndriodBluetooth.csproj", "{F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}"
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Elian.iOS", "Elian.iOS\Elian.iOS.csproj", "{59135C2F-B508-46F4-B100-1C53EFF255D9}"
 EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Elian.iOS", "Elian.iOS\Elian.iOS.csproj", "{910EE201-816C-442E-8E4D-E613999AEFA1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.IOS.HDLFVSDK", "..\..\..\HDLDemo\鍏ㄨ閫歕Shared.IOS.HDLFVSDK\Shared.IOS.HDLFVSDK\Shared.IOS.HDLFVSDK.csproj", "{56776799-6E94-4016-B369-068B96C6ACDE}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -80,6 +80,30 @@
 		{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|iPhone.Build.0 = Release|Any CPU
 		{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{72F7636B-BDB8-4CD1-B8FC-EBDF7B95738D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72F7636B-BDB8-4CD1-B8FC-EBDF7B95738D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72F7636B-BDB8-4CD1-B8FC-EBDF7B95738D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{72F7636B-BDB8-4CD1-B8FC-EBDF7B95738D}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{72F7636B-BDB8-4CD1-B8FC-EBDF7B95738D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{72F7636B-BDB8-4CD1-B8FC-EBDF7B95738D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{72F7636B-BDB8-4CD1-B8FC-EBDF7B95738D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72F7636B-BDB8-4CD1-B8FC-EBDF7B95738D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72F7636B-BDB8-4CD1-B8FC-EBDF7B95738D}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{72F7636B-BDB8-4CD1-B8FC-EBDF7B95738D}.Release|iPhone.Build.0 = Release|Any CPU
+		{72F7636B-BDB8-4CD1-B8FC-EBDF7B95738D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{72F7636B-BDB8-4CD1-B8FC-EBDF7B95738D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{59135C2F-B508-46F4-B100-1C53EFF255D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59135C2F-B508-46F4-B100-1C53EFF255D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59135C2F-B508-46F4-B100-1C53EFF255D9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{59135C2F-B508-46F4-B100-1C53EFF255D9}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{59135C2F-B508-46F4-B100-1C53EFF255D9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{59135C2F-B508-46F4-B100-1C53EFF255D9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{59135C2F-B508-46F4-B100-1C53EFF255D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59135C2F-B508-46F4-B100-1C53EFF255D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{59135C2F-B508-46F4-B100-1C53EFF255D9}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{59135C2F-B508-46F4-B100-1C53EFF255D9}.Release|iPhone.Build.0 = Release|Any CPU
+		{59135C2F-B508-46F4-B100-1C53EFF255D9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{59135C2F-B508-46F4-B100-1C53EFF255D9}.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
@@ -92,30 +116,6 @@
 		{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
-		{F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Release|iPhone.Build.0 = Release|Any CPU
-		{F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F066AA51-BC58-4E4D-9A9D-FA3A9C4CA690}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{910EE201-816C-442E-8E4D-E613999AEFA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{910EE201-816C-442E-8E4D-E613999AEFA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{910EE201-816C-442E-8E4D-E613999AEFA1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{910EE201-816C-442E-8E4D-E613999AEFA1}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{910EE201-816C-442E-8E4D-E613999AEFA1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{910EE201-816C-442E-8E4D-E613999AEFA1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{910EE201-816C-442E-8E4D-E613999AEFA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{910EE201-816C-442E-8E4D-E613999AEFA1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{910EE201-816C-442E-8E4D-E613999AEFA1}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{910EE201-816C-442E-8E4D-E613999AEFA1}.Release|iPhone.Build.0 = Release|Any CPU
-		{910EE201-816C-442E-8E4D-E613999AEFA1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{910EE201-816C-442E-8E4D-E613999AEFA1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 5951681..8d78e92 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -73,12 +73,12 @@
         <WarningLevel>4</WarningLevel>
         <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
         <MtouchArch>ARM64</MtouchArch>
-        <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
+        <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
         <MtouchI18n>cjk</MtouchI18n>
         <DeviceSpecificBuild>true</DeviceSpecificBuild>
         <MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
         <MtouchLink>SdkOnly</MtouchLink>
-<CodesignProvision>ComEvoyoHomeDevelopment</CodesignProvision>
+<CodesignProvision>ComEvoyoHomeAppStore0301</CodesignProvision>
     </PropertyGroup>
     <ItemGroup>
         <Reference Include="System" />
diff --git a/ZigbeeApp/Home.Ios/Info.plist b/ZigbeeApp/Home.Ios/Info.plist
index e23d73e..769c58b 100755
--- a/ZigbeeApp/Home.Ios/Info.plist
+++ b/ZigbeeApp/Home.Ios/Info.plist
@@ -56,7 +56,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.2.1</string>
 	<key>CFBundleVersion</key>
-	<string>2022042704</string>
+	<string>2022071101</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.HDLFVSDK.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.HDLFVSDK.dll
index dd7f728..1add2e4 100644
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.HDLFVSDK.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.HDLFVSDK.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
index 459e2bd..5be3a2e 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
@@ -312,6 +312,7 @@
 #if iOS
                             Console.WriteLine(Config.Instance.HomeId);
                             //鍒濆鍖栧叏瑙嗛��
+
                             Shared.IOS.HDLFVSDK.Video.Init("", Config.Instance.HomeId);
 #endif
                         }

--
Gitblit v1.8.0