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/HDLLinphoneMonitorActivity.java | 30 +++++++-------
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneIntercomActivity.java | 10 +++--
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneReverseCallActivity.java | 16 ++++---
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java | 14 +++++++
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/layout/activity_hdllinphone_monitor.xml | 6 +--
HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java | 7 +++
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/layout/activity_hdllinphone_intercom.xml | 6 --
HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml | 4 ++
8 files changed, 58 insertions(+), 35 deletions(-)
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
index 248d721..2e4a99b 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
@@ -163,7 +163,10 @@
@Override
public void outgoingInit() {
super.outgoingInit();
+<<<<<<< HEAD
Log.d("HDLLinphoneKit","------outgoingInit------");
+=======
+>>>>>>> 1697a5c0a1d40e756738d1f99d496c6e33b3fd52
}
@Override
@@ -177,9 +180,12 @@
@Override
public void callEnd() {
super.callEnd();
+<<<<<<< HEAD
Log.d("HDLLinphoneKit","------callEnd------");
// context.sendBroadcast(new Intent(HDLLinphoneIntercomActivity.RECEIVE_FINISH_VIDEO_ACTIVITY));
+=======
+>>>>>>> 1697a5c0a1d40e756738d1f99d496c6e33b3fd52
}
});
}
@@ -452,6 +458,12 @@
if (addressToCall != null) {
call = core.inviteAddressWithParams(addressToCall, params);
+ // 璁剧疆澶栨斁
+ for (AudioDevice audioDevice : HDLLinphoneService.getCore().getAudioDevices()) {
+ if (audioDevice.getType() == AudioDevice.Type.Speaker) {
+ call.setOutputAudioDevice(audioDevice);
+ }
+ }
}
}
return call;
@@ -570,6 +582,8 @@
return;
}
}
+ currentCall.setSpeakerVolumeGain(1.0f);
+ currentCall.setSpeakerMuted(speakerOn);
} catch (Exception e) {
e.printStackTrace();
}
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 0a48ba6..40f0158 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
@@ -139,6 +139,9 @@
timer_lp_calltime = (Chronometer) findViewById(R.id.timer_lp_calltime);
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);
}
/**
@@ -210,7 +213,6 @@
@Override
public void onTick(long millisUntilFinished) {
if (!HDLLinphoneIntercomActivity.this.isFinishing()) {
-
}
}
@@ -219,12 +221,9 @@
*/
@Override
public void onFinish() {
-// showToast("寮�閿乷nFinish");
iv_lp_unlock.setEnabled(true);
}
-
};
-//
}
@Override
@@ -310,6 +309,9 @@
if (HDLLinphoneKit.getInstance().getOnHDLLinphoneCallListener() != null) {
HDLLinphoneKit.getInstance().getOnHDLLinphoneCallListener().onAnswerAction();
}
+
+ iv_lp_screenshot.setEnabled(true);
+ iv_lp_unlock.setEnabled(true);
}
/****************寮�閿佹垚鍔�********/
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneMonitorActivity.java b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneMonitorActivity.java
index ba549af..8ce8269 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneMonitorActivity.java
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneMonitorActivity.java
@@ -32,7 +32,7 @@
import org.linphone.core.CoreListenerStub;
/**
-*鐩戣椤甸潰
+ * 鐩戣椤甸潰
*/
public class HDLLinphoneMonitorActivity extends LPCheckPermissionsActivity implements View.OnClickListener {
private static final String TAG = "HDLLinphoneMonitorActivity";
@@ -90,7 +90,7 @@
onDestroyLinphone();
- HDLLog.i(TAG,"onDestroy");
+ HDLLog.i(TAG, "onDestroy");
}
@@ -110,17 +110,17 @@
video_lp_rendering = findViewById(R.id.video_lp_rendering);
video_lp_rendering2 = findViewById(R.id.video_lp_rendering2);
- setWidthHeightWithRatio(ll_video_lp_rendering,16,9);
+ setWidthHeightWithRatio(ll_video_lp_rendering, 16, 9);
}
/**
* initData
*/
- private void initData(){
+ private void initData() {
Bundle extras = getIntent().getExtras();
- if(extras != null){
- String titleName = extras.getString(HDLLinphoneKit.KEY_TITLE_NAME);
- if(!TextUtils.isEmpty(titleName)){
+ if (extras != null) {
+ String titleName = extras.getString(HDLLinphoneKit.KEY_TITLE_NAME);
+ if (!TextUtils.isEmpty(titleName)) {
tv_lp_title.setText(titleName);
}
}
@@ -160,7 +160,7 @@
/**
* 鍒濆鍖栧紑闂ㄥ洖璋冧簨浠�
*/
- void initCallBack(){
+ void initCallBack() {
HDLLinphoneKit.getInstance().setOpenOpenDoorCallBack(new OnLPOpenDoorCallBack() {
@Override
public void onOpenSuccess() {
@@ -177,9 +177,9 @@
/**
* 鍒濆鍖栧紑閿佸睆钄藉�掕鏃�
*/
- void initCountDownTimer(){
+ void initCountDownTimer() {
- mCountDownTimer = new CountDownTimer(10*1000, 1000) {
+ mCountDownTimer = new CountDownTimer(10 * 1000, 1000) {
@Override
public void onTick(long millisUntilFinished) {
if (!HDLLinphoneMonitorActivity.this.isFinishing()) {
@@ -219,11 +219,11 @@
private void onClickScreenshot() {
// Bitmap img = HDLImageUtils.createViewBitmap(video_lp_rendering);
Bitmap img = video_lp_rendering.getBitmap();
- boolean isSuccess = HDLImageUtils.saveImageToGallery(this, img);
+ boolean isSuccess = HDLImageUtils.saveImageToGallery(this, img);
- if(isSuccess){
+ if (isSuccess) {
showToast(getString(R.string.lp_saveToTheAlbumsStr));
- }else {
+ } else {
showToast(getString(R.string.lp_operationFailedStr));
}
}
@@ -257,6 +257,7 @@
iv_lp_unlock.setEnabled(false);
startOpenDoorCountdown();
}
+
/**
* 寮�鍚�掕鏃�
*/
@@ -317,13 +318,12 @@
core.addListener(mCoreListener);
core.enableMic(false);//鍏抽棴楹﹀厠椋�
}
-
}
/**
* onDestroyLinphone
*/
- void onDestroyLinphone(){
+ void onDestroyLinphone() {
Core core = HDLLinphoneKit.getInstance().getCore();
if (core != null) {
core.removeListener(mCoreListener);
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 4a06395..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;
@@ -113,7 +113,6 @@
HDLLog.i(TAG, "onDestroy");
}
-
/**
* initView
*/
@@ -133,6 +132,9 @@
timer_lp_calltime = (Chronometer) findViewById(R.id.timer_lp_calltime);
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);
}
/**
@@ -205,7 +207,6 @@
@Override
public void onTick(long millisUntilFinished) {
if (!HDLLinphoneReverseCallActivity.this.isFinishing()) {
-
}
}
@@ -309,6 +310,9 @@
if (HDLLinphoneKit.getInstance().getOnHDLLinphoneCallListener() != null) {
HDLLinphoneKit.getInstance().getOnHDLLinphoneCallListener().onAnswerAction();
}
+
+ iv_lp_screenshot.setEnabled(true);
+ iv_lp_unlock.setEnabled(true);
}
/****************寮�閿佹垚鍔�********/
@@ -343,7 +347,6 @@
int temp1 = Integer.parseInt(timer_lp_calltime.getText().toString().split(":")[1]);
return temp0 * 60 + temp1;
}
-
/****************灏佽甯哥敤鏂规硶********/
/**
@@ -415,7 +418,6 @@
video_lp_rendering2 = null;
}
-
/**
* 鍒濆鍖栭渿鍔ㄥ櫒
*/
@@ -441,8 +443,8 @@
/**
* 鍏抽棴闇囧姩鍣�
*/
- void cancelVibrator(){
- if(mVibrator != null){
+ void cancelVibrator() {
+ if (mVibrator != null) {
mVibrator.cancel();
mVibrator = null;
}
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/layout/activity_hdllinphone_intercom.xml b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/layout/activity_hdllinphone_intercom.xml
index 11caacd..0306a53 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/layout/activity_hdllinphone_intercom.xml
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/layout/activity_hdllinphone_intercom.xml
@@ -21,14 +21,10 @@
android:gravity="center"
android:text="瀹ゅ唴鏈�"
android:textColor="@color/lpsdk_textColor"
- android:textSize="18sp"></TextView>
+ android:textSize="18sp"/>
</RelativeLayout>
- <!-- <org.linphone.mediastream.video.display.GL2JNIView-->
- <!-- android:id="@+id/video_rendering"-->
- <!-- android:layout_width="match_parent"-->
- <!-- android:layout_height="match_parent"/>-->
<LinearLayout
android:id="@+id/ll_video_lp_rendering"
android:layout_width="wrap_content"
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/layout/activity_hdllinphone_monitor.xml b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/layout/activity_hdllinphone_monitor.xml
index fbff933..0439297 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/layout/activity_hdllinphone_monitor.xml
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/layout/activity_hdllinphone_monitor.xml
@@ -77,8 +77,7 @@
android:layout_height="66dp"
android:scaleType="fitCenter"
android:background="@drawable/btn_click_lp_screenshot"
- android:layout_centerHorizontal="true"
- ></ImageView>
+ android:layout_centerHorizontal="true"/>
<TextView
android:id="@+id/tv_lp_screenshot"
android:layout_width="match_parent"
@@ -87,8 +86,7 @@
android:gravity="center"
android:textColor="@color/lpsdk_textColor"
android:textSize="14sp"
- android:layout_alignParentBottom="true"
- ></TextView>
+ android:layout_alignParentBottom="true"/>
</RelativeLayout>
diff --git a/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java b/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java
index 2fa757f..e1a68a0 100644
--- a/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java
+++ b/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java
@@ -15,8 +15,15 @@
public class LinphoneTestActivity extends Activity {
+<<<<<<< HEAD
private static final String password = "c3jPOxdmD0bkNuo930eY9eYBD";
private static final String serverIP = "47.96.88.250:25060";
+=======
+// "A583853817423247",
+// "763548",
+ private static final String password = "763548";
+ private static final String serverIP = "139.159.157.75:46000";//""116.62.26.215:35060";
+>>>>>>> 1697a5c0a1d40e756738d1f99d496c6e33b3fd52
private String account = "";
// 鐧诲綍
diff --git a/HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml b/HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml
index 8a12f46..e7a4301 100644
--- a/HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml
+++ b/HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml
@@ -27,9 +27,13 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
+<<<<<<< HEAD
android:inputType="number"
android:text="1539852889620406274"
/>
+=======
+ android:text="A583853817423247" />
+>>>>>>> 1697a5c0a1d40e756738d1f99d496c6e33b3fd52
<Button
android:id="@+id/login_btn"
--
Gitblit v1.8.0