Merge pull request #13 from KevinHuo/dev

release v1.1.0
pili-engineering · Sep 10, 2018 · 8fa8199 · 8fa8199
2 parents fa3c474 + 2ef10a6
commit 8fa8199
Show file tree

Hide file tree

Showing 49 changed files with 1,926 additions and 129 deletions.
diff --git a/QNDroidRTCDemo/app/build.gradle b/QNDroidRTCDemo/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.qiniu.droid.rtc.demo"
         minSdkVersion 18
         targetSdkVersion 25
-        versionCode 6
-        versionName "1.0.1"
+        versionCode 7
+        versionName "1.1.0"
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
     }
     buildTypes {
@@ -20,9 +20,11 @@ android {
 }
 
 dependencies {
-    compile files('libs/qndroid-rtc-1.0.1.jar')
+    compile files('libs/qndroid-rtc-1.1.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')
 }
diff --git a/QNDroidRTCDemo/app/libs/pldroid-player-2.1.4.jar b/QNDroidRTCDemo/app/libs/pldroid-player-2.1.4.jar
diff --git a/...oidRTCDemo/app/libs/qndroid-rtc-1.0.1.jar → ...oidRTCDemo/app/libs/qndroid-rtc-1.1.0.jar b/...oidRTCDemo/app/libs/qndroid-rtc-1.0.1.jar → ...oidRTCDemo/app/libs/qndroid-rtc-1.1.0.jar
diff --git a/QNDroidRTCDemo/app/src/main/AndroidManifest.xml b/QNDroidRTCDemo/app/src/main/AndroidManifest.xml
@@ -21,41 +21,57 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
         <meta-data
             android:name="com.bugsnag.android.API_KEY"
-            android:value="dc3c1a9ac6f60a571f79b502c5a9b185"/>
+            android:value="dc3c1a9ac6f60a571f79b502c5a9b185" />
 
-        <activity android:name=".activity.WelcomeActivity"
-                  android:screenOrientation="portrait">
+        <activity
+            android:name=".activity.WelcomeActivity"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".activity.MainActivity"
-                  android:screenOrientation="portrait" />
-        <activity android:name=".activity.RoomActivity"
-                  android:screenOrientation="portrait"
-                  android:launchMode="singleTop"
-                  android:configChanges="orientation|smallestScreenSize|screenSize|screenLayout"
-                  android:theme="@style/AppTheme">
-        </activity>
-        <activity android:name=".activity.UserConfigActivity"
-                  android:screenOrientation="portrait" />
-        <activity android:name=".activity.SettingActivity"
-                  android:screenOrientation="portrait" />
-        <service android:name=".service.DownloadService"
-                 android:exported="false"/>
+        <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" />
+
+        <service
+            android:name=".service.DownloadService"
+            android:exported="false" />
+
         <provider
-            android:authorities="${applicationId}.update.provider"
             android:name=".utils.UpdateApkFileProvider"
+            android:authorities="${applicationId}.update.provider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/update_apk_paths" />
         </provider>
+
+        <activity android:name=".activity.ScreenCaptureActivity"
+            android:screenOrientation="portrait"
+            android:configChanges="orientation|smallestScreenSize|screenSize|screenLayout"
+            android:launchMode="singleTop"/>
+
+        <activity android:name=".activity.LiveRoomActivity"
+            android:configChanges="orientation|smallestScreenSize|screenSize|screenLayout"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>