UVCプラグインの機能追加

dConnectDevicePlugin/dConnectDeviceUVC/app/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+
 // Create github.properties in root project folder file with
 // gpr.usr=GITHUB_USER_ID
 // gpr.key=PERSONAL_ACCESS_TOKEN
@@ -7,8 +8,9 @@ def githubProperties = new Properties()
 if (githubPropertiesFile.exists()) {
     githubProperties.load(new FileInputStream(githubPropertiesFile))
 }
+
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     def getVersionName = { ->
         def version
@@ -46,6 +48,10 @@ android {
         }
     }
 
+    dataBinding {
+        enabled = true
+    }
+
     packagingOptions {
         exclude 'LICENSE.txt'
         exclude 'META-INF/DEPENDENCIES'
@@ -61,6 +67,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
     repositories {
         maven {
             name = "DeviceConnect-Android"
@@ -76,8 +83,19 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-    implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:1.9.1'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation "androidx.navigation:navigation-fragment:2.3.3"
+    implementation "androidx.navigation:navigation-ui:2.3.3"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.3.3"
+    implementation "androidx.navigation:navigation-ui-ktx:2.3.3"
+    implementation "androidx.preference:preference:1.1.1"
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.3.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata:2.3.0'
+    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.1.2'
-    implementation project(':libuvccamera')
+    implementation 'org.deviceconnect:libmedia:1.2.2'
+    implementation 'org.deviceconnect:libsrt:1.2.2'
+    implementation project(':libuvc')
 }

dConnectDevicePlugin/dConnectDeviceUVC/app/src/main/AndroidManifest.xml

@@ -1,34 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.deviceconnect.android.deviceplugin.uvc" >
-
-    <uses-feature android:name="android.hardware.usb.host" />
+    package="org.deviceconnect.android.deviceplugin.uvc">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
+
+    <uses-feature android:name="android.hardware.usb.host" />
+
     <application
-        android:name=".UVCDeviceApplication"
+        android:allowBackup="false"
         android:icon="@drawable/dconnect_icon"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-
-        <activity
-            android:name=".activity.UVCServiceListActivity"
-            android:label="@string/app_name" >
-        </activity>
+        android:label="@string/app_name_uvc"
+        android:theme="@style/AppTheme">
 
-        <activity
-            android:name=".activity.UVCDeviceSettingsActivity"
-            android:label="@string/app_name" >
-        </activity>
+        <!-- プラグインの設定画面用の Activity -->
+        <activity android:name=".activity.UVCSettingsActivity"
+            android:exported="true"
+            android:label="@string/app_name_uvc_settings"
+            android:theme="@style/AppCompatTheme" />
 
-        <activity
-            android:name=".activity.ErrorDialogActivity"
-            android:theme="@style/Theme.Transparent">
-        </activity>
+        <!-- プラグイン本体サービス -->
+        <service
+            android:name=".UVCDeviceService"
+            android:exported="true">
+            <meta-data
+                android:name="org.deviceconnect.android.deviceplugin"
+                android:resource="@xml/org_deviceconnect_android_deviceplugin_uvc" />
+        </service>
 
-        <receiver android:name=".UVCDeviceServiceProvider" >
+        <!-- Device Connect API リクエストのレシーバー -->
+        <!--
+            NOTE:  下記のレシーバーは、旧仕様のDevice Connect Managerとの互換性、
+            およびDevice Connect Managerのアンインストール検知のために残しています.
+        -->
+        <receiver
+            android:name=".UVCDeviceServiceProvider"
+            android:enabled="true"
+            android:exported="true">
             <meta-data
                 android:name="org.deviceconnect.android.deviceplugin"
                 android:resource="@xml/org_deviceconnect_android_deviceplugin_uvc" />
@@ -39,32 +48,9 @@
                 <action android:name="org.deviceconnect.action.POST" />
                 <action android:name="org.deviceconnect.action.DELETE" />
                 <!-- uninstall notification -->
-                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED"/>
-                <data android:scheme="package"/>
+                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
+                <data android:scheme="package" />
             </intent-filter>
         </receiver>
-
-        <service
-            android:name=".UVCDeviceService"
-            android:exported="true" >
-            <meta-data
-                android:name="org.deviceconnect.android.deviceplugin"
-                android:resource="@xml/org_deviceconnect_android_deviceplugin_uvc" />
-        </service>
-
-        <service
-            android:name="org.deviceconnect.android.message.DConnectLaunchService"
-            android:exported="true" >
-            <meta-data
-                android:name="org.deviceconnect.android.deviceplugin"
-                android:value="enable" />
-        </service>
-
-        <activity
-            android:name="org.deviceconnect.android.localoauth.activity.ConfirmAuthActivity"
-            android:excludeFromRecents="true"
-            android:exported="false" >
-        </activity>
     </application>
-
 </manifest>