From 90d4fdb42a7f4818897ff76def0a151a99d2d9e1 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 十一月 2023 13:56:14 +0800
Subject: [PATCH] 2.4.2Google
---
HDL_ON/Common/HDLCommon.cs | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 24e612e..bd3f2d6 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -258,7 +258,7 @@
{
try
{
- MainPage.Log($"鎺ユ敹鍒版帹閫�.\r\n{Newtonsoft.Json.JsonConvert.SerializeObject(jpushMessageInfo).ToString()}");
+ //Console.WriteLine($"鎺ユ敹鍒版帹閫侊紝锛岋紝锛�.{Newtonsoft.Json.JsonConvert.SerializeObject(jpushMessageInfo).ToString()}");
//Extras涓虹┖涓嶅鐞�
if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;
@@ -357,6 +357,9 @@
//钀ょ煶鐚溂
eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"瀛愯处鍙穞oken
eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//璁惧搴忓垪鍙�
+ eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
+ eSVideoInfo.spk = json["spk"].ToString();
+
eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
if (json.ContainsKey("msgId") && !string.IsNullOrEmpty(json["msgId"].ToString()))
{
@@ -370,32 +373,32 @@
else if (interphoneTypeEnum == InterphoneType.HDL.ToString())
{
//HDL Linphone 鐙勮�愬厠
- eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
- eSVideoInfo.callId = json["callId"].ToString();
- eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
- eSVideoInfo.DeviceName = json["deviceName"].ToString();
- eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString();
- eSVideoInfo.spk = json["spk"].ToString();
+ //eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
+ //eSVideoInfo.callId = json["callId"].ToString();
+ //eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
+ //eSVideoInfo.DeviceName = json["deviceName"].ToString();
+ //eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString();
+ //eSVideoInfo.spk = json["spk"].ToString();
- //ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
- //鎵撳紑鍛煎彨椤甸潰
- HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.HDL.ToString());
+ ////ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
+ ////鎵撳紑鍛煎彨椤甸潰
+ //HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.HDL.ToString());
return;
}
else if (interphoneTypeEnum == InterphoneType.FREEVIEW.ToString())
{
//鍏ㄨ閫� Linphone 鐙勮�愬厠
- eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
- eSVideoInfo.callId = json["callId"].ToString();
- eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
- eSVideoInfo.DeviceName = json["deviceName"].ToString();
- eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString();
- eSVideoInfo.spk = json["spk"].ToString();
+ //eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
+ //eSVideoInfo.callId = json["callId"].ToString();
+ //eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
+ //eSVideoInfo.DeviceName = json["deviceName"].ToString();
+ //eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString();
+ //eSVideoInfo.spk = json["spk"].ToString();
- //ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
- //鎵撳紑鍛煎彨椤甸潰
- HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.FREEVIEW.ToString());
- return;
+ ////ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
+ ////鎵撳紑鍛煎彨椤甸潰
+ //HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.FREEVIEW.ToString());
+ //return;
}
//3.鎵撳紑鍛煎彨椤甸潰
@@ -510,7 +513,7 @@
DB_ResidenceData.Instance.EixtAccount();
MainPage.Log("閫�鍑鸿处鍙锋竻绌烘暟鎹�");
//4.娉ㄩ攢HDLSIP璐﹀彿鐧诲綍 2021-08-20
- HDLLinphone.Current.LogoutAllAccount();
+ //HDLLinphone.Current.LogoutAllAccount();
MainPage.Log("娉ㄩ攢HDLSIP璐﹀彿鐧诲綍");
#if __IOS__
@@ -686,7 +689,7 @@
if (internetStatus == 0)//娌℃湁缃戠粶杩炴帴 0
{
MainPage.InternetStatus = 0;
- DAL.Mqtt.MqttClient.InitState();
+ //DAL.Mqtt.MqttClient.DisConnectRemote();//.InitState();
}
else if (internetStatus == 1)//3,4G鐨勭綉缁滆繛鎺� 1
{
@@ -772,8 +775,8 @@
((BaseActivity)Shared.Application.Activity).SetPermission(result =>
{
//2023骞�03鏈�29鏃�13:08:35 淇敼
- Com.Videogo.Hdl.HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id);
- Com.Videogo.Hdl.HDLEzvizSdk.Instance.JumpToCameraListActivity(Shared.Application.Activity, list);
+ //Com.Videogo.Hdl.HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id);
+ //Com.Videogo.Hdl.HDLEzvizSdk.Instance.JumpToCameraListActivity(Shared.Application.Activity, list);
//if (result)
//{
// Android.Content.Intent intent = new Android.Content.Intent();
--
Gitblit v1.8.0