From 51f5f7a47d394163dccf2441cd04c2a19ceeda34 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 08 一月 2024 09:41:59 +0800
Subject: [PATCH] Merge branch 'Dev-Google-V2.4.3' into Google-2023-11-17-1
---
HDL_ON/Common/ApiUtlis.cs | 100 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 70 insertions(+), 30 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index e0a8a6a..86bdfdc 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -104,6 +104,19 @@
code = Ins.HttpRequest.RefreshToken();
if (code != StateCode.SUCCESS)
{
+ if (waitPage != null)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ waitPage.Hide();
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ catch { }
+ });
+ }
MainPage.Log($"鍒锋柊token澶辫触");
return;
}
@@ -112,6 +125,19 @@
code = Ins.HttpRequest.GetHomePager();
if (code != StateCode.SUCCESS)
{
+ if (waitPage != null)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ waitPage.Hide();
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ catch { }
+ });
+ }
MainPage.Log($"鍒锋柊浣忓畢淇℃伅澶辫触");
return;
}
@@ -120,6 +146,19 @@
code = Ins.HttpRequest.GetUserInfo();
if (code != StateCode.SUCCESS)
{
+ if (waitPage != null)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ waitPage.Hide();
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ catch { }
+ });
+ }
MainPage.Log($"鍒锋柊涓汉淇℃伅澶辫触");
return;
}
@@ -178,7 +217,7 @@
FunctionList.List.ClearDatas();
//MainPage.Log($"============璁惧============寮�濮�" + FunctionList.List.Functions.Count);
//MainPage.Log($"璇诲彇璁惧淇℃伅鎴愬姛");
- //MainPage.Log($"sid鍒楄〃鑾峰彇====" + deviceResult.Data.ToString());
+ MainPage.Log($"sid鍒楄〃鑾峰彇====\r\n" , deviceResult.Data.ToString());
var deviceList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
if (deviceList == null)
{
@@ -298,33 +337,33 @@
//======================鑾峰彇Sip璐﹀彿骞朵笖鍒濆鍖朣DK鍙瀵硅璁惧鍒楄〃====================
//濡傛灉妫�娴嬬嚎绋嬫病鍚姩锛屾墠缁х画涓嬮潰鎿嶄綔 鍥犱负App鏈夊彲鑳藉垰鍚姩椹笂鏀跺埌鎺ㄩ�佷簡锛岀劧鍚庢墠鎵ц鍒拌繖閲�
- if (HDLLinphone.Current.CheckIncomingCallThreadIsNull())
- {
+ //if (HDLLinphone.Current.CheckIncomingCallThreadIsNull())
+ //{
- //褰撳墠浣忓畢鏄疕DL鍙瀵硅绫诲瀷鐨勮澶�
- if (isInterphoneType_HDL)
- {
- //HDLLinphone鍙瀵硅,鑾峰彇Sip璐﹀彿骞跺垵濮嬪寲SDK
- HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
- callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
- callVideoInfo.InterphoneType = InterphoneType.HDL.ToString();
- HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
- }
- else if (isInterphoneType_FREEVIEW)
- {
- //HDLLinphone鍙瀵硅,鑾峰彇Sip璐﹀彿骞跺垵濮嬪寲SDK
- HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
- callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
- callVideoInfo.InterphoneType = InterphoneType.FREEVIEW.ToString();
- HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
- }
- else
- {
- Utlis.WriteLine("褰撳墠浣忓畢涓嶆敮鎸丠DL鍙瀵硅,閫�鍑虹櫥褰曟墍鏈夎处鍙�");
- //褰撳墠浣忓畢涓嶆敮鎸丠DL鍙瀵硅
- HDLLinphone.Current.LogoutAllAccount();
- }
- }
+ // //褰撳墠浣忓畢鏄疕DL鍙瀵硅绫诲瀷鐨勮澶�
+ // if (isInterphoneType_HDL)
+ // {
+ // //HDLLinphone鍙瀵硅,鑾峰彇Sip璐﹀彿骞跺垵濮嬪寲SDK
+ // HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
+ // callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+ // callVideoInfo.InterphoneType = InterphoneType.HDL.ToString();
+ // HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
+ // }
+ // else if (isInterphoneType_FREEVIEW)
+ // {
+ // //HDLLinphone鍙瀵硅,鑾峰彇Sip璐﹀彿骞跺垵濮嬪寲SDK
+ // HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
+ // callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+ // callVideoInfo.InterphoneType = InterphoneType.FREEVIEW.ToString();
+ // HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
+ // }
+ // else
+ // {
+ // Utlis.WriteLine("褰撳墠浣忓畢涓嶆敮鎸丠DL鍙瀵硅,閫�鍑虹櫥褰曟墍鏈夎处鍙�");
+ // //褰撳墠浣忓畢涓嶆敮鎸丠DL鍙瀵硅
+ // HDLLinphone.Current.LogoutAllAccount();
+ // }
+ //}
@@ -496,11 +535,12 @@
//======================瀹夐槻====================
GetSecurityList();
+
+ //===================璇诲彇閫昏緫鍒楄〃====================
+ Logic.LogicList.Clear();//涓婚〉涓嬫媺寮哄埗鍒锋柊鑷姩鍖栧垪琛�
+ MainView.GetLogicList();//璇诲彇鑷姩鍖栧垪琛�
})
{ IsBackground = true }.Start();
-
- //===================璇诲彇閫昏緫鍒楄〃==========================
- Logic.LogicList.Clear();//涓婚〉涓嬫媺寮哄埗鍒锋柊鑷姩鍖栧垪琛�
//======================娉ㄥ唽鎺ㄩ��====================
httpRequest.RegisteredPush();
--
Gitblit v1.8.0