Skip to content

Commit a1fa84b

Browse files
TakayukiHoshi1984TakayukiHoshi1984
committed
Merge branch 'main' into modify_fused_location
# Conflicts: # dConnectManager/dConnectManager/dconnect-manager-app/src/main/java/org/deviceconnect/android/manager/DConnectService.java # dConnectManager/dConnectManager/gradle/wrapper/gradle-wrapper.properties
2 parents 1174f5c + bbafada commit a1fa84b

135 files changed

Lines changed: 10422 additions & 6132 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/dConnectDeviceHost/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ android {
3333
buildConfigField "String", "DEMO_DIR", "\"demo\""
3434
buildConfigField "String", "DEMO_ZIP", "\"" + DEMO_ZIP_NAME + "\""
3535
buildConfigField "long", "STATS_INTERVAL", "5000L"
36-
}
36+
}
3737

3838
signingConfigs {
3939
releaseConfig {
@@ -105,8 +105,8 @@ dependencies {
105105
implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:1.9.7'
106106
implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.6'
107107
implementation 'org.deviceconnect:dconnect-demo-lib:1.0.1'
108-
implementation 'org.deviceconnect:libmedia:1.2.2'
109-
implementation 'org.deviceconnect:libsrt:1.2.2'
108+
implementation 'org.deviceconnect:libmedia:1.3.0'
109+
implementation 'org.deviceconnect:libsrt:1.3.0'
110110
// implementation project(':libmedia')
111111
// implementation project(':libsrt')
112112
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,15 @@
112112
android:name="org.deviceconnect.android.deviceplugin.host.setting.HostSettingActivity"
113113
android:exported="false"
114114
android:launchMode="singleTask"
115+
android:taskAffinity=".settings"
115116
android:theme="@style/AppCompatTheme" />
116117

117118
<!-- レコーダー設定画面用の Activity -->
118119
<activity
119120
android:name=".activity.recorder.settings.SettingsActivity"
120121
android:configChanges="keyboardHidden|orientation|screenSize"
121122
android:exported="false"
123+
android:taskAffinity=".recorder_settings"
122124
android:theme="@style/AppCompatTheme" />
123125

124126
<!-- プラグイン本体サービス -->

‎dConnectDevicePlugin/dConnectDeviceHost/app/src/main/assets/org_deviceconnect_android_deviceplugin_host/api/connection.json‎

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
"/network/bitrate": {
294294
"get": {
295295
"summary": "スマートデバイスの接続ネットワークのビットレートを取得する。",
296-
"description": "接続しているネットワークのビットレートを取得する。",
296+
"description": "接続しているネットワークのビットレートを取得する。<br> until が省略された場合には、since から今の時刻までの間のビットレート情報を取得します。<br> since と until が省略された場合には、Host プラグインの起動時からのビットレートの情報を取得します。",
297297
"operationId": "connectionNetworkBitrateGet",
298298
"parameters": [
299299
{
@@ -302,6 +302,20 @@
302302
"description": "サービスID。取得対象スマートデバイス",
303303
"required": true,
304304
"type": "string"
305+
},
306+
{
307+
"name": "since",
308+
"in": "query",
309+
"description": "取得開始時刻 (yyyy/MM/dd HH:mm:ss)",
310+
"required": false,
311+
"type": "string"
312+
},
313+
{
314+
"name": "until",
315+
"in": "query",
316+
"description": "取得終了時刻 (yyyy/MM/dd HH:mm:ss)",
317+
"required": false,
318+
"type": "string"
305319
}
306320
],
307321
"responses": {
@@ -335,7 +349,7 @@
335349
"description": "サービスID。取得対象スマートデバイス",
336350
"required": true,
337351
"type": "string"
338-
},
352+
},
339353
{
340354
"name": "interval",
341355
"in": "formData",
@@ -545,7 +559,7 @@
545559
"description": "サービスID。取得対象スマートデバイス",
546560
"required": true,
547561
"type": "string"
548-
},
562+
},
549563
{
550564
"name": "interval",
551565
"in": "formData",
@@ -663,7 +677,7 @@
663677
"description": "サービスID。取得対象スマートデバイス",
664678
"required": true,
665679
"type": "string"
666-
},
680+
},
667681
{
668682
"name": "interval",
669683
"in": "formData",
@@ -781,7 +795,7 @@
781795
"description": "サービスID。取得対象スマートデバイス",
782796
"required": true,
783797
"type": "string"
784-
},
798+
},
785799
{
786800
"name": "interval",
787801
"in": "formData",
@@ -899,7 +913,7 @@
899913
"description": "サービスID。取得対象スマートデバイス",
900914
"required": true,
901915
"type": "string"
902-
},
916+
},
903917
{
904918
"name": "interval",
905919
"in": "formData",
@@ -1071,7 +1085,7 @@
10711085
"allOf": [
10721086
{
10731087
"$ref": "#/definitions/CommonResponse"
1074-
},
1088+
},
10751089
{
10761090
"type": "object",
10771091
"required": ["network"],
@@ -1089,7 +1103,7 @@
10891103
"allOf": [
10901104
{
10911105
"$ref": "#/definitions/CommonEvent"
1092-
},
1106+
},
10931107
{
10941108
"required": ["network"],
10951109
"properties": {
@@ -1106,7 +1120,7 @@
11061120
"allOf": [
11071121
{
11081122
"$ref": "#/definitions/CommonResponse"
1109-
},
1123+
},
11101124
{
11111125
"required": ["mobile", "wifi"],
11121126
"properties": {
@@ -1180,7 +1194,7 @@
11801194
"allOf": [
11811195
{
11821196
"$ref": "#/definitions/CommonResponse"
1183-
},
1197+
},
11841198
{
11851199
"type": "object",
11861200
"required": ["enable"],
@@ -1212,7 +1226,7 @@
12121226
"allOf": [
12131227
{
12141228
"$ref": "#/definitions/CommonResponse"
1215-
},
1229+
},
12161230
{
12171231
"required": ["connectStatus"],
12181232
"properties": {
@@ -1236,7 +1250,7 @@
12361250
"allOf": [
12371251
{
12381252
"$ref": "#/definitions/CommonEvent"
1239-
},
1253+
},
12401254
{
12411255
"required": ["connectStatus"],
12421256
"properties": {
@@ -1260,7 +1274,7 @@
12601274
"allOf": [
12611275
{
12621276
"$ref": "#/definitions/CommonResponse"
1263-
},
1277+
},
12641278
{
12651279
"type": "object",
12661280
"required": ["enable"],
@@ -1292,7 +1306,7 @@
12921306
"allOf": [
12931307
{
12941308
"$ref": "#/definitions/CommonResponse"
1295-
},
1309+
},
12961310
{
12971311
"required": ["connectStatus"],
12981312
"properties": {
@@ -1316,7 +1330,7 @@
13161330
"allOf": [
13171331
{
13181332
"$ref": "#/definitions/CommonEvent"
1319-
},
1333+
},
13201334
{
13211335
"required": ["connectStatus"],
13221336
"properties": {
@@ -1354,7 +1368,7 @@
13541368
"allOf": [
13551369
{
13561370
"$ref": "#/definitions/CommonResponse"
1357-
},
1371+
},
13581372
{
13591373
"type": "object",
13601374
"required": ["enable"],
@@ -1386,7 +1400,7 @@
13861400
"allOf": [
13871401
{
13881402
"$ref": "#/definitions/CommonResponse"
1389-
},
1403+
},
13901404
{
13911405
"required": ["connectStatus"],
13921406
"properties": {
@@ -1410,7 +1424,7 @@
14101424
"allOf": [
14111425
{
14121426
"$ref": "#/definitions/CommonEvent"
1413-
},
1427+
},
14141428
{
14151429
"required": ["connectStatus"],
14161430
"properties": {
@@ -1434,7 +1448,7 @@
14341448
"allOf": [
14351449
{
14361450
"$ref": "#/definitions/CommonResponse"
1437-
},
1451+
},
14381452
{
14391453
"type": "object",
14401454
"required": ["enable"],
@@ -1466,7 +1480,7 @@
14661480
"allOf": [
14671481
{
14681482
"$ref": "#/definitions/CommonResponse"
1469-
},
1483+
},
14701484
{
14711485
"required": ["connectStatus"],
14721486
"properties": {
@@ -1490,7 +1504,7 @@
14901504
"allOf": [
14911505
{
14921506
"$ref": "#/definitions/CommonEvent"
1493-
},
1507+
},
14941508
{
14951509
"required": ["connectStatus"],
14961510
"properties": {

0 commit comments

Comments
 (0)