HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java
@@ -162,7 +162,6 @@ @Override public void outgoingInit() { super.outgoingInit(); } @Override @@ -175,8 +174,6 @@ @Override public void callEnd() { super.callEnd(); // context.sendBroadcast(new Intent(HDLLinphoneIntercomActivity.RECEIVE_FINISH_VIDEO_ACTIVITY)); } }); } @@ -449,6 +446,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; @@ -558,6 +561,8 @@ return; } } currentCall.setSpeakerVolumeGain(1.0f); currentCall.setSpeakerMuted(speakerOn); } catch (Exception e) { e.printStackTrace(); } 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); HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneReverseCallActivity.java
@@ -113,14 +113,15 @@ HDLLog.i(TAG, "onDestroy"); } /** * initView */ private void initView() { tv_lp_title = findViewById(R.id.tv_lp_title); iv_lp_screenshot = findViewById(R.id.iv_lp_screenshot); iv_lp_screenshot.setEnabled(false); iv_lp_unlock = findViewById(R.id.iv_lp_unlock); iv_lp_unlock.setEnabled(false); iv_lp_hangUp = findViewById(R.id.iv_lp_hangUp); tv_lp_hangUp = findViewById(R.id.tv_lp_hangUp); iv_lp_answer = findViewById(R.id.iv_lp_answer); @@ -205,7 +206,6 @@ @Override public void onTick(long millisUntilFinished) { if (!HDLLinphoneReverseCallActivity.this.isFinishing()) { } } @@ -309,6 +309,9 @@ if (HDLLinphoneKit.getInstance().getOnHDLLinphoneCallListener() != null) { HDLLinphoneKit.getInstance().getOnHDLLinphoneCallListener().onAnswerAction(); } iv_lp_screenshot.setEnabled(true); iv_lp_unlock.setEnabled(true); } /****************开锁成功********/ @@ -343,7 +346,6 @@ int temp1 = Integer.parseInt(timer_lp_calltime.getText().toString().split(":")[1]); return temp0 * 60 + temp1; } /****************封装常用方法********/ /** @@ -415,7 +417,6 @@ video_lp_rendering2 = null; } /** * 初始化震动器 */ @@ -441,8 +442,8 @@ /** * 关闭震动器 */ void cancelVibrator(){ if(mVibrator != null){ void cancelVibrator() { if (mVibrator != null) { mVibrator.cancel(); mVibrator = null; } 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" HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java
@@ -15,8 +15,10 @@ public class LinphoneTestActivity extends Activity { private static final String password = "123456"; private static final String serverIP = "116.62.26.215:35060"; // "A583853817423247", // "763548", private static final String password = "763548"; private static final String serverIP = "139.159.157.75:46000";//""116.62.26.215:35060"; private String account = ""; // 登录 HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml
@@ -27,7 +27,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:inputType="number" /> android:text="A583853817423247" /> <Button android:id="@+id/login_btn"
