Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DoorLock
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
朱建香
DoorLock
Commits
d2083240
Commit
d2083240
authored
Jan 03, 2018
by
朱建香
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2018/01/03 18:06
1.将config的配置放到defaultConfig里,,并修改配网和门锁管理页面
parent
afc5bcad
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
dev/src/public/defaultConfig.js
+3
-1
dev/src/view/addDevice/v_wifiAdd.js
+3
-2
dev/src/view/doorlockManage/v_index.js
+2
-1
No files found.
dev/src/public/defaultConfig.js
View file @
d2083240
export
default
{
export
default
{
"url"
:
"https://cloud.iot.u-gen.net/"
"url"
:
"https://cloud.iot.u-gen.net/"
,
"model"
:
"USMARTLOCK_SECURITY_SMARTDOOR_SMART_LOCK"
,
}
}
\ No newline at end of file
dev/src/view/addDevice/v_wifiAdd.js
View file @
d2083240
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
*/
*/
import
config
from
'../../public/config.js'
;
import
config
from
'../../public/config.js'
;
import
defaultConfig
from
'../../public/defaultConfig.js'
;
import
{
iot
,
uPublic
,
uComponents
}
from
'../../public/public.js'
;
import
{
iot
,
uPublic
,
uComponents
}
from
'../../public/public.js'
;
iot
.
ready
(
init
);
iot
.
ready
(
init
);
...
@@ -157,7 +158,7 @@ function connectButtonTap(self){
...
@@ -157,7 +158,7 @@ function connectButtonTap(self){
uComponents
.
showCommLoading
(
self
);
uComponents
.
showCommLoading
(
self
);
iot
.
business
.
sds
.
findWifi
({
iot
.
business
.
sds
.
findWifi
({
data
:
{
data
:
{
model
:
c
onfig
.
model
,
model
:
defaultC
onfig
.
model
,
ssid
:
self
.
getTextWiFiName
(),
ssid
:
self
.
getTextWiFiName
(),
wifiPwd
:
self
.
getTextPassword
(),
wifiPwd
:
self
.
getTextPassword
(),
timeout
:
20000
timeout
:
20000
...
@@ -215,7 +216,7 @@ function connectButtonTap(self){
...
@@ -215,7 +216,7 @@ function connectButtonTap(self){
if
(
window
.
iotDebug
)
{
if
(
window
.
iotDebug
)
{
iotDebug
.
upload
(
iot
,
'找设备'
);
iotDebug
.
upload
(
iot
,
'找设备'
);
}
}
let
productId
=
c
onfig
.
model
;
let
productId
=
defaultC
onfig
.
model
;
if
(
response
.
data
==
"onJoining"
){
if
(
response
.
data
==
"onJoining"
){
if
(
window
.
iotDebug
){
if
(
window
.
iotDebug
){
iotDebug
.
push
(
'end: 激活中'
+
JSON
.
stringify
(
response
));
iotDebug
.
push
(
'end: 激活中'
+
JSON
.
stringify
(
response
));
...
...
dev/src/view/doorlockManage/v_index.js
View file @
d2083240
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
*/
*/
import
config
from
'../../public/config.js'
;
import
config
from
'../../public/config.js'
;
import
defaultConfig
from
'../../public/defaultConfig.js'
;
import
{
iot
,
uPublic
,
uComponents
}
from
'../../public/public.js'
;
import
{
iot
,
uPublic
,
uComponents
}
from
'../../public/public.js'
;
import
{
projectMethods
}
from
'../../public/components.js'
;
import
{
projectMethods
}
from
'../../public/components.js'
;
...
@@ -199,7 +200,7 @@ function initComponentsConfig() {
...
@@ -199,7 +200,7 @@ function initComponentsConfig() {
function
getDoorlockInfo
(
self
){
function
getDoorlockInfo
(
self
){
uComponents
.
showLoading
(
self
);
uComponents
.
showLoading
(
self
);
let
productId
=
c
onfig
.
model
;
let
productId
=
defaultC
onfig
.
model
;
iot
.
business
.
device
.
getInfo
({
iot
.
business
.
device
.
getInfo
({
data
:
{
data
:
{
device_id
:
self
.
extras
.
lockInfo
.
lock_id
device_id
:
self
.
extras
.
lockInfo
.
lock_id
...
...
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