From a70ecc5ff8e63921df9009fee23b6abe27f9556a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:14:48 +0800
Subject: [PATCH] 删除可视对讲，萤石类设备
---
HDL_ON/Common/HDLCommon.cs | 313 ----------------------------------------------------
1 files changed, 0 insertions(+), 313 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 749d7df..d971fc4 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -267,200 +267,13 @@
{
//鎶ヨ鎺ㄩ�佸脊绐楁彁绀�
ShowAlarmPushMessage(jpushMessageInfo, true);
- //钀ょ煶闂ㄩ攣鎺ㄩ��
- UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
- }
- else if (jpushMessageInfo.messageType == (PushMessageType.FLCall.ToString()))
- {
- if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
-
- 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, InterphoneType.FLVI.ToString());
-
- }
- else if (jpushMessageInfo.messageType == PushMessageType.HDL_INTERPHONE.ToString())
- {
- if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
-
- //瀛楁鍏煎闂锛屽彧鑳界洿鎺ュ彇鍊间簡
- var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
-
- //1.瑙嗗璁插巶瀹剁被鍨�
- string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
- if (string.IsNullOrEmpty(interphoneTypeEnum)) return;
- ESVideoInfo eSVideoInfo = new ESVideoInfo();// GetESOnVideoJson(jpushMessageInfo.expantContent);
- //2.鏍规嵁鍙瀵硅鍘傚绫诲瀷锛屽鐞嗕笉鍚岀殑鏁版嵁
- if (interphoneTypeEnum == InterphoneType.IMOUVISIAL.ToString())
- {
- //澶у崕涔愭
- 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();
- eSVideoInfo.Lc_Psk = json["psk"].ToString();//2021-10-15 PSK瀛楁涓嶈兘鍙朿name
- }
- else 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();
-
- 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();
- }
- }
- else if (interphoneTypeEnum == InterphoneType.HDL.ToString())
- {
- try
- {
- var pushTime = json["pushTime"];
- if (pushTime == null)
- {
- return;
- }
- if (!string.IsNullOrEmpty(pushTime.ToString()))
- {
- var pushDateTime = Utlis.UnixToDateTimeMS(Convert.ToInt64(pushTime));
- if (pushDateTime.AddSeconds(30) < DateTime.Now)
- {
- return;
- }
- }
- }
- 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
- {
- 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", "鑷爺鍙瀵硅閾冨０鎾斁寮傚父:" + 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
-
- MainPage.Log("鎺ユ敹鍒版帹閫�: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();
- //鎵撳紑鍛煎彨椤甸潰
- HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.HDL.ToString(), jpushMessageInfo.isNotificationGoing);
- 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();
-
- //ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
- //鎵撳紑鍛煎彨椤甸潰
- HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.FREEVIEW.ToString());
- return;
- }
-
- //3.鎵撳紑鍛煎彨椤甸潰
- if (eSVideoInfo == null) return;
- ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, interphoneTypeEnum);
-
}
else if (jpushMessageInfo.messageType == (PushMessageType.Prompt.ToString()))
{
ShowAlarmPushMessage(jpushMessageInfo, false);
- //钀ょ煶闂ㄩ攣鎺ㄩ��
- HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
}
else if (jpushMessageInfo.messageType == (PushMessageType.DOOR_BELL.ToString()))
{
- //钀ょ煶闂ㄩ攣鎺ㄩ��
- HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
}
@@ -561,8 +374,6 @@
OnAppConfig.Instance.SaveConfig();
DB_ResidenceData.Instance.EixtAccount();
MainPage.Log("閫�鍑鸿处鍙锋竻绌烘暟鎹�");
- //4.娉ㄩ攢HDLSIP璐﹀彿鐧诲綍 2021-08-20
- HDLLinphone.Current.LogoutAllAccount();
MainPage.Log("娉ㄩ攢HDLSIP璐﹀彿鐧诲綍");
#if __IOS__
@@ -760,129 +571,5 @@
}
#endregion
-#region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
-
- /// <summary>
- /// 鑾峰彇瀛愯处鍙穞oken骞惰烦杞澶囧垪琛ㄩ〉闈�
- /// </summary>
- /// <param name="bodyView"></param>
- public void Go2EZvizMonitor(FrameLayout bodyView)
- {
- var waitPage = new Loading();
- bodyView.AddChidren(waitPage);
- waitPage.Start(Language.StringByID(StringId.PleaseWait));
-
- new Thread(() =>
- {
- try
- {
- var list = UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockLockModelsList();
- //鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken
- var result = new HttpServerRequest().EZGetChildToken();
- if (result.Code == StateCode.SUCCESS)
- {
- var ezChildAccessToken = result.Data.ToString();
-
- //var ezChildAccessToken = Newtonsoft.Json.JsonConvert.DeserializeObject<EZChildAccessToken>(result.Data.ToString());
- Application.RunOnMainThread(() =>
- {
- if (!string.IsNullOrEmpty(ezChildAccessToken))
- {
-
-#if __IOS__
-
- //iOS
- //鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY
- EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
- //1.璁剧疆鎵�闇�娌充笢鐨凙ccessToken鍜孯efreshToken銆佸煙鍚嶅湴鍧�
- EZSDK.IOS.EZSDK.SharedInstance().SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken);
- EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id);
- //2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK
- EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(ezChildAccessToken);
-
- //////3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
- //EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();
-
- //EZSDK.IOS.EZDeviceInfo info = new EZSDK.IOS.EZDeviceInfo();
- //info.de
- //EZSDK.IOS.EZSDK.Play(info);
-
- //2023骞�03鏈�29鏃�13:08:35 淇敼
- Foundation.NSObject[] nSObject = new Foundation.NSObject[list.Count];
- for (int i = 0; i < list.Count; i++)
- {
- string strValue = list[i];
- nSObject[i] = new Foundation.NSString(strValue);
- }
- EZSDK.IOS.EZSDK.SharedInstance().ToEZDeviceListViewWithFilterTypes(nSObject);
-
-
-
-#else
- //Android
- //1.璁剧疆鎵�闇�娌充笢鐨則oken銆佸煙鍚嶅湴鍧�
- //2.璁剧疆钀ょ煶瀛愯处鍙风殑token
- //3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
- ((BaseActivity)Shared.Application.Activity).SetCamera(b =>
- {
- if (b)
- {
- ((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,
- HttpUtil.APP_KEY, HttpUtil.SECRET_KEY);
- Com.Videogo.Hdl.HDLEzvizSdk.Instance.JumpToCameraListActivity(Shared.Application.Activity, list);
- //if (result)
- //{
- // Android.Content.Intent intent = new Android.Content.Intent();
- // var bundle = new Android.OS.Bundle();
- // //浼犻�抧ame鍙傛暟涓簍inyphp
- // bundle.PutString("EzChildAccessToken", ezChildAccessToken);
- // bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
- // bundle.PutString("Url", OnAppConfig.Instance.RequestHttpsHost);
- // bundle.PutString("EzvizAppKey", "1aa98a90489b4838b966b57018b4b04b");
- // bundle.PutInt("Platform", 1);
- // bundle.PutString("HomeId", DB_ResidenceData.Instance.CurrentRegion.id);
- // intent.PutExtras(bundle);
- // intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
- // Shared.Application.Activity.StartActivity(intent);
- //}
- }, "android.permission.RECORD_AUDIO");
-
- }
- });
-#endif
-
-
- }
-
- });
- }
- else
- {
- if (result.Code != "-1")
- IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
- }
- }
- catch (Exception ex)
- {
- }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- if (waitPage != null)
- {
- waitPage.RemoveFromParent();
- waitPage = null;
- }
- });
- }
- })
- { IsBackground = true }.Start();
- }
-
-#endregion
}
}
--
Gitblit v1.8.0