sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 1，修复xhj、sky添加锁之后空白卡死问题 2，移除安卓内高德相关配置依赖

Browse Source
This commit is contained in:
DaisyWu 2025-05-06 19:32:13 +08:00
parent c49e7cab03
commit cace002228
3 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/build.gradle
View File

@ -328,7 +328,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
// implementation('com.amap.api:location:5.6.0') // implementation('com.amap.api:location:5.6.0')
// implementation('com.amap.api:3dmap:8.1.0') // implementation('com.amap.api:3dmap:8.1.0')
implementation('com.amap.api:3dmap-location-search:latest.integration') // implementation('com.amap.api:3dmap-location-search:latest.integration')
implementation 'cn.jiguang.sdk:jpush:5.2.3' implementation 'cn.jiguang.sdk:jpush:5.2.3'
// 接入华为厂商 // 接入华为厂商

34
lib/mine/addLock/saveLock/saveLock_logic.dart
View File

@ -365,15 +365,15 @@ class SaveLockLogic extends BaseGetXController {
void bindBlueAdmin() async { void bindBlueAdmin() async {
state.lockInfo['adminPwd'] = state.adminPassword; state.lockInfo['adminPwd'] = state.adminPassword;
final Map<String, dynamic> positionMap = <String, dynamic>{}; // final Map<String, dynamic> positionMap = <String, dynamic>{};
positionMap['longitude'] = state.addressInfo['longitude']; // positionMap['longitude'] = state.addressInfo['longitude'];
positionMap['latitude'] = state.addressInfo['latitude']; // positionMap['latitude'] = state.addressInfo['latitude'];
positionMap['country'] = state.addressInfo['country']; // positionMap['country'] = state.addressInfo['country'];
positionMap['province'] = state.addressInfo['province']; // positionMap['province'] = state.addressInfo['province'];
positionMap['city'] = state.addressInfo['city']; // positionMap['city'] = state.addressInfo['city'];
positionMap['district'] = state.addressInfo['district']; // positionMap['district'] = state.addressInfo['district'];
positionMap['township'] = state.addressInfo['street']; // positionMap['township'] = state.addressInfo['street'];
positionMap['address'] = state.addressInfo['address']; // positionMap['address'] = state.addressInfo['address'];
final Map<String, dynamic> bluetooth = <String, dynamic>{}; final Map<String, dynamic> bluetooth = <String, dynamic>{};
bluetooth['bluetoothDeviceId'] = BlueManage().connectDeviceMacAddress; bluetooth['bluetoothDeviceId'] = BlueManage().connectDeviceMacAddress;
@ -395,7 +395,7 @@ class SaveLockLogic extends BaseGetXController {
final SaveLockEntity entity = await ApiRepository.to.bindingBlueAdmin( final SaveLockEntity entity = await ApiRepository.to.bindingBlueAdmin(
lockAlias: state.aliName.value, lockAlias: state.aliName.value,
position: positionMap, position: {},
bluetooth: bluetooth, bluetooth: bluetooth,
lockInfo: state.lockInfo, lockInfo: state.lockInfo,
lockUserNo: state.lockUserNo.toString(), lockUserNo: state.lockUserNo.toString(),
@ -505,9 +505,10 @@ class SaveLockLogic extends BaseGetXController {
} else { } else {
eventBus.fire(RefreshLockListInfoDataEvent(clearScanDevices: true,isUnShowLoading: true)); eventBus.fire(RefreshLockListInfoDataEvent(clearScanDevices: true,isUnShowLoading: true));
Future<void>.delayed(const Duration(seconds: 1), () { Future<void>.delayed(const Duration(seconds: 1), () {
Get.close(state.isFromMap == 1 // Get.close(state.isFromMap == 1
? (CommonDataManage().seletLockType == 0 ? 4 : 5) // ? (CommonDataManage().seletLockType == 0 ? 4 : 5)
: (CommonDataManage().seletLockType == 0 ? 5 : 6)); // : (CommonDataManage().seletLockType == 0 ? 5 : 6));
Get.until((route) => route.isFirst);
}); });
//刚刚配对完，需要对开锁页锁死 2 秒 //刚刚配对完，需要对开锁页锁死 2 秒
Future<void>.delayed(const Duration(milliseconds: 200), () { Future<void>.delayed(const Duration(milliseconds: 200), () {
@ -521,9 +522,10 @@ class SaveLockLogic extends BaseGetXController {
} else { } else {
eventBus.fire(RefreshLockListInfoDataEvent(clearScanDevices: true,isUnShowLoading: true)); eventBus.fire(RefreshLockListInfoDataEvent(clearScanDevices: true,isUnShowLoading: true));
Future<void>.delayed(const Duration(seconds: 1), () { Future<void>.delayed(const Duration(seconds: 1), () {
Get.close(state.isFromMap == 1 // Get.close(state.isFromMap == 1
? (CommonDataManage().seletLockType == 0 ? 4 : 5) // ? (CommonDataManage().seletLockType == 0 ? 4 : 5)
: (CommonDataManage().seletLockType == 0 ? 5 : 6)); // : (CommonDataManage().seletLockType == 0 ? 5 : 6));
Get.until((route) => route.isFirst);
}); });
//刚刚配对完，需要对开锁页锁死 2 秒 //刚刚配对完，需要对开锁页锁死 2 秒
Future<void>.delayed(const Duration(milliseconds: 200), () { Future<void>.delayed(const Duration(milliseconds: 200), () {

16
lib/mine/addLock/saveLock/saveLock_state.dart
View File

@ -18,9 +18,9 @@ class SaveLockState {
if (map['pwdTimestamp']!= null) { if (map['pwdTimestamp']!= null) {
pwdTimestamp.value = map['pwdTimestamp']; pwdTimestamp.value = map['pwdTimestamp'];
} }
if (map['addressInfo'] != null) { // if (map['addressInfo'] != null) {
addressInfo.value = map['addressInfo']; // addressInfo.value = map['addressInfo'];
} // }
if (map['lockInfo'] != null) { if (map['lockInfo'] != null) {
lockInfo = map['lockInfo']; lockInfo = map['lockInfo'];
} }
@ -33,13 +33,13 @@ class SaveLockState {
if (map['featureSettingParams'] != null) { if (map['featureSettingParams'] != null) {
featureSettingParams = map['featureSettingParams']; featureSettingParams = map['featureSettingParams'];
} }
if (map['isFromMap'] != null) { // if (map['isFromMap'] != null) {
isFromMap = map['isFromMap']; // isFromMap = map['isFromMap'];
} // }
} }
RxString aliName = ''.obs; RxString aliName = ''.obs;
RxInt pwdTimestamp = 0.obs; RxInt pwdTimestamp = 0.obs;
RxMap addressInfo = {}.obs; // RxMap addressInfo = {}.obs;
final Rx<LockSetInfoData> lockSetInfoData = LockSetInfoData().obs; final Rx<LockSetInfoData> lockSetInfoData = LockSetInfoData().obs;
TextEditingController aliNameController = TextEditingController(); TextEditingController aliNameController = TextEditingController();
FocusNode focusNode = FocusNode(); FocusNode focusNode = FocusNode();
@ -49,7 +49,7 @@ class SaveLockState {
String featureValue = ''; String featureValue = '';
String featureSettingValue = ''; String featureSettingValue = '';
List featureSettingParams = []; List featureSettingParams = [];
int isFromMap = 0; // 0:不是从地图界面进入 1:从地图界面进入 // int isFromMap = 0; // 0:不是从地图界面进入 1:从地图界面进入
RxBool ifCurrentScreen = true.obs; // 是否是当前界面,用于判断是否需要针对当前界面进行展示 RxBool ifCurrentScreen = true.obs; // 是否是当前界面,用于判断是否需要针对当前界面进行展示
RxInt sureBtnState = 0.obs; // 0可点击 1 不可点击 RxInt sureBtnState = 0.obs; // 0可点击 1 不可点击