This commit is contained in:
crusader 2018-10-18 10:47:14 +09:00
parent 60e7dd9ca9
commit 92ee13d15b
2 changed files with 33 additions and 6 deletions

View File

@ -1,6 +1,6 @@
import { Store, select } from '@ngrx/store'; import { Store, select } from '@ngrx/store';
import { Host, Port, DiscoveryModeType, Service } from '@overflow/model/discovery'; import { Host, Port, DiscoveryModeType, Service, Zone } from '@overflow/model/discovery';
import { RPCSubscriber } from '@overflow/commons/ui/decorator/RPCSubscriber'; import { RPCSubscriber } from '@overflow/commons/ui/decorator/RPCSubscriber';
import { RPCError } from '@overflow/rpc-js'; import { RPCError } from '@overflow/rpc-js';
@ -44,11 +44,35 @@ export class DiscoverySession {
if (null !== discoverySession) { if (null !== discoverySession) {
return null; return null;
} }
let _zone: Zone = null;
let _host: Host = null;
let _port: Port = null;
if (null !== zone) {
_zone = {
...zone,
hostList: null,
};
}
if (null !== host) {
_host = {
...host,
portList: null,
};
}
if (null !== port) {
_port = {
...port,
serviceList: null,
};
}
const discoverRequestInfo = { const discoverRequestInfo = {
requesterID: memberID, requesterID: memberID,
zone, zone: _zone,
host, host: _host,
port, port: _port,
discoverHost, discoverHost,
discoverPort, discoverPort,
discoverService, discoverService,

View File

@ -3,7 +3,10 @@
<div class="start-button" (click)="requestDiscover()"> <div class="start-button" (click)="requestDiscover()">
<svg version="1.1" viewBox="0 0 200 210"> <svg version="1.1" viewBox="0 0 200 210">
<path d="M8.3,193.5c0.1,2.4,0.8,4.9,2.1,7.1c4.5,7.7,14.3,10.4,22.1,5.9l152.1-87.8c2-1.3,3.8-3.1,5.1-5.4 <path d="M8.3,193.5c0.1,2.4,0.8,4.9,2.1,7.1c4.5,7.7,14.3,10.4,22.1,5.9l152.1-87.8c2-1.3,3.8-3.1,5.1-5.4
c4.5-7.7,1.8-17.6-5.9-22.1L31.6,3.4c-2.2-1.1-4.6-1.7-7.2-1.7c-8.9,0-16.2,7.2-16.2,16.2V193.5z" /> c4.5-7.7,1.8-17.6-5.9-22.1L31.6,3.4c-2.2-1.1-4.6-1.7-7.2-1.7c-8.9,0-16.2,7.2-16.2,16.2V193.5z">
</path>
<animateTransform attributeName="transform" type="scale" values="1 1; 1.1 1.1; 1 1" dur="3s" repeatCount="indefinite" />
<animate attributeName="fill" values="gray;white;gray" dur="3s" repeatCount="indefinite" />
</svg> </svg>
</div> </div>
<div class="home-description"> <div class="home-description">
@ -20,4 +23,4 @@
</div> </div>
</of-p-div> </of-p-div>
<p-confirmDialog></p-confirmDialog> <p-confirmDialog></p-confirmDialog>