From 589eb3ae9f309dd7adaac7b5ee48f4a9259855f8 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期四, 14 十一月 2024 14:16:24 +0800
Subject: [PATCH] 对接海康可视对讲，禁用vp8
---
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneIntercomActivity.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneIntercomActivity.java b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneIntercomActivity.java
index df27cb0..ad3adbc 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneIntercomActivity.java
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneIntercomActivity.java
@@ -7,6 +7,7 @@
import android.content.IntentFilter;
import android.graphics.Bitmap;
import android.media.AudioAttributes;
+import android.media.MediaPlayer;
import android.os.Build;
import android.os.Bundle;
import android.os.CountDownTimer;
@@ -51,6 +52,9 @@
private ImageView iv_lp_hangUp;
private TextView tv_lp_hangUp;
+
+ private RelativeLayout rl_lp_hangUpAll;
+
private ImageView iv_lp_answer;
private TextView tv_lp_answer;
private RelativeLayout rl_lp_answerView;
@@ -75,7 +79,6 @@
//Linphone
private CoreListenerStub mCoreListener;
-
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -92,6 +95,8 @@
initVibrator();
}
+
+
/**
* onDestroy
@@ -116,7 +121,6 @@
}
//5.
onDestroyLinphone();
-
HDLLog.i(TAG, "onDestroy");
}
@@ -131,6 +135,7 @@
iv_lp_unlock = findViewById(R.id.iv_lp_unlock);
iv_lp_hangUp = findViewById(R.id.iv_lp_hangUp);
tv_lp_hangUp = findViewById(R.id.tv_lp_hangUp);
+ rl_lp_hangUpAll = findViewById(R.id.rl_lp_hangUp_all);
iv_lp_answer = findViewById(R.id.iv_lp_answer);
tv_lp_answer = findViewById(R.id.tv_lp_answer);
rl_lp_answerView = findViewById(R.id.rl_lp_answerView);
@@ -144,6 +149,8 @@
iv_lp_screenshot.setEnabled(false);
iv_lp_unlock.setEnabled(false);
+ setViewGone(rl_lp_hangUpAll);
+
}
/**
@@ -240,6 +247,9 @@
} else if (id == R.id.iv_lp_hangUp || id == R.id.tv_lp_hangUp) {
//鎸傛柇
onClickHangUp();
+ } else if (id == R.id.iv_lp_hangUp_all || id == R.id.tv_lp_hangUp_all) {
+ //鍏ㄩ儴鎸傛柇
+// onClickHangUpAll();
} else if (id == R.id.iv_lp_answer || id == R.id.tv_lp_answer) {
//鎺ュ惉
onClickAnswer();
@@ -322,6 +332,22 @@
}
/**
+ * 鍏ㄩ儴鎸傛柇鐐瑰嚮浜嬩欢
+ */
+ private void onClickHangUpAll() {
+ //1.鎸傛柇
+ HDLLinphoneKit.getInstance().hangUp();
+ //2.鍥炶皟浜嬩欢
+ if (HDLLinphoneKit.getInstance().getOnHDLLinphoneCallListener() != null) {
+ HDLLinphoneKit.getInstance().getOnHDLLinphoneCallListener().onCallAllRejection();
+ }
+ //3.椤甸潰鍏抽棴
+ finish();
+ }
+
+
+
+ /**
* 鎺ュ惉鎸夐挳鐐瑰嚮浜嬩欢
*/
private void onClickAnswer() {
@@ -334,6 +360,7 @@
tv_lp_hangUp.setText(getString(R.string.lp_hangupStr));
setViewGone(rl_lp_answerView);
setViewGone(tv_lp_calltime);
+ setViewGone(rl_lp_hangUpAll);
setViewVisible(timer_lp_calltime);
startCallTimeCountdown();
//鎺ュ惉閫氱煡
--
Gitblit v1.8.0