FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

76_SMAPortal: internal code changes, minor bug fixes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22149 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-06-09 20:41:58 +00:00
parent 1f28c668dd
commit 0a21b48819
3 changed files with 634 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- changed: 76_SMAPortal: internal code changes, minor bug fixes
- bugfix: 70_BRAVIA: fix register procedure - bugfix: 70_BRAVIA: fix register procedure
- change: 32_withings: added sleep apnea readings - change: 32_withings: added sleep apnea readings
- feature: 72_XiaomiDevice: Vacuum segments, Zhimi ZA4 fan readings - feature: 72_XiaomiDevice: Vacuum segments, Zhimi ZA4 fan readings

995
fhem/FHEM/76_SMAPortal.pm
View File

File diff suppressed because it is too large Load Diff

110
fhem/contrib/DS_Starter/76_SMAPortal.pm
View File

@ -231,7 +231,7 @@ sub Initialize {
"interval ". "interval ".
"showPassInLog:1,0 ". "showPassInLog:1,0 ".
"userAgent ". "userAgent ".
"verbose5Data:none,loginData,balanceData,liveData,weatherData,forecastData,consumerLiveData,consumerDayData,consumerMonthData,consumerYearData ". "verbose5Data:none,loginData,balanceDayData,liveData,weatherData,forecastData,consumerLiveData,consumerDayData,consumerMonthData,consumerYearData ".
$readingFnAttributes; $readingFnAttributes;
eval { FHEM::Meta::InitMod( __FILE__, $hash ) }; ## no critic 'eval' # für Meta.pm (https://forum.fhem.de/index.php/topic,97589.0.html) eval { FHEM::Meta::InitMod( __FILE__, $hash ) }; ## no critic 'eval' # für Meta.pm (https://forum.fhem.de/index.php/topic,97589.0.html)
@ -756,14 +756,13 @@ sub GetSetData { ## no cri
my $cookieLocation = AttrVal($name, "cookieLocation", "./log/".$name."_cookie.txt"); my $cookieLocation = AttrVal($name, "cookieLocation", "./log/".$name."_cookie.txt");
my $v5d = AttrVal($name, "verbose5Data", "none"); my $v5d = AttrVal($name, "verbose5Data", "none");
my $dl = AttrVal($name, "detailLevel", 1); # selected Detail Level my $dl = AttrVal($name, "detailLevel", 1); # selected Detail Level
my ($ccyeardata_content) = ("");
my $state = "ok"; my $state = "ok";
my ($reread,$retry) = (0,0); my ($reread,$retry) = (0,0);
my ($exceed,$newcycle) = (0,0); my ($exceed,$newcycle) = (0,0);
my ($balancedataday_content,$ccdaydata_content,$ccmonthdata_content) = ("","",""); my ($st,$lc) = ("","");
my ($st,$lc) = ("",""); my @da = ();
my ($ccdaydata_content,$ccmonthdata_content,$ccyeardata_content) = ("","","");
my ($d,$op,$paref); my ($d,$op,$paref);
my @da = ();
if($setp ne "none") { if($setp ne "none") {
# Verbraucher soll in den Status $op geschaltet werden # Verbraucher soll in den Status $op geschaltet werden
@ -858,8 +857,11 @@ sub GetSetData { ## no cri
tag => "liveData" tag => "liveData"
}); });
$paref = [ $hash,$errstate,$state,$livedata ]; ($reread,$retry,$errstate,$state) = analyzeData ({ hash => $hash,
($reread,$retry,$errstate,$state) = analyzeData($paref); errstate => $errstate,
state => $state,
data => $livedata
});
if($errstate) { if($errstate) {
$st = encode_base64 ( $state,""); $st = encode_base64 ( $state,"");
@ -912,8 +914,11 @@ sub GetSetData { ## no cri
tag => "weatherData" tag => "weatherData"
}); });
$paref = [ $hash,$errstate,$state,$weatherdata ]; ($reread,$retry,$errstate,$state) = analyzeData ({ hash => $hash,
($reread,$retry,$errstate,$state) = analyzeData($paref); errstate => $errstate,
state => $state,
data => $weatherdata
});
if($errstate) { if($errstate) {
$st = encode_base64 ( $state,""); $st = encode_base64 ( $state,"");
@ -929,24 +934,28 @@ sub GetSetData { ## no cri
### Statistic Data Tag (anchorTime beachten !) ### Statistic Data Tag (anchorTime beachten !)
################################################ ################################################
Log3 ($name, 4, "$name - Getting statistic day data");
my $req = HTTP::Request->new( 'POST', 'https://www.sunnyportal.com/FixedPages/HoManEnergyRedesign.aspx/GetLegendWithValues' );
my $anchort = int ($time / 1000); # anchorTime -> abzurufendes Datum my $anchort = int ($time / 1000); # anchorTime -> abzurufendes Datum
my $tab = 1; # Tab 1 -> Tag , 2->Monat, 3->Jahr, 4->Gesamt my $tab = 1; # Tab 1 -> Tag , 2->Monat, 3->Jahr, 4->Gesamt
my $cont = qq{"tabNumber":$tab,"anchorTime":$anchort}; my %fields = ("Content-Type" => "application/json; charset=utf-8");
my $cont = qq{ {"tabNumber":$tab,"anchorTime":$anchort} };
$req->header ( "Content-Type" => "application/json; charset=utf-8" ); my ($balancedataday,$balancedataday_content) = _putData ({ name => $name,
$req->header ( "Content-Length" => 39 ); ua => $ua,
$req->content ( "{$cont}" ); call => 'https://www.sunnyportal.com/FixedPages/HoManEnergyRedesign.aspx/GetLegendWithValues',
fields => \%fields,
content => $cont,
tag => "balanceDayData"
});
my $res = $ua->request( $req ); ($reread,$retry,$errstate,$state) = analyzeData ({ hash => $hash,
my $balancedataday_content = $res->content; errstate => $errstate,
state => $state,
data => $balancedataday
});
if($v5d eq "balanceData") { if($errstate) {
Log3 ($name, 5, "$name - Return Code: ".$res->code); $st = encode_base64 ( $state,"");
Log3 ($name, 5, "$name - Statistic data received:\n".Dumper decode_json($balancedataday_content)); return "$name|0|0|$errstate|$getp|$setp|$st";
} }
if ($balancedataday_content && $balancedataday_content !~ m/undefined/ix) { if ($balancedataday_content && $balancedataday_content !~ m/undefined/ix) {
@ -964,8 +973,11 @@ sub GetSetData { ## no cri
tag => "forecastData" tag => "forecastData"
}); });
$paref = [ $hash,$errstate,$state,$forecastdata ]; ($reread,$retry,$errstate,$state) = analyzeData ({ hash => $hash,
($reread,$retry,$errstate,$state) = analyzeData($paref); errstate => $errstate,
state => $state,
data => $forecastdata
});
if($errstate) { if($errstate) {
$st = encode_base64 ($state, ""); $st = encode_base64 ($state, "");
@ -991,8 +1003,11 @@ sub GetSetData { ## no cri
tag => "consumerLiveData" tag => "consumerLiveData"
}); });
$paref = [ $hash,$errstate,$state,$consumerlivedata ]; ($reread,$retry,$errstate,$state) = analyzeData ({ hash => $hash,
($reread,$retry,$errstate,$state) = analyzeData($paref); errstate => $errstate,
state => $state,
data => $consumerlivedata
});
if($errstate) { if($errstate) {
$st = encode_base64 ( $state,""); $st = encode_base64 ( $state,"");
@ -1177,7 +1192,7 @@ return ($state, $errstate);
} }
################################################################ ################################################################
# Standard Abruf Daten # Standard Abruf Daten GET
################################################################ ################################################################
sub _getData { sub _getData {
my $paref = shift; my $paref = shift;
@ -1205,6 +1220,37 @@ sub _getData {
return ($data,$dcont); return ($data,$dcont);
} }
################################################################
# Standard Abruf Daten POST
################################################################
sub _putData {
my $paref = shift;
my $name = $paref->{name};
my $ua = $paref->{ua};
my $call = $paref->{call};
my $fields = $paref->{fields};
my $content = $paref->{content};
my $tag = $paref->{tag};
my $v5d = AttrVal($name, "verbose5Data", "none");
my $cont;
Log3 ($name, 4, "$name - Getting $tag");
my $data = $ua->post( $call, %$fields, Content => $content );
my $dcont = $data->content;
$cont = eval{decode_json($dcont)} or do { $cont = $dcont };
if($v5d eq $tag) {
Log3 ($name, 5, "$name - Return Code: ".$data->code);
Log3 ($name, 5, "$name - $tag received:\n".Dumper $cont);
}
return ($data,$dcont);
}
################################################################ ################################################################
## Verarbeitung empfangene Daten, setzen Readings ## Verarbeitung empfangene Daten, setzen Readings
################################################################ ################################################################
@ -2044,10 +2090,10 @@ return 1;
################################################################ ################################################################
sub analyzeData { ## no critic 'complexity' sub analyzeData { ## no critic 'complexity'
my $paref = shift; my $paref = shift;
my $hash = $paref->[0]; my $hash = $paref->{hash};
my $errstate = $paref->[1]; my $errstate = $paref->{errstate};
my $state = $paref->[2]; my $state = $paref->{state};
my $ad = $paref->[3]; my $ad = $paref->{data};
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my ($reread,$retry) = (0,0); my ($reread,$retry) = (0,0);
my $data = ""; my $data = "";
@ -2114,7 +2160,7 @@ sub analyzeData { ## no
$state = ($p1 // "")." ".($p2 // ""); $state = ($p1 // "")." ".($p2 // "");
} }
Log3 ($name, 5, "$name - No JSON Data received:\n ".$njdat) if($v5d eq "loginData"); Log3 ($name, 5, "$name - No JSON Data received:\n ".$njdat);
$errstate = 1; $errstate = 1;
} }