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
34666832
Commit
34666832
authored
Sep 29, 2019
by
HaOuiha
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
d1e3a0e4
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
13 deletions
+20
-13
.gitignore
+3
-0
screens/Private/CameraScreen.js
+2
-2
screens/Private/ProfileScreen/ChangePasswordScreen.js
+1
-1
screens/Private/SmartMeterScreen/SmartMeterDetailScreen.js
+4
-0
screens/Public/RegisterScreen.js
+10
-10
No files found.
.gitignore
View file @
34666832
...
...
@@ -55,3 +55,5 @@ buck-out/
# Bundle artifact
*.jsbundle
*android/app/release
\ No newline at end of file
screens/Private/CameraScreen.js
View file @
34666832
...
...
@@ -44,12 +44,12 @@ class CameraScreen extends Component {
this
.
setState
({
isWaiting
:
true
});
},
250
);
/*--------------------------------------------------------------------*/
this
.
createNewDevice
(
'7cb6e9aa-0a44-47d6-bca8-4d724b0fcd43'
);
//
this.createNewDevice('7cb6e9aa-0a44-47d6-bca8-4d724b0fcd43');
};
componentDidUpdate
=
(
prevProps
,
prevState
)
=>
{
if
(
this
.
props
.
isFocused
!==
prevProps
.
isFocused
)
{
this
.
props
.
getAllMainDeviceInfo
();
this
.
state
.
scanned
&&
this
.
props
.
getAllMainDeviceInfo
();
}
};
...
...
screens/Private/ProfileScreen/ChangePasswordScreen.js
View file @
34666832
...
...
@@ -61,7 +61,7 @@ export default class ChangePasswordScreen extends React.Component {
logout
=
async
()
=>
{
this
.
setState
({
changeSuccessModal
:
false
});
this
.
props
.
navigation
.
navigate
(
'Login'
);
await
AsyncStorage
.
clear
(
);
await
AsyncStorage
.
removeItem
(
'RememberedLogin'
);
};
render
()
{
...
...
screens/Private/SmartMeterScreen/SmartMeterDetailScreen.js
View file @
34666832
...
...
@@ -85,6 +85,10 @@ class SmartMeterDetailScreen extends Component {
this
.
setSubBreakersState
();
}
if
(
prevProps
.
isFocused
!==
this
.
props
.
isFocused
)
{
if
(
this
.
props
.
isFocused
===
true
)
{
clearInterval
(
this
.
getDataInterval
);
this
.
getDataInterval
=
setInterval
(()
=>
this
.
props
.
getCurrentSelectedData
(
this
.
deviceId
),
6000
);
}
// when not focud this page
if
(
this
.
props
.
isFocused
===
false
)
{
this
.
_mcbLinksListMounted
=
false
;
...
...
screens/Public/RegisterScreen.js
View file @
34666832
...
...
@@ -56,16 +56,16 @@ class RegisterScreen extends Component {
}
};
sendEmail
=
async
()
=>
{
const
user
=
app
.
auth
().
currentUser
;
try
{
await
user
.
sendEmailVerification
().
then
(()
=>
{
app
.
auth
().
signOut
();
});
}
catch
(
error
)
{
alert
(
error
);
}
};
//
sendEmail = async () => {
//
const user = app.auth().currentUser;
//
try {
//
await user.sendEmailVerification().then(() => {
//
app.auth().signOut();
//
});
//
} catch (error) {
//
alert(error);
//
}
//
};
render
()
{
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