Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
safetcut-app
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
atichat
safetcut-app
Commits
d1e3a0e4
Commit
d1e3a0e4
authored
Sep 29, 2019
by
HaOuiha
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
54d429fa
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
android/app/release/app-release.apk
+0
-0
android/build.gradle
+1
-1
screens/Private/SmartMeterScreen/SmartMeterDetailScreen.js
+5
-5
No files found.
android/app/release/app-release.apk
View file @
d1e3a0e4
No preview for this file type
android/build.gradle
View file @
d1e3a0e4
...
...
@@ -14,7 +14,7 @@ buildscript {
maven
{
url
"https://maven.google.com"
}
}
dependencies
{
classpath
(
"com.android.tools.build:gradle:3.4.1"
)
classpath
(
'com.android.tools.build:gradle:3.5.0'
)
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
...
...
screens/Private/SmartMeterScreen/SmartMeterDetailScreen.js
View file @
d1e3a0e4
...
...
@@ -54,13 +54,13 @@ class SmartMeterDetailScreen extends Component {
_mcbLinksListMounted
=
false
;
getDataInterval
=
null
;
deviceId
=
this
.
props
.
navigation
.
getParam
(
'deviceId'
);
getData
=
async
()
=>
{
const
deviceId
=
this
.
props
.
navigation
.
getParam
(
'deviceId'
);
await
this
.
props
.
getCurrentSelectedData
(
deviceId
,
true
);
await
this
.
props
.
getCurrentSelectedData
(
this
.
deviceId
,
true
);
await
this
.
props
.
getTimers
();
this
.
getDataInterval
=
setInterval
(()
=>
this
.
props
.
getCurrentSelectedData
(
deviceId
),
6000
);
this
.
getDataInterval
=
setInterval
(()
=>
this
.
props
.
getCurrentSelectedData
(
this
.
deviceId
),
6000
);
};
componentDidMount
=
async
()
=>
{
...
...
@@ -110,7 +110,7 @@ class SmartMeterDetailScreen extends Component {
this
.
setState
({
isWaiting
:
true
});
await
this
.
props
.
setMainStatus
(
value
);
this
.
setState
({
isWaiting
:
false
});
this
.
getDataInterval
=
setInterval
(()
=>
this
.
props
.
getCurrentSelectedData
(
deviceId
),
6000
);
this
.
getDataInterval
=
setInterval
(()
=>
this
.
props
.
getCurrentSelectedData
(
this
.
deviceId
),
6000
);
};
componentWillUnmount
=
()
=>
{
...
...
@@ -253,7 +253,7 @@ class SmartMeterDetailScreen extends Component {
this
.
setState
({
isWaiting
:
true
});
await
this
.
props
.
setSubBreakerStatus
(
value
,
indexMcbLinks
,
indexSubBreakers
);
this
.
setState
({
isWaiting
:
false
});
this
.
getDataInterval
=
setInterval
(()
=>
this
.
props
.
getCurrentSelectedData
(
deviceId
),
6000
);
this
.
getDataInterval
=
setInterval
(()
=>
this
.
props
.
getCurrentSelectedData
(
this
.
deviceId
),
6000
);
};
return
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment