From 47f179be722a61c95cc03c8f90e1aa91c12d1124 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 23 十月 2024 18:49:23 +0800
Subject: [PATCH] UI走查，安卓
---
HDL_ON/Common/HDLCommon.cs | 99 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 74 insertions(+), 25 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 749d7df..ce6a03e 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -247,6 +247,10 @@
{
try
{
+ if (OnAppConfig.Instance.LastLoginUserId == "")
+ {
+ return;
+ }
//MainPage.Log($"鎺ユ敹鍒版帹閫侊紝锛岋紝锛�.{Newtonsoft.Json.JsonConvert.SerializeObject(jpushMessageInfo).ToString()}");
//Extras涓虹┖涓嶅鐞�
if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;
@@ -353,37 +357,47 @@
}
}
}
- catch (Exception ex) {
+ catch (Exception ex)
+ {
MainPage.Log("Error", $"鑷爺鍙瀵硅閫氱煡寮傚父:{ex.StackTrace}");
}
#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
{
- try
+ //瀹夊崜濡傛灉璁剧疆浜嗛潤闊筹紝涓嶈兘鍝嶉搩
+ if (Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.AudioManager.RingerMode.ToString().ToLower() == "normal")
{
- DateTime dateTime = DateTime.Now;
- while (true)
+ Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MissedCallsTime = 30;
+ Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.SetMediaPlayerLooping(true);
+ Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.PlayRingtone();
+ new Thread(() =>
{
- Thread.Sleep(1000);
- if (!Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MediaPlayerPlayingStatus || dateTime.AddSeconds(Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.MissedCallsTime) <= DateTime.Now)
+ try
{
- break;
+ 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);
}
- }
- Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.SetMediaPlayerLooping(false);
+ catch (Exception ex)
+ {
+ MainPage.Log("error", "鑷爺鍙瀵硅閾冨０鎾斁寮傚父:" + ex.Message);
+ }
+ })
+ { IsBackground = true }.Start();
}
- catch (Exception ex)
- {
- MainPage.Log("error", "鑷爺鍙瀵硅閾冨０鎾斁寮傚父:" + ex.Message);
- }
- })
- { IsBackground = true }.Start();
-
- #elif __IOS__
+ }catch(Exception ex)
+ {
+ MainPage.Log("Error", $"瀹夊崜鍙瀵硅鍝嶉搩寮傚父:{ex.StackTrace}");
+ }
+#elif __IOS__
SoundPlayer.Ins.PlaySound();
new Thread(() => {
int count = 0;
@@ -417,7 +431,7 @@
}
})
{ IsBackground = true }.Start();
- #endif
+#endif
MainPage.Log("鎺ユ敹鍒版帹閫�:HDL Linphone 鐙勮�愬厠");
eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
@@ -459,11 +473,46 @@
}
else if (jpushMessageInfo.messageType == (PushMessageType.DOOR_BELL.ToString()))
{
+ try
+ {
+ var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
+ string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
+ if (string.IsNullOrEmpty(interphoneTypeEnum)) return;
+ ESVideoInfo eSVideoInfo = new ESVideoInfo();
+ if (interphoneTypeEnum == InterphoneType.EZVIZ.ToString())
+ {
+ eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"瀛愯处鍙穞oken
+ eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//璁惧搴忓垪鍙�
+ eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
+ eSVideoInfo.spk = json["spk"].ToString();
+ if (eSVideoInfo.spk == SPK.Peephole)
+ {
+ eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
+ if (json.ContainsKey("msgId") && !string.IsNullOrEmpty(json["msgId"].ToString()))
+ {
+ eSVideoInfo.msgId = json["msgId"].ToString();
+ }
+ if (json.ContainsKey("currentTime") && !string.IsNullOrEmpty(json["currentTime"].ToString()))
+ {
+ eSVideoInfo.currentTime = json["currentTime"].ToString();
+ }
+
+ if (eSVideoInfo != null)
+ {
+ //鎵撳紑鍛煎彨椤甸潰
+ ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, interphoneTypeEnum);
+ return;
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("Error", $"缁撴潫闂ㄩ搩鎺ㄩ�佹暟鎹紓甯�:{ex.Message}");
+ }
//钀ょ煶闂ㄩ攣鎺ㄩ��
HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
}
-
-
}
}
catch (Exception EX)
@@ -530,7 +579,7 @@
Logout();
}catch (Exception ex)
{
- MainPage.Log($"鎸や笅绾垮紓甯�:{ex.Message}");
+ MainPage.Log("Error",$"鎸や笅绾垮紓甯�:{ex.Message}");
}
}
--
Gitblit v1.8.0