| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DLL/FL/iOS/Shared.IOS.ESVideoPhoneSDK.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_Android/Other/JPush/JPushReceiver.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/AppDelegate.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/Common/HDLCommon.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/FL/ESOnVideo.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/NewAPI.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/DAL/Server/NewApiRes.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI1-Login/LoginPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,27 +1,44 @@ <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/UI/UI1-Login/ForgetPasswordPage.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/AppDelegate.cs"> <Files> <File FileName="HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs" Line="1" Column="1" /> <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" /> </Files> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL_ON" expanded="True"> <Node name="Common" expanded="True" /> <Node name="DAL" expanded="True"> <Node name="FL" expanded="True" /> <Node name="Server" expanded="True" /> </Node> <Node name="Entity" expanded="True" /> <Node name="UI" expanded="True"> <Node name="UI1-Login" expanded="True"> <Node name="ForgetPasswordPage.cs" selected="True" /> </Node> <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="Other" expanded="True" /> <Node name="AppDelegate.cs" selected="True" /> </Node> <Node name="ys" expanded="True" /> </Node> </State> </Pad> @@ -36,7 +53,10 @@ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore /> <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> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> </Properties> DLL/FL/iOS/Shared.IOS.ESVideoPhoneSDK.dllBinary files differ
HDL-ON_Android/Other/JPush/JPushReceiver.cs
@@ -57,6 +57,7 @@ if (jpushExpandData != null && jpushExpandData.messageType != null) { pushMes.messageType = jpushExpandData.messageType; pushMes.expantContent = jpushExpandData.expantContent; Utlis.WriteLine("PushMes messageType : " + pushMes.messageType); } @@ -162,6 +163,7 @@ if (jpushExpandData != null && jpushExpandData.messageType != null) { pushMes.messageType = jpushExpandData.messageType; pushMes.expantContent = jpushExpandData.expantContent; Utlis.WriteLine("PushMes messageType : " + pushMes.messageType); }
@@ -295,6 +295,7 @@ var title = alert["title"] as NSString; var expandData = ""; var messageType = ""; var expantContent = ""; if (userInfo.ContainsKey(new NSString("expandData"))) { var expandDataStr = userInfo["expandData"] as NSString; @@ -308,7 +309,13 @@ messageType = expandDataNSD["messageType"] as NSString; Utlis.WriteLine("messageType: " + messageType); } if (expandDataNSD.ContainsKey(new NSString("expantContent"))) { expantContent = expandDataNSD["expantContent"] as NSString; Utlis.WriteLine("expantContent: " + expantContent); } } } else @@ -322,7 +329,8 @@ Title = title, Content = body, Extras = expandData, messageType = messageType messageType = messageType, expantContent = expantContent }; Utlis.WriteLine("PushMes title : " + pushMes.Title); Utlis.WriteLine("PushMes message : " + pushMes.Content); HDL_ON/Common/HDLCommon.cs
@@ -277,22 +277,25 @@ } else if (jpushMessageInfo.messageType.Contains(PushMessageType.FLCall.ToString())) { #if DEBUG #if __Android__ ShowAlert("来电通知！！！！"); if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return; #else ESOnVideo.Current.Test(); #endif #endif //解析呼叫的门口机UUID信息，并跳转丰林呼叫页面 //ESVideoInfo eSVideoInfo = new ESVideoInfo() //{ // DeviceName = "室外机88", // ESVideoUUID = "JJY000019VPLLF", //}; //ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo); ESVideoInfo eSVideoInfo = GetESOnVideoJson(jpushMessageInfo.expantContent); if (eSVideoInfo == null) return; if (string.IsNullOrEmpty(eSVideoInfo.uuid)) return; if (eSVideoInfo.uuid.Contains(",")) { var uuid = eSVideoInfo.uuid.Split(','); eSVideoInfo.ESVideoUUID = uuid[0]; } else { eSVideoInfo.ESVideoUUID = eSVideoInfo.uuid; } ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo); } } @@ -304,6 +307,27 @@ } /// <summary> /// /// </summary> /// <param name="jsonStr"></param> /// <returns></returns> ESVideoInfo GetESOnVideoJson(string jsonStr) { try { if (!string.IsNullOrEmpty(jsonStr)) { return Newtonsoft.Json.JsonConvert.DeserializeObject<ESVideoInfo>(jsonStr); } return null; } catch { return null; } } /// <summary> /// 账号在别处登陆，被踢下线 跳转到登录页面 /// 要在主线程调用 /// 退出登录操作 HDL_ON/DAL/FL/ESOnVideo.cs
@@ -38,11 +38,13 @@ } /// <summary> /// /// 门口机、丰林小区信息和房间信息等参数 /// </summary> public ESVideoInfo esVideoInfo; //public FLInfo mFLInfo; /// <summary> /// /// </summary> public void InitESVideoSDK() { //ESVideo. @@ -66,6 +68,7 @@ Shared.Application.currentVC.NavigationController.PushViewController(vc, true); #else #endif } @@ -84,9 +87,12 @@ //vc.MESRoomID = mESVideoInfo.ESRoomID; vc.DeviceName = mESVideoInfo.DeviceName; //vc.RoomName = mESVideoInfo.RoomName; vc.MESCallDelegate = new OnESCallDelegate(this); //vc.MESCallDelegate = new OnESCallDelegate(this); mOnESCallDelegate = new OnESCallDelegate(this); vc.MESCallDelegate = mOnESCallDelegate; Shared.Application.currentVC.NavigationController.PushViewController(vc, true); #else #endif } @@ -99,7 +105,13 @@ /// <returns></returns> bool CheckESVideoInfoIsNullOrEmpty() { return (esVideoInfo == null || string.IsNullOrEmpty(esVideoInfo.callId)); if(esVideoInfo == null || string.IsNullOrEmpty(esVideoInfo.callId)) { Utlis.WriteLine("ESVideoInfo Is NullOrEmpty"); return true; } return false; //return (esVideoInfo == null || string.IsNullOrEmpty(esVideoInfo.callId)); } /// <summary> @@ -121,12 +133,11 @@ } else { Utlis.WriteLine("POST 接听失败"); Utlis.WriteLine("POST 接听失败 code: " + revertObj.Code); } }) { IsBackground = true }.Start(); { IsBackground = false }.Start(); } @@ -154,11 +165,11 @@ } else { Utlis.WriteLine("POST 挂断失败"); Utlis.WriteLine("POST 挂断失败 code: "+ revertObj.Code); } }) { IsBackground = true }.Start(); { IsBackground = false }.Start(); } /// <summary> @@ -183,11 +194,11 @@ } else { Utlis.WriteLine("POST 拒接失败"); Utlis.WriteLine("POST 拒接失败 code: " + revertObj.Code); } }) { IsBackground = true }.Start(); { IsBackground = false }.Start(); } /// <summary> @@ -215,14 +226,15 @@ } else { Utlis.WriteLine("POST 截图上传失败"); Utlis.WriteLine("POST 截图上传失败 code: " + revertObj.Code); } }) { IsBackground = true }.Start(); { IsBackground = false }.Start(); } DateTime UnlockDateTime = DateTime.MinValue; /// <summary> /// 开锁成功 /// </summary> @@ -231,6 +243,15 @@ Utlis.WriteLine("UnlockAction"); if (CheckESVideoInfoIsNullOrEmpty()) return; //3S内不允许触发第二次 if(UnlockDateTime.AddSeconds(3) > DateTime.Now) { UnlockDateTime = DateTime.Now; Utlis.WriteLine("3S内不允许触发第二次"); //丰林SDKbug，呼叫的时候开锁成功会有2次回调， return; } new Thread(() => { @@ -245,11 +266,11 @@ } else { Utlis.WriteLine("POST 开锁失败"); Utlis.WriteLine("POST 开锁失败 code: " + revertObj.Code); } }) { IsBackground = true }.Start(); { IsBackground = false }.Start(); } #endregion @@ -259,8 +280,11 @@ /////// <summary> /////// OnESCallDelegate 继承响应事件 /////// </summary> //OnESCallDelegate mOnESCallDelegate; OnESCallDelegate mOnESCallDelegate; /// <summary> /// /// </summary> public class OnESCallDelegate : ESCallDelegate { @@ -333,6 +357,7 @@ { DeviceName = "室外机88", ESVideoUUID = "JJY000019VPLLF", }; if (isMonitor) { @@ -340,6 +365,7 @@ } else { eSVideoInfo.callId = "88888"; ShowESvideoVideoIntercom(eSVideoInfo); } @@ -360,7 +386,7 @@ /// 室外机的名称 /// 例：室外机 /// </summary> public string DeviceName = string.Empty; public string DeviceName = "门口机"; /// <summary> /// 丰林请求的唯一id /// </summary> @@ -377,10 +403,10 @@ /// 丰林楼栋号 /// </summary> public string unitno; /// <summary> /// 丰林住宅Id /// </summary> public string HomeID; ///// <summary> ///// 丰林住宅Id ///// </summary> //public string HomeID; /// <summary> /// 呼叫记录Id /// </summary> HDL_ON/DAL/Server/NewAPI.cs
@@ -526,10 +526,10 @@ #endregion #region ■ -- 丰林相关相关接口___________________________ ///// <summary> ///// 检查住宅是否绑定丰林，并获取门口机列表 ///// </summary> //public const string API_POST_FL_Check = "/home-wisdom/app/fl/vi/answer"; /// <summary> /// 检查住宅是否绑定丰林，并获取门口机列表 /// </summary> public const string API_POST_FL_Check = "/home-wisdom/app/fl/vi/check"; /// <summary> /// 接听 /// </summary> HDL_ON/DAL/Server/NewApiRes.cs
@@ -1434,6 +1434,11 @@ /// 信息类型 /// </summary> public string messageType = ""; /// <summary> /// 扩展数据内容 /// </summary> public string expantContent = ""; }
@@ -188,15 +188,15 @@ #if DEBUG btnIcon_bg.MouseUpEventHandler += (sender, e) => { ESOnVideo.Current.Test(); //ESOnVideo.Current.Test(); }; bool b = false; btnIcon.MouseUpEventHandler += (sender, e) => { ESOnVideo.Current.Test(false); //ESOnVideo.Current.Test(false); return; //return; if (b) { etAccount.Text = "18316672920";//"18316120654";//lcg "18316672920";//hzx;// "13415629083"//cf;//tujie"18316120654"; HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
@@ -71,6 +71,19 @@ }; bodyView.AddChidren(btnOnTitle); #if DEBUG btnOnIcon.MouseUpEventHandler += (sender, e) => { ESOnVideo.Current.Test(); }; btnOnTitle.MouseUpEventHandler += (sender, e) => { ESOnVideo.Current.Test(false); }; #endif Button btnOnVersion = new Button() { Y = btnOnTitle.Bottom,
