From 5a64fc39289d4121b2950c07a4b6e43cf76dd4a5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 11:16:59 +0800
Subject: [PATCH] Merge branch 'tzy2' into MergeFL
---
HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs b/HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs
index ba0102f..7585efa 100644
--- a/HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs
+++ b/HDL-ON_Android/FengLinVideo/Form/ReverseCallFragment.cs
@@ -113,6 +113,7 @@
}
}
+ public static Thread unlockThread = null;//鍏紑鍑烘潵锛屽叧闂璦ctivity鐨勬椂鍊欒缁撴潫杩欎釜绾跨▼锛屼笉鐒朵細寮曡捣宕╂簝
/// <summary>
/// 鏇存柊寮�閿佹寜閽姸鎬�,寮�閿佹垚鍔燂紝15绉掑唴涓嶇粰鍐嶇偣鍑绘寜閽�
/// </summary>
@@ -124,15 +125,28 @@
unlockImg.Enabled = false;
- new Thread(() =>
- {
- Thread.Sleep(15 * 1000);
- Activity.RunOnUiThread(() =>
- {
- if (unlockImg != null)
- unlockImg.Enabled = true;
- });
- }).Start();
+ unlockThread = new Thread(() =>
+ {
+ try
+ {
+ Thread.Sleep(15 * 1000);
+
+ Activity.RunOnUiThread(() =>
+ {
+ try {
+ if (unlockImg != null)
+ unlockImg.Enabled = true;
+ }
+ catch { }
+ });
+
+ }
+ catch { }
+ });//.Start();
+
+ unlockThread.Start();
+
+ PostUnlock();
}
catch { }
}
@@ -218,7 +232,7 @@
switch (event1)
{
- case "EVT_RECV_CUSTOM_DATA":
+ case "EVT_RECV_CUSTOM_DATA":// 寮�閿佹垚鍔�
string data = tp.GetString("data");
UpdataUnlockState();
break;
@@ -265,7 +279,7 @@
{
string UserData = "user text";
//娉ㄦ剰锛歊equestAudio 璇锋眰瀵规柟闊抽锛孯equestVideo璇锋眰瀵规柟瑙嗛 SendAudio鍙戦�佹湰鍦伴煶棰� SendVideo 鍙戦�佹湰鍦拌棰� 涓�鑸棬鍙ｄ笉鎺ユ敹鍒拌棰戯紝鎵�浠ユ渶濂借缃�0锛屽噺灏戞祦閲忔秷鑰�
- string param = string.Format("RequestAudio=1\r\n" + "RequestVideo=1\r\n" + "SendAudio=1\r\n" + "SendVideo=0r\n" + "UserData=%s\r\n", UserData);
+ string param = string.Format("RequestAudio=1\r\n" + "RequestVideo=1\r\n" + "SendAudio=1\r\n" + "SendVideo=1r\n" + "UserData=%s\r\n", UserData);
mPhone.AcceptRing(param);
answerLayout.Visibility = ViewStates.Gone;
PostAnswer();
@@ -317,7 +331,7 @@
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("callId", VideoActivity.CallId);
d.Add("images", images);
- d.Add("imagesName", img_name);
+ d.Add("imagesName", "_Android.jpg");
string jsonString = HttpUtil.GetSignRequestJson(d);
string url = "/home-wisdom/app/fl/vi/screenshot";
@@ -400,5 +414,27 @@
}).Start();
}
+
+ /// <summary>
+ /// post 寮�閿佽褰�
+ /// </summary>
+ private void PostUnlock()
+ {
+ new Thread(() =>
+ {
+ try
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("callId", VideoActivity.CallId);//鍛煎彨璁板綍id int
+ string jsonString = HttpUtil.GetSignRequestJson(d);
+
+ string url = "/home-wisdom/app/fl/vi/unlock";
+ ResponsePackNew response = HttpUtil.RequestHttpsPost(url, jsonString);
+ Log.Info("FengLinVideo", "Post Reject Response code=" + response.Code);
+ }
+ catch { }
+
+ }).Start();
+ }
}
}
--
Gitblit v1.8.0