Procházet zdrojové kódy

Added isRunning detection for cloud connections

martijndierckx před 5 roky
rodič
revize
ad5e6c389e
4 změnil soubory, kde provedl 14 přidání a 3 odebrání
  1. 1 1
      dist/Hydrawise.d.ts.map
  2. 6 1
      dist/Hydrawise.js
  3. 0 0
      dist/Hydrawise.js.map
  4. 7 1
      src/Hydrawise.ts

+ 1 - 1
dist/Hydrawise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Hydrawise.d.ts","sourceRoot":"","sources":["../src/Hydrawise.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAK5D,UAAU,sBAAsB;IAC/B,IAAI,EAAG,uBAAuB,CAAC;IAC/B,IAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAI,CAAC,EAAE,MAAM,CAAA;CACb;AAED,sEAAsE;AACtE,qBAAa,SAAS;IAErB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA+C;IACjE,IAAI,EAAE,uBAAuB,CAAC;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IAE/B;;;;;;;;OAQG;gBACS,OAAO,EAAE,sBAAsB;IAY3C;;;;;OAKG;IACH,OAAO,CAAC,OAAO;IA0Cf;;;;;;;OAOG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAwCxG;;;;;;OAMG;IACI,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,mBAAmB,GAAG,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAmClH;;;;;OAKG;IACI,OAAO,CAAC,WAAW,EAAE,aAAa,GAAG,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIpF;;;;OAIG;IACI,WAAW,CAAC,UAAU,CAAC,EAAE,mBAAmB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIrF;;;;;OAKG;IACI,WAAW,CAAC,WAAW,EAAE,aAAa,GAAG,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIxF;;;;;OAKG;IACI,eAAe,CAAC,UAAU,CAAC,EAAE,mBAAmB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIzF;;;;OAIG;IACI,QAAQ,CAAC,WAAW,EAAE,aAAa,GAAG,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIlE;;;OAGG;IACI,YAAY,CAAC,UAAU,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC;IAInE;;;;OAIG;IACI,QAAQ,CAAC,UAAU,CAAC,EAAE,mBAAmB,GAAG,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA0EpF;;;OAGG;IACI,cAAc,IAAI,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAsDvD;;;;OAIG;IACI,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAWrD;;;;OAIG;IACI,oBAAoB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAa9D;;;;;;;;;OASG;IACI,OAAO,CAAC,MAAM,GAAE,GAAQ,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;CAUnE"}
+{"version":3,"file":"Hydrawise.d.ts","sourceRoot":"","sources":["../src/Hydrawise.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAK5D,UAAU,sBAAsB;IAC/B,IAAI,EAAG,uBAAuB,CAAC;IAC/B,IAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAI,CAAC,EAAE,MAAM,CAAA;CACb;AAED,sEAAsE;AACtE,qBAAa,SAAS;IAErB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA+C;IACjE,IAAI,EAAE,uBAAuB,CAAC;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IAE/B;;;;;;;;OAQG;gBACS,OAAO,EAAE,sBAAsB;IAY3C;;;;;OAKG;IACH,OAAO,CAAC,OAAO;IA0Cf;;;;;;;OAOG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAwCxG;;;;;;OAMG;IACI,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,mBAAmB,GAAG,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAmClH;;;;;OAKG;IACI,OAAO,CAAC,WAAW,EAAE,aAAa,GAAG,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIpF;;;;OAIG;IACI,WAAW,CAAC,UAAU,CAAC,EAAE,mBAAmB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIrF;;;;;OAKG;IACI,WAAW,CAAC,WAAW,EAAE,aAAa,GAAG,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIxF;;;;;OAKG;IACI,eAAe,CAAC,UAAU,CAAC,EAAE,mBAAmB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIzF;;;;OAIG;IACI,QAAQ,CAAC,WAAW,EAAE,aAAa,GAAG,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIlE;;;OAGG;IACI,YAAY,CAAC,UAAU,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC;IAInE;;;;OAIG;IACI,QAAQ,CAAC,UAAU,CAAC,EAAE,mBAAmB,GAAG,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAgFpF;;;OAGG;IACI,cAAc,IAAI,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAsDvD;;;;OAIG;IACI,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAWrD;;;;OAIG;IACI,oBAAoB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAa9D;;;;;;;;;OASG;IACI,OAAO,CAAC,MAAM,GAAE,GAAQ,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;CAUnE"}

+ 6 - 1
dist/Hydrawise.js

@@ -246,7 +246,7 @@ class Hydrawise {
                         if (that.type == HydrawiseConnectionType_1.HydrawiseConnectionType.LOCAL) {
                             zone.defaultRunDuration = z.normalRuntime * 60;
                         }
-                        // Running?
+                        // Running? (local connection)
                         if (data.running !== undefined) {
                             let runningZone = data.running.find((x) => {
                                 return x.relay_id == z.relay_id;
@@ -256,6 +256,11 @@ class Hydrawise {
                                 zone.remainingRunningTime = runningZone.time_left;
                             }
                         }
+                        // Running? (cloud connection)
+                        if (z.time == 1) {
+                            zone.isRunning = true;
+                            zone.remainingRunningTime = z.run;
+                        }
                         zones.push(new HydrawiseZone_1.HydrawiseZone(zone));
                     }
                 });

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
dist/Hydrawise.js.map


+ 7 - 1
src/Hydrawise.ts

@@ -298,7 +298,7 @@ export class Hydrawise {
 							zone.defaultRunDuration = z.normalRuntime * 60;
 						}
 
-						// Running?
+						// Running? (local connection)
 						if(data.running !== undefined) {
 							let runningZone = data.running.find((x: any) => {
 								return x.relay_id == z.relay_id;
@@ -308,6 +308,12 @@ export class Hydrawise {
 								zone.remainingRunningTime = runningZone.time_left;
 							}
 						}
+
+						// Running? (cloud connection)
+						if(z.time == 1) {
+							zone.isRunning = true;
+							zone.remainingRunningTime = z.run;
+						}
 						
 						zones.push(new HydrawiseZone(zone));
 					}

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů