Skip to content

D
DoorLock
Commit 22735af2 by 朱建香
Options

1123

parent 6ea9af5f
Showing with 75 additions and 86 deletions
dev/src/view/device/v_index.js
......@@ -697,12 +697,14 @@ function getLockInfo(self){
//设置设备信息
function setDevceInfo(self, data) {
console.log(data);
self.setBatteryPercent(data.BatteryPercentage.value);
if(data.BatteryPercentage.value >= 10){
//向上取整
self.setBatteryState(config.powerIcon[Math.ceil(data.BatteryPercentage.value/20)]);
}else{
self.setBatteryState(config.powerIcon[Math.round(data.BatteryPercentage.value/20)]);
if(data.BatteryPercentage){
self.setBatteryPercent(data.BatteryPercentage.value);
if(data.BatteryPercentage.value >= 10){
//向上取整
self.setBatteryState(config.powerIcon[Math.ceil(data.BatteryPercentage.value/20)]);
}else{
self.setBatteryState(config.powerIcon[Math.round(data.BatteryPercentage.value/20)]);
}
}
if(data.action.value == 'notify'){
if(data.notify_type.value == 104){
......
dev/src/view/login/v_index.js
......@@ -21,15 +21,17 @@ function init() {
showLoginButtonFlag: true
},
mounted(){
// loginButtonTap(this);
if(window.iotDebug){
iotDebug.push('start: Debug');
}
var self = this;
if (plus.os.name == 'Android') {
iot.permission.checkPermission(['READ_EXTERNAL_STORAGE'], function (res) {
console.log('success', res);
var clientInfo = plus.push.getClientInfo();
self.setClientId(clientInfo.clientid);
self.setClientId(clientInfo.clientid);
loginButtonTap(self);
}, function (err) {
console.log('error', err);
......@@ -83,79 +85,60 @@ function initComponentsConfig() {
}
function loginButtonTap(self){
uComponents.showLoading(self);
if(window.iotDebug){
iotDebug.push('start: initSDSLogin');
}
iot.business.sds.init({
data: {
oa: true
},
success: (response) => {
console.log(response);
if(window.iotDebug){
iotDebug.push('end: initSDSLoginSuccess');
}
if(window.iotDebug){
iotDebug.push('start: SDSlogin');
}
iot.business.user.login({
data: {
sds: true
},
success: (response) => {
console.log(response);
if(window.iotDebug){
iotDebug.push('end: SDSloginSuccees');
}
// console.log(response);
// alert(JSON.stringify(response));
var data = uPublic.checkResponseData(response.data);
if(data){
self.setShowLoginButtonFlag(false);
if(data.hasOwnProperty('UserID')){
console.log("sds登陆成功了");
cloudsLogin(self, data.UserID);
}
// iot.navigator.openWindow({
// url: '../device/index.html',
// id: 'device'
// });
}else{
}
},
error: (error) => {
console.log(error);
if(window.iotDebug){
iotDebug.push('end: sds登陆失败'+JSON.stringify(error));
}
if (window.iotDebug) {
iotDebug.upload(iot,'sds登陆失败');
}
//请求失败
// uPublic.openRequestErrorAlert(self);
},
complete: () => {
uComponents.hideLoading(self);
}
});
},
error: (error) => {
console.log(error);
if(window.iotDebug){
iotDebug.push('end: sds登陆初始化失败'+JSON.stringify(error));
}
if (window.iotDebug) {
iotDebug.upload(iot,'sds登陆初始化失败');
}
//请求失败
uPublic.openRequestErrorAlert(self);
},
complete: () => {
uComponents.hideLoading(self);
// uComponents.showLoading(self);
// if(window.iotDebug){
// iotDebug.push('start: initSDSLogin');
// }
window.SDSPlugin.login({},(res)=>{
console.log(res);
var data = uPublic.checkResponseData(res.data);
if(data){
cloudsLogin(self, data.UserID);
}
});
},(err)=>{
console.log(err);
})
// iot.business.sds.login({
// data: {
//// sds: true
// },
// success: (response) => {
//// console.log(response);
//// if(window.iotDebug){
//// iotDebug.push('end: SDSloginSuccees');
//// }
////// console.log(response);
////// alert(JSON.stringify(response));
//// var data = uPublic.checkResponseData(response.data);
//// if(data){
//// self.setShowLoginButtonFlag(false);
//// if(data.hasOwnProperty('UserID')){
//// console.log("sds登陆成功了");
//// cloudsLogin(self, data.UserID);
//// }
////// iot.navigator.openWindow({
////// url: '../device/index.html',
////// id: 'device'
////// });
//// }else{
////
//// }
// },
// error: (error) => {
//// console.log(error);
//// if(window.iotDebug){
//// iotDebug.push('end: sds登陆失败'+JSON.stringify(error));
//// }
//// if (window.iotDebug) {
//// iotDebug.upload(iot,'sds登陆失败');
//// }
//// //请求失败
////// uPublic.openRequestErrorAlert(self);
// },
// complete: () => {
//// uComponents.hideLoading(self);
// }
// });
}
function cloudsLogin(self, id){
......@@ -179,6 +162,7 @@ function cloudsLogin(self, id){
url: '../device/index.html',
id: 'device'
});
plus.navigator.closeSplashscreen();
// uPublic.openWindow({
// url: '../device/index.html',
// id: 'device',
......
web/lib/js/start.js
......@@ -26,7 +26,7 @@ UIOT_Debug.prototype.upload = function (iot,title) {
http.open('POST', 'https://admin.iot.u-gen.net/admin/api/debug/uploadDebugLog', true);
http.setRequestHeader('Accept', 'application/json');
http.setRequestHeader('Content-type', 'application/json; charset=UTF-8');
http.onreadystatechange = () => {
http.onreadystatechange = function() {
if (http.readyState === 4 && http.status === 200) {
var response = JSON.parse(http.responseText);
// console.log(response);
......
web/view/device/index.js
......@@ -24588,12 +24588,14 @@ function getLockInfo(self) {
//设置设备信息
function setDevceInfo(self, data) {
console.log(data);
self.setBatteryPercent(data.BatteryPercentage.value);
if (data.BatteryPercentage.value >= 10) {
//向上取整
self.setBatteryState(_config2.default.powerIcon[Math.ceil(data.BatteryPercentage.value / 20)]);
} else {
self.setBatteryState(_config2.default.powerIcon[Math.round(data.BatteryPercentage.value / 20)]);
if (data.BatteryPercentage) {
self.setBatteryPercent(data.BatteryPercentage.value);
if (data.BatteryPercentage.value >= 10) {
//向上取整
self.setBatteryState(_config2.default.powerIcon[Math.ceil(data.BatteryPercentage.value / 20)]);
} else {
self.setBatteryState(_config2.default.powerIcon[Math.round(data.BatteryPercentage.value / 20)]);
}
}
if (data.action.value == 'notify') {
if (data.notify_type.value == 104) {
......
web/view/login/index.html
......@@ -17,6 +17,7 @@
<script type="text/javascript" src="../../lib/js/start.js"></script>
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
<script type="text/javascript" src="../../lib/js/SDSPlugin.js"></script>
</head>
<body ontouchstart="">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment