From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期二, 30 十一月 2021 13:14:28 +0800 Subject: [PATCH] 2021-11-30 1.修复乐橙Android,没调用拒接接口问题。 --- HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs | 65 ++++++++++++++++---------------- 1 files changed, 33 insertions(+), 32 deletions(-) diff --git a/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs b/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs index 84d67cf..1dca30f 100644 --- a/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs +++ b/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs @@ -31,6 +31,7 @@ private System.Threading.Timer timer = null; private int Time = 0; + private bool isAnswer;//鏄惁宸茬粡鐐瑰嚮鎺ュ惉杩囦簡 private static LeChengVideoActivity CurtActivity; @@ -50,7 +51,7 @@ CurtActivity.Play(); CurtActivity.CloseAudio(); - + return mView; } @@ -95,6 +96,16 @@ catch { } }).Start(); + } + + /// <summary> + /// 寮�閿� + /// </summary> + private void Unlock() + { + // + CurtActivity.Unlock(); + UpdataUnlockState(); } /// <summary> @@ -192,6 +203,7 @@ if (v.Equals(answerImg)) { //鎺ユ敹鏉ョ數 + isAnswer = true; CurtActivity.StartTalk(); answerLayout.Visibility = ViewStates.Gone; PostAnswer(); @@ -199,46 +211,35 @@ else if (v.Equals(hangupImg)) { CurtActivity.StopTalk(); - PostHangup(); + //2021-11-30 澧炲姞鎷掔粷鍜屾寕鏂搷浣滃鐞� + if (isAnswer) + { + //濡傛灉鎺ュ惉杩囦簡锛屾墽琛屾寕鏂帴鍙� + PostHangup(); + } + else + { + //娌℃帴鍚洿鎺ユ寕鏂紝鎵ц鎷掓帴鎺ュ彛 + PostReject(); + } + TimeEnd(); Activity.Finish(); } else if (v.Equals(screenshotImg)) { //鏈夎棰戣繃鏉ュ彲璋冪敤姝ゆ帴鍙h繘琛屾媿鐓� + screenshotImg.Selected = true; + SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss"); + string time = format.Format(new Date(SystemClock.CurrentThreadTimeMillis())); + string ss = Android.OS.Environment.ExternalStorageDirectory.Path + "/DCIM/Camera"; + string path = ss + "/" + time + ".jpg"; + CurtActivity.SnapShot(path); } else if (v.Equals(unlockImg)) { - PostUnlock(); + CurtActivity.Unlock(); } - } - - /// <summary> - /// post 鎴浘 - /// </summary> - /// <param name="path">鎴浘淇濈暀鐨勮矾寰�</param> - private void PostScreenshot(string path) - { - new Thread(() => - { - try - { - string[] str = path.Split("/"); - string img_name = str.GetValue(str.Length - 1).ToString().Replace(".jpg", ""); - byte[] images = FileUtlis.Files.ReadFileForPath(path); - Dictionary<string, object> d = new Dictionary<string, object>(); - d.Add("callId", VideoActivity.CallId); - d.Add("images", images); - d.Add("imagesName", img_name); - string jsonString = HttpUtil.GetSignRequestJson(d); - - string url = "/home-wisdom/app/fl/vi/screenshot"; - ResponsePackNew response = HttpUtil.RequestHttpsPost(url, jsonString); - Log.Info("LcVideo", "Post Screenshot Response code=" + response.Code); - } - catch { } - - }).Start(); } /// <summary> @@ -277,7 +278,7 @@ { Dictionary<string, object> d = new Dictionary<string, object>(); d.Add("callId", CurtActivity.CallId);//鍛煎彨id - //d.Add("callStatus", "REJECT");//鍙敤鍊�:MISSED,RECEIVED,REJECT + d.Add("callStatus", "RECEIVED");//鍙敤鍊�:MISSED,RECEIVED,REJECT d.Add("callDuration", Time);//閫氳瘽鏃堕暱锛堢锛� d.Add("interphoneTypeEnum", "IMOUVISIAL");//鍙敤鍊�:FLVI,IMOUVISIAL string jsonString = HttpUtil.GetSignRequestJson(d); -- Gitblit v1.8.0