From 02ef7fd8315dfa7a5d8d3ddc0d04a3d4625dc0b5 Mon Sep 17 00:00:00 2001 From: wxr <wxr@hdlchina.com.cn> Date: 星期一, 02 九月 2024 16:56:34 +0800 Subject: [PATCH] 增加面板地暖SPK;增加安卓金茂热水器,光伏储能切图 --- HDL_ON/Common/HDLCommon.cs | 73 ++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 1 deletions(-) diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs index d99e10b..db3372f 100644 --- a/HDL_ON/Common/HDLCommon.cs +++ b/HDL_ON/Common/HDLCommon.cs @@ -7,6 +7,10 @@ using HDL_ON.Entity; using System.Threading; using HDL_ON.DriverLayer; +#if __IOS__ +using Other; +using Shared.IOS.HDLLinphoneSDK; +#endif namespace HDL_ON { /// <summary> @@ -305,7 +309,7 @@ ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, InterphoneType.FLVI.ToString()); } - else if (jpushMessageInfo.messageType == (PushMessageType.HDL_INTERPHONE.ToString())) + else if (jpushMessageInfo.messageType == PushMessageType.HDL_INTERPHONE.ToString()) { if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return; @@ -368,6 +372,72 @@ } } catch { } + + + +#if __ANDROID__ + Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MissedCallsTime = 30; + Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.SetMediaPlayerLooping(true); + Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.PlayRingtone(); + new Thread(() => + { + try + { + DateTime dateTime = DateTime.Now; + while (true) + { + Thread.Sleep(1000); + if (!Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MediaPlayerPlayingStatus || dateTime.AddSeconds(Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MissedCallsTime) <= DateTime.Now) + { + break; + } + } + Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.SetMediaPlayerLooping(false); + } + catch (Exception ex) + { + MainPage.Log("error", "鑷爺鍙瀵硅閾冨0鎾斁寮傚父:" + ex.Message); + } + }) + { IsBackground = true }.Start(); + +#elif __IOS__ + SoundPlayer.Ins.PlaySound(); + new Thread(() => { + int count = 0; + while (true) + { + if (SoundPlayer.Ins.player == null) + { + break; + } + if (!SoundPlayer.Ins.player.Playing) + { + break; + } + System.Threading.Thread.Sleep(1000); + count++; + MainPage.Log("linphone 鍛煎彨璁℃椂锛�" + count); + if (count > 29) + { + SoundPlayer.Ins.StopSound(); + Application.RunOnMainThread(() => { + try + { + HDLLinPhoneSDK.Instance().HideIntercomeVC(); + }catch(Exception ex) + { + MainPage.Log("error", "ios linphone 鍛煎彨瓒呮椂鍏抽棴鐣岄潰寮傚父锛�" + ex.Message); + } + }); + break; + } + } + }) + { IsBackground = true }.Start(); +#endif + + //HDL Linphone 鐙勮�愬厠 eSVideoInfo.HomeId = jpushMessageInfo.HomeId; eSVideoInfo.callId = json["callId"].ToString(); @@ -376,6 +446,7 @@ eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString(); eSVideoInfo.spk = json["spk"].ToString(); + //ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�"); //鎵撳紑鍛煎彨椤甸潰 HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.HDL.ToString()); -- Gitblit v1.8.0