lss
2022-06-15 685a971c4049f24184423adfddb24a68b3afc0aa
2022-6-15

送测
4个文件已添加
6个文件已修改
203 ■■■■■ 已修改文件
.DS_Store 补丁 | 查看 | 原始文档 | 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 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/core/service/HDLLinphoneService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDLLinphoneSDKDemoNew/app/.DS_Store 补丁 | 查看 | 原始文档 | blame | 历史
HDLLinphoneSDKDemoNew/app/src/main/AndroidManifest.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Shared.Droid.HDLLinphone/.DS_Store 补丁 | 查看 | 原始文档 | blame | 历史
.DS_Store
Binary files differ
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
     */
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);
        }
    }
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/core/service/HDLLinphoneService.java
@@ -345,8 +345,7 @@
        //8.视频相关设置
        mCore.setVideoPreset("custom");//视频预设为custom
        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);
HDLLinphoneSDKDemoNew/app/.DS_Store
Binary files differ
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>
HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/LinphoneTestActivity.java
New file
@@ -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.初始化SDK,并注册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();
    }
}
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";
HDLLinphoneSDKDemoNew/app/src/main/res/layout/activity_linphone_test.xml
New file
@@ -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>
Shared.Droid.HDLLinphone/.DS_Store
Binary files differ