From 65d30e65eb0ee4168871e891984ea565b144c7f4 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 16 七月 2021 10:35:10 +0800
Subject: [PATCH] 海林传感器主页显示
---
HDL_ON/Common/HDLCommon.cs | 114 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 95 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 1abb521..d7de09c 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -273,33 +273,81 @@
if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
{
//鎶ヨ鎺ㄩ�佸脊绐楁彁绀�
- ShowAlarmPushMessage(jpushMessageInfo);
+ ShowAlarmPushMessage(jpushMessageInfo,true);
}
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, "FLVI");
+
+ }
+ else if (jpushMessageInfo.messageType.Contains(PushMessageType.HDL_INTERPHONE.ToString()))
+ {
+ if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
+
+ //瀛楁鍏煎闂锛屽彧鑳界洿鎺ュ彇鍊间簡
+ var json= Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
+ ESVideoInfo eSVideoInfo = new ESVideoInfo();// GetESOnVideoJson(jpushMessageInfo.expantContent);
+ eSVideoInfo.callId = json["callId"].ToString();
+ //eSVideoInfo.Lc_AccessToken = UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken;//json["subAccountToken"].ToString();//
+ eSVideoInfo.Lc_AccessToken = json["subAccountToken"].ToString();//2021-05-13 鐩墠浜戠杩樻病鎷垮埌Lc_AccessToken锛岀洰鍓嶆病鍔炴硶姝ｅ父浣跨敤
+ eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
+ eSVideoInfo.Lc_Location = OnAppConfig.Instance.RequestHttpsHost.Contains("China") ? 0 : 1;
+ eSVideoInfo.Lc_PlayToken = json["token"].ToString();
+ eSVideoInfo.Lc_Psk = json["cname"].ToString();
+
+ if (eSVideoInfo == null) return;
+
+ ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, "IMOUVISIAL");
+
+ }
+ else if(jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
+ {
+ ShowAlarmPushMessage(jpushMessageInfo, false);
}
}
}
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 +373,8 @@
case "13602944661":
case "18778381374":
case "18316672920":
+ case "15626203746":
+ case "551775569@qq.com":
return;
}
@@ -385,7 +435,8 @@
/// 鎶ヨ鎺ㄩ�佸脊绐楁彁绀�,鐐瑰嚮鏌ョ湅璺宠浆淇℃伅涓績
/// </summary>
/// <param name="jpushMessageInfo"></param>
- public void ShowAlarmPushMessage(JPushMessageInfo jpushMessageInfo)
+ /// <param name="isAlarm">鏄惁鏄姤璀︿俊鎭紝锛堝姞杞界殑寮圭獥棰滆壊涓嶄竴鏍凤級</param>
+ public void ShowAlarmPushMessage(JPushMessageInfo jpushMessageInfo,bool isAlarm)
{
//娌＄櫥褰曚笉澶勭悊
if (UserInfo.Current == null || !UserInfo.Current.IsLogin || MainPage.BasePageView == null)
@@ -396,12 +447,35 @@
//璺宠浆淇℃伅涓績椤甸潰
Action goAction = () =>
{
+ //鏌ョ湅瀵瑰簲浣忓畢鐨勪俊鎭紝瑕佸垏鎹㈠埌瀵瑰簲浣忓畢
+ if (jpushMessageInfo.HomeId != DB_ResidenceData.Instance.CurrentRegion.id)
+ {
+ var homeTemp = UserInfo.Current.regionList.Find((obj) => jpushMessageInfo.HomeId == obj.id);
+ if (homeTemp != null)
+ {
+ DB_ResidenceData.Instance.CurrentRegion = homeTemp;
+ DB_ResidenceData.Instance.SaveResidenceData();
+ DB_ResidenceData.Instance.EixtAccount();
+ //鍒锋柊浣忓畢鏁版嵁
+ Common.ApiUtlis.Ins.DownloadData();
+ while (MainPage.BasePageView.ChildrenCount > 1)
+ {
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 2;
+ }
+ MainPage.CurPageIndex = 9999;
+ MainPage.UserBasePage.ChooseCollection();
+ }
+ }
//Dialog
alarmPushConfirmDialog = null;
Action backAction = () =>
{
};
+ while (MainPage.BasePageView.ChildrenCount > 1)
+ {
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 2;
+ }
var skipPage = new MessageCenterPage();
MainPage.BasePageView.AddChidren(skipPage);
skipPage.LoadPage(backAction);
@@ -414,10 +488,11 @@
alarmPushConfirmDialog = null;
};
+
//闃叉澶氭寮圭獥澶勭悊
if (alarmPushConfirmDialog == null)
{
- alarmPushConfirmDialog = new ConfirmDialog();
+ alarmPushConfirmDialog = new ConfirmDialog(isAlarm);
alarmPushConfirmDialog.ShowDialog(Language.StringByID(StringId.Tip), jpushMessageInfo.Content, goAction, cancelAction, StringId.Cancel, StringId.LookOver);
}
else
@@ -532,7 +607,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