From cda2410f9c29f2fadc16e9de38ccae95b75a89dd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 六月 2021 10:51:13 +0800
Subject: [PATCH] 1
---
HDL_ON/Common/HDLCommon.cs | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 1abb521..cf27527 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/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);
}
}
@@ -300,6 +303,27 @@
catch(Exception EX)
{
Utlis.WriteLine("catch: " + EX.ToString());
+ }
+ }
+
+ /// <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;
}
}
@@ -325,6 +349,8 @@
case "13602944661":
case "18778381374":
case "18316672920":
+ case "15626203746":
+ case "551775569@qq.com":
return;
}
@@ -532,7 +558,8 @@
{
#if __IOS__
//iOS
-
+ //鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY
+ EZSDK.IOS.EZSDK.InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
//1.璁剧疆鎵�闇�娌充笢鐨凙ccessToken鍜孯efreshToken銆佸煙鍚嶅湴鍧�
EZSDK.IOS.EZSDK.SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken);
EZSDK.IOS.EZSDK.SetRequestHttpsHost(OnAppConfig.Instance.RequestHttpsHost);
--
Gitblit v1.8.0