From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL-ON_Android/VideoActivity.cs | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_Android/VideoActivity.cs b/HDL-ON_Android/VideoActivity.cs
index 1a9cf00..385ba73 100644
--- a/HDL-ON_Android/VideoActivity.cs
+++ b/HDL-ON_Android/VideoActivity.cs
@@ -43,7 +43,7 @@
public static int Tpye = 0;//绫诲瀷锛�0 鐩戞帶锛�1鍙嶅懠
public static string UUId;
- public static int CallId;//callId 鍛煎彨璁板綍id
+ public static string CallId;//callId 鍛煎彨璁板綍id
public static string CmtID;//cmtID 涓版灄绀惧尯鍙�
public static string Roomno;//roomno 涓版灄鎴块棿鍙�
public static string Unitno;//unitno 涓版灄妤兼爧鍙� string
@@ -60,7 +60,7 @@
ESVideoUUID = Intent.GetStringExtra("ESVideoUUID");//瀹ゅ鏈篣UID锛屼緥:JJY000007FSEYX
DeviceName = Intent.GetStringExtra("DeviceName");//瀹ゅ鏈虹殑鍚嶇О锛屼緥锛屽澶栨満
UUId = Intent.GetStringExtra("uuid");//
- CallId = Intent.GetIntExtra("callId", 0);
+ CallId = Intent.GetStringExtra("callId");
CmtID = Intent.GetStringExtra("cmtID");
Roomno = Intent.GetStringExtra("roomno");
Unitno = Intent.GetStringExtra("unitno");
@@ -169,7 +169,7 @@
mPhone.SetRemoteSurfaceHolder(mRemoteSurfaceHolder, "mRemoteSurfaceHolder!=null"); //璁剧疆鏉ョ數绐楀彛
}
- ViewGroup v = (ViewGroup)FindViewById(Resource.Id.localVideo);
+ ViewGroup v = (ViewGroup)FindViewById(Resource.Id.locaVideo);
mPhone.SetLocalVideoContainer(v);//璁剧疆鏈湴瑙嗛绐楀彛锛屼竴瀹氳璋冪敤锛屼笉鐒跺悗浼氬嚭鐜版病澹伴煶
}
else
@@ -215,6 +215,28 @@
mPhone = null;
//mPhone.OnActivityDestroy();
}
+
+ if (ReverseCallFragment.unlockThread != null)
+ {
+ try
+ {
+ //
+ ReverseCallFragment.unlockThread.Interrupt();
+ }
+ catch { }
+ ReverseCallFragment.unlockThread = null;
+ }
+
+ if (MonitorFragment.thread != null)
+ {
+ try
+ {
+ //
+ MonitorFragment.thread.Interrupt();
+ }
+ catch { }
+ MonitorFragment.thread = null;
+ }
}
public override void OnBackPressed()
--
Gitblit v1.8.0