lss
2022-06-28 ec33080ccafdec563688ed794eff0a3b35a3feec
2022-6-28
6个文件已修改
36 ■■■■■ 已修改文件
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/HDLLinphoneKit.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneMonitorActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneReverseCallActivity.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/res/layout/activity_hdllinphone_intercom.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
@@ -257,6 +257,7 @@
        iv_lp_unlock.setEnabled(false);
        startOpenDoorCountdown();
    }
    /**
     * 开启倒计时
     */
@@ -317,7 +318,6 @@
            core.addListener(mCoreListener);
            core.enableMic(false);//关闭麦克风
        }
    }
    /**
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;
    }
    /****************封装常用方法********/
    /**
@@ -414,7 +416,6 @@
        video_lp_rendering = null;
        video_lp_rendering2 = 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"