From 685a971c4049f24184423adfddb24a68b3afc0aa Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期三, 15 六月 2022 13:54:03 +0800
Subject: [PATCH] 2022-6-15
---
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneMonitorActivity.java | 2
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneReverseCallActivity.java | 10 --
HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java | 5 -
HDLLinphoneSDKDemoNew/app/src/main/AndroidManifest.xml | 3
HDLLinphoneSDKDemoNew/app/.DS_Store | 0
Shared.Droid.HDLLinphone/.DS_Store | 0
.DS_Store | 0
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/core/service/HDLLinphoneService.java | 3
HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java | 104 ++++++++++++++++++++++++++
HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml | 76 +++++++++++++++++++
10 files changed, 184 insertions(+), 19 deletions(-)
diff --git a/.DS_Store b/.DS_Store
index 058440d..87cccca 100644
--- a/.DS_Store
+++ b/.DS_Store
Binary files differ
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 d50ac3b..ba549af 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
@@ -94,7 +94,6 @@
}
-
/**
* initView
*/
@@ -144,6 +143,7 @@
view.setLayoutParams(layoutParams);
}
}
+
/**
* init OnClickListener
*/
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..4a06395 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
@@ -72,7 +72,6 @@
private String deviceSipAccount;//璁惧SIP璐﹀彿
-
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -86,8 +85,7 @@
initCallBack();
initCountDownTimer();
initLinphone();
- initVibrator();
-
+// initVibrator();
}
/**
@@ -111,11 +109,8 @@
mCountDownTimer.cancel();
mCountDownTimer = null;
}
- //5.
onDestroyLinphone();
-
HDLLog.i(TAG, "onDestroy");
-
}
@@ -138,8 +133,6 @@
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);
-
-
}
/**
@@ -152,7 +145,6 @@
if (!TextUtils.isEmpty(titleName)) {
tv_lp_title.setText(titleName);
}
-
deviceSipAccount = extras.getString(HDLLinphoneKit.KEY_SIP_ACCOUNT);
}
}
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/core/service/HDLLinphoneService.java b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/core/service/HDLLinphoneService.java
index 936ed14..6462798 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/core/service/HDLLinphoneService.java
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/core/service/HDLLinphoneService.java
@@ -345,8 +345,7 @@
//8.瑙嗛鐩稿叧璁剧疆
mCore.setVideoPreset("custom");//瑙嗛棰勮涓篶ustom
mCore.setPreferredFramerate(5);//FPS浼樺厛璁剧疆涓�5
- VideoDefinition preferredVideoDefinition =
- Factory.instance().createVideoDefinitionFromName("qvga");
+ VideoDefinition preferredVideoDefinition = Factory.instance().createVideoDefinitionFromName("qvga");
mCore.setPreferredVideoDefinition(preferredVideoDefinition);//瑙嗛灏哄鍋忓ソ榛樿qvga
//9.璁剧疆甯﹀闄愬埗锛屽甫瀹藉崟浣嶄负kbits/s, 0琛ㄧず鏃犻檺
// mCore.setUploadBandwidth(1536);
diff --git a/HDLLinphoneSDKDemoNew/app/.DS_Store b/HDLLinphoneSDKDemoNew/app/.DS_Store
new file mode 100644
index 0000000..36c0582
--- /dev/null
+++ b/HDLLinphoneSDKDemoNew/app/.DS_Store
Binary files differ
diff --git a/HDLLinphoneSDKDemoNew/app/src/main/AndroidManifest.xml b/HDLLinphoneSDKDemoNew/app/src/main/AndroidManifest.xml
index 7c53299..04e8b87 100644
--- a/HDLLinphoneSDKDemoNew/app/src/main/AndroidManifest.xml
+++ b/HDLLinphoneSDKDemoNew/app/src/main/AndroidManifest.xml
@@ -9,14 +9,13 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.HDLLinphoneSDKDemo">
- <activity android:name=".MainActivity">
+ <activity android:name=".LinphoneTestActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
-
</application>
diff --git a/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java b/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java
new file mode 100644
index 0000000..823228d
--- /dev/null
+++ b/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java
@@ -0,0 +1,104 @@
+package com.example.hdllinphonesdkdemo;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.hdl.hdllinphonesdk.HDLLinphoneKit;
+import com.hdl.hdllinphonesdk.activity.HDLLinphoneReverseCallActivity;
+import com.hdl.hdllinphonesdk.callback.OnHDLLinphoneCallListener;
+
+public class LinphoneTestActivity extends Activity {
+
+ private static final String password = "123456";
+ private static final String serverIP = "116.62.26.215:35060";
+ private String account = "";
+
+ // 鐧诲綍
+ private EditText accountEdit;
+ private Button loginBtn;
+
+ // 鍛煎彨
+ private EditText numberEdit;
+ private Button callBtn;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.activity_linphone_test);
+
+ accountEdit = findViewById(R.id.account_et);
+ loginBtn = findViewById(R.id.login_btn);
+ loginBtn.setOnClickListener(view -> {
+ //
+ account = accountEdit.getText().toString().trim();
+ if (account.equals("")) return;
+ // 鐧诲綍
+ HDLLinphoneKit.getInstance().setAccountAndLogin(account, password, serverIP, HDLLinphoneKit.INTER_PHONE_TYPE_HDL);
+ });
+
+ numberEdit = findViewById(R.id.number_et);
+ callBtn = findViewById(R.id.call_btn);
+ callBtn.setOnClickListener(view -> {
+ String number = numberEdit.getText().toString().trim();
+ if (number.equals("")) return;
+ // 鍛煎彨
+ Intent intent = new Intent(LinphoneTestActivity.this, HDLLinphoneReverseCallActivity.class);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.putExtra(HDLLinphoneKit.KEY_SIP_ACCOUNT, number);
+ startActivity(intent);
+// HDLLinphoneKit.getInstance().callTo(number, true);
+ });
+
+ //1.鍒濆鍖朣DK锛屽苟娉ㄥ唽HDLLinphoneService
+ HDLLinphoneKit.getInstance().initLinphone(this);
+ //2.璁剧疆鏄惁鑷姩璺宠浆鍛煎彨,濡傛灉瀵规帴鏋佸厜鎺ㄩ�佸啀寮瑰嚭椤甸潰锛岃繖閲岃璁剧疆false
+ HDLLinphoneKit.getInstance().setAutoJumpCallView(true);
+ //3.鐩戝惉鍛煎彨鍜岀洃鎺ч〉闈紝鐢ㄦ埛鎿嶄綔鐨勭浉鍏充簨浠躲�佹帴鍚�佹嫆鎺ャ�佸紑閿佺瓑....
+ setOnHDLLinphoneCallListener();
+ }
+
+ void setOnHDLLinphoneCallListener() {
+ HDLLinphoneKit.getInstance().setOnHDLLinphoneCallListener(new OnHDLLinphoneCallListener() {
+ @Override
+ public void onAnswerAction() {
+ showToast("鎺ュ惉");
+ }
+
+ @Override
+ public void onRejectCallAction() {
+ showToast("鎷掓帴");
+ }
+
+ @Override
+ public void onUnlockAction() {
+ //
+ }
+
+ @Override
+ public void onHangUpAction(int callDuration) {
+ showToast("鎸傛柇 閫氳瘽鏃堕暱锛�" + callDuration);
+ }
+
+ @Override
+ public void onScreenshotSuccessfulAction(Bitmap image) {
+ showToast("鎴浘");
+ }
+
+ @Override
+ public void onIncomingCall(String s) {
+
+ }
+ });
+ }
+
+ void showToast(String msg) {
+ Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+ }
+}
diff --git a/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java b/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java
index 0225760..7399ed2 100644
--- a/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java
+++ b/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java
@@ -11,11 +11,6 @@
import com.hdl.hdllinphonesdk.activity.HDLLinphoneMonitorActivity;
import com.hdl.hdllinphonesdk.callback.OnHDLLinphoneCallListener;
import com.hdl.hdllinphonesdk.dialog.LpTipDialog;
-//import com.hdl.hdllinphonesdk.core.service.HDLLinphoneService;
-//import com.hdl.hdllinphonesdk.utils.HDLLog;
-//
-//import org.linphone.core.Core;
-//import org.linphone.core.ProxyConfig;
public class MainActivity extends Activity {
private static final String TAG = "MainActivity";
diff --git a/HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml b/HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml
new file mode 100644
index 0000000..d655ecd
--- /dev/null
+++ b/HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/lpsdk_app_bg"
+ android:gravity="center_vertical"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:id="@+id/login_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="10dp"
+ android:layout_marginEnd="10dp"
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="璐﹀彿:"
+ android:textColor="@color/lpsdk_textColor"
+ android:textSize="20sp" />
+
+ <!--sip鍙�-->
+ <EditText
+ android:id="@+id/account_et"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:inputType="number" />
+
+ <Button
+ android:id="@+id/login_btn"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingStart="10dp"
+ android:paddingEnd="10dp"
+ android:text="鐧诲綍"
+ android:textSize="18sp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/account_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="10dp"
+ android:layout_marginTop="30dp"
+ android:layout_marginEnd="10dp"
+ android:orientation="horizontal">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍛煎彨鍙�:"
+ android:textColor="@color/lpsdk_textColor"
+ android:textSize="20sp" />
+
+ <!--sip鍙�-->
+ <EditText
+ android:id="@+id/number_et"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:inputType="number" />
+
+ <Button
+ android:id="@+id/call_btn"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingStart="10dp"
+ android:paddingEnd="10dp"
+ android:text="鍛煎彨"
+ android:textSize="18sp" />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Shared.Droid.HDLLinphone/.DS_Store b/Shared.Droid.HDLLinphone/.DS_Store
new file mode 100644
index 0000000..ea3e419
--- /dev/null
+++ b/Shared.Droid.HDLLinphone/.DS_Store
Binary files differ
--
Gitblit v1.8.0