Merge pull request #23 from york1996/release-2.0.0

release v2.0.0
pili-engineering · Dec 29, 2018 · be841a1 · be841a1
2 parents 7e9efe9 + 119e7ec
commit be841a1
Show file tree

Hide file tree

Showing 53 changed files with 1,689 additions and 1,602 deletions.
diff --git a/QNDroidRTCDemo/app/build.gradle b/QNDroidRTCDemo/app/build.gradle
@@ -1,35 +1,42 @@
 apply plugin: 'com.android.application'
 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.qiniu.droid.rtc.demo"
         minSdkVersion 18
-        targetSdkVersion 25
-        versionCode 9
-        versionName "1.2.0"
+        targetSdkVersion 28
+        versionCode 12
+        versionName "2.0.0"
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+    lintOptions {
+        disable 'GoogleAppIndexingWarning'
+        abortOnError false
     }
 }
 
 dependencies {
-    compile files('libs/qndroid-rtc-1.2.0.jar')
-    compile 'com.android.support:appcompat-v7:25+'
-    compile 'com.squareup.okhttp3:okhttp:3.9.1'
-    compile 'com.bugsnag:bugsnag-android-ndk:1.+'
-    compile 'de.greenrobot:eventbus:2.4.0'
-    compile 'com.android.support:recyclerview-v7:25.4.0'
-    implementation files('libs/pldroid-player-2.1.4.jar')
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.9.1'
+    implementation 'com.bugsnag:bugsnag-android-ndk:1.+'
+    implementation 'de.greenrobot:eventbus:2.4.0'
+    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+
+    // QNDroidRTCLibrary
+    if (buildWithQNDroidRTCLibrary) {
+        implementation project(':library')
+        implementation files('libs/pldroid-player-2.1.4.jar')
+    } else {
+        implementation fileTree(include: ['*.jar'], dir: 'libs')
+    }
 }
diff --git a/QNDroidRTCDemo/app/libs/qndroid-rtc-1.2.0.jar b/QNDroidRTCDemo/app/libs/qndroid-rtc-1.2.0.jar
diff --git a/QNDroidRTCDemo/app/libs/qndroid-rtc-2.0.0.jar b/QNDroidRTCDemo/app/libs/qndroid-rtc-2.0.0.jar
diff --git a/QNDroidRTCDemo/app/src/main/AndroidManifest.xml b/QNDroidRTCDemo/app/src/main/AndroidManifest.xml
@@ -34,18 +34,15 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
         <activity
             android:name=".activity.MainActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".activity.RoomActivity"
-            android:configChanges="orientation|smallestScreenSize|screenSize|screenLayout"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme"></activity>
+
         <activity
             android:name=".activity.UserConfigActivity"
             android:screenOrientation="portrait" />
+
         <activity
             android:name=".activity.SettingActivity"
             android:screenOrientation="portrait" />
@@ -64,14 +61,17 @@
                 android:resource="@xml/update_apk_paths" />
         </provider>
 
-        <activity android:name=".activity.ScreenCaptureActivity"
-            android:screenOrientation="portrait"
+        <activity
+            android:name=".activity.LiveRoomActivity"
             android:configChanges="orientation|smallestScreenSize|screenSize|screenLayout"
-            android:launchMode="singleTop"/>
+            android:screenOrientation="portrait" />
 
-        <activity android:name=".activity.LiveRoomActivity"
+        <activity
+            android:name=".activity.RoomActivity"
             android:configChanges="orientation|smallestScreenSize|screenSize|screenLayout"
-            android:screenOrientation="portrait" />
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme" />
     </application>
 
-</manifest>
+</manifest>
diff --git a/QNDroidRTCDemo/app/src/main/java/com/qiniu/droid/rtc/demo/activity/LiveRoomActivity.java b/QNDroidRTCDemo/app/src/main/java/com/qiniu/droid/rtc/demo/activity/LiveRoomActivity.java
@@ -337,6 +337,10 @@ public void run() {
 
     }
 
