From 17bf9921d0432fcab9d43ed256f02334e1cf6755 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期二, 29 三月 2022 10:27:34 +0800
Subject: [PATCH] 1.封装新的全视通dll 2.更新TBL.dll、IOS.dll库
---
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll | 0
ZigbeeApp/Home.Ios/AppDelegate.cs | 13 +++
ZigbeeApp/Shared/Common/CommonPage.cs | 8 ++
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.HDLFVSDK.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs | 4 +
ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs | 17 ++++-
ZigbeeApp/GateWay.sln | 40 +++++++++----
ZigbeeApp/Home.Ios/Home.IOS.csproj | 19 +++---
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll | 0
ZigbeeApp/Home.Ios/ESVideo.cs | 30 +++++-----
ZigbeeApp/Shared/Phone/UserView/HomePage.cs | 7 ++
11 files changed, 89 insertions(+), 49 deletions(-)
diff --git a/ZigbeeApp/GateWay.sln b/ZigbeeApp/GateWay.sln
index 5a0e676..5032ec6 100644
--- a/ZigbeeApp/GateWay.sln
+++ b/ZigbeeApp/GateWay.sln
@@ -10,9 +10,11 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elian.iOS", "Elian.iOS\Elian.iOS.csproj", "{85F1AF50-75A6-4011-B811-56B32DA77568}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GateWay.Droid", "GateWay.Droid\GateWay.Droid.csproj", "{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}"
+EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Home.IOS", "Home.Ios\Home.IOS.csproj", "{F1296E2C-3777-4385-85B2-DA77617E3178}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GateWay.Droid", "GateWay.Droid\GateWay.Droid.csproj", "{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EzvizLib.ios", "..\..\..\HDLDemo\鍏ㄨ閫歕EzvizLib.ios\EzvizLib.ios.csproj", "{25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -64,18 +66,6 @@
{85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhone.Build.0 = Release|Any CPU
{85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{85F1AF50-75A6-4011-B811-56B32DA77568}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
- {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
- {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhone.ActiveCfg = Debug|iPhone
- {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhone.Build.0 = Debug|iPhone
- {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
- {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
- {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
- {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
- {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhone.ActiveCfg = Release|iPhone
- {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhone.Build.0 = Release|iPhone
- {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
- {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|Any CPU.Build.0 = Debug|Any CPU
{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -88,6 +78,30 @@
{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|iPhone.Build.0 = Release|Any CPU
{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+ {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
+ {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhone.ActiveCfg = Debug|iPhone
+ {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhone.Build.0 = Debug|iPhone
+ {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+ {F1296E2C-3777-4385-85B2-DA77617E3178}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+ {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
+ {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
+ {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhone.ActiveCfg = Release|iPhone
+ {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhone.Build.0 = Release|iPhone
+ {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+ {F1296E2C-3777-4385-85B2-DA77617E3178}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+ {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|Any CPU.Build.0 = Release|Any CPU
+ {25AE4CD7-C9E2-42FE-B7D6-80E76BA13491}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/ZigbeeApp/Home.Ios/AppDelegate.cs b/ZigbeeApp/Home.Ios/AppDelegate.cs
index 58c9d0b..81c715d 100644
--- a/ZigbeeApp/Home.Ios/AppDelegate.cs
+++ b/ZigbeeApp/Home.Ios/AppDelegate.cs
@@ -7,6 +7,7 @@
using Shared.Common;
using Shared.IOS.TBL;
using UIKit;
+
namespace Home.IOS
{
[Register("AppDelegate")]
@@ -24,8 +25,10 @@
public override bool FinishedLaunching(UIApplication application, NSDictionary launchOptions)
{
- //Shared.IOS.HDLFVSDK.Video.FVapplication(application, launchOptions);
- Shared.IOS.HDLFVSDK.Video.ShowVideo();
+ //鍏ㄨ閫氳皟鐢‵inishedLaunch
+ Shared.IOS.HDLFVSDK.Video.FVapplication(application,new NSDictionary());
+
+
Shared.Application.IsGpsEnable = false;
Shared.Application.IsMusicEnable = false;
base.FinishedLaunching(application, launchOptions);
@@ -49,6 +52,7 @@
haveToSignOut = false;
if (launchOptions != null)
{
+
// check for a remote notification
if (launchOptions.ContainsKey(UIApplication.LaunchOptionsRemoteNotificationKey))
{
@@ -268,6 +272,7 @@
// or when the user quits the application and it begins the transition to the background state.
// Games should use this method to pause the game.
base.OnResignActivation(application);
+ Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
}
public override void DidEnterBackground(UIApplication application)
@@ -277,6 +282,7 @@
//Shared.BusSocket.Stop ();On鍦ㄨ繖閲屽仠姝usSocket
ZigBee.Common.Application.FindGateWaySocket.Stop();
base.DidEnterBackground(application);
+ Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
}
public override void WillEnterForeground(UIApplication application)
@@ -292,8 +298,11 @@
base.WillEnterForeground(application);
}
+
public override void OnActivated(UIApplication application)
{
+ //鍏ㄨ閫氳皟鐢˙ecomeActive
+ Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
// Restart any tasks that were paused (or not yet started) while the application was inactive.
// If the application was previously in the background, optionally refresh the user interface.
base.OnActivated(application);
diff --git a/ZigbeeApp/Home.Ios/ESVideo.cs b/ZigbeeApp/Home.Ios/ESVideo.cs
old mode 100755
new mode 100644
index 9045787..d6a357b
--- a/ZigbeeApp/Home.Ios/ESVideo.cs
+++ b/ZigbeeApp/Home.Ios/ESVideo.cs
@@ -1,5 +1,5 @@
锘縰sing System;
-using Shared.IOS.ESVideoPhoneSDK;
+//using Shared.IOS.ESVideoPhoneSDK;
namespace GateWay.Ios
{
@@ -21,15 +21,15 @@
/// <param name="mESVideoInfo"></param>
public static void ShowESVideoMonitor(ESVideoInfo mESVideoInfo)
{
- ESVideoMonitorViewController mESVideoMonitorViewController = new ESVideoMonitorViewController();
+ //ESVideoMonitorViewController mESVideoMonitorViewController = new ESVideoMonitorViewController();
- mESVideoMonitorViewController.MESVideoID = mESVideoInfo.ESVideoUUID;
- mESVideoMonitorViewController.MESRoomID = mESVideoInfo.ESRoomID;
- mESVideoMonitorViewController.DeviceName = mESVideoInfo.DeviceName;
- mESVideoMonitorViewController.RoomName = mESVideoInfo.RoomName;
- mESVideoMonitorViewController.IsCollect = mESVideoInfo.IsCollect;
+ //mESVideoMonitorViewController.MESVideoID = mESVideoInfo.ESVideoUUID;
+ //mESVideoMonitorViewController.MESRoomID = mESVideoInfo.ESRoomID;
+ //mESVideoMonitorViewController.DeviceName = mESVideoInfo.DeviceName;
+ //mESVideoMonitorViewController.RoomName = mESVideoInfo.RoomName;
+ //mESVideoMonitorViewController.IsCollect = mESVideoInfo.IsCollect;
- Shared.Application.currentVC.NavigationController.PushViewController(mESVideoMonitorViewController, true);
+ //Shared.Application.currentVC.NavigationController.PushViewController(mESVideoMonitorViewController, true);
}
@@ -40,14 +40,14 @@
/// <param name="mESVideoInfo"></param>
public static void ShowESvideoVideoIntercom(ESVideoInfo mESVideoInfo)
{
- ESvideoVideoIntercomViewController mESvideoVideoIntercomViewController = new ESvideoVideoIntercomViewController();
- mESvideoVideoIntercomViewController.MESVideoID = mESVideoInfo.ESVideoUUID;
- mESvideoVideoIntercomViewController.MESRoomID = mESVideoInfo.ESRoomID;
- mESvideoVideoIntercomViewController.DeviceName = mESVideoInfo.DeviceName;
- mESvideoVideoIntercomViewController.RoomName = mESVideoInfo.RoomName;
- mESvideoVideoIntercomViewController.IsCollect = mESVideoInfo.IsCollect;
+ //ESvideoVideoIntercomViewController mESvideoVideoIntercomViewController = new ESvideoVideoIntercomViewController();
+ //mESvideoVideoIntercomViewController.MESVideoID = mESVideoInfo.ESVideoUUID;
+ //mESvideoVideoIntercomViewController.MESRoomID = mESVideoInfo.ESRoomID;
+ //mESvideoVideoIntercomViewController.DeviceName = mESVideoInfo.DeviceName;
+ //mESvideoVideoIntercomViewController.RoomName = mESVideoInfo.RoomName;
+ //mESvideoVideoIntercomViewController.IsCollect = mESVideoInfo.IsCollect;
- Shared.Application.currentVC.NavigationController.PushViewController(mESvideoVideoIntercomViewController, true);
+ //Shared.Application.currentVC.NavigationController.PushViewController(mESvideoVideoIntercomViewController, true);
}
}
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index efe7dc0..6c83bb0 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -53,13 +53,15 @@
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchI18n>cjk</MtouchI18n>
-<MtouchHttpClientHandler>CFNetworkHandler</MtouchHttpClientHandler>
+<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<OnDemandResourcesInitialInstallTags></OnDemandResourcesInitialInstallTags>
<OnDemandResourcesInitialInstallTags></OnDemandResourcesInitialInstallTags>
<OnDemandResourcesPrefetchOrder></OnDemandResourcesPrefetchOrder>
<MtouchLink>SdkOnly</MtouchLink>
<CodesignProvision>ComEvoyoHomeDevelopment</CodesignProvision>
-<MtouchExtraArgs>-gcc_flags="-dead_strip" </MtouchExtraArgs>
+<MtouchEnableSGenConc>true</MtouchEnableSGenConc>
+<MtouchFastDev>true</MtouchFastDev>
+<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -84,9 +86,6 @@
<Reference Include="Xamarin.iOS" />
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors" />
- <Reference Include="Shared.IOS">
- <HintPath>..\Shared\DLL\IOS\Shared.IOS.dll</HintPath>
- </Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\Shared\DLL\Newtonsoft.Json.dll</HintPath>
</Reference>
@@ -94,14 +93,14 @@
<HintPath>..\packages\BouncyCastle.Crypto.dll.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
- <Reference Include="Shared.IOS.ESVideoPhoneSDK">
- <HintPath>..\Shared\DLL\IOS\Shared.IOS.ESVideoPhoneSDK.dll</HintPath>
- </Reference>
<Reference Include="Shared.IOS.TBL">
- <HintPath>..\Shared\DLL\IOS\Shared.IOS.TBL.dll</HintPath>
+ <HintPath>..\..\..\Library\Shared.IOS.TBL\bin\Debug\Shared.IOS.TBL.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS">
+ <HintPath>..\Shared\DLL\IOS\Shared.IOS.dll</HintPath>
</Reference>
<Reference Include="Shared.IOS.HDLFVSDK">
- <HintPath>..\Shared\DLL\Shared.IOS.HDLFVSDK.dll</HintPath>
+ <HintPath>..\Shared\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index 6aab059..9d948cf 100644
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -318,8 +318,12 @@
try
{
Application.RunOnMainThread(() =>
- {
- //璁惧畾涓�涓椂闂�
+ {
+#if iOS
+ //鍏ㄨ閫氶��鍑虹櫥褰�
+ Shared.IOS.HDLFVSDK.Video.Logout();
+#endif
+ //璁惧畾涓�涓椂闂�
Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
Config.Instance.Save();
CommonPage.Instance.RemoveAll();
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.HDLFVSDK.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.HDLFVSDK.dll
new file mode 100644
index 0000000..5866af4
--- /dev/null
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.HDLFVSDK.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
old mode 100755
new mode 100644
index d400378..b91fe54
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
old mode 100755
new mode 100644
index 2155c2e..bcbf111
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
old mode 100755
new mode 100644
index ea8bce7..5b6e524
--- a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
@@ -1137,8 +1137,15 @@
bool result = UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
- ZigBee.Common.Application.Init();
-
+ ZigBee.Common.Application.Init();
+
+#if iOS
+
+ //鍒濆鍖栧叏瑙嗛��
+ Shared.IOS.HDLFVSDK.Video.Init("", revertData.UserID.ToString());
+
+#endif
+
HdlThreadLogic.Current.RunMain(() =>
{
CommonPage.Loading.Hide();
@@ -1224,9 +1231,9 @@
});
}
- #endregion
+#endregion
- #region 鈻� 涓�鑸柟娉昣__________________________
+#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
/// 妫�娴嬮殣绉佸崗璁�
@@ -1244,6 +1251,6 @@
return true;
}
- #endregion
+#endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
old mode 100755
new mode 100644
index aa3f637..006d5d2
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -428,7 +428,9 @@
return;
}
var form = new HdlBackup.HdlBackupListForm();
- form.AddForm();
+ //Shared.IOS.HDLFVSDK.Video.Init("", "chen123");
+ Shared.IOS.HDLFVSDK.Video.ShowVideo();
+ ; form.AddForm();
};
}
diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
old mode 100755
new mode 100644
index 7072a40..9c187c3
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -145,7 +145,12 @@
Config.Instance.LoginToken = revertData.Token;
//涓婃姤璁惧ID
CommonPage.Instance.PushRegID();
- isLoginSuccess = 1;
+ isLoginSuccess = 1;
+
+#if iOS
+ //鍒濆鍖栧叏瑙嗛��
+ Shared.IOS.HDLFVSDK.Video.Init("",revertData.UserID.ToString());
+#endif
}
else if (stateCodeStr == "YOUDATANOISLOCALREGION")
{
--
Gitblit v1.8.0