移植 rtc 的拨打接听音视频电话界面

http://tapd.oa.com/NEW_IOT/prong/stories/view/1020393192859567379

Change-Id: I0110d5f774f175fb075d20e87febb55adf70dd32

Author: sevenhhe

app/build.gradle

@@ -183,4 +183,6 @@ dependencies {
     implementation 'cn.aigestudio.wheelpicker:WheelPicker:1.1.3'
     implementation 'com.chauthai.swipereveallayout:swipe-reveal-layout:1.4.1'
     implementation 'com.github.Jay-Goo:RangeSeekBar:v3.0.0'
+    implementation project(path: ':trtc')
+
 }

app/src/main/AndroidManifest.xml

@@ -116,6 +116,9 @@
         <activity android:name=".kitlink.activity.BindMobilePhoneActivity" />
         <activity android:name=".kitlink.activity.AboutUsActivity" />
         <activity android:name=".kitlink.activity.HelpCenterActivity" />
+        <activity android:name="com.tencent.iot.explorer.trtc.ui.audiocall.TRTCAudioCallActivity" />
+        <activity android:name="com.tencent.iot.explorer.trtc.ui.videocall.TRTCVideoCallActivity" />
+
         <activity
             android:name=".kitlink.activity.ConfigNetFailedActivity"
             android:launchMode="singleTask" />

app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/MainActivity.kt

@@ -1,9 +1,7 @@
 package com.tencent.iot.explorer.link.kitlink.activity
 
-import android.app.Activity
 import android.app.AlertDialog
 import android.content.DialogInterface
-import android.content.Intent
 import android.text.TextUtils
 import android.view.View
 import androidx.fragment.app.Fragment
@@ -119,7 +117,6 @@ class MainActivity : PActivity(), MyCallback {
         FirebaseCrashlytics.getInstance().setUserId(userId)
         FirebaseAnalytics.getInstance(this).setUserId(userId)
         openXGPush()
-//        home_bottom_view.addUnclickAbleItem(2) // 限定2号位置不可选中
         home_bottom_view.addMenu(
             BottomItemEntity(
                 getString(R.string.main_tab_1),
@@ -135,13 +132,6 @@ class MainActivity : PActivity(), MyCallback {
                     R.mipmap.smart_unpressed, R.mipmap.smart_pressed
                 )
             )
-//            .addMenu(
-//                BottomItemEntity(
-//                    "",
-//                    resources.getColor(R.color.translucent), resources.getColor(R.color.translucent),
-//                    R.color.translucent, R.color.translucent
-//                )
-//            )
             .addMenu(
                 BottomItemEntity(
                     getString(R.string.main_tab_4),
@@ -168,47 +158,11 @@ class MainActivity : PActivity(), MyCallback {
             .commit()
     }
 
-//    private fun showOptionDialog() {
-//        if (addDialog == null) {
-//            var options = ArrayList<String>()
-//            options.add(getString(R.string.smart_option_1))
-//            options.add(getString(R.string.smart_option_2))
-//            addDialog = ListOptionsDialog(this, options)
-//            addDialog?.setOnDismisListener(onItemClickedListener)
-//        }
-//        addDialog?.show()
-//    }
-//
-//    private var onItemClickedListener = ListOptionsDialog.OnDismisListener {
-//        if (it == 0) {
-//            jumpActivity(AddManualTaskActivity::class.java)
-//        } else if (it == 1) {
-//            jumpActivity(AddAutoicTaskActivity::class.java)
-//        }
-//    }
-
     override fun setListener() {
-        iv_main_add.setOnClickListener{
-//            showOptionDialog()
-        }
+        iv_main_add.setOnClickListener{}
 
         home_bottom_view.setOnItemClickListener { _, position, previewPosition ->
-//            if (position == 2) {
-//                return@setOnItemClickListener
-//            }
-//
-//            var tagPos = position
-//            if (tagPos > 2) {
-//                tagPos = tagPos - 1
-//            }
             showFragment(position)
-//            if (tagPos == 1) {
-//                window.decorView.systemUiVisibility =
-//                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-//            } else {
-//                window.decorView.systemUiVisibility =
-//                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-//            }
         }
         (fragments[0] as? HomeFragment)?.run {
             popupListener = object : HomeFragment.PopupListener {
@@ -322,7 +276,6 @@ class MainActivity : PActivity(), MyCallback {
             timestamp = t
             T.show(getString(R.string.tap_more_exit)) //再按一下退出应用
         }
-//        super.onBackPressed()
     }
 
     private fun showCancelAccountStoppedDialog(time: Long){

gradle.properties

@@ -21,4 +21,5 @@ android.enableJetifier=true
 kotlin.code.style=official
 signing.keyId=MY_KEY_ID
 signing.password=MY_PASSWORD
-signing.secretKeyRingFile=MY_KEY_RING_FILE
+signing.secretKeyRingFile=MY_KEY_RING_FILE
+android.injected.testOnly = false

sdkdemo/build.gradle

@@ -97,4 +97,6 @@ dependencies {
     implementation 'com.alibaba:fastjson:1.2.73'
     implementation "com.tencent.iot.thirdparty.android:esptouch:0.3.7.2"
     implementation 'com.android.support:multidex:1.0.3'
+    implementation project(path: ':trtc')
+
 }

trtc/build.gradle

@@ -1,6 +1,8 @@
 apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 29
@@ -12,7 +14,6 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
 
         ndk {
@@ -34,11 +35,13 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.tencent.liteav:LiteAVSDK_TRTC:latest.release'
+//    implementation 'com.squareup.picasso:picasso:2.5.2'
+    implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation 'com.alibaba:fastjson:1.2.73'
+
 }
 
 task androidJavadocs(type: Javadoc) {

trtc/src/androidTest/java/com/tencent/iot/explorer/trtc/ExampleInstrumentedTest.java

@@ -0,0 +1,14 @@
+package com.tencent.iot.explorer.trtc.model;
+
+import com.tencent.iot.explorer.trtc.ui.audiocall.TRTCAudioCallActivity;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class IntentParams implements Serializable {
+    public List<UserInfo> mUserInfos;
+
+    public IntentParams(List<UserInfo> userInfos) {
+        mUserInfos = userInfos;
+    }
+}

trtc/src/main/java/com/tencent/iot/explorer/trtc/Test.java

@@ -0,0 +1,9 @@
+package com.tencent.iot.explorer.trtc.model
+
+open class RoomKey {
+    var appId = 0
+    var roomId = ""
+    var callType = TRTCCalling.TYPE_AUDIO_CALL
+    var userId = ""
+    var userSig = ""
+}

trtc/src/main/java/com/tencent/iot/explorer/trtc/model/IntentParams.java

@@ -0,0 +1,7 @@
+package com.tencent.iot.explorer.trtc.model;
+
+public abstract class TRTCCalling {
+    public static final int TYPE_UNKNOWN = 0;
+    public static final int TYPE_AUDIO_CALL = 1;
+    public static final int TYPE_VIDEO_CALL = 2;
+}

trtc/src/main/java/com/tencent/iot/explorer/trtc/model/RoomKey.kt

@@ -0,0 +1,104 @@
+package com.tencent.iot.explorer.trtc.model;
+
+import java.util.List;
+import java.util.Map;
+
+public interface TRTCCallingDelegate {
+    /**
+     * sdk内部发生了错误
+     * @param code 错误码
+     * @param msg 错误消息
+     */
+    void onError(int code, String msg);
+
+    /**
+     * 被邀请通话回调
+     * @param sponsor 邀请者
+     * @param userIdList 同时还被邀请的人
+     * @param isFromGroup 是否IM群组邀请
+     * @param callType 邀请类型 1-语音通话，2-视频通话
+     */
+    void onInvited(String sponsor, List<String> userIdList, boolean isFromGroup, int callType);
+
+    /**
+     * 正在IM群组通话时，如果其他与会者邀请他人，会收到此回调
+     * 例如 A-B-C 正在IM群组中，A邀请[D、E]进入通话，B、C会收到[D、E]的回调
+     * 如果此时 A 再邀请 F 进入群聊，那么B、C会收到[D、E、F]的回调
+     * @param userIdList 邀请群组
+     */
+    void onGroupCallInviteeListUpdate(List<String> userIdList);
+
+    /**
+     * 如果有用户同意进入通话，那么会收到此回调
+     * @param userId 进入通话的用户
+     */
+    void onUserEnter(String userId);
+
+    /**
+     * 如果有用户同意离开通话，那么会收到此回调
+     * @param userId 离开通话的用户
+     */
+    void onUserLeave(String userId);
+
+    /**
+     * 1. 在C2C通话中，只有发起方会收到拒绝回调
+     * 例如 A 邀请 B、C 进入通话，B拒绝，A可以收到该回调，但C不行
+     *
+     * 2. 在IM群组通话中，所有被邀请人均能收到该回调
+     * 例如 A 邀请 B、C 进入通话，B拒绝，A、C均能收到该回调
+     * @param userId 拒绝通话的用户
+     */
+    void onReject(String userId);
+
+    /**
+     * 1. 在C2C通话中，只有发起方会收到无人应答的回调
+     * 例如 A 邀请 B、C 进入通话，B不应答，A可以收到该回调，但C不行
+     *
+     * 2. 在IM群组通话中，所有被邀请人均能收到该回调
+     * 例如 A 邀请 B、C 进入通话，B不应答，A、C均能收到该回调
+     * @param userId
+     */
+    void onNoResp(String userId);
+
+    /**
+     * 邀请方忙线
+     * @param userId 忙线用户
+     */
+    void onLineBusy(String userId);
+
+    /**
+     * 作为被邀请方会收到，收到该回调说明本次通话被取消了
+     */
+    void onCallingCancel();
+
+    /**
+     * 作为被邀请方会收到，收到该回调说明本次通话超时未应答
+     */
+    void onCallingTimeout();
+
+    /**
+     * 收到该回调说明本次通话结束了
+     */
+    void onCallEnd();
+
+    /**
+     * 远端用户开启/关闭了摄像头
+     * @param userId 远端用户ID
+     * @param isVideoAvailable true:远端用户打开摄像头  false:远端用户关闭摄像头
+     */
+    void onUserVideoAvailable(String userId, boolean isVideoAvailable);
+
+    /**
+     * 远端用户开启/关闭了麦克风
+     * @param userId 远端用户ID
+     * @param isVideoAvailable true:远端用户打开麦克风  false:远端用户关闭麦克风
+     */
+    void onUserAudioAvailable(String userId, boolean isVideoAvailable);
+
+    /**
+     * 用户说话音量回调
+     * @param volumeMap 音量表，根据每个userid可以获取对应的音量大小，音量最小值0，音量最大值100
+     */
+    void onUserVoiceVolume(Map<String, Integer> volumeMap);
+
+}

trtc/src/main/java/com/tencent/iot/explorer/trtc/model/TRTCCalling.java

@@ -0,0 +1,21 @@
+package com.tencent.iot.explorer.trtc.model;
+
+import com.tencent.iot.explorer.trtc.ui.utils.Utils;
+
+import java.io.Serializable;
+
+public class UserInfo implements Serializable {
+    private String userId;
+    public String userAvatar;
+    public String userName;
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+        userAvatar = Utils.getAvatarUrl(this.userId);
+        userName = this.userId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+}