|
@@ -433,8 +433,9 @@
|
|
|
setTimeout(() => {
|
|
|
getDataByKey(db, storeName, userCardId);
|
|
|
}, 1000);
|
|
|
-
|
|
|
- var timerInterval = null, timeInterval = 0;
|
|
|
+
|
|
|
+ var timerInterval = null,
|
|
|
+ timeInterval = 0;
|
|
|
function connect(type) {
|
|
|
$.ajax({
|
|
|
url: baseUrl + '/api/resources/user/cloud/connect',
|
|
@@ -501,21 +502,21 @@
|
|
|
} else if (res.status === 5200) {
|
|
|
if (timeInterval > 7) {
|
|
|
$.toast('网络异常,请稍后重试', 'text');
|
|
|
- timerInterval = clearTimeout()
|
|
|
+ timerInterval = clearTimeout();
|
|
|
setTimeout(() => {
|
|
|
quit();
|
|
|
- }, 3000)
|
|
|
- return
|
|
|
+ }, 3000);
|
|
|
+ return;
|
|
|
}
|
|
|
timerInterval = setTimeout(() => {
|
|
|
connect(type);
|
|
|
timeInterval += 1;
|
|
|
- }, 3000)
|
|
|
- } else {
|
|
|
+ }, 3000);
|
|
|
+ } else {
|
|
|
$.toast('画面异常,请重新进入', 'text');
|
|
|
setTimeout(() => {
|
|
|
quit();
|
|
|
- }, 3000)
|
|
|
+ }, 3000);
|
|
|
}
|
|
|
},
|
|
|
});
|
|
@@ -1489,8 +1490,10 @@
|
|
|
JSON.stringify({
|
|
|
type: 'setPhoneSize',
|
|
|
data: {
|
|
|
+ id: config.id,
|
|
|
width: config.width,
|
|
|
height: config.height,
|
|
|
+ dpi: config.dpi,
|
|
|
},
|
|
|
}),
|
|
|
);
|
|
@@ -1503,6 +1506,7 @@
|
|
|
id: config.id,
|
|
|
width: config.width,
|
|
|
height: config.height,
|
|
|
+ dpi: config.dpi,
|
|
|
desc: '分辨率修改', // 可选
|
|
|
},
|
|
|
}),
|
|
@@ -1520,9 +1524,10 @@
|
|
|
contentType: 'application/json; charset=UTF-8',
|
|
|
data: JSON.stringify({
|
|
|
userCardId: window.userCardId,
|
|
|
+ resolvingPowerId: config.id,
|
|
|
width: config.width,
|
|
|
height: config.height,
|
|
|
- resolvingPowerId: config.id,
|
|
|
+ dpi: config.dpi,
|
|
|
}),
|
|
|
});
|
|
|
|