Skip to content

Commit 8688899

Browse files
895377235895377235
committed
starrtc demo for android v1.2.2
1 parent 7bf83cf commit 8688899

File tree

203 files changed

+7353
-901
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+7353
-901
lines changed

‎README.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,8 @@ QQ群：807242783
106106

107107
更新记录
108108
===
109-
https://github.com/starrtc/android-demo/wiki/Changelog
109+
https://github.com/starrtc/android-demo/wiki/Changelog
110+
111+
对比
112+
===
113+
webRTC vs starRTC: https://github.com/starrtc/android-demo/raw/master/webRTC_vs_starRTC.mp4

‎StarRTC_demo.apk

-915 KB
Binary file not shown.

‎app/app.iml

+18-9
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@
2323
</facet>
2424
</component>
2525
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
26-
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
27-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
26+
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
27+
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
2828
<exclude-output />
2929
<content url="file://$MODULE_DIR$">
3030
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
31-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r" isTestSource="false" generated="true" />
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
@@ -84,18 +84,27 @@
8484
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8585
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8686
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
8889
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
8991
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkReleaseClasspath" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
9195
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
9398
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
95103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
96104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
97106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
99108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
100109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
101110
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />

‎app/build.gradle

+9-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 25
5-
buildToolsVersion '27.0.3'
5+
buildToolsVersion '28.0.3'
66
defaultConfig {
77
applicationId "com.starrtc.demo"
8-
minSdkVersion 18
8+
minSdkVersion 17
99
targetSdkVersion 25
1010
versionCode 1
1111
versionName "1.0"
@@ -26,6 +26,13 @@ android {
2626
jniLibs.srcDirs = ['libs']
2727
}
2828
}
29+
30+
lintOptions {
31+
checkReleaseBuilds false
32+
// Or, if you prefer, you can continue to check for errors in release builds,
33+
// but continue the build even when errors are found:
34+
abortOnError false
35+
}
2936
}
3037

3138

‎app/libs/armeabi-v7a/libstarRTC.so

1.74 MB
Binary file not shown.

‎app/libs/star_rtc_sdk.jar

69.9 KB
Binary file not shown.

‎app/src/main/AndroidManifest.xml

+65-20
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
<uses-feature android:name="android.hardware.camera" />
66
<uses-feature android:name="android.hardware.camera.autofocus" />
7+
78
<uses-permission android:name="android.permission.CAMERA" />
89
<uses-permission android:name="android.permission.FLASHLIGHT" />
910
<uses-permission android:name="android.permission.INTERNET" />
@@ -13,6 +14,8 @@
1314
<uses-permission android:name="android.permission.BLUETOOTH" />
1415
<uses-permission android:name="android.permission.RECORD_AUDIO" />
1516
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
17+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
18+
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
1619

1720
<application
1821
android:allowBackup="true"
@@ -25,14 +28,14 @@
2528
android:screenOrientation="portrait">
2629
<intent-filter>
2730
<action android:name="android.intent.action.MAIN" />
28-
2931
<category android:name="android.intent.category.LAUNCHER" />
3032
</intent-filter>
3133
</activity>
3234

3335
<!-- starAvSdk -->
3436
<!-- 【必须】消息收发service -->
35-
<!-- <service
37+
<!--
38+
<service
3639
android:name="com.starrtc.starrtcsdk.core.service.StarService"
3740
android:exported="true">
3841
<intent-filter>
@@ -45,19 +48,51 @@
4548
<intent-filter>
4649
<action android:name="cn.starav.staravsdk.service.StarAssistService" />
4750
</intent-filter>
48-
</service>-->
49-
51+
</service>
52+
-->
5053
<!-- starAvSdk -->
5154
<service
5255
android:name=".demo.service.FloatWindowsService"
53-
android:exported="false">
54-
</service>-->
56+
android:exported="false"></service>
57+
58+
<activity
59+
android:name=".demo.StarAvDemoActivity"
60+
android:screenOrientation="portrait" />
61+
62+
<!-- 设置 -->
63+
<activity
64+
android:name=".demo.setting.AboutActivity"
65+
android:screenOrientation="portrait" />
66+
<activity
67+
android:name=".demo.setting.SettingActivity"
68+
android:screenOrientation="portrait" />
69+
70+
<!-- VOIP -->
5571
<activity
5672
android:name=".demo.voip.VoipListActivity"
5773
android:screenOrientation="portrait" />
5874
<activity
5975
android:name=".demo.voip.VoipActivity"
6076
android:screenOrientation="portrait" />
77+
<activity
78+
android:name=".demo.voip.VoipAudioActivity"
79+
android:screenOrientation="portrait" />
80+
<activity
81+
android:name=".demo.voip.VoipCreateActivity"
82+
android:screenOrientation="portrait" />
83+
<activity
84+
android:name=".demo.voip.VoipRingingActivity"
85+
android:screenOrientation="portrait" />
86+
<!-- P2P直连 -->
87+
<activity android:name=".demo.p2p.VoipP2PDemoActivity"
88+
android:screenOrientation="landscape"/>
89+
<activity android:name=".demo.p2p.VoipP2PCreateActivity"
90+
android:screenOrientation="landscape"/>
91+
<activity android:name=".demo.p2p.VoipP2PRingingActivity"
92+
android:screenOrientation="landscape"/>
93+
<activity android:name=".demo.p2p.VoipP2PActivity"
94+
android:screenOrientation="landscape"/>
95+
<!-- 视频互动直播 -->
6196
<activity
6297
android:name=".demo.videolive.VideoLiveListActivity"
6398
android:screenOrientation="portrait" />
@@ -67,6 +102,8 @@
67102
<activity
68103
android:name=".demo.videolive.VideoLiveActivity"
69104
android:screenOrientation="portrait" />
105+
106+
<!-- 视频会议 -->
70107
<activity
71108
android:name=".demo.videomeeting.VideoMeetingActivity"
72109
android:screenOrientation="landscape" />
@@ -76,15 +113,13 @@
76113
<activity
77114
android:name=".demo.videomeeting.VideoMeetingCreateActivity"
78115
android:screenOrientation="portrait" />
79-
<activity
80-
android:name=".demo.test.EchoTestActivity"
81-
android:screenOrientation="portrait" />
116+
117+
<!-- 测试 -->
82118
<activity
83119
android:name=".demo.test.LoopTestActivity"
84120
android:screenOrientation="landscape" />
85-
<activity
86-
android:name=".demo.setting.SettingActivity"
87-
android:screenOrientation="portrait" />
121+
122+
<!-- IM -->
88123
<activity
89124
android:name=".demo.im.chatroom.ChatroomActivity"
90125
android:screenOrientation="portrait" />
@@ -110,27 +145,37 @@
110145
android:name=".demo.im.group.MessageGroupListActivity"
111146
android:screenOrientation="portrait" />
112147
<activity
113-
android:name=".demo.voip.VoipRingingActivity"
148+
android:name=".demo.im.c2c.C2CListActivity"
114149
android:screenOrientation="portrait" />
115150
<activity
116-
android:name=".demo.StarAvDemoActivity"
151+
android:name=".demo.im.c2c.C2CCreateActivity"
117152
android:screenOrientation="portrait" />
118153
<activity
119-
android:name=".demo.test.LayoutTestActivity"
154+
android:name=".demo.im.group.MessageGroupSettingActivity"
120155
android:screenOrientation="portrait" />
156+
157+
<!-- 音频互动直播 -->
121158
<activity
122-
android:name=".demo.im.c2c.C2CListActivity"
159+
android:name=".demo.audiolive.AudioLiveListActivity"
123160
android:screenOrientation="portrait" />
124161
<activity
125-
android:name=".demo.im.c2c.C2CCreateActivity"
162+
android:name=".demo.audiolive.AudioLiveCreateActivity"
126163
android:screenOrientation="portrait" />
127164
<activity
128-
android:name=".demo.im.group.MessageGroupSettingActivity"
165+
android:name=".demo.audiolive.AudioLiveActivity"
129166
android:screenOrientation="portrait" />
167+
168+
<!-- 小班课 -->
130169
<activity
131-
android:name=".demo.voip.VoipCreateActivity"
170+
android:name=".demo.miniclass.MiniClassCreateActivity"
171+
android:screenOrientation="portrait" />
172+
<activity
173+
android:name=".demo.miniclass.MiniClassListActivity"
132174
android:screenOrientation="portrait" />
133-
<activity android:name=".demo.setting.AboutActivity"></activity>
175+
<activity
176+
android:name=".demo.miniclass.MiniClassActivity"
177+
android:screenOrientation="landscape" />
178+
<activity android:name=".demo.setting.SetupServerHostActivity"></activity>
134179
</application>
135180

136181
</manifest>

‎app/src/main/assets/sample.pcm

-3.66 MB
Binary file not shown.

‎app/src/main/java/com/starrtc/demo/demo/database/CoreDB.java renamed to ‎app/src/main/java/com/starrtc/demo/database/CoreDB.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.starrtc.demo.demo.database;
1+
package com.starrtc.demo.database;
22

33
import android.database.Cursor;
44

@@ -96,13 +96,14 @@ public void setHistory(HistoryBean historyBean,Boolean hasRead){
9696
historyBean.setNewMsgCount(0);
9797
}
9898
if (cursor != null) cursor.close();
99-
coreDBM.execSQL("delete from " + HISTORY_TABLE + " where type=? and conversationId=?",
100-
new Object[]{historyBean.getType(),historyBean.getConversationId()});
101-
coreDBM.execSQL("insert into " + HISTORY_TABLE + "(type,conversationId,newMsg,lastMsg,lastTime,groupName,groupCreaterId) values(?,?,?,?,?,?,?)",
102-
new Object[]{historyBean.getType(), historyBean.getConversationId(),
99+
coreDBM.execSQL("UPDATE "+HISTORY_TABLE+" SET newMsg = ?," +
100+
" lastMsg = ?," +
101+
" lastTime = ?" +
102+
" where type=? and conversationId=?",
103+
new Object[]{
103104
historyBean.getNewMsgCount(), historyBean.getLastMsg(),
104-
historyBean.getLastTime(),historyBean.getGroupName(),
105-
historyBean.getGroupCreaterId()});
105+
historyBean.getLastTime(),
106+
historyBean.getType(), historyBean.getConversationId()});
106107
}else{
107108
if(hasRead){
108109
historyBean.setNewMsgCount(0);

‎app/src/main/java/com/starrtc/demo/demo/database/HistoryBean.java renamed to ‎app/src/main/java/com/starrtc/demo/database/HistoryBean.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.starrtc.demo.demo.database;
1+
package com.starrtc.demo.database;
22

33
public class HistoryBean {
44
private int id = 0;

‎app/src/main/java/com/starrtc/demo/demo/database/MessageBean.java renamed to ‎app/src/main/java/com/starrtc/demo/database/MessageBean.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.starrtc.demo.demo.database;
1+
package com.starrtc.demo.database;
22

33
public class MessageBean {
44
private int id;

‎app/src/main/java/com/starrtc/demo/demo/BaseActivity.java

+26
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
import android.view.View;
66

77
import com.starrtc.demo.R;
8+
import com.starrtc.demo.demo.p2p.VoipP2PRingingActivity;
89
import com.starrtc.demo.demo.voip.VoipRingingActivity;
910
import com.starrtc.demo.utils.AEvent;
1011
import com.starrtc.demo.utils.IEventListener;
12+
import com.starrtc.starrtcsdk.api.XHClient;
1113
import com.starrtc.starrtcsdk.core.im.message.XHIMMessage;
1214

1315
import org.json.JSONException;
@@ -28,13 +30,15 @@ protected void onPause() {
2830

2931
private void addListener(){
3032
AEvent.addListener(AEvent.AEVENT_VOIP_REV_CALLING,this);
33+
AEvent.addListener(AEvent.AEVENT_VOIP_P2P_REV_CALLING,this);
3134
AEvent.addListener(AEvent.AEVENT_C2C_REV_MSG,this);
3235
AEvent.addListener(AEvent.AEVENT_GROUP_REV_MSG,this);
3336
AEvent.addListener(AEvent.AEVENT_USER_ONLINE,this);
3437
AEvent.addListener(AEvent.AEVENT_USER_OFFLINE,this);
3538
}
3639
private void removeListener(){
3740
AEvent.removeListener(AEvent.AEVENT_VOIP_REV_CALLING,this);
41+
AEvent.removeListener(AEvent.AEVENT_VOIP_P2P_REV_CALLING,this);
3842
AEvent.removeListener(AEvent.AEVENT_C2C_REV_MSG,this);
3943
AEvent.removeListener(AEvent.AEVENT_GROUP_REV_MSG,this);
4044
AEvent.removeListener(AEvent.AEVENT_USER_ONLINE,this);
@@ -67,6 +71,14 @@ public void run() {
6771
startActivity(intent);
6872
}
6973
break;
74+
case AEvent.AEVENT_VOIP_P2P_REV_CALLING:
75+
if(MLOC.canPickupVoip){
76+
MLOC.hasNewVoipMsg = true;
77+
Intent intent = new Intent(BaseActivity.this,VoipP2PRingingActivity.class);
78+
intent.putExtra("targetId",eventObj.toString());
79+
startActivity(intent);
80+
}
81+
break;
7082
case AEvent.AEVENT_C2C_REV_MSG:
7183
MLOC.hasNewC2CMsg = true;
7284
runOnUiThread(new Runnable() {
@@ -121,6 +133,13 @@ public void run() {
121133
@Override
122134
public void run() {
123135
MLOC.showMsg(BaseActivity.this,"服务已断开");
136+
if(findViewById(R.id.loading)!=null) {
137+
if (XHClient.getInstance().getIsOnline()) {
138+
findViewById(R.id.loading).setVisibility(View.INVISIBLE);
139+
} else {
140+
findViewById(R.id.loading).setVisibility(View.VISIBLE);
141+
}
142+
}
124143
}
125144
});
126145
break;
@@ -129,6 +148,13 @@ public void run() {
129148
@Override
130149
public void run() {
131150
// MLOC.showMsg(BaseActivity.this,"服务已连接");
151+
if(findViewById(R.id.loading)!=null) {
152+
if (XHClient.getInstance().getIsOnline()) {
153+
findViewById(R.id.loading).setVisibility(View.INVISIBLE);
154+
} else {
155+
findViewById(R.id.loading).setVisibility(View.VISIBLE);
156+
}
157+
}
132158
}
133159
});
134160
break;

0 commit comments

Comments
 (0)