From a780f0b8d0ccec90d359c0c554f07d5afde9554c Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期二, 28 六月 2022 17:05:31 +0800
Subject: [PATCH] 代码同步
---
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneReverseCallActivity.java | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneReverseCallActivity.java b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneReverseCallActivity.java
index d0b31f5..70d9b3b 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneReverseCallActivity.java
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneReverseCallActivity.java
@@ -58,7 +58,7 @@
private TextView tv_lp_calltime;
//鍙傛暟
- private boolean isAnswer;//鏄惁宸茬粡鎺ュ惉浜�
+ private boolean isAnswer = false;//鏄惁宸茬粡鎺ュ惉浜�
private int callTime;//閫氳瘽鏃堕棿
//鍊掕鏃�
private CountDownTimer mCountDownTimer;
@@ -71,7 +71,6 @@
private CoreListenerStub mCoreListener;
private String deviceSipAccount;//璁惧SIP璐﹀彿
-
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -86,8 +85,7 @@
initCallBack();
initCountDownTimer();
initLinphone();
- initVibrator();
-
+// initVibrator();
}
/**
@@ -111,13 +109,9 @@
mCountDownTimer.cancel();
mCountDownTimer = null;
}
- //5.
onDestroyLinphone();
-
HDLLog.i(TAG, "onDestroy");
-
}
-
/**
* initView
@@ -139,7 +133,8 @@
tv_lp_calltime = findViewById(R.id.tv_lp_calltime);
setWidthHeightWithRatio(ll_video_lp_rendering, 16, 9);
-
+ iv_lp_screenshot.setEnabled(false);
+ iv_lp_unlock.setEnabled(false);
}
/**
@@ -152,7 +147,6 @@
if (!TextUtils.isEmpty(titleName)) {
tv_lp_title.setText(titleName);
}
-
deviceSipAccount = extras.getString(HDLLinphoneKit.KEY_SIP_ACCOUNT);
}
}
@@ -213,7 +207,6 @@
@Override
public void onTick(long millisUntilFinished) {
if (!HDLLinphoneReverseCallActivity.this.isFinishing()) {
-
}
}
@@ -317,6 +310,9 @@
if (HDLLinphoneKit.getInstance().getOnHDLLinphoneCallListener() != null) {
HDLLinphoneKit.getInstance().getOnHDLLinphoneCallListener().onAnswerAction();
}
+
+ iv_lp_screenshot.setEnabled(true);
+ iv_lp_unlock.setEnabled(true);
}
/****************寮�閿佹垚鍔�********/
@@ -351,7 +347,6 @@
int temp1 = Integer.parseInt(timer_lp_calltime.getText().toString().split(":")[1]);
return temp0 * 60 + temp1;
}
-
/****************灏佽甯哥敤鏂规硶********/
/**
@@ -423,7 +418,6 @@
video_lp_rendering2 = null;
}
-
/**
* 鍒濆鍖栭渿鍔ㄥ櫒
*/
@@ -449,8 +443,8 @@
/**
* 鍏抽棴闇囧姩鍣�
*/
- void cancelVibrator(){
- if(mVibrator != null){
+ void cancelVibrator() {
+ if (mVibrator != null) {
mVibrator.cancel();
mVibrator = null;
}
--
Gitblit v1.8.0