Skip to content

Commit bb9d692

Browse files
masaru-takanomasaru-takano
committed
Merge remote-tracking branch 'origin/main' into feature_copyright_protection
2 parents 5a1ac16 + d206979 commit bb9d692

105 files changed

Lines changed: 1441 additions & 1120 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/dConnectDeviceChromeCast/app/src/main/java/org/deviceconnect/android/deviceplugin/chromecast/profile/ChromeCastMediaPlayerProfile.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ private Cursor getCursorFrom(final Uri uri, final String key, final String value
759759
* 指定したメディアをローカルサーバ上で公開する.
760760
*
761761
* @param mediaId メディアID
762-
* @return dummyUrl ダミーURL
762+
* @return placeHolderUrl 代用URL
763763
*/
764764
private String exposeMedia(final long mediaId) {
765765
Uri targetUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"recorders": [
4141
{
4242
"id": "photo_0",
43-
"name": "Dummy Camera Recorder - back",
43+
"name": "Example Camera Recorder - back",
4444
"state": "inactive",
4545
"imageWidth": 3264,
4646
"imageHeight": 2448,
@@ -52,7 +52,7 @@
5252
},
5353
{
5454
"id": "photo_1",
55-
"name": "Dummy Camera Recorder - front",
55+
"name": "Example Camera Recorder - front",
5656
"state": "inactive",
5757
"imageWidth": 1280,
5858
"imageHeight": 960,
@@ -64,7 +64,7 @@
6464
},
6565
{
6666
"id": "video_0",
67-
"name": "Dummy Video Recorder - back",
67+
"name": "Example Video Recorder - back",
6868
"state": "inactive",
6969
"imageWidth": 640,
7070
"imageHeight": 480,
@@ -73,7 +73,7 @@
7373
},
7474
{
7575
"id": "video_1",
76-
"name": "Dummy Video Recorder - front",
76+
"name": "Example Video Recorder - front",
7777
"state": "inactive",
7878
"imageWidth": 640,
7979
"imageHeight": 480,
@@ -82,14 +82,14 @@
8282
},
8383
{
8484
"id": "audio",
85-
"name": "Dummy Audio Recorder",
85+
"name": "Example Audio Recorder",
8686
"state": "inactive",
8787
"mimeType": "audio/3gp",
8888
"config": ""
8989
},
9090
{
9191
"id": "screen",
92-
"name": "Dummy Screen",
92+
"name": "Example Screen",
9393
"state": "inactive",
9494
"imageWidth": 1080,
9595
"imageHeight": 1776,
@@ -139,8 +139,8 @@
139139
"result": 0,
140140
"product": "Example System",
141141
"version": "1.0.0",
142-
"uri": "Dummy URI",
143-
"path": "Dummy Path"
142+
"uri": "Example URI",
143+
"path": "Example Path"
144144
}
145145
}
146146
}
@@ -189,8 +189,8 @@
189189
"result": 0,
190190
"product": "Example System",
191191
"version": "1.0.0",
192-
"uri": "Dummy URI",
193-
"path": "Dummy Path"
192+
"uri": "Example URI",
193+
"path": "Example Path"
194194
}
195195
}
196196
}
@@ -681,8 +681,8 @@
681681
"result": 0,
682682
"product": "Example System",
683683
"version": "1.0.0",
684-
"uri": "Dummy URI",
685-
"path": "Dummy Path"
684+
"uri": "Example URI",
685+
"path": "Example Path"
686686
}
687687
}
688688
}
@@ -731,12 +731,12 @@
731731
},
732732
"examples": {
733733
"application/json": {
734-
"serviceId": "Host.dummyId.localhost.deviceconnect.org",
734+
"serviceId": "Host.exampleId.localhost.deviceconnect.org",
735735
"profile": "mediastreamrecording",
736736
"attribute": "onphoto",
737737
"photo": {
738-
"uri": "Dummy URI",
739-
"path": "Dummy Path",
738+
"uri": "Example URI",
739+
"path": "Example Path",
740740
"mimeType": "image/png"
741741
}
742742
}
@@ -807,7 +807,7 @@
807807
"result": 0,
808808
"product": "Example System",
809809
"version": "1.0.0",
810-
"uri": "Dummy Preview URI"
810+
"uri": "Example Preview URI"
811811
}
812812
}
813813
}
@@ -855,7 +855,7 @@
855855
"result": 0,
856856
"product": "Example System",
857857
"version": "1.0.0",
858-
"uri": "Dummy Preview URI"
858+
"uri": "Example Preview URI"
859859
}
860860
}
861861
}
@@ -1042,7 +1042,7 @@
10421042
"version": "1.0.0",
10431043
"media": {
10441044
"status": "stop",
1045-
"path": "Dummy Path",
1045+
"path": "Example Path",
10461046
"mimeType": "video/3gp"
10471047
}
10481048
}
@@ -1093,12 +1093,12 @@
10931093
},
10941094
"examples": {
10951095
"application/json": {
1096-
"serviceId": "Host.dummyId.localhost.deviceconnect.org",
1096+
"serviceId": "Host.exampleId.localhost.deviceconnect.org",
10971097
"profile": "mediastreamrecording",
10981098
"attribute": "onrecordingchange",
10991099
"media": {
11001100
"status": "stop",
1101-
"path": "Dummy Path",
1101+
"path": "Example Path",
11021102
"mimeType": "image/png"
11031103
}
11041104
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@
319319
},
320320
"examples": {
321321
"application/json": {
322-
"serviceId": "Host.dummyId.localhost.deviceconnect.org",
322+
"serviceId": "Host.exampleId.localhost.deviceconnect.org",
323323
"profile": "phone",
324324
"attribute": "onconnect",
325325
"phoneStatus": {
@@ -437,7 +437,7 @@
437437
},
438438
"examples": {
439439
"application/json": {
440-
"serviceId": "Host.dummyId.localhost.deviceconnect.org",
440+
"serviceId": "Host.exampleId.localhost.deviceconnect.org",
441441
"profile": "phone",
442442
"attribute": "onconnect",
443443
"state": "ringing",

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
},
100100
"examples": {
101101
"application/json": {
102-
"serviceId": "Host.dummyId.localhost.deviceconnect.org",
102+
"serviceId": "Host.exampleId.localhost.deviceconnect.org",
103103
"profile": "touch",
104104
"attribute": "ontouch",
105105
"touch": {
@@ -239,7 +239,7 @@
239239
},
240240
"examples": {
241241
"application/json": {
242-
"serviceId": "Host.dummyId.localhost.deviceconnect.org",
242+
"serviceId": "Host.exampleId.localhost.deviceconnect.org",
243243
"profile": "touch",
244244
"attribute": "ontouchstart",
245245
"touch": {
@@ -379,7 +379,7 @@
379379
},
380380
"examples": {
381381
"application/json": {
382-
"serviceId": "Host.dummyId.localhost.deviceconnect.org",
382+
"serviceId": "Host.exampleId.localhost.deviceconnect.org",
383383
"profile": "touch",
384384
"attribute": "ontouchend",
385385
"touch": {
@@ -519,7 +519,7 @@
519519
},
520520
"examples": {
521521
"application/json": {
522-
"serviceId": "Host.dummyId.localhost.deviceconnect.org",
522+
"serviceId": "Host.exampleId.localhost.deviceconnect.org",
523523
"profile": "touch",
524524
"attribute": "ontouchmove",
525525
"touch": {
@@ -659,7 +659,7 @@
659659
},
660660
"examples": {
661661
"application/json": {
662-
"serviceId": "Host.dummyId.localhost.deviceconnect.org",
662+
"serviceId": "Host.exampleId.localhost.deviceconnect.org",
663663
"profile": "touch",
664664
"attribute": "ontouchcancel",
665665
"touch": {
@@ -799,7 +799,7 @@
799799
},
800800
"examples": {
801801
"application/json": {
802-
"serviceId": "Host.dummyId.localhost.deviceconnect.org",
802+
"serviceId": "Host.exampleId.localhost.deviceconnect.org",
803803
"profile": "touch",
804804
"attribute": "ondoubletap",
805805
"touch": {
@@ -939,7 +939,7 @@
939939
},
940940
"examples": {
941941
"application/json": {
942-
"serviceId": "Host.dummyId.localhost.deviceconnect.org",
942+
"serviceId": "Host.exampleId.localhost.deviceconnect.org",
943943
"profile": "touch",
944944
"attribute": "ondoubletap",
945945
"touch": {

‎dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/camera/CameraWrapper.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void notifyEvent(final CameraEvent event) {
8787

8888
private final Handler mSessionConfigurationHandler;
8989

90-
private final ImageReader mDummyPreviewReader;
90+
private final ImageReader mPlaceHolderPreviewReader;
9191

9292
private final Options mOptions;
9393

@@ -134,8 +134,8 @@ void notifyEvent(final CameraEvent event) {
134134
mOptions = initOptions();
135135
mAutoFocusMode = choiceAutoFocusMode(context, mCameraManager, cameraId);
136136
mAutoExposureMode = choiceAutoExposureMode(mCameraManager, cameraId);
137-
mDummyPreviewReader = createImageReader(mOptions.getPreviewSize(), ImageFormat.YUV_420_888);
138-
mDummyPreviewReader.setOnImageAvailableListener(reader -> {
137+
mPlaceHolderPreviewReader = createImageReader(mOptions.getPreviewSize(), ImageFormat.YUV_420_888);
138+
mPlaceHolderPreviewReader.setOnImageAvailableListener(reader -> {
139139
Image image = reader.acquireNextImage();
140140
if (image != null) {
141141
image.close();
@@ -352,7 +352,7 @@ private List<Surface> createSurfaceList() {
352352
surfaceList.add(mTargetSurface);
353353
}
354354
} else {
355-
surfaceList.add(mDummyPreviewReader.getSurface());
355+
surfaceList.add(mPlaceHolderPreviewReader.getSurface());
356356
}
357357
if (mIsRecording) {
358358
surfaceList.add(mRecordingSurface);
@@ -366,7 +366,7 @@ private List<Surface> createSurfaceList() {
366366
private List<Surface> createSurfaceListForStillImage() {
367367
List<Surface> surfaceList = new LinkedList<>();
368368
surfaceList.add(mStillImageSurface);
369-
surfaceList.add(mDummyPreviewReader.getSurface());
369+
surfaceList.add(mPlaceHolderPreviewReader.getSurface());
370370
return surfaceList;
371371
}
372372

@@ -703,7 +703,7 @@ private void prepareCapture(final CameraDevice cameraDevice) throws CameraWrappe
703703
request.addTarget(mTargetSurface);
704704
}
705705
} else {
706-
request.addTarget(mDummyPreviewReader.getSurface());
706+
request.addTarget(mPlaceHolderPreviewReader.getSurface());
707707
}
708708
setDefaultCaptureRequest(request, true);
709709
mCaptureSession.setRepeatingRequest(request.build(), new CameraCaptureSession.CaptureCallback() {
@@ -807,7 +807,7 @@ public synchronized void turnOnTorch(final @Nullable TorchOnListener listener,
807807
}
808808

809809
if (!mIsPreview && !mIsRecording) {
810-
requestBuilder.addTarget(mDummyPreviewReader.getSurface());
810+
requestBuilder.addTarget(mPlaceHolderPreviewReader.getSurface());
811811
}
812812
requestBuilder.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_TORCH);
813813
mCaptureSession.setRepeatingRequest(requestBuilder.build(), null, mBackgroundHandler);
@@ -850,7 +850,7 @@ public synchronized void turnOffTorch(final @Nullable TorchOffListener listener,
850850
requestBuilder.addTarget(mTargetSurface);
851851
}
852852
} else {
853-
requestBuilder.addTarget(mDummyPreviewReader.getSurface());
853+
requestBuilder.addTarget(mPlaceHolderPreviewReader.getSurface());
854854
}
855855
requestBuilder.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_OFF);
856856
mCaptureSession.setRepeatingRequest(requestBuilder.build(),null, mBackgroundHandler);

‎dConnectDevicePlugin/dConnectDeviceHost/demo/camera/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@
262262
</v-btn>
263263
</v-toolbar-items>
264264
</v-toolbar>
265-
<v-toolbar class="elevation-0"></v-toolbar> <!-- サムネイル位置調整用のダミー -->
265+
<v-toolbar class="elevation-0"></v-toolbar> <!-- サムネイル位置調整用の代用 -->
266266

267267
<!-- キャスト設定ダイアログ -->
268268
<v-dialog

‎dConnectDevicePlugin/dConnectDeviceHost/demo/camera/js/core.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,9 +334,9 @@ export class DeviceConnectClient {
334334
} else {
335335
console.warn('authorize: createClient: erroCode=' + json.errorCode);
336336
if (json.errorCode === 2) {
337-
// LocalOAuth が OFF の場合はダミーのアクセストークンを返す.
338-
// WebSocket 接続確立時にダミーを送信する必要がある.
339-
return Promise.resolve({ result:0, accessToken:'dummy' });
337+
// LocalOAuth が OFF の場合は代用のアクセストークンを返す.
338+
// WebSocket 接続確立時に代用を送信する必要がある.
339+
return Promise.resolve({ result:0, accessToken:'placeHolder' });
340340
}
341341
return Promise.reject({ what: 'connect', reason: 'no-client', errorMessage: 'クライアントIDを取得できませんでした。' });
342342
}

0 commit comments

Comments
 (0)