sky/starcloud-sdk-uniapp
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: sky:e351a939f6744b581eecebb905818aee4c0b4d2a
Branches Tags
sky:develop_sky
..
compare: sky:2cd828e7cf27f63ce4042726e8f5dc7db301796a
Branches Tags
sky:develop_sky

No commits in common. "e351a939f6744b581eecebb905818aee4c0b4d2a" and "2cd828e7cf27f63ce4042726e8f5dc7db301796a" have entirely different histories.
e351a939f6 ... 2cd828e7cf

9 changed files with 389 additions and 501 deletions
Show Stats Expand all files Collapse all files

632
api.js
View File

@ -1,220 +1,221 @@
import {request} from './export' import { request } from './export'
// 创建账号 // 创建账号
export function starCloudCreateUser(data) { export function starCloudCreateUser(data) {
return request({ return request({
url: '/createUser', url: '/createUser',
method: 'POST', method: 'POST',
data data
}) })
} }
// 获取访问令牌 // 获取访问令牌
export function getStarCloudToken(data) { export function getStarCloudToken(data) {
return request({ return request({
url: '/oauth2/token', url: '/oauth2/token',
method: 'POST', method: 'POST',
data data
}) })
} }
// 更新锁用户 // 更新锁用户
export function updateLockUserNoRequest(data) { export function updateLockUserNoRequest(data) {
return request({ return request({
url: '/v1/key/updateLockUserNo', url: '/v1/key/updateLockUserNo',
method: 'POST', method: 'POST',
data data
}) })
} }
// 获取所有锁用户 // 获取所有锁用户
export function getUserNoListRequest(data) { export function getUserNoListRequest(data) {
return request({ return request({
url: '/v1/key/getUserNoList', url: '/v1/key/getUserNoList',
method: 'POST', method: 'POST',
data data
}) })
} }
// 获取手机联网token // 获取手机联网token
export function getLockNetTokenRequest(data) { export function getLockNetTokenRequest(data) {
return request({ return request({
url: '/v1/lock/getLockNetToken', url: '/v1/lock/getLockNetToken',
method: 'POST', method: 'POST',
data data
}) })
} }
// 获取服务器时间 // 获取服务器时间
export function getServerDatetimeRequest(data) { export function getServerDatetimeRequest(data) {
return request({ return request({
url: '/v1/lock/queryDate', url: '/v1/lock/queryDate',
method: 'POST', method: 'POST',
data data
}) })
} }
// 获取锁详情 // 获取锁详情
export function getLockDetailRequest(data) { export function getLockDetailRequest(data) {
return request({ return request({
url: '/v1/lock/detail', url: '/v1/lock/detail',
method: 'POST', method: 'POST',
data data
}) })
} }
// 获取离线密码 // 获取离线密码
export function getOfflinePasswordRequest(data) { export function getOfflinePasswordRequest(data) {
return request({ return request({
url: '/v1/keyboardPwd/get', url: '/v1/keyboardPwd/get',
method: 'POST', method: 'POST',
data data
}) })
} }
// 添加自定义密码 // 添加自定义密码
export function addCustomPasswordRequest(data) { export function addCustomPasswordRequest(data) {
return request({ return request({
url: '/v1/keyboardPwd/add', url: '/v1/keyboardPwd/add',
method: 'POST', method: 'POST',
data data
}) })
} }
// 更新密码 // 更新密码
export function updatePasswordRequest(data) { export function updatePasswordRequest(data) {
return request({ return request({
url: '/v1/keyboardPwd/update', url: '/v1/keyboardPwd/update',
method: 'POST', method: 'POST',
data data
}) })
} }
// 删除密码 // 删除密码
export function deletePasswordRequest(data) { export function deletePasswordRequest(data) {
return request({ return request({
url: '/v1/keyboardPwd/delete', url: '/v1/keyboardPwd/delete',
method: 'POST', method: 'POST',
data data
}) })
} }
// 绑定智能锁 // 绑定智能锁
export function bindLockRequest(data) { export function bindLockRequest(data) {
return request({ return request({
url: '/v1/lock/initialize', url: '/v1/lock/initialize',
method: 'POST', method: 'POST',
data data
}) })
} }
// 移除坏锁 // 移除坏锁
export function removeBadLockRequest(data) { export function removeBadLockRequest(data) {
return request({ return request({
url: '/v1/lock/removeBadLock', url: '/v1/lock/removeBadLock',
method: 'POST', method: 'POST',
data data
}) })
} }
// 删除锁 // 删除锁
export function deleteLockRequest(data) { export function deleteLockRequest(data) {
return request({ return request({
url: '/v1/lock/delete', url: '/v1/lock/delete',
method: 'POST', method: 'POST',
data data
}) })
} }
// 更新锁电量 // 更新锁电量
export function updateElectricQuantityRequest(data) { export function updateElectricQuantityRequest(data) {
return request({ return request({
url: '/v1/lock/updateElectricQuantity', url: '/v1/lock/updateElectricQuantity',
method: 'POST', method: 'POST',
data data
}) })
} }
// 修改管理员密码 // 修改管理员密码
export function changeAdminKeyboardPwdRequest(data) { export function changeAdminKeyboardPwdRequest(data) {
return request({ return request({
url: '/v1/lock/changeAdminKeyboardPwd', url: '/v1/lock/changeAdminKeyboardPwd',
method: 'POST', method: 'POST',
data data
}) })
} }
// 获取操作记录的最后上传时间 // 获取操作记录的最后上传时间
export function getLastRecordTimeRequest(data) { export function getLastRecordTimeRequest(data) {
return request({ return request({
url: '/v1/lockRecord/getLastRecordTime', url: '/v1/lockRecord/getLastRecordTime',
method: 'POST', method: 'POST',
data data
}) })
} }
// 上传操作记录 // 上传操作记录
export function uploadRecordRequest(data) { export function uploadRecordRequest(data) {
return request({ return request({
url: '/v1/lockRecord/upload', url: '/v1/lockRecord/upload',
method: 'POST', method: 'POST',
data data
}) })
} }
// 获取锁应用设置 // 获取锁应用设置
export function getLockSettingDataRequest(data) { export function getLockSettingDataRequest(data) {
return request({ return request({
url: '/v1/lock/getLockSettingData', url: '/v1/lock/getLockSettingData',
method: 'POST', method: 'POST',
data data
}) })
} }
// 检查密码和密码名称是否已存在 // 检查密码和密码名称是否已存在
export function checkPasswordRequest(data) { export function checkPasswordRequest(data) {
return request({ return request({
url: '/v1/keyboardPwd/checkKeyboardpwdName', url: '/v1/keyboardPwd/checkKeyboardpwdName',
method: 'POST', method: 'POST',
data data
}) })
} }
//电表-刷新电表数据 //电表-刷新电表数据
export function elecRefreshElecInfoRequest(data) { export function elecRefreshElecInfoRequest(data) {
return request({ return request({
url: '/v1/elec/refreshElecInfo', url: '/v1/elec/refreshElecInfo',
method: 'POST', method: 'POST',
data data
}) })
} }
export function updateElecSettingRequest(data) { export function updateElecSettingRequest(data) {
return request({ return request({
url: '/v1/elec/updateElecSetting', url: '/v1/elec/updateElecSetting',
method: 'POST', method: 'POST',
data data
}) })
} }
//冷水表-刷新水表数据 //冷水表-刷新水表数据
export function coldWaterRefreshWaterInfoRequest(data) { export function coldWaterRefreshWaterInfoRequest(data) {
return request({ return request({
url: '/v1/coldWater/refreshWaterInfo', url: '/v1/coldWater/refreshWaterInfo',
method: 'POST', method: 'POST',
data data
}) })
} }
//热水表-刷新水表数据 //热水表-刷新水表数据
export function hotWaterRefreshWaterInfoRequest(data) { export function hotWaterRefreshWaterInfoRequest(data) {
return request({ return request({
url: '/v1/hotWater/refreshWaterInfo', url: '/v1/hotWater/refreshWaterInfo',
method: 'POST', method: 'POST',
data data
}) })
} }
@ -235,11 +236,11 @@ export function hotWaterRefreshWaterInfoRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function addIcCardRequest(data) { export function addIcCardRequest(data) {
return request({ return request({
url: '/v1/identityCard/add', url: '/v1/identityCard/add',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -255,11 +256,11 @@ export function addIcCardRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function updateIcCardRequest(data) { export function updateIcCardRequest(data) {
return request({ return request({
url: '/v1/identityCard/update', url: '/v1/identityCard/update',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -269,11 +270,11 @@ export function updateIcCardRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function deleteIcCardRequest(data) { export function deleteIcCardRequest(data) {
return request({ return request({
url: '/v1/identityCard/delete', url: '/v1/identityCard/delete',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -282,11 +283,11 @@ export function deleteIcCardRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function clearAllIcCard(data) { export function clearAllIcCard(data) {
return request({ return request({
url: '/v1/identityCard/clear', url: '/v1/identityCard/clear',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -296,11 +297,11 @@ export function clearAllIcCard(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function checkRepeatCardName(data) { export function checkRepeatCardName(data) {
return request({ return request({
url: '/v1/identityCard/checkIdentityCardName', url: '/v1/identityCard/checkIdentityCardName',
method: 'POST', method: 'POST',
data data
}) })
} }
@ -312,14 +313,15 @@ export function checkRepeatCardName(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function getIcCardListRequest(data) { export function getIcCardListRequest(data) {
return request({ return request({
url: '/v1/identityCard/list', url: '/v1/identityCard/list',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
* 指纹-添加(永久/限时/单次/循环) * 指纹-添加(永久/限时/单次/循环)
* *
@ -337,11 +339,11 @@ export function getIcCardListRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function addFingerprintRequest(data) { export function addFingerprintRequest(data) {
return request({ return request({
url: '/v1/fingerprint/add', url: '/v1/fingerprint/add',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -357,11 +359,11 @@ export function addFingerprintRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function updateFingerprintRequest(data) { export function updateFingerprintRequest(data) {
return request({ return request({
url: '/v1/fingerprint/update', url: '/v1/fingerprint/update',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -375,11 +377,11 @@ export function updateFingerprintRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function deleteFingerprintRequest(data) { export function deleteFingerprintRequest(data) {
return request({ return request({
url: '/v1/fingerprint/delete', url: '/v1/fingerprint/delete',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -388,11 +390,11 @@ export function deleteFingerprintRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function clearAllFingerprint(data) { export function clearAllFingerprint(data) {
return request({ return request({
url: '/v1/fingerprint/clear', url: '/v1/fingerprint/clear',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -402,11 +404,11 @@ export function clearAllFingerprint(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function checkRepeatFingerprintName(data) { export function checkRepeatFingerprintName(data) {
return request({ return request({
url: '/v1/fingerprint/checkFingerprintName', url: '/v1/fingerprint/checkFingerprintName',
method: 'POST', method: 'POST',
data data
}) })
} }
@ -418,11 +420,11 @@ export function checkRepeatFingerprintName(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function getFingerprintListRequest(data) { export function getFingerprintListRequest(data) {
return request({ return request({
url: '/v1/fingerprint/list', url: '/v1/fingerprint/list',
method: 'POST', method: 'POST',
data data
}) })
} }
@ -443,11 +445,11 @@ export function getFingerprintListRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function addFaceRequest(data) { export function addFaceRequest(data) {
return request({ return request({
url: '/v1/face/add', url: '/v1/face/add',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -465,11 +467,11 @@ export function addFaceRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function updateFaceRequest(data) { export function updateFaceRequest(data) {
return request({ return request({
url: '/v1/face/update', url: '/v1/face/update',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -479,11 +481,11 @@ export function updateFaceRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function deleteFaceRequest(data) { export function deleteFaceRequest(data) {
return request({ return request({
url: '/v1/face/delete', url: '/v1/face/delete',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -492,11 +494,11 @@ export function deleteFaceRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function clearAllFace(data) { export function clearAllFace(data) {
return request({ return request({
url: '/v1/face/clear', url: '/v1/face/clear',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -506,11 +508,11 @@ export function clearAllFace(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function checkRepeatFaceName(data) { export function checkRepeatFaceName(data) {
return request({ return request({
url: '/v1/face/checkFaceName', url: '/v1/face/checkFaceName',
method: 'POST', method: 'POST',
data data
}) })
} }
@ -522,11 +524,11 @@ export function checkRepeatFaceName(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function getFaceListRequest(data) { export function getFaceListRequest(data) {
return request({ return request({
url: '/v1/face/list', url: '/v1/face/list',
method: 'POST', method: 'POST',
data data
}) })
} }
@ -547,11 +549,11 @@ export function getFaceListRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function addPalmVeinRequest(data) { export function addPalmVeinRequest(data) {
return request({ return request({
url: '/v1/palmVein/add', url: '/v1/palmVein/add',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -569,11 +571,11 @@ export function addPalmVeinRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function updatePalmVeinRequest(data) { export function updatePalmVeinRequest(data) {
return request({ return request({
url: '/v1/palmVein/update', url: '/v1/palmVein/update',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -583,11 +585,11 @@ export function updatePalmVeinRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function deletePalmVeinRequest(data) { export function deletePalmVeinRequest(data) {
return request({ return request({
url: '/v1/palmVein/delete', url: '/v1/palmVein/delete',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -596,11 +598,11 @@ export function deletePalmVeinRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function clearAllPalmVein(data) { export function clearAllPalmVein(data) {
return request({ return request({
url: '/v1/palmVein/clear', url: '/v1/palmVein/clear',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -610,11 +612,11 @@ export function clearAllPalmVein(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function checkRepeatPalmVeinName(data) { export function checkRepeatPalmVeinName(data) {
return request({ return request({
url: '/v1/palmVein/checkPalmVeinName', url: '/v1/palmVein/checkPalmVeinName',
method: 'POST', method: 'POST',
data data
}) })
} }
@ -626,14 +628,15 @@ export function checkRepeatPalmVeinName(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function getPalmVeinListRequest(data) { export function getPalmVeinListRequest(data) {
return request({ return request({
url: '/v1/palmVein/list', url: '/v1/palmVein/list',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
* 遥控-添加(永久/限时/循环) * 遥控-添加(永久/限时/循环)
* *
@ -651,11 +654,11 @@ export function getPalmVeinListRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function addRemoteRequest(data) { export function addRemoteRequest(data) {
return request({ return request({
url: '/v1/remote/add', url: '/v1/remote/add',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -673,11 +676,11 @@ export function addRemoteRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function updateRemoteRequest(data) { export function updateRemoteRequest(data) {
return request({ return request({
url: '/v1/remote/update', url: '/v1/remote/update',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -687,11 +690,11 @@ export function updateRemoteRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function deleteRemoteRequest(data) { export function deleteRemoteRequest(data) {
return request({ return request({
url: '/v1/remote/delete', url: '/v1/remote/delete',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -700,11 +703,11 @@ export function deleteRemoteRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function clearAllRemote(data) { export function clearAllRemote(data) {
return request({ return request({
url: '/v1/remote/clear', url: '/v1/remote/clear',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -714,11 +717,11 @@ export function clearAllRemote(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function checkRepeatRemoteName(data) { export function checkRepeatRemoteName(data) {
return request({ return request({
url: '/v1/remote/checkRemoteName', url: '/v1/remote/checkRemoteName',
method: 'POST', method: 'POST',
data data
}) })
} }
@ -730,11 +733,11 @@ export function checkRepeatRemoteName(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function getRemoteListRequest(data) { export function getRemoteListRequest(data) {
return request({ return request({
url: '/v1/remote/list', url: '/v1/remote/list',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -743,11 +746,11 @@ export function getRemoteListRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function remoteUnLockRequest(data) { export function remoteUnLockRequest(data) {
return request({ return request({
url: '/v1/gateway/unlock', url: '/v1/gateway/unlock',
method: 'POST', method: 'POST',
data data
}) })
} }
@ -757,11 +760,11 @@ export function remoteUnLockRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function getLockSettingRequest(data) { export function getLockSettingRequest(data) {
return request({ return request({
url: '/v1/lockSetting/getLockSetting', url: '/v1/lockSetting/getLockSetting',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -770,11 +773,11 @@ export function getLockSettingRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function updateLockSettingRequest(data) { export function updateLockSettingRequest(data) {
return request({ return request({
url: '/v1/lockSetting/updateLockSetting', url: '/v1/lockSetting/updateLockSetting',
method: 'POST', method: 'POST',
data data
}) })
} }
/** /**
@ -783,57 +786,10 @@ export function updateLockSettingRequest(data) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export function getUserLockListRequest(data) { export function getUserLockListRequest(data) {
return request({ return request({
url: '/v1/lock/list', url: '/v1/lock/list',
method: 'POST', method: 'POST',
data data
}) })
} }
/**
* 获取网关配置
* @returns {Promise<unknown>}
*/
export function getGatewayConfig(data) {
return request({
url: '/v1/gateway/getGatewayConfig',
method: 'POST',
data
})
}
/**
* 获取设备配网信息
* @param data.deviceType 设备类型：1-wifi网关 2-wifi锁
* @param data.deviceMac 网关/锁MAC地址
* @returns {Promise<unknown>}
*/
export function getDeviceNetworkInfo(data) {
return request({
url: '/v1/deviceNetwork/getNetworkInfo',
method: 'POST',
data
})
}
/**
* 更新设备配网信息
* @param data.deviceType 设备类型：1-wifi网关 2-wifi锁
* @param data.deviceMac 网关/锁MAC地址
* @param data.wifiName wifi名称
* @param data.networkMac 网络mac地址
* @param data.secretKey secretKey
* @param data.peerId 设备peerId
* @returns {Promise<unknown>}
*/
export function updateDeviceNetworkInfo(data) {
return request({
url: '/v1/deviceNetwork/setting',
method: 'POST',
data
})
}

36
common.js
View File

@ -3,7 +3,7 @@ import {
arrayToTimestamp, arrayToTimestamp,
convertWeekdaysToNumber, convertWeekdaysToNumber,
createPackageEnd, createPackageEnd,
md5Encrypt, parseNetworkJsonFromDecrypted, parseWifiList, md5Encrypt, parseWifiList,
removeTrailingZeros, removeTrailingZeros,
timestampToArray, timestampToArray,
uint8ArrayToString uint8ArrayToString
@ -30,7 +30,7 @@ import {
getLastRecordTimeRequest, getLastRecordTimeRequest,
getLockNetTokenRequest, getLockNetTokenRequest,
getStarCloudToken, getStarCloudToken,
getUserNoListRequest, updateDeviceNetworkInfo, getUserNoListRequest,
updateElectricQuantityRequest, updateElectricQuantityRequest,
updateFaceRequest, updateFaceRequest,
updateFingerprintRequest, updateFingerprintRequest,
@ -1020,7 +1020,7 @@ export async function parsingCharacteristicValue(binaryData) {
cardRight: this.requestParams.isAdmin, cardRight: this.requestParams.isAdmin,
lockId: this.lockInfo.lockId, lockId: this.lockInfo.lockId,
cardNumber: decrypted[6] * 256 + decrypted[7], cardNumber: decrypted[6] * 256 + decrypted[7],
cardUserNo: decrypted[6] * 256 + decrypted[7] cardUserNo: this.requestParams.cardUserNo
}) })
if (addResult.code === Result.Success.code) { if (addResult.code === Result.Success.code) {
// 增加返回一个卡序号 // 增加返回一个卡序号
@ -1106,7 +1106,7 @@ export async function parsingCharacteristicValue(binaryData) {
fingerRight: this.requestParams.isAdmin, fingerRight: this.requestParams.isAdmin,
lockId: this.lockInfo.lockId, lockId: this.lockInfo.lockId,
fingerprintNumber: decrypted[6] * 256 + decrypted[7], fingerprintNumber: decrypted[6] * 256 + decrypted[7],
fingerprintUserNo: decrypted[6] * 256 + decrypted[7] fingerprintUserNo: this.requestParams.fingerprintUserNo
}) })
if (addResult.code === Result.Success.code) { if (addResult.code === Result.Success.code) {
// 增加返回一个指纹序号 // 增加返回一个指纹序号
@ -1191,7 +1191,7 @@ export async function parsingCharacteristicValue(binaryData) {
fingerRight: this.requestParams.isAdmin, fingerRight: this.requestParams.isAdmin,
lockId: this.lockInfo.lockId, lockId: this.lockInfo.lockId,
faceNumber: decrypted[6] * 256 + decrypted[7], faceNumber: decrypted[6] * 256 + decrypted[7],
faceUserNo: decrypted[6] * 256 + decrypted[7] faceUserNo: this.requestParams.faceUserNo
}) })
if (addResult.code === Result.Success.code) { if (addResult.code === Result.Success.code) {
// 增加返回一个序号 // 增加返回一个序号
@ -1268,7 +1268,7 @@ export async function parsingCharacteristicValue(binaryData) {
palmVeinRight: this.requestParams.isAdmin, palmVeinRight: this.requestParams.isAdmin,
lockId: this.lockInfo.lockId, lockId: this.lockInfo.lockId,
palmVeinNumber: decrypted[6] * 256 + decrypted[7], palmVeinNumber: decrypted[6] * 256 + decrypted[7],
palmVeinUserNo: decrypted[6] * 256 + decrypted[7] palmVeinUserNo: this.requestParams.palmVeinUserNo
}) })
if (addResult.code === Result.Success.code) { if (addResult.code === Result.Success.code) {
// 增加返回一个卡序号 // 增加返回一个卡序号
@ -1343,7 +1343,7 @@ export async function parsingCharacteristicValue(binaryData) {
remoteRight: this.requestParams.isAdmin, remoteRight: this.requestParams.isAdmin,
lockId: this.lockInfo.lockId, lockId: this.lockInfo.lockId,
remoteNumber: decrypted[6] * 256 + decrypted[7], remoteNumber: decrypted[6] * 256 + decrypted[7],
remoteUserNo: decrypted[6] * 256 + decrypted[7] remoteUserNo: this.requestParams.remoteUserNo
}) })
if (addResult.code === Result.Success.code) { if (addResult.code === Result.Success.code) {
// 增加返回一个卡序号 // 增加返回一个卡序号
@ -1494,27 +1494,7 @@ export async function parsingCharacteristicValue(binaryData) {
break; break;
case cmdIds.configureNetworkResult: case cmdIds.configureNetworkResult:
if (decrypted[2] === Result.Success.code) { if (decrypted[2] === Result.Success.code) {
// 提取配网信息 this.characteristicValueCallback(new Result(decrypted[2], null, "配网成功"))
const {
peerId,
wifiName,
secretKey,
deviceMac,
networkMac
} = parseNetworkJsonFromDecrypted(decrypted);
const {code, message} = await updateDeviceNetworkInfo({
deviceType: 2, // 1-wifi网关 2-wifi锁
deviceMac: deviceMac || this.lockInfo.mac,
wifiName: wifiName || this.requestParams.wifiName,
networkMac: networkMac || this.requestParams.wifiName,
secretKey,
peerId
});
if (code === Result.Success.code) {
this.characteristicValueCallback(new Result(decrypted[2], null, "配网成功"))
} else {
this.characteristicValueCallback(code, null, message);
}
} else { } else {
this.characteristicValueCallback(new Result(decrypted[2], null, "配网失败")) this.characteristicValueCallback(new Result(decrypted[2], null, "配网失败"))
} }

4
env.js
View File

@ -1,7 +1,7 @@
// uni版本号 // uni版本号
export const uniVersion = '1.0.23' export const uniVersion = '1.0.18'
// uni构建号 // uni构建号
export const uniBuildNumber = 24 export const uniBuildNumber = 19
// web版本号 // web版本号
export const webVersion = '1.0.1' export const webVersion = '1.0.1'

42
format.js
View File

@ -217,46 +217,4 @@ function _bytesToString(bytes) {
str += String.fromCharCode(bytes[i]); str += String.fromCharCode(bytes[i]);
} }
return str; return str;
}
// 解析decrypted中的json数据，返回对象
export function parseNetworkJsonFromDecrypted(decrypted) {
let peerId, wifiName, secretKey, deviceMac, networkMac;
try {
const secretKeyJsonLength = (decrypted[4] << 8) + decrypted[3];
const secretKeyList = decrypted.slice(5, 5 + secretKeyJsonLength);
let result;
if (typeof TextDecoder !== 'undefined') {
result = new TextDecoder('utf-8').decode(secretKeyList);
} else {
// 兼容性处理
result = uint8ArrayToString(secretKeyList);
}
const jsonMap = JSON.parse(result);
peerId = jsonMap.peerId;
wifiName = jsonMap.wifiName;
secretKey = jsonMap.secretKey;
deviceMac = jsonMap.deviceMac;
networkMac = jsonMap.networkMac;
console.log('解析配网信息:', jsonMap);
} catch (e) {
console.error('解析配网信息失败:', e);
}
return { peerId, wifiName, secretKey, deviceMac, networkMac };
}
/**
* 生成随机长度字符串
* @param length
* @returns {string}
*/
export function generateRandomString(length) {
const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
let result = '';
for (let i = 0; i < length; i++) {
result += chars[Math.floor(Math.random() * chars.length)];
}
return result;
} }

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "star-cloud-uni", "name": "star-cloud-uni",
"version": "1.0.23", "version": "1.0.18",
"type": "module", "type": "module",
"main": "./uni/index.js", "main": "./uni/index.js",
"author": "zzc059", "author": "zzc059",

58
star-cloud/configureNetwork.js
View File

@ -1,10 +1,9 @@
import { import {
checkRequiredFields, checkRequiredFields,
createPackageEnd, generateRandomString, createPackageEnd,
} from "../format.js"; } from "../format.js";
import {cmdIds, Result} from "../constant.js"; import {cmdIds, Result} from "../constant.js";
import {searchAndConnectDevice, writeBLECharacteristicValue} from "../uni/basic.js"; import {searchAndConnectDevice, writeBLECharacteristicValue} from "../uni/basic.js";
import {getDeviceNetworkInfo, getGatewayConfig} from "../api.js";
/** /**
* 开始搜索wifi * 开始搜索wifi
@ -67,39 +66,32 @@ export async function startSearchWiFi(params = {}) {
* @returns {Promise<unknown>} * @returns {Promise<unknown>}
*/ */
export async function connectWiFi(params) { export async function connectWiFi(params) {
const cardRequiredFields = ['ssid', 'password', 'clientId', 'starLockPeerId']; const cardRequiredFields = ['ssid', 'password'];
const missingField = checkRequiredFields(params, cardRequiredFields); const missingField = checkRequiredFields(params, cardRequiredFields);
if (missingField) { if (missingField) {
return new Result(Result.codes.NotMoreData, null, `参数信息不完整: ${missingField}`); return new Result(Result.codes.NotMoreData, null, `参数信息不完整: ${missingField}`);
} }
// 获取网关配置
const config = await getGatewayConfig();
if (config.code !== Result.Success.code) {
return new Result(Result.codes.Fail, null, `获取网关配置失败: ${config.message}`);
}
const clientId = params.clientId;
const starLockPeerId = params.starLockPeerId;
let { let {
ssid, ssid,
password, password,
configureJson = JSON.stringify({ configureJson = JSON.stringify({
starcloudRpcPeerId: config.data.starcloudRpcPeerId, starcloudRpcPeerId: "6HnEcGnXMUcLQoE7rnC4aXMVJmojMnKAjqKHrt4TmN1U",
starcloudReportPeerId: config.data.starcloudReportPeerId, starcloudReportPeerId: "G3ehYz8djE35CTE2LWn5xe2nD51UpjC4hWd3vqVmXViE",
starcloudUrl: config.data.starcloudUrl, starcloudUrl: "http://cloud.skychip.top",
userPeerId: config.data.userPeerId, userPeerId: "C2HjHNy9LsjxW2QEmceiNDTN6XSXFDUZ3fYsnBigVQXA",
scdUrl: config.data.scdUrl, scdUrl: "http://scd.skychip.top:8710",
starlockPeerId: starLockPeerId, starlockPeerId: "0b3bd6327daafe2da24fdd0cae76c71477f32e3ef8ab",
clientId: clientId, clientId: "sBfWAwdMqVKIMBj4dPuRextHViC266aE",
secretKey: generateRandomString(18), secretKey: "zNn1AluC6sTVAtA4dX",
userPeerld: "zC2HjHNy9LsjxW2QEmceiNDTN6XSXFDUZ3fYsnBigVQX"
}) })
} = params } = params
const uid = this.accountInfo.uid.toString() const uid = this.accountInfo.uid.toString()
// 设置执行账号 // 设置执行账号
const result = await this.login(uid) const result = await this.login(params.uid)
if (result.code !== Result.Success.code) { if (result.code !== Result.Success.code) {
return result return result
} }
@ -176,30 +168,4 @@ export async function connectWiFi(params) {
return writeResult return writeResult
} }
return this.getWriteResult(this.connectWiFi, params) return this.getWriteResult(this.connectWiFi, params)
}
/**
* 获取锁配网信息
* @param params
* @param {Number} params.uid uid
* @param {Number} params.deviceMac 锁mac地址
* @returns {Promise<void>}
*/
export async function getLockNetworkInfo(params) {
const cardRequiredFields = ['uid', 'deviceMac'];
const missingField = checkRequiredFields(params, cardRequiredFields);
if (missingField) {
return new Result(Result.codes.NotMoreData, null, `参数信息不完整: ${missingField}`);
}
// 设置执行账号
const result = await this.login(params.uid)
if (result.code !== Result.Success.code) {
return result
}
return await getDeviceNetworkInfo({
deviceType: 2,
deviceMac: params.deviceMac,
})
} }

72
star-cloud/lock.js
View File

@ -66,9 +66,6 @@ export async function selectLock(params) {
*/ */
export async function openDoor(params) { export async function openDoor(params) {
const {type} = params const {type} = params
// ⏱️ 记录开始时间
const startTime = Date.now();
log.info({ log.info({
...new Result( ...new Result(
Result.Success.code, Result.Success.code,
@ -105,8 +102,7 @@ export async function openDoor(params) {
// 确认设备连接正常 // 确认设备连接正常
if (!params.connected) { if (!params.connected) {
const searchResult = await searchAndConnectDevice(this.lockInfo.bluetooth.bluetoothDeviceName, true, this.lockInfo.bluetooth.bluetoothDeviceId) const searchResult = await searchAndConnectDevice(this.lockInfo.bluetooth.bluetoothDeviceName)
log.info({ log.info({
...new Result( ...new Result(
searchResult.code, searchResult.code,
@ -270,16 +266,8 @@ export async function openDoor(params) {
), ),
name: 'openDoor' name: 'openDoor'
}) })
// 获取最终结果
const finalResult = this.getWriteResult(this.openDoor, params);
// ⏱️ 计算耗时 return this.getWriteResult(this.openDoor, params)
const endTime = Date.now();
const duration = endTime - startTime;
console.log(`开门耗时：${duration}`)
return finalResult;
} }
/** /**
@ -385,16 +373,10 @@ export async function getLockSupportFeatures(params) {
/** /**
* 远程开锁 * 远程开锁
* @param params * @param params
* @param {Number} params.uid uid
* @param {Number} params.lockId 锁 Id * @param {Number} params.lockId 锁 Id
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
export async function remoteUnLock(params) { export async function remoteUnLock(params) {
const cardRequiredFields = ['uid', 'lockId'];
const missingField = checkRequiredFields(params, cardRequiredFields);
if (missingField) {
return new Result(Result.codes.NotMoreData, null, `参数信息不完整: ${missingField}`);
}
// 设置执行账号 // 设置执行账号
const result = await this.login(params.uid) const result = await this.login(params.uid)
if (result.code !== Result.Success.code) { if (result.code !== Result.Success.code) {
@ -421,5 +403,55 @@ export async function getLockList(params) {
} }
/**
* 搜索wifi列表
* @param params
* @returns {Promise<void>}
*/
export async function searchWifiList(params) {
// 需要校验的参数
const baseRequiredFields = [
'uid',
];
const missingField = checkRequiredFields(params, baseRequiredFields);
if (missingField) {
return new Result(Result.NotMoreData, null, `参数信息不完整: ${missingField}`);
}
// 确认设备连接正常
if (!params.connected) {
const searchResult = await searchAndConnectDevice(this.lockInfo.bluetooth.bluetoothDeviceName)
if (searchResult.code !== Result.Success.code) {
return searchResult
}
this.updateLockInfo(searchResult.data)
}
const {uid} = params
const length = 2 + 20
const headArray = this.createPackageHeader(3, length)
const contentArray = new Uint8Array(length)
contentArray[0] = cmdIds.getWifiList / 256
contentArray[1] = cmdIds.getWifiList % 256
for (let i = 0; i < uid.length; i++) {
contentArray[i + 2] = uid.charCodeAt(i)
}
console.log('加密前：', Array.from(contentArray))
const cebArray = sm4.encrypt(contentArray, this.lockInfo.bluetooth.privateKey, {
mode: 'ecb',
output: 'array'
})
const packageArray = createPackageEnd(headArray, cebArray)
await writeBLECharacteristicValue(this.lockInfo.deviceId,
this.lockInfo.serviceId,
this.lockInfo.writeCharacteristicId,
packageArray)
return this.getWriteResult(this.searchWifiList, params)
}

33
uni/basic.js
View File

@ -8,18 +8,13 @@ import {Result} from '../constant'
*/ */
// 查找设备并连接 // 查找设备并连接
export function searchAndConnectDevice(name, reset = true, deviceId = null) { export function searchAndConnectDevice(name, reset = true) {
// 循环查找设备 // 循环查找设备
let timer let timer
// 超时计时器 // 超时计时器
let timeoutTimer let timeoutTimer
return new Promise(async resolve => { return new Promise(async resolve => {
// 如果提供了deviceId，则直接连接
if (deviceId) {
const connectResult = await createBLEConnection(deviceId)
resolve(connectResult)
}
const result = await startBluetoothDevicesDiscovery() const result = await startBluetoothDevicesDiscovery()
if (result.code === Result.Success.code) { if (result.code === Result.Success.code) {
let searchFlag = false let searchFlag = false
@ -194,16 +189,28 @@ export function createBLEConnection(deviceId, reconnectNumber = 0) {
res.data.serviceId, res.data.serviceId,
res.data.notifyCharacteristicId res.data.notifyCharacteristicId
) )
// 使用同步方法获取系统信息
const systemInfo = uni.getSystemInfoSync();
if (systemInfo.platform === 'android') {
// 如果是Android机型，则设置BLE MTU
uni.setBLEMTU({
deviceId: deviceId,
mtu: 512,
fail: res => {
// console.log('mtu fail', res);
},
success: res => {
// console.log('mtu success', res);
}
});
} else {
// 对于非Android设备，可以在这里添加其他逻辑或者直接忽略
// console.log('当前设备不是Android，跳过设置BLE MTU');
}
resolve(res) resolve(res)
}, },
async fail(err) { async fail(err) {
if (err.errno === 1500101) {
// 未初始化，初始化成功后在重连
const result = await openBluetoothAdapter()
if (result.code === Result.Success.code) {
resolve(await createBLEConnection(deviceId, reconnectNumber + 1))
}
}
if (err.errno === 1509007) { if (err.errno === 1509007) {
const res = await getBLEDeviceServicesAndCharacteristics(deviceId) const res = await getBLEDeviceServicesAndCharacteristics(deviceId)
await notifyBLECharacteristicValueChange( await notifyBLECharacteristicValueChange(

11
uni/index.js
View File

@ -433,15 +433,4 @@ export const startSearchWiFi = async params => {
*/ */
export const connectWiFi = async params => { export const connectWiFi = async params => {
return await starCloudInstance.connectWiFi(params) return await starCloudInstance.connectWiFi(params)
}
/**
* 获取设备配网信息
* @param params.uid uid
* @param params.deviceMac 锁mac地址
* @returns {Promise<*>}
*/
export const getLockNetworkInfo = async params => {
return await starCloudInstance.getLockNetworkInfo(params)
} }