| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DLL/FL/iOS/Shared.IOS.ESVideoOnSDK.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/HDL-ON_iOS.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/NewAPI.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/HDL_ON.projitems | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,15 +1,8 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/AppDelegate.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs"> <Files> <File FileName="HDL-ON_Android/Other/JLCountrycode.cs" Line="40" Column="1" /> <File FileName="HDL_ON/Common/HDLCommon.cs" Line="412" Column="42" /> <File FileName="HDL_ON/DAL/FL/ESOnVideo.cs" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs" /> <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1462" Column="18" /> <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="23" Column="22" /> <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" Line="166" Column="75" /> <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="320" Column="39" /> <File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" Line="16" Column="1" /> </Files> <Pads> <Pad Id="ProjectPad"> @@ -18,26 +11,11 @@ <Node name="HDL_ON" expanded="True"> <Node name="Common" expanded="True" /> <Node name="DAL" expanded="True"> <Node name="Server" expanded="True" /> <Node name="ThirdPartySdk" expanded="True"> <Node name="ESOnVideo.cs" selected="True" /> </Node> </Node> <Node name="Entity" expanded="True" /> <Node name="UI" expanded="True"> <Node name="1-test-" expanded="True" /> <Node name="BindingResidence" expanded="True" /> <Node name="CSS" expanded="True" /> <Node name="UI0-Public" expanded="True" /> <Node name="UI0-Stan" expanded="True" /> <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True" /> </Node> </Node> <Node name="HDL-ON_Android" expanded="True"> <Node name="Other" expanded="True"> <Node name="JPush" expanded="True" /> </Node> </Node> <Node name="HDL-ON_iOS" expanded="True"> <Node name="AppDelegate.cs" selected="True" /> <Node name="UI" expanded="True" /> </Node> </Node> </State> @@ -53,10 +31,7 @@ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/Common/HDLCommon.cs" relfile="HDL_ON/Common/HDLCommon.cs" line="298" column="1" /> <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/Common/HDLCommon.cs" relfile="HDL_ON/Common/HDLCommon.cs" line="284" column="1" /> </BreakpointStore> <BreakpointStore /> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> </Properties> DLL/FL/iOS/Shared.IOS.ESVideoOnSDK.dllBinary files differ
HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -94,7 +94,7 @@ <HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath> </Reference> <Reference Include="Shared.IOS.ESVideoOnSDK"> <HintPath>..\..\ESVideoPhoneSDKProject\On+\xamarin\Shared.IOS.ESVideoOnSDK\Shared.IOS.ESVideoOnSDK\bin\Release\Shared.IOS.ESVideoOnSDK.dll</HintPath> <HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> HDL_ON/DAL/Server/NewAPI.cs
@@ -547,7 +547,7 @@ /// </summary> public const string API_POST_FL_Screenshot = "/home-wisdom/app/fl/vi/screenshot"; /// <summary> /// 通话视频截图上传 /// 挂断 /// </summary> public const string API_POST_FL_HangUp = "/home-wisdom/app/fl/vi/hang-up"; /// <summary> HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
File was renamed from HDL_ON/DAL/FL/ESOnVideo.cs @@ -8,6 +8,9 @@ using Shared.IOS.ESVideoOnSDK; using UIKit; using Foundation; #else using Android.Content; #endif @@ -68,6 +71,17 @@ Shared.Application.currentVC.NavigationController.PushViewController(vc, true); #else Intent intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.VideoActivity)); intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID); intent.PutExtra("uuid", mESVideoInfo.uuid); intent.PutExtra("DeviceName", mESVideoInfo.DeviceName); intent.PutExtra("cmtID", mESVideoInfo.cmtID); intent.PutExtra("roomno", mESVideoInfo.roomno); intent.PutExtra("unitno", mESVideoInfo.unitno); intent.PutExtra("HomeID", mESVideoInfo.HomeID); intent.PutExtra("callId", mESVideoInfo.callId); intent.PutExtra("Type", 0); Shared.Application.Activity.StartActivity(intent); #endif } @@ -93,6 +107,17 @@ Shared.Application.currentVC.NavigationController.PushViewController(vc, true); #else Intent intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.VideoActivity)); intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID); intent.PutExtra("uuid", mESVideoInfo.uuid); intent.PutExtra("DeviceName", mESVideoInfo.DeviceName); intent.PutExtra("cmtID", mESVideoInfo.cmtID); intent.PutExtra("roomno", mESVideoInfo.roomno); intent.PutExtra("unitno", mESVideoInfo.unitno); intent.PutExtra("HomeID", mESVideoInfo.HomeID); intent.PutExtra("callId", mESVideoInfo.callId); intent.PutExtra("Type", 1); Shared.Application.Activity.StartActivity(intent); #endif } @@ -105,13 +130,7 @@ /// <returns></returns> bool CheckESVideoInfoIsNullOrEmpty() { if(esVideoInfo == null || string.IsNullOrEmpty(esVideoInfo.callId)) { Utlis.WriteLine("ESVideoInfo Is NullOrEmpty"); return true; } return false; //return (esVideoInfo == null || string.IsNullOrEmpty(esVideoInfo.callId)); return (esVideoInfo == null || string.IsNullOrEmpty(esVideoInfo.callId)); } /// <summary> @@ -119,7 +138,7 @@ /// </summary> void AnswerAction() { Utlis.WriteLine("AnswerAction"); //Utlis.WriteLine("AnswerAction"); if (CheckESVideoInfoIsNullOrEmpty()) return; @@ -129,7 +148,7 @@ var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_FL_Answer, requestJson); if (revertObj.Code == StateCode.SUCCESS) { Utlis.WriteLine("POST 接听成功"); //Utlis.WriteLine("POST 接听成功"); } else { @@ -147,7 +166,7 @@ /// <param name="callDuration"></param> void HangUpAction(int callDuration) { Utlis.WriteLine("HangUpAction :" + callDuration); //Utlis.WriteLine("HangUpAction :" + callDuration); if (CheckESVideoInfoIsNullOrEmpty()) return; @@ -161,7 +180,7 @@ var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_FL_HangUp, requestJson); if (revertObj.Code == StateCode.SUCCESS) { Utlis.WriteLine("POST 挂断成功"); //Utlis.WriteLine("POST 挂断成功"); } else { @@ -177,7 +196,7 @@ /// </summary> void RejectCallAction() { Utlis.WriteLine("RejectCallAction"); //Utlis.WriteLine("RejectCallAction"); if (CheckESVideoInfoIsNullOrEmpty()) return; @@ -190,7 +209,7 @@ var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_FL_Reject, requestJson); if (revertObj.Code == StateCode.SUCCESS) { Utlis.WriteLine("POST 拒接成功"); //Utlis.WriteLine("POST 拒接成功"); } else { @@ -206,23 +225,27 @@ /// </summary> void ScreenshotSuccessfulAction(byte[] dataBytes) { Utlis.WriteLine("ScreenshotSuccessfulAction"); //Utlis.WriteLine("ScreenshotSuccessfulAction"); if (CheckESVideoInfoIsNullOrEmpty()) return; new Thread(() => { var imageName = Guid.NewGuid().ToString(); //var imageName = Guid.NewGuid().ToString(); Dictionary<string, object> dic = new Dictionary<string, object>(); dic.Add("callId", esVideoInfo.callId); dic.Add("images", dataBytes); dic.Add("imagesName", "FL" + imageName + "_ios.jpg"); #if __IOS__ dic.Add("imagesName", "_IOS.jpg"); #else dic.Add("imagesName", "_Android.jpg"); #endif var requestJson = HttpUtil.GetSignRequestJson(dic); var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_FL_Screenshot, requestJson); if (revertObj.Code == StateCode.SUCCESS) { Utlis.WriteLine("POST 截图上传成功"); //Utlis.WriteLine("POST 截图上传成功"); } else { @@ -240,18 +263,20 @@ /// </summary> void UnlockAction() { Utlis.WriteLine("UnlockAction"); //Utlis.WriteLine("UnlockAction"); if (CheckESVideoInfoIsNullOrEmpty()) return; //3S内不允许触发第二次 if(UnlockDateTime.AddSeconds(3) > DateTime.Now) { UnlockDateTime = DateTime.Now; Utlis.WriteLine("3S内不允许触发第二次"); //丰林SDKbug，呼叫的时候开锁成功会有2次回调， return; } UnlockDateTime = DateTime.Now; new Thread(() => { @@ -262,7 +287,7 @@ var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_FL_Unlock, requestJson); if (revertObj.Code == StateCode.SUCCESS) { Utlis.WriteLine("POST 开锁成功"); //Utlis.WriteLine("POST 开锁成功"); } else { @@ -273,10 +298,10 @@ { IsBackground = false }.Start(); } #endregion #endregion #if __IOS__ #region OnESCallDelegate #region OnESCallDelegate /////// <summary> /////// OnESCallDelegate 继承响应事件 /////// </summary> @@ -344,7 +369,7 @@ } #endregion #endregion #endif /// <summary> @@ -386,7 +411,7 @@ /// 室外机的名称 /// 例：室外机 /// </summary> public string DeviceName = "门口机"; public string DeviceName = "室外机"; /// <summary> /// 丰林请求的唯一id /// </summary> HDL_ON/HDL_ON.projitems
@@ -360,7 +360,7 @@ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\Matching.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\PirNameView.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\BrandListPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\FL\ESOnVideo.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\ThirdPartySdk\ESOnVideo.cs" /> </ItemGroup> <ItemGroup> <Folder Include="$(MSBuildThisFileDirectory)UI\" /> @@ -400,6 +400,6 @@ <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\ArmSensor\" /> <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\" /> <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\" /> <Folder Include="$(MSBuildThisFileDirectory)DAL\FL\" /> <Folder Include="$(MSBuildThisFileDirectory)DAL\ThirdPartySdk\" /> </ItemGroup> </Project>
