Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

fengxiang

2018-08-03 e91e87b7b86e8d1d66caeab727a3cdc68fdc09ef

1
2
3
4
5
6
<ng-container [ngSwitch]="deviceControllerService.incumbent">
    <app-device-status *ngSwitchCase="'status'"></app-device-status>
    <app-device-data *ngSwitchCase="'data'"></app-device-data>
    <app-device-status   *ngSwitchDefault>
    </app-device-status>
</ng-container>