watsonb8/homebridge-harmony-control
1
1
Fork 0
Code Issues 2 Pull Requests Actions Projects Releases Wiki Activity

Code re-organization

Browse Source
This commit is contained in:
watsonb8
2020-01-01 23:39:07 -05:00
parent 020a2fc240
commit 672362a9a4
6 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Accessories/ControlUnit.ts
View File

@@ -1,5 +1,4 @@
import { IActivity } from '../Models/Config/IActivity';
import { IMatrix } from '../Models/Config/IMatrix';
import * as Config from "../Models/Config"
import { IAccessory } from './IAccessory';
import callbackify from '../Util/Callbackify';
import HarmonyDataProvider from '../DataProviders/HarmonyDataProvider';
@@ -31,7 +30,7 @@ export enum RemoteKey {
export interface IControlUnitProps {
dataProvider: HarmonyDataProvider,
displayName: string,
activities: Array<IActivity>,
activities: Array<Config.IActivity>,
api: any,
log: any,
homebridge: any,
@@ -55,7 +54,7 @@ export class ControlUnit implements IAccessory {
private inputServices: Array<HAPNodeJS.Service | undefined> = [];
//Harmony fields
private activities: Array<IActivity> = [];
private activities: Array<Config.IActivity> = [];
private dataProvider: HarmonyDataProvider;
public platformAccessory: any;
@@ -180,7 +179,7 @@ export class ControlUnit implements IAccessory {
* Event handler for GET active identifier characteristic
*/
private onGetActiveIdentifier = async () => {
let currentActivity: IActivity = this.dataProvider.getIsActive(this.name)!;
let currentActivity: Config.IActivity = this.dataProvider.getIsActive(this.name)!;
let identifier: number = 0;
if (currentActivity) {
identifier = this.activities.findIndex(e => e.DisplayName === currentActivity.DisplayName);
@@ -240,7 +239,7 @@ export class ControlUnit implements IAccessory {
*/
private configureInputSourceService(): void {
let inputs: Array<HAPNodeJS.Service> = [];
this.activities.forEach((activity: IActivity, index: number) => {
this.activities.forEach((activity: Config.IActivity, index: number) => {
let inputService = new Service.InputSource(activity.DisplayName, 'activity' + activity.DisplayName);
inputService
.setCharacteristic(Characteristic.Identifier, index)

5
src/Accessories/DeviceButton.ts
View File

@@ -1,8 +1,7 @@
import HarmonyDataProvider from "../DataProviders/HarmonyDataProvider";
import { IDeviceButton } from "../Models/Config/IDeviceButton";
import { IDeviceButton } from "../Models/Config";
import { IAccessory } from "./IAccessory";
import { sleep } from "../Util/Sleep";
import { ICommand } from "../Models/IDevice";
import { ICommand } from "../Models";
let Service: HAPNodeJS.Service;
let Characteristic: HAPNodeJS.Characteristic;

3
src/Accessories/index.ts Normal file
View File

@@ -0,0 +1,3 @@
export { ControlUnit } from './ControlUnit';
export { DeviceButton } from './DeviceButton';
export { IAccessory } from './IAccessory';