diff --git a/WebRTCControlled/.gitignore b/WebRTCControlled/.gitignore index add2a72..705e923 100644 --- a/WebRTCControlled/.gitignore +++ b/WebRTCControlled/.gitignore @@ -1,2 +1,4 @@ /build/ -/.idea/ \ No newline at end of file +/app/build/ +/.idea/ +/.gradle/ \ No newline at end of file diff --git a/WebRTCControlled/app/build.gradle b/WebRTCControlled/app/build.gradle index bc4775a..8a2bdeb 100644 --- a/WebRTCControlled/app/build.gradle +++ b/WebRTCControlled/app/build.gradle @@ -43,7 +43,8 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' // WebRTC - implementation 'io.github.nicholasgasior:webrtc-android:1.0.0' + implementation 'io.github.webrtc-sdk:android:144.7559.09' +// implementation 'org.webrtc:google-webrtc:1.0.32006' // OkHttp for WebSocket implementation 'com.squareup.okhttp3:okhttp:4.12.0' // Gson for JSON diff --git a/WebRTCControlled/app/src/main/java/com/tt/controlled/service/ScreenCaptureService.java b/WebRTCControlled/app/src/main/java/com/tt/controlled/service/ScreenCaptureService.java index d8ab7ef..10c5a91 100644 --- a/WebRTCControlled/app/src/main/java/com/tt/controlled/service/ScreenCaptureService.java +++ b/WebRTCControlled/app/src/main/java/com/tt/controlled/service/ScreenCaptureService.java @@ -162,16 +162,8 @@ public class ScreenCaptureService extends Service { webRtcClient.setInputCallback(commandJson -> inputHandler.handleCommand(commandJson)); // 初始化屏幕捕获 - screenCapturer = new ScreenCapturerAndroid(resultData, new ScreenCapturerAndroid.Callback() { - @Override - public void onCapturerStarted(boolean success) { - Log.d(TAG, "Screen capture started: " + success); - } + screenCapturer = new ScreenCapturerAndroid(resultData, new MediaProjection.Callback() { - @Override - public void onCapturerStopped() { - Log.d(TAG, "Screen capture stopped"); - } }); webRtcClient.setVideoCapturer(screenCapturer); diff --git a/WebRTCControlled/app/src/main/res/mipmap-hdpi/ic_launcher.png b/WebRTCControlled/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cde69bc Binary files /dev/null and b/WebRTCControlled/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/WebRTCControlled/app/src/main/res/mipmap-mdpi/ic_launcher.png b/WebRTCControlled/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c133a0c Binary files /dev/null and b/WebRTCControlled/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/WebRTCControlled/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/WebRTCControlled/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..bfa42f0 Binary files /dev/null and b/WebRTCControlled/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/WebRTCControlled/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/WebRTCControlled/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..324e72c Binary files /dev/null and b/WebRTCControlled/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/WebRTCControlled/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/WebRTCControlled/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..aee44e1 Binary files /dev/null and b/WebRTCControlled/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/WebRTCControlled/settings.gradle b/WebRTCControlled/settings.gradle index 341b565..ed5c346 100644 --- a/WebRTCControlled/settings.gradle +++ b/WebRTCControlled/settings.gradle @@ -3,6 +3,7 @@ pluginManagement { google() mavenCentral() gradlePluginPortal() + maven { url "https://jitpack.io" } } } @@ -11,6 +12,7 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + maven { url "https://jitpack.io" } } } diff --git a/WebRTCController/.gitignore b/WebRTCController/.gitignore index add2a72..705e923 100644 --- a/WebRTCController/.gitignore +++ b/WebRTCController/.gitignore @@ -1,2 +1,4 @@ /build/ -/.idea/ \ No newline at end of file +/app/build/ +/.idea/ +/.gradle/ \ No newline at end of file diff --git a/WebRTCController/app/build.gradle b/WebRTCController/app/build.gradle index ee65807..bd53745 100644 --- a/WebRTCController/app/build.gradle +++ b/WebRTCController/app/build.gradle @@ -33,7 +33,7 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.4' // WebRTC - implementation 'io.github.nicholasgasior:webrtc-android:1.0.0' + implementation 'io.github.webrtc-sdk:android:144.7559.09' // OkHttp for WebSocket implementation 'com.squareup.okhttp3:okhttp:4.12.0' diff --git a/WebRTCController/app/src/main/res/mipmap-hdpi/ic_launcher.png b/WebRTCController/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cde69bc Binary files /dev/null and b/WebRTCController/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/WebRTCController/app/src/main/res/mipmap-mdpi/ic_launcher.png b/WebRTCController/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c133a0c Binary files /dev/null and b/WebRTCController/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/WebRTCController/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/WebRTCController/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..bfa42f0 Binary files /dev/null and b/WebRTCController/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/WebRTCController/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/WebRTCController/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..324e72c Binary files /dev/null and b/WebRTCController/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/WebRTCController/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/WebRTCController/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..aee44e1 Binary files /dev/null and b/WebRTCController/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/WebRTCController/gradle/wrapper/gradle-wrapper.jar b/WebRTCController/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..13372ae Binary files /dev/null and b/WebRTCController/gradle/wrapper/gradle-wrapper.jar differ diff --git a/WebRTCController/gradle/wrapper/gradle-wrapper.properties b/WebRTCController/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..3f63540 --- /dev/null +++ b/WebRTCController/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Mar 16 15:27:10 CST 2021 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip diff --git a/WebRTCController/settings.gradle b/WebRTCController/settings.gradle index eabf65d..f4e0a1c 100644 --- a/WebRTCController/settings.gradle +++ b/WebRTCController/settings.gradle @@ -3,6 +3,7 @@ pluginManagement { google() mavenCentral() gradlePluginPortal() + maven { url "https://jitpack.io" } } } @@ -11,6 +12,7 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + maven { url "https://jitpack.io" } } }