libmedia,libsrtのアップデート

TakayukiHoshi1984 · TakayukiHoshi1984 · commit a65bfc9828e3 · 2021-10-25T14:59:57.000+09:00
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/app/build.gradle b/dConnectDevicePlugin/dConnectDeviceHost/app/build.gradle
@@ -33,7 +33,7 @@ android {
         buildConfigField "String", "DEMO_DIR", "\"demo\""
         buildConfigField "String", "DEMO_ZIP", "\"" + DEMO_ZIP_NAME + "\""
         buildConfigField "long", "STATS_INTERVAL", "5000L"
-    }
+     }
 
     signingConfigs {
         releaseConfig {
@@ -103,8 +103,8 @@ dependencies {
     implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:1.9.7'
     implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.6'
     implementation 'org.deviceconnect:dconnect-demo-lib:1.0.1'
-    implementation 'org.deviceconnect:libmedia:1.2.2'
-    implementation 'org.deviceconnect:libsrt:1.2.2'
+    implementation 'org.deviceconnect:libmedia:1.3.0'
+    implementation 'org.deviceconnect:libsrt:1.3.0'
 //    implementation project(':libmedia')
 //    implementation project(':libsrt')
 }
diff --git a/dConnectDevicePlugin/dConnectDeviceUVC/app/build.gradle b/dConnectDevicePlugin/dConnectDeviceUVC/app/build.gradle
@@ -95,7 +95,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:1.9.7'
     implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.6'
-    implementation 'org.deviceconnect:libmedia:1.2.2'
-    implementation 'org.deviceconnect:libsrt:1.2.2'
+    implementation 'org.deviceconnect:libmedia:1.3.0'
+    implementation 'org.deviceconnect:libsrt:1.3.0'
     implementation project(':libuvc')
 }
diff --git a/dConnectDevicePlugin/dConnectDeviceUVC/app/src/main/AndroidManifest.xml b/dConnectDevicePlugin/dConnectDeviceUVC/app/src/main/AndroidManifest.xml
@@ -8,7 +8,11 @@
 
     <uses-feature android:name="android.hardware.usb.host" />
 
-    <application android:allowBackup="false">
+    <application
+        android:allowBackup="false"
+        android:icon="@drawable/dconnect_icon"
+        android:label="@string/app_name_uvc"
+        android:theme="@style/AppTheme">
 
         <!-- プラグインの設定画面用の Activity -->
         <activity android:name=".activity.UVCSettingsActivity"
@@ -23,15 +27,6 @@
             <meta-data
                 android:name="org.deviceconnect.android.deviceplugin"
                 android:resource="@xml/org_deviceconnect_android_deviceplugin_uvc" />
-
-            <meta-data
-                android:name="org.deviceconnect.android.deviceplugin.name"
-                android:value="@string/app_name_uvc" />
-
-            <meta-data
-                android:name="org.deviceconnect.android.deviceplugin.icon"
-                android:resource="@drawable/dconnect_icon" />
-
         </service>
 
         <!-- Device Connect API リクエストのレシーバー -->
diff --git a/dConnectDevicePlugin/dConnectDeviceUVC/build.gradle b/dConnectDevicePlugin/dConnectDeviceUVC/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:4.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/dConnectDevicePlugin/dConnectDeviceUVC/gradle/wrapper/gradle-wrapper.properties b/dConnectDevicePlugin/dConnectDeviceUVC/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/dConnectManager/dConnectManager/build.gradle b/dConnectManager/dConnectManager/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:4.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/dConnectManager/dConnectManager/dconnect-manager-app-things/build.gradle b/dConnectManager/dConnectManager/dconnect-manager-app-things/build.gradle
@@ -38,7 +38,7 @@ android {
     repositories {
         maven {
             name = "DeviceConnect-Android"
-            url = uri("https://maven.pkg.github.com/DeviceConnect/DeviceConnect-Android")
+            url = uri("https://maven.pkg.github.com/TakayukiHoshi1984/DeviceConnect-Android")
 
             credentials {
                 username = System.getenv("GPR_USER") ?: githubProperties['gpr.usr']
diff --git a/dConnectManager/dConnectManager/dconnect-manager-app/build.gradle b/dConnectManager/dConnectManager/dconnect-manager-app/build.gradle
@@ -82,7 +82,7 @@ android {
     repositories {
         maven {
             name = "DeviceConnect-Android"
-            url = uri("https://maven.pkg.github.com/DeviceConnect/DeviceConnect-Android")
+            url = uri("https://maven.pkg.github.com/TakayukiHoshi1984/DeviceConnect-Android")
 
             credentials {
                 username = System.getenv("GPR_USER") ?: githubProperties['gpr.usr']
@@ -116,7 +116,7 @@ dependencies {
 }
 
 android.testVariants.all { variant ->
-    task("generateJavadocForManagerJUnit", type: Javadoc, overwrite: true) {
+    tasks.register("generate${variant.name.capitalize()}JavadocForManagerJUnit", Javadoc) {
         title = "Android Device Connect Manager Unit Test"
         description = "Generates Javadoc for JUnit"
         source = android.sourceSets.androidTest.java.sourceFiles
diff --git a/dConnectManager/dConnectManager/dconnect-manager-app/src/main/java/org/deviceconnect/android/manager/DConnectService.java b/dConnectManager/dConnectManager/dconnect-manager-app/src/main/java/org/deviceconnect/android/manager/DConnectService.java
@@ -304,41 +304,7 @@ public void onError(final Exception e) {
             }
         }
     }
-
-    /**
-     * Hostプラグインを追加します.
-     */
-    private void addDevicePlugin() {
-        String packageName = getPackageName();
-        String className = HostDevicePlugin.class.getName();
-
-        DevicePlugin plugin;
-        try {
-            plugin = new DevicePlugin.Builder(this)
-                    .setClassName(className)
-                    .setPackageName(packageName)
-                    .setConnectionType(ConnectionType.DIRECT)
-                    .setDeviceName(getString(R.string.app_name_host))
-                    .setPluginIconId(R.drawable.dconnect_icon)
-                    .setVersionName(org.deviceconnect.android.deviceplugin.host.BuildConfig.VERSION_NAME)
-                    .setPluginXml(DevicePluginXmlUtil.getXml(getApplicationContext(),
-                            R.xml.org_deviceconnect_android_deviceplugin_host))
-                    .setPluginId(DConnectUtil.toMD5(packageName + className))
-                    .setPluginSdkVersionName(VersionName.parse("2.0.0"))
-                    .addProviderAuthority("org.deviceconnect.android.deviceplugin.host.provider.included")
-                    .build();
-            mManager.getPluginManager().addDevicePlugin(plugin);
-        } catch (UnsupportedEncodingException e) {
-            if (DEBUG) {
-                Log.e(TAG, "add plugin error.", e);
-            }
-        } catch (NoSuchAlgorithmException e) {
-            if (DEBUG) {
-                Log.e(TAG, "add plugin error.", e);
-            }
-        }
-    }
-    /**
+   /**
      * DConnectManagerを停止します.
      */
     private void stopManager() {
diff --git a/dConnectManager/dConnectManager/gradle/wrapper/gradle-wrapper.properties b/dConnectManager/dConnectManager/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`jcenter()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.6.2'`
	`9`	`+ classpath 'com.android.tools.build:gradle:4.1.2'`
`10`	`10`
`11`	`11`	`// NOTE: Do not place your application dependencies here; they belong`
`12`	`12`	`// in the individual module build.gradle files`