更新Android Demo到6.8.7959

Author: kuenzhang

.gitignore

@@ -1,42 +1,101 @@
-Android/.gradle/3.3/taskArtifacts/fileHashes.bin
-Android/.gradle/3.3/taskArtifacts/fileSnapshots.bin
-Android/.gradle/3.3/taskArtifacts/taskArtifacts.bin
-Android/.gradle/3.3/taskArtifacts/taskArtifacts.lock
-Android/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
-Android/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
-Android/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
-Android/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
-Android/.idea/gradle.xml
-Android/.idea/misc.xml
-Android/.idea/modules.xml
-Android/.idea/runConfigurations.xml
-Android/.idea/workspace.xml
-Android/.idea/caches/build_file_checksums.ser
-Android/.idea/codeStyles/Project.xml
-Android/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_26_0_0_alpha1.xml
-Android/.idea/libraries/Gradle__com_android_support_appcompat_v7_26_0_0_alpha1.xml
-Android/.idea/libraries/Gradle__com_android_support_multidex_1_0_1.xml
-Android/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_1.xml
-Android/.idea/libraries/Gradle__com_android_support_support_annotations_26_0_0_alpha1_jar.xml
-Android/.idea/libraries/Gradle__com_android_support_support_compat_26_0_0_alpha1.xml
-Android/.idea/libraries/Gradle__com_android_support_support_core_ui_26_0_0_alpha1.xml
-Android/.idea/libraries/Gradle__com_android_support_support_core_utils_26_0_0_alpha1.xml
-Android/.idea/libraries/Gradle__com_android_support_support_fragment_26_0_0_alpha1.xml
-Android/.idea/libraries/Gradle__com_android_support_support_media_compat_26_0_0_alpha1.xml
-Android/.idea/libraries/Gradle__com_android_support_support_v4_26_0_0_alpha1.xml
-Android/.idea/libraries/Gradle__com_android_support_support_vector_drawable_26_0_0_alpha1.xml
-Android/.idea/libraries/Gradle__com_squareup_okhttp3_logging_interceptor_3_8_1_jar.xml
-Android/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_8_1_jar.xml
-Android/.idea/libraries/Gradle__com_squareup_okio_okio_1_13_0_jar.xml
-Android/.idea/libraries/Gradle__LiteAVSDK_TRTC_release__aar.xml
-Android/.settings/*
-.project
-Android/TRTCDemo/local.properties
-Android/TRTCDemo/build
-iOS/Pods/*
-iOS/Podfile.lock
-iOS/TRTCDemo.xcworkspace
-iOS/SDK/*.framework
-Mac/Pods/*
-Mac/Podfile.lock
-Mac/TRTCDemo.xcworkspace
+# windows vs
+Build
+*.cache
+*.suo
+project/win/sdk/liteav/liteav.VC.db
+project/win/sdk/liteav/liteav.VC.VC.opendb
+Win32
+Win64
+*.ipch
+
+
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## User settings
+xcuserdata/
+*/IDEWorkspaceChecks.plist
+project/ios/demo/liteav/TXLiteAVDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+project/ios/demo/TXXiaoShiPinDemo/TXXiaoShiPinDemo/Framework/TXLiteAVSDK_Enterprise.framework/
+project/ios/demo/XiaoZhiBoApp/XiaoZhiBoApp/Framework/TXLiteAVSDK_Enterprise.framework/
+
+
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
+*.xcscmblueprint
+*.xccheckout
+
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
+build/
+DerivedData/
+*.moved-aside
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+
+## Xcode Patch
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcworkspace/contents.xcworkspacedata
+/*.gcno
+
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Android Studio
+# Built application files
+/*/build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Gradle generated files
+.gradle/
+
+# Signing files
+.signing/
+
+# User-specific configurations
+.idea/libraries/
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/vcs.xml
+*.iml

Android/TRTCDemo/app/build.gradle

@@ -27,8 +27,10 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation 'com.tencent.liteav:LiteAVSDK_TRTC:latest.release'
-    implementation 'com.android.support:appcompat-v7:25.+'
-    implementation 'com.android.support:recyclerview-v7:25.+'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.8.1'
     implementation 'com.android.support:multidex:1.0.0'
+    implementation 'com.blankj:utilcode:1.25.9'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation "com.android.support:design:25.+"
+    implementation "com.android.support:appcompat-v7:25.+"
+    implementation "com.android.support:recyclerview-v7:25.+"
 }

Android/TRTCDemo/app/src/main/AndroidManifest.xml

@@ -36,14 +36,16 @@
         </activity>
 
         <activity
-            android:name=".trtc.TRTCNewActivity"
-            android:theme="@style/NewActivityTheme"
-            android:screenOrientation="portrait" />
-
+            android:name=".trtc.TRTCNewRoomActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/NewActivityTheme" />
         <activity
-            android:name=".trtc.TRTCMainActivity"
+
+            android:name=".trtc.TRTCVideoRoomActivity"
             android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustPan"
+            android:screenOrientation="portrait"
+            android:theme="@style/NewActivityTheme"
+            android:windowSoftInputMode="adjustPan" />n"
             android:screenOrientation="portrait" />
 </application>
 </manifest>

Android/TRTCDemo/app/src/main/java/com/tencent/liteav/demo/MainActivity.java

@@ -14,8 +14,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 import com.tencent.liteav.demo.expandableadapter.*;
-import com.tencent.liteav.demo.trtc.TRTCNewActivity;
 
+import com.tencent.liteav.demo.trtc.TRTCNewRoomActivity;
 import com.tencent.rtmp.TXLiveBase;
 
 import java.io.File;
@@ -104,8 +104,8 @@ private List<GroupBean> initGroupData() {
 
         // 视频通话
         List<ChildBean> videoConnectChildList = new ArrayList<>();
-        videoConnectChildList.add(new ChildBean("腾讯云视频通话", R.drawable.room_multi, TRTCNewActivity.class));
-        videoConnectChildList.add(new ChildBean("万人低延时直播间", R.drawable.room_multi, TRTCNewActivity.class));
+        videoConnectChildList.add(new ChildBean("腾讯云视频通话", R.drawable.room_multi, TRTCNewRoomActivity.class));
+        videoConnectChildList.add(new ChildBean("万人低延时直播间", R.drawable.room_multi, TRTCNewRoomActivity.class));
         if (videoConnectChildList.size() != 0) {
             GroupBean videoConnectGroupBean = new GroupBean("实时音视频 TRTC", R.drawable.room_multi, videoConnectChildList);
             groupList.add(videoConnectGroupBean);