Skip to content

Commit b0e7f13

Browse files
TakayukiHoshi1984TakayukiHoshi1984
authored
Merge pull request #546 from TakayukiHoshi1984/feature_uvc_plugin_update
UVCプラグインの機能追加
2 parents be91215 + 42412fe commit b0e7f13

1,035 files changed

Lines changed: 25551 additions & 328897 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dConnectDevicePlugin/dConnectDeviceUVC/app/build.gradle‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apply plugin: 'com.android.application'
2+
23
// Create github.properties in root project folder file with
34
// gpr.usr=GITHUB_USER_ID
45
// gpr.key=PERSONAL_ACCESS_TOKEN
@@ -7,8 +8,9 @@ def githubProperties = new Properties()
78
if (githubPropertiesFile.exists()) {
89
githubProperties.load(new FileInputStream(githubPropertiesFile))
910
}
11+
1012
android {
11-
compileSdkVersion 29
13+
compileSdkVersion 30
1214

1315
def getVersionName = { ->
1416
def version
@@ -46,6 +48,10 @@ android {
4648
}
4749
}
4850

51+
dataBinding {
52+
enabled = true
53+
}
54+
4955
packagingOptions {
5056
exclude 'LICENSE.txt'
5157
exclude 'META-INF/DEPENDENCIES'
@@ -61,6 +67,7 @@ android {
6167
sourceCompatibility JavaVersion.VERSION_1_8
6268
targetCompatibility JavaVersion.VERSION_1_8
6369
}
70+
6471
repositories {
6572
maven {
6673
name = "DeviceConnect-Android"
@@ -76,8 +83,19 @@ android {
7683

7784
dependencies {
7885
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
79-
implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:1.9.1'
86+
implementation 'androidx.appcompat:appcompat:1.2.0'
87+
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
88+
implementation "androidx.navigation:navigation-fragment:2.3.3"
89+
implementation "androidx.navigation:navigation-ui:2.3.3"
90+
implementation "androidx.navigation:navigation-fragment-ktx:2.3.3"
91+
implementation "androidx.navigation:navigation-ui-ktx:2.3.3"
92+
implementation "androidx.preference:preference:1.1.1"
93+
implementation 'androidx.lifecycle:lifecycle-viewmodel:2.3.0'
94+
implementation 'androidx.lifecycle:lifecycle-livedata:2.3.0'
95+
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
96+
implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:1.9.7'
8097
implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.6'
81-
implementation 'org.deviceconnect:libmedia:1.1.2'
82-
implementation project(':libuvccamera')
98+
implementation 'org.deviceconnect:libmedia:1.2.2'
99+
implementation 'org.deviceconnect:libsrt:1.2.2'
100+
implementation project(':libuvc')
83101
}

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

Lines changed: 31 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,43 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="org.deviceconnect.android.deviceplugin.uvc" >
4-
5-
<uses-feature android:name="android.hardware.usb.host" />
3+
package="org.deviceconnect.android.deviceplugin.uvc">
64

75
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
86
<uses-permission android:name="android.permission.INTERNET" />
97
<uses-permission android:name="android.permission.CAMERA" />
8+
9+
<uses-feature android:name="android.hardware.usb.host" />
10+
1011
<application
11-
android:name=".UVCDeviceApplication"
12+
android:allowBackup="false"
1213
android:icon="@drawable/dconnect_icon"
13-
android:label="@string/app_name"
14-
android:theme="@style/AppTheme" >
15-
16-
<activity
17-
android:name=".activity.UVCServiceListActivity"
18-
android:label="@string/app_name" >
19-
</activity>
14+
android:label="@string/app_name_uvc"
15+
android:theme="@style/AppTheme">
2016

21-
<activity
22-
android:name=".activity.UVCDeviceSettingsActivity"
23-
android:label="@string/app_name" >
24-
</activity>
17+
<!-- プラグインの設定画面用の Activity -->
18+
<activity android:name=".activity.UVCSettingsActivity"
19+
android:exported="true"
20+
android:label="@string/app_name_uvc_settings"
21+
android:theme="@style/AppCompatTheme" />
2522

26-
<activity
27-
android:name=".activity.ErrorDialogActivity"
28-
android:theme="@style/Theme.Transparent">
29-
</activity>
23+
<!-- プラグイン本体サービス -->
24+
<service
25+
android:name=".UVCDeviceService"
26+
android:exported="true">
27+
<meta-data
28+
android:name="org.deviceconnect.android.deviceplugin"
29+
android:resource="@xml/org_deviceconnect_android_deviceplugin_uvc" />
30+
</service>
3031

31-
<receiver android:name=".UVCDeviceServiceProvider" >
32+
<!-- Device Connect API リクエストのレシーバー -->
33+
<!--
34+
NOTE: 下記のレシーバーは、旧仕様のDevice Connect Managerとの互換性、
35+
およびDevice Connect Managerのアンインストール検知のために残しています.
36+
-->
37+
<receiver
38+
android:name=".UVCDeviceServiceProvider"
39+
android:enabled="true"
40+
android:exported="true">
3241
<meta-data
3342
android:name="org.deviceconnect.android.deviceplugin"
3443
android:resource="@xml/org_deviceconnect_android_deviceplugin_uvc" />
@@ -39,32 +48,9 @@
3948
<action android:name="org.deviceconnect.action.POST" />
4049
<action android:name="org.deviceconnect.action.DELETE" />
4150
<!-- uninstall notification -->
42-
<action android:name="android.intent.action.PACKAGE_FULLY_REMOVED"/>
43-
<data android:scheme="package"/>
51+
<action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
52+
<data android:scheme="package" />
4453
</intent-filter>
4554
</receiver>
46-
47-
<service
48-
android:name=".UVCDeviceService"
49-
android:exported="true" >
50-
<meta-data
51-
android:name="org.deviceconnect.android.deviceplugin"
52-
android:resource="@xml/org_deviceconnect_android_deviceplugin_uvc" />
53-
</service>
54-
55-
<service
56-
android:name="org.deviceconnect.android.message.DConnectLaunchService"
57-
android:exported="true" >
58-
<meta-data
59-
android:name="org.deviceconnect.android.deviceplugin"
60-
android:value="enable" />
61-
</service>
62-
63-
<activity
64-
android:name="org.deviceconnect.android.localoauth.activity.ConfirmAuthActivity"
65-
android:excludeFromRecents="true"
66-
android:exported="false" >
67-
</activity>
6855
</application>
69-
7056
</manifest>

0 commit comments

Comments
 (0)