Skip to content

Commit 4b60f44

Browse files
Insider-MYInsider-MY
committed
修改完善android视频通话
1 parent 28529dc commit 4b60f44

File tree

4 files changed

+58
-33
lines changed

4 files changed

+58
-33
lines changed

‎AR-Android-Video-Base/app/src/main/java/org/ar/ar_android_video_base/VideoBaseActivity.kt

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package org.ar.ar_android_video_base
22

33
import android.os.Bundle
44
import android.util.Log
5+
import android.view.KeyEvent
56
import android.view.LayoutInflater
67
import android.view.TextureView
78
import android.view.View
@@ -110,38 +111,44 @@ class VideoBaseActivity:AppCompatActivity() ,View.OnClickListener{
110111
mRtcEngine?.setupRemoteVideo(VideoCanvas(view,Constants.RENDER_MODE_HIDDEN,uid))
111112
}
112113

114+
override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
115+
if (keyCode == KeyEvent.KEYCODE_BACK){
116+
release()
117+
finish()
118+
return true
119+
}
120+
return super.onKeyDown(keyCode, event)
121+
}
122+
113123
override fun onClick(p0: View?) {
114124
when(p0?.id){
115125
R.id.mic ->{
116-
if (isMic){
117-
viewBinding?.mic?.setImageResource(R.drawable.img_audio_open)
118-
}else{
119-
viewBinding?.mic?.setImageResource(R.drawable.img_audio_close)
120-
}
121126
isMic =!isMic
127+
viewBinding?.mic?.isSelected =isMic
122128
mRtcEngine?.muteLocalAudioStream(isMic)
123129
}
124130
R.id.camera->{
125-
if (isCamera){
126-
viewBinding?.camera?.setImageResource(R.drawable.img_switch)
127-
}else{
128-
viewBinding?.camera?.setImageResource(R.drawable.img_switch_click)
129-
}
130131
isCamera =!isCamera
132+
viewBinding?.camera?.isSelected=isCamera
131133
mRtcEngine?.switchCamera()
132134
}
133135
R.id.leave->{
136+
release()
134137
finish()
135138
}
136139
}
137140
}
138141

139-
override fun onDestroy() {
140-
super.onDestroy()
142+
private fun release(){
141143
removeLocal()
142144
mRtcEngine?.leaveChannel()
143145
RtcEngine.destroy()
144146
mRtcEngine=null
145147
}
146148

149+
override fun onDestroy() {
150+
super.onDestroy()
151+
release()
152+
}
153+
147154
}

‎AR-Android-Video-Base/app/src/main/res/drawable/selector_audio_drawable.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item android:state_selected="true" android:drawable="@drawable/img_audio_close"/>
4+
<item android:state_selected="false" android:drawable="@drawable/img_audio_open"/>
5+
</selector>

‎AR-Android-Video-Base/app/src/main/res/drawable/seleltor_camera_drawable.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item android:state_selected="true" android:drawable="@drawable/img_switch_click"/>
4+
<item android:state_selected="false" android:drawable="@drawable/img_switch"/>
5+
</selector>

‎AR-Android-Video-Base/app/src/main/res/layout/activity_video.xml

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,40 +12,48 @@
1212
android:layout_height="match_parent"
1313
android:layout_marginBottom="@dimen/dp_120"/>
1414

15-
<RelativeLayout
15+
<LinearLayout
1616
android:layout_width="match_parent"
1717
android:layout_height="wrap_content"
1818
android:layout_marginBottom="@dimen/dp_20"
1919
android:layout_alignParentBottom="true">
2020

21-
<ImageView
21+
<Button
2222
android:id="@+id/mic"
23-
android:layout_width="@dimen/dp_62"
24-
android:layout_height="@dimen/dp_62"
25-
android:layout_marginStart="@dimen/dp_38"
26-
android:padding="@dimen/dp_5"
27-
android:layout_alignParentStart="true"
28-
android:src="@drawable/img_audio_open"/>
23+
android:layout_width="0dp"
24+
android:layout_height="wrap_content"
25+
android:layout_weight="1"
26+
android:drawableTop="@drawable/selector_audio_drawable"
27+
android:text="静音"
28+
android:textColor="@color/white"
29+
android:drawablePadding="@dimen/dp_10"
30+
android:background="@null"/>
2931

30-
<ImageView
32+
<Button
3133
android:id="@+id/leave"
32-
android:layout_width="@dimen/dp_72"
33-
android:layout_height="@dimen/dp_72"
34+
android:layout_width="@dimen/dp_0_1"
35+
android:layout_height="wrap_content"
36+
android:layout_weight="1"
3437
android:layout_marginLeft="@dimen/dp_10"
3538
android:layout_marginRight="@dimen/dp_10"
36-
android:padding="@dimen/dp_5"
37-
android:layout_centerInParent="true"
38-
android:src="@drawable/img_leave"/>
39+
android:drawableTop="@drawable/img_leave"
40+
android:text="挂断"
41+
android:textColor="@color/white"
42+
android:drawablePadding="@dimen/dp_10"
43+
android:background="@null"/>
3944

40-
<ImageView
45+
<Button
4146
android:id="@+id/camera"
42-
android:layout_width="@dimen/dp_62"
43-
android:layout_height="@dimen/dp_62"
44-
android:layout_marginEnd="@dimen/dp_38"
47+
android:layout_width="0dp"
48+
android:layout_height="wrap_content"
49+
android:layout_weight="1"
4550
android:padding="@dimen/dp_5"
46-
android:layout_alignParentEnd="true"
47-
android:src="@drawable/img_switch"/>
51+
android:text="转换摄像头"
52+
android:textColor="@color/white"
53+
android:drawablePadding="@dimen/dp_10"
54+
android:drawableTop="@drawable/seleltor_camera_drawable"
55+
android:background="@null"/>
4856

49-
</RelativeLayout>
57+
</LinearLayout>
5058

5159
</RelativeLayout>

0 commit comments

Comments
 (0)