Skip to content

Commit 91ab8ac

Browse files
SundoggyNewSundoggyNew
committed
把TRTCAudioCallActivity和TRTCVideoCallActivity拆分到app和sdkdemo中。
Change-Id: I83816348acd84f07c778a1673c85a96546f1d983
1 parent c1fdf81 commit 91ab8ac

32 files changed

+2932
-52
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,11 @@
139139
<activity android:name=".kitlink.activity.ControlPanelActivity" />
140140
<activity android:name=".kitlink.activity.AboutUsActivity" />
141141
<activity android:name=".kitlink.activity.SelectPointActivity" />
142-
<activity android:name="com.tencent.iot.explorer.link.rtc.ui.audiocall.TRTCAudioCallActivity"
142+
<activity android:name=".kitlink.activity.rtcui.audiocall.TRTCAudioCallActivity"
143143
android:screenOrientation="portrait"/>
144-
<activity android:name="com.tencent.iot.explorer.link.rtc.ui.videocall.TRTCVideoCallActivity"
144+
<activity android:name=".kitlink.activity.rtcui.videocall.TRTCVideoCallActivity"
145145
android:screenOrientation="portrait"/>
146-
<receiver android:name="com.tencent.iot.explorer.link.rtc.ui.utils.NetWorkStateReceiver">
146+
<receiver android:name=".kitlink.activity.rtcui.utils.NetWorkStateReceiver">
147147
<intent-filter>
148148
<!--检测网络变化的acton-->
149149
<action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>

‎app/src/main/java/com/tencent/iot/explorer/link/App.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import com.tencent.iot.explorer.link.kitlink.consts.CommonField
3131
import com.tencent.iot.explorer.link.kitlink.util.HttpRequest
3232
import com.tencent.iot.explorer.link.kitlink.util.WeatherUtils
3333
import com.tencent.iot.explorer.link.rtc.model.*
34-
import com.tencent.iot.explorer.link.rtc.ui.audiocall.TRTCAudioCallActivity
35-
import com.tencent.iot.explorer.link.rtc.ui.videocall.TRTCVideoCallActivity
34+
import com.tencent.iot.explorer.link.kitlink.activity.rtcui.audiocall.TRTCAudioCallActivity
35+
import com.tencent.iot.explorer.link.kitlink.activity.rtcui.videocall.TRTCVideoCallActivity
3636
import java.util.*
3737
import kotlin.collections.ArrayList
3838

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package com.tencent.iot.explorer.link.kitlink.activity
22

3-
import android.bluetooth.BluetoothGatt
43
import android.content.Intent
54
import android.text.TextUtils
6-
import android.util.Log
75
import android.view.View
86
import android.view.ViewGroup
97
import android.widget.Toast
10-
import com.alibaba.fastjson.JSON
118
import com.alibaba.fastjson.JSONObject
129
import com.tencent.iot.explorer.link.App
1310
import com.tencent.iot.explorer.link.R
@@ -26,23 +23,20 @@ import com.tencent.iot.explorer.link.core.log.L
2623
import com.tencent.iot.explorer.link.customview.recyclerview.CRecyclerView
2724
import com.tencent.iot.explorer.link.kitlink.consts.CommonField
2825
import com.tencent.iot.explorer.link.kitlink.entity.DevicePropertyEntity
29-
import com.tencent.iot.explorer.link.kitlink.entity.ProductEntity
30-
import com.tencent.iot.explorer.link.kitlink.entity.ProductsEntity
3126
import com.tencent.iot.explorer.link.kitlink.popup.CommonPopupWindow
3227
import com.tencent.iot.explorer.link.kitlink.popup.EnumPopupWindow
3328
import com.tencent.iot.explorer.link.kitlink.popup.NumberPopupWindow
3429
import com.tencent.iot.explorer.link.kitlink.popup.OfflinePopupWindow
3530
import com.tencent.iot.explorer.link.kitlink.theme.PanelThemeManager
36-
import com.tencent.iot.explorer.link.kitlink.util.HttpRequest
3731
import com.tencent.iot.explorer.link.kitlink.util.StatusBarUtil
3832
import com.tencent.iot.explorer.link.mvp.IPresenter
3933
import com.tencent.iot.explorer.link.mvp.presenter.ControlPanelPresenter
4034
import com.tencent.iot.explorer.link.mvp.view.ControlPanelView
4135
import com.tencent.iot.explorer.link.rtc.model.RoomKey
4236
import com.tencent.iot.explorer.link.rtc.model.TRTCUIManager
43-
import com.tencent.iot.explorer.link.rtc.ui.audiocall.TRTCAudioCallActivity
44-
import com.tencent.iot.explorer.link.rtc.ui.utils.NetWorkStateReceiver
45-
import com.tencent.iot.explorer.link.rtc.ui.videocall.TRTCVideoCallActivity
37+
import com.tencent.iot.explorer.link.kitlink.activity.rtcui.audiocall.TRTCAudioCallActivity
38+
import com.tencent.iot.explorer.link.kitlink.activity.rtcui.utils.NetWorkStateReceiver
39+
import com.tencent.iot.explorer.link.kitlink.activity.rtcui.videocall.TRTCVideoCallActivity
4640
import kotlinx.android.synthetic.main.activity_control_panel.*
4741
import kotlinx.android.synthetic.main.menu_back_and_right.*
4842
import kotlinx.android.synthetic.main.menu_back_layout.*

‎sdk/explorer-link-rtc/src/main/java/com/tencent/iot/explorer/link/rtc/ui/audiocall/TRTCAudioCallActivity.java‎ renamed to ‎app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/rtcui/audiocall/TRTCAudioCallActivity.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.tencent.iot.explorer.link.rtc.ui.audiocall;
1+
package com.tencent.iot.explorer.link.kitlink.activity.rtcui.audiocall;
22

33
import android.content.Context;
44
import android.content.Intent;
@@ -32,10 +32,10 @@
3232
import com.tencent.iot.explorer.link.rtc.model.TRTCUIManager;
3333
import com.tencent.iot.explorer.link.rtc.model.UserInfo;
3434
import com.tencent.iot.explorer.link.rtc.model.impl.TRTCCallingImpl;
35-
import com.tencent.iot.explorer.link.rtc.ui.audiocall.audiolayout.TRTCAudioLayout;
36-
import com.tencent.iot.explorer.link.rtc.ui.audiocall.audiolayout.TRTCAudioLayoutManager;
35+
import com.tencent.iot.explorer.link.kitlink.activity.rtcui.audiocall.audiolayout.TRTCAudioLayout;
36+
import com.tencent.iot.explorer.link.kitlink.activity.rtcui.audiocall.audiolayout.TRTCAudioLayoutManager;
3737
import com.tencent.iot.explorer.link.rtc.model.TRTCCallStatus;
38-
import com.tencent.iot.explorer.link.rtc.ui.utils.NetWorkStateReceiver;
38+
import com.tencent.iot.explorer.link.kitlink.activity.rtcui.utils.NetWorkStateReceiver;
3939

4040
import java.util.ArrayList;
4141
import java.util.HashMap;
@@ -271,7 +271,7 @@ public static void startBeingCall(Context context, RoomKey roomKey, String being
271271
beingCallUserInfo.setUserId(beingCallUserId);
272272
starter.putExtra(PARAM_BEINGCALL_USER, beingCallUserInfo);
273273
starter.putExtra(PARAM_SELF_INFO, JSON.toJSONString(roomKey));
274-
starter.putExtra(PARAM_OTHER_INVITING_USER, new IntentParams(new ArrayList<>()));
274+
starter.putExtra(PARAM_OTHER_INVITING_USER, new IntentParams(new ArrayList<UserInfo>()));
275275
starter.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
276276
context.startActivity(starter);
277277
TRTCUIManager.getInstance().callStatus = TRTCCallStatus.TYPE_CALLING.getValue();
@@ -308,7 +308,7 @@ private void removeOtherIsEnterRoom15secondsTask() {
308308
}
309309
}
310310

311-
private void checkoutIsEnterRoom60seconds(boolean calling, String message) {
311+
private void checkoutIsEnterRoom60seconds(final boolean calling, final String message) {
312312
if (enterRoomTask == null) {
313313
enterRoomTask = new TimerTask(){
314314
@Override

‎app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/rtcui/audiocall/audiolayout/TRTCAudioLayout.java‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
package com.tencent.iot.explorer.link.kitlink.activity.rtcui.audiocall.audiolayout;
2+
3+
import android.content.Context;
4+
import android.graphics.Bitmap;
5+
import android.util.AttributeSet;
6+
import android.widget.FrameLayout;
7+
import android.widget.ImageView;
8+
import android.widget.RelativeLayout;
9+
import android.widget.TextView;
10+
11+
import com.tencent.iot.explorer.link.rtc.R;
12+
13+
14+
/**
15+
* 通话界面中，显示单个用户头像的自定义布局
16+
*/
17+
public class TRTCAudioLayout extends RelativeLayout {
18+
private static final int MIN_AUDIO_VOLUME = 10;
19+
20+
private ImageView mImageHead;
21+
private TextView mTextName;
22+
private ImageView mImageAudioInput;
23+
private FrameLayout mLayoutShade;
24+
private String mUserId;
25+
26+
public TRTCAudioLayout(Context context) {
27+
this(context, null);
28+
}
29+
30+
public TRTCAudioLayout(Context context, AttributeSet attrs) {
31+
super(context, attrs);
32+
inflate(context, R.layout.trtccalling_audiocall_item_user_layout, this);
33+
initView();
34+
}
35+
36+
private void initView() {
37+
mImageHead = (ImageView) findViewById(R.id.img_head);
38+
mTextName = (TextView) findViewById(R.id.tv_name);
39+
mImageAudioInput = (ImageView) findViewById(R.id.iv_audio_input);
40+
mLayoutShade = (FrameLayout) findViewById(R.id.fl_shade);
41+
}
42+
43+
public void setAudioVolume(int vol) {
44+
if (vol > MIN_AUDIO_VOLUME) {
45+
mImageAudioInput.setVisibility(VISIBLE);
46+
} else {
47+
mImageAudioInput.setVisibility(GONE);
48+
}
49+
}
50+
51+
public void setUserId(String userId) {
52+
mUserId = userId;
53+
mTextName.setText(mUserId);
54+
}
55+
56+
public void setBitmap(Bitmap bitmap) {
57+
mImageHead.setImageBitmap(bitmap);
58+
}
59+
60+
public ImageView getImageView() {
61+
return mImageHead;
62+
}
63+
64+
public void startLoading() {
65+
mLayoutShade.setVisibility(VISIBLE);
66+
}
67+
68+
public void stopLoading() {
69+
mLayoutShade.setVisibility(GONE);
70+
}
71+
}

0 commit comments

Comments
 (0)