+    @Override
+    public void onCameraCaptureReady() {
+    }
+
     @Override
     public void onJoinedRoom() {
         mIsJoinedRoom = true;

diff --git a/QNDroidRTCDemo/app/src/main/java/com/qiniu/droid/rtc/demo/activity/MainActivity.java b/QNDroidRTCDemo/app/src/main/java/com/qiniu/droid/rtc/demo/activity/MainActivity.java
@@ -25,6 +25,7 @@
 import com.qiniu.droid.rtc.demo.model.UpdateInfo;
 import com.qiniu.droid.rtc.demo.model.UserList;
 import com.qiniu.droid.rtc.demo.service.DownloadService;
+import com.qiniu.droid.rtc.demo.ui.RadioGroupFlow;
 import com.qiniu.droid.rtc.demo.utils.Config;
 import com.qiniu.droid.rtc.demo.utils.QNAppServer;
 import com.qiniu.droid.rtc.demo.utils.ToastUtils;
@@ -39,10 +40,11 @@ public class MainActivity extends AppCompatActivity {
 
     private EditText mRoomEditText;
     private ProgressDialog mProgressDialog;
-    private RadioGroup mCaptureModeRadioGroup;
+    private RadioGroupFlow mCaptureModeRadioGroup;
     private RadioButton mScreenCapture;
     private RadioButton mCameraCapture;
     private RadioButton mOnlyAudioCapture;
+    private RadioButton mMutiTrackCapture;
 
     private String mUserName;
     private String mRoomName;
@@ -116,7 +118,7 @@ public void onClickConference(final View v) {
         handleRoomInfo();
         SharedPreferences preferences = getSharedPreferences(getString(R.string.app_name), Context.MODE_PRIVATE);
         mUserName = preferences.getString(Config.USER_NAME, "");
-        mIsScreenCaptureEnabled = (mCaptureMode == Config.SCREEN_CAPTURE);
+        mIsScreenCaptureEnabled = (mCaptureMode == Config.SCREEN_CAPTURE || mCaptureMode == Config.MUTI_TRACK_CAPTURE);
         if (mIsScreenCaptureEnabled) {
             QNScreenCaptureUtil.requestScreenCapture(this);
         } else {
@@ -145,7 +147,7 @@ public void run() {
                             ToastUtils.s(MainActivity.this, getString(R.string.null_room_token_toast));
                             return;
                         }
-                        Intent intent = new Intent(MainActivity.this, mIsScreenCaptureEnabled ? ScreenCaptureActivity.class : RoomActivity.class);
+                        Intent intent = new Intent(MainActivity.this, RoomActivity.class);
                         intent.putExtra(RoomActivity.EXTRA_ROOM_ID, roomName.trim());
                         intent.putExtra(RoomActivity.EXTRA_ROOM_TOKEN, token);
                         intent.putExtra(RoomActivity.EXTRA_USER_ID, mUserName);
@@ -221,11 +223,12 @@ private boolean handleRoomInfo() {
     private void initView() {
         setContentView(R.layout.activity_main);
         mRoomEditText = (EditText) findViewById(R.id.room_edit_text);
-        mCaptureModeRadioGroup = (RadioGroup) findViewById(R.id.capture_mode_button);
+        mCaptureModeRadioGroup = findViewById(R.id.capture_mode_button);
         mCaptureModeRadioGroup.setOnCheckedChangeListener(mOnCheckedChangeListener);
         mScreenCapture = (RadioButton) findViewById(R.id.screen_capture_button);
         mCameraCapture = (RadioButton) findViewById(R.id.camera_capture_button);
         mOnlyAudioCapture = (RadioButton) findViewById(R.id.audio_capture_button);
+        mMutiTrackCapture = findViewById(R.id.muti_track_button);
 
         SharedPreferences preferences = getSharedPreferences(getString(R.string.app_name), Context.MODE_PRIVATE);
         String roomName = preferences.getString(Config.ROOM_NAME, Config.PILI_ROOM);
@@ -235,8 +238,10 @@ private void initView() {
                 mScreenCapture.setChecked(true);
             } else if (captureMode == Config.CAMERA_CAPTURE) {
                 mCameraCapture.setChecked(true);
-            } else {
+            } else if (captureMode == Config.ONLY_AUDIO_CAPTURE){
                 mOnlyAudioCapture.setChecked(true);
+            } else {
+                mMutiTrackCapture.setChecked(true);
             }
         } else {
             mScreenCapture.setEnabled(false);
@@ -313,6 +318,9 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
                 case R.id.audio_capture_button:
                     mCaptureMode = Config.ONLY_AUDIO_CAPTURE;
                     break;
+                case R.id.muti_track_button:
+                    mCaptureMode = Config.MUTI_TRACK_CAPTURE;
+                    break;
             }
         }
     };