diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index a2a967bc..341d6fae 100755
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -29,6 +29,9 @@
+
+
+
diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
index 4f8650e0..895ba92e 100644
--- a/ios/fastlane/Fastfile
+++ b/ios/fastlane/Fastfile
@@ -143,7 +143,8 @@ platform :ios do
sh("flutter","pub","get")
end
Dir.chdir ".." do
- sh("bundle", "exec" ,"pod", "install")
+ #sh("bundle", "exec" ,"pod", "install")
+ sh("pod", "install")
end
Dir.chdir "../.." do
sh("flutter", "build", "ios", "--no-tree-shake-icons", "--no-codesign", "--release", "--flavor", "#{flavor}", "-t", "lib/main_#{flavor}_lite.dart", "--build-number=#{build_number}", "--build-name=#{build_version}")
diff --git a/lib/blue/blue_manage.dart b/lib/blue/blue_manage.dart
index 6f258b2c..f90753b4 100755
--- a/lib/blue/blue_manage.dart
+++ b/lib/blue/blue_manage.dart
@@ -123,14 +123,18 @@ class BlueManage {
.eventBus!
.on()
.listen((EventSendModel model) {
+ AppLog.log('eventBus接收发送数据:${model}');
if (model.sendChannel == DataChannel.ble) {
FlutterBluePlus.isSupported.then((bool isAvailable) async {
if (isAvailable) {
if (_adapterState == BluetoothAdapterState.on) {
// 蓝牙已开启，可以进行蓝牙操作
+ AppLog.log('蓝牙已开启，开始收发送数据:${model.data}');
writeCharacteristicWithResponse(model.data);
} else {
- try {} catch (e) {
+ try {
+ AppLog.log('蓝牙已关闭，停止发送数据:${model.data}');
+ } catch (e) {
AppLog.log('蓝牙打开失败');
}
}
@@ -315,8 +319,10 @@ class BlueManage {
}
/// 判断是否包含指定的uuid
- bool _isMatch(List serviceUuids, {DeviceType deviceType = DeviceType.blue}) {
- final List prefixes = getDeviceType(deviceType).map((e) => e.toLowerCase()).toList();
+ bool _isMatch(List serviceUuids,
+ {DeviceType deviceType = DeviceType.blue}) {
+ final List prefixes =
+ getDeviceType(deviceType).map((e) => e.toLowerCase()).toList();
for (String uuid in serviceUuids) {
final String cleanUuid = uuid.replaceAll('-', '').toLowerCase();
if (cleanUuid.length == 8) {
diff --git a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart
index b908e07a..e13c01bd 100755
--- a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart
+++ b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart
@@ -257,15 +257,42 @@ class _AuthorizedAdminPageState extends State
onTap: () async {
final Contact? currentContact =
await logic.state.contactPicker.selectContact();
- logic.state.contact = currentContact!;
- if (currentContact.phoneNumbers!.isNotEmpty) {
- logic.state.emailOrPhoneController.text = currentContact
- .phoneNumbers![0]
- .replaceAll(RegExp(r'\s+\b|\b\s'), '');
- }
- if (currentContact.fullName!.isNotEmpty) {
- logic.state.keyNameController.text =
- currentContact.fullName!;
+ if (currentContact != null) {
+ setState(() {
+ logic.state.contact = currentContact;
+
+ // 处理手机号
+ if (currentContact.phoneNumbers != null &&
+ currentContact.phoneNumbers!.isNotEmpty) {
+ // 获取第一个手机号并清理格式
+ String phoneNumber = currentContact.phoneNumbers![0];
+ // 移除所有空格、括号、连字符等特殊字符
+ phoneNumber =
+ phoneNumber.replaceAll(RegExp(r'[\s\(\)\-]'), '');
+ // 如果号码以+开头，保留+号
+ if (phoneNumber.startsWith('+')) {
+ phoneNumber = '+' +
+ phoneNumber
+ .substring(1)
+ .replaceAll(RegExp(r'[^\d]'), '');
+ } else {
+ phoneNumber =
+ phoneNumber.replaceAll(RegExp(r'[^\d]'), '');
+ }
+ logic.state.emailOrPhoneController.text = phoneNumber;
+ } else {
+ logic.state.emailOrPhoneController.text = '';
+ }
+
+ // 处理姓名
+ if (currentContact.fullName != null &&
+ currentContact.fullName!.isNotEmpty) {
+ logic.state.keyNameController.text =
+ currentContact.fullName!;
+ } else {
+ logic.state.keyNameController.text = '';
+ }
+ });
}
},
),
@@ -602,17 +629,42 @@ class _AuthorizedAdminPageState extends State
onTap: () async {
final Contact? currentContact =
await state.contactPicker.selectContact();
- setState(() {
- state.contact = currentContact!;
- if (currentContact.phoneNumbers!.isNotEmpty) {
- state.emailOrPhoneController.text = currentContact
- .phoneNumbers![0]
- .replaceAll(RegExp(r'\s+\b|\b\s'), '');
- }
- if (currentContact.fullName!.isNotEmpty) {
- state.keyNameController.text = currentContact.fullName!;
- }
- });
+ if (currentContact != null) {
+ setState(() {
+ state.contact = currentContact;
+
+ // 处理手机号
+ if (currentContact.phoneNumbers != null &&
+ currentContact.phoneNumbers!.isNotEmpty) {
+ // 获取第一个手机号并清理格式
+ String phoneNumber = currentContact.phoneNumbers![0];
+ // 移除所有空格、括号、连字符等特殊字符
+ phoneNumber =
+ phoneNumber.replaceAll(RegExp(r'[\s\(\)\-]'), '');
+ // 如果号码以+开头，保留+号
+ if (phoneNumber.startsWith('+')) {
+ phoneNumber = '+' +
+ phoneNumber
+ .substring(1)
+ .replaceAll(RegExp(r'[^\d]'), '');
+ } else {
+ phoneNumber =
+ phoneNumber.replaceAll(RegExp(r'[^\d]'), '');
+ }
+ state.emailOrPhoneController.text = phoneNumber;
+ } else {
+ state.emailOrPhoneController.text = '';
+ }
+
+ // 处理姓名
+ if (currentContact.fullName != null &&
+ currentContact.fullName!.isNotEmpty) {
+ state.keyNameController.text = currentContact.fullName!;
+ } else {
+ state.keyNameController.text = '';
+ }
+ });
+ }
},
),
)
diff --git a/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart b/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart
index e2cbf86f..1cf65f45 100755
--- a/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart
+++ b/lib/main/lockDetail/authorizedAdmin/volumeAuthorizationLock/volumeAuthorizationLock_page.dart
@@ -286,20 +286,47 @@ class _VolumeAuthorizationLockPageState
),
alignment: Alignment.center,
child: InkWell(
- onTap: () async {
- final Contact? currentContact =
- await state.contactPicker.selectContact();
- // setState(() {
- if (currentContact!.phoneNumbers!.isNotEmpty) {
- state.emailOrPhoneController.text = currentContact
- .phoneNumbers![0]
- .replaceAll(RegExp(r'\s+\b|\b\s'), '');
- }
- if (currentContact.fullName!.isNotEmpty) {
- state.keyNameController.text = currentContact.fullName!;
- }
- // });
- },
+ onTap: () async {
+ final Contact? currentContact =
+ await logic.state.contactPicker.selectContact();
+ if (currentContact != null) {
+ setState(() {
+ logic.state.contact = currentContact;
+
+ // 处理手机号
+ if (currentContact.phoneNumbers != null &&
+ currentContact.phoneNumbers!.isNotEmpty) {
+ // 获取第一个手机号并清理格式
+ String phoneNumber = currentContact.phoneNumbers![0];
+ // 移除所有空格、括号、连字符等特殊字符
+ phoneNumber =
+ phoneNumber.replaceAll(RegExp(r'[\s\(\)\-]'), '');
+ // 如果号码以+开头，保留+号
+ if (phoneNumber.startsWith('+')) {
+ phoneNumber = '+' +
+ phoneNumber
+ .substring(1)
+ .replaceAll(RegExp(r'[^\d]'), '');
+ } else {
+ phoneNumber =
+ phoneNumber.replaceAll(RegExp(r'[^\d]'), '');
+ }
+ logic.state.emailOrPhoneController.text = phoneNumber;
+ } else {
+ logic.state.emailOrPhoneController.text = '';
+ }
+
+ // 处理姓名
+ if (currentContact.fullName != null &&
+ currentContact.fullName!.isNotEmpty) {
+ logic.state.keyNameController.text =
+ currentContact.fullName!;
+ } else {
+ logic.state.keyNameController.text = '';
+ }
+ });
+ }
+ },
),
)
else
diff --git a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart
index da455907..118b2123 100755
--- a/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart
+++ b/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/view/sendElectronicKeyView_page.dart
@@ -20,6 +20,7 @@ import 'package:star_lock/tools/pickers/time_picker/model/pduration.dart';
import 'package:star_lock/tools/regularExpression.dart';
import 'package:star_lock/tools/showTipView.dart';
import 'package:star_lock/tools/submitBtn.dart';
+import 'package:permission_handler/permission_handler.dart';
class SendElectronicKeyView extends StatefulWidget {
SendElectronicKeyView({required this.type, Key? key}) : super(key: key);
@@ -31,6 +32,8 @@ class SendElectronicKeyView extends StatefulWidget {
class _SendElectronicKeyViewState extends State
with AutomaticKeepAliveClientMixin {
+
+
@override
Widget build(BuildContext context) {
super.build(context);
@@ -163,8 +166,8 @@ class _SendElectronicKeyViewState extends State
color: Colors.white,
border: Border(
bottom: BorderSide(
- color: AppColors.greyLineColor, // 设置边框颜色
- width: 2.0.h, // 设置边框宽度
+ color: AppColors.greyLineColor,
+ width: 2.0.h,
),
)),
child: Row(
@@ -174,17 +177,14 @@ class _SendElectronicKeyViewState extends State
Expanded(
child: TextField(
controller: logic.getCurrentController(1),
- //输入框一行
maxLines: 1,
inputFormatters: [
FilteringTextInputFormatter.deny('\n'),
LengthLimitingTextInputFormatter(30),
],
- // controller: _controller,
autofocus: false,
textAlign: TextAlign.end,
decoration: InputDecoration(
- //输入里面输入文字内边距设置
hintText: rightTitle,
hintStyle: TextStyle(fontSize: 22.sp),
focusedBorder: const OutlineInputBorder(
@@ -205,9 +205,7 @@ class _SendElectronicKeyViewState extends State
fontSize: 22.sp, textBaseline: TextBaseline.alphabetic),
),
),
- SizedBox(
- width: 10.w,
- ),
+ SizedBox(width: 10.w),
Container(
width: 32.w,
height: 32.w,
@@ -222,22 +220,49 @@ class _SendElectronicKeyViewState extends State
onTap: () async {
final Contact? currentContact =
await logic.state.contactPicker.selectContact();
- logic.state.contact = currentContact!;
- if (currentContact.phoneNumbers!.isNotEmpty) {
- logic.state.emailOrPhoneController.text = currentContact
- .phoneNumbers![0]
- .replaceAll(RegExp(r'\s+\b|\b\s'), '');
- }
- if (currentContact.fullName!.isNotEmpty) {
- logic.state.keyNameController.text =
- currentContact.fullName!;
+ if (currentContact != null) {
+ setState(() {
+ logic.state.contact = currentContact;
+
+ // 处理手机号
+ if (currentContact.phoneNumbers != null &&
+ currentContact.phoneNumbers!.isNotEmpty) {
+ // 获取第一个手机号并清理格式
+ String phoneNumber = currentContact.phoneNumbers![0];
+ // 移除所有空格、括号、连字符等特殊字符
+ phoneNumber =
+ phoneNumber.replaceAll(RegExp(r'[\s\(\)\-]'), '');
+ // 如果号码以+开头，保留+号
+ if (phoneNumber.startsWith('+')) {
+ phoneNumber = '+' +
+ phoneNumber
+ .substring(1)
+ .replaceAll(RegExp(r'[^\d]'), '');
+ } else {
+ phoneNumber =
+ phoneNumber.replaceAll(RegExp(r'[^\d]'), '');
+ }
+ logic.state.emailOrPhoneController.text = phoneNumber;
+ } else {
+ logic.state.emailOrPhoneController.text = '';
+ }
+
+ // 处理姓名
+ if (currentContact.fullName != null &&
+ currentContact.fullName!.isNotEmpty) {
+ logic.state.keyNameController.text =
+ currentContact.fullName!;
+ } else {
+ logic.state.keyNameController.text = '';
+ }
+ });
}
},
),
),
Container(
- color: AppColors.greyLineColor, // 设置边框颜色
- height: 2.0.h, //
+ color: AppColors.greyLineColor,
+ height: 2.0.h,
)
],
),
@@ -616,19 +641,46 @@ class _SendElectronicKeyViewState extends State
alignment: Alignment.center,
child: InkWell(
onTap: () async {
- final Contact? currentContact =
- await logic.state.contactPicker.selectContact();
- logic.state.contact = currentContact!;
- if (currentContact.phoneNumbers!.isNotEmpty) {
- logic.state.emailOrPhoneController.text = currentContact
- .phoneNumbers![0]
- .replaceAll(RegExp(r'\s+\b|\b\s'), '');
- }
- if (currentContact.fullName!.isNotEmpty) {
- logic.state.keyNameController.text =
- currentContact.fullName!;
- }
- },
+ final Contact? currentContact =
+ await logic.state.contactPicker.selectContact();
+ if (currentContact != null) {
+ setState(() {
+ logic.state.contact = currentContact;
+
+ // 处理手机号
+ if (currentContact.phoneNumbers != null &&
+ currentContact.phoneNumbers!.isNotEmpty) {
+ // 获取第一个手机号并清理格式
+ String phoneNumber = currentContact.phoneNumbers![0];
+ // 移除所有空格、括号、连字符等特殊字符
+ phoneNumber =
+ phoneNumber.replaceAll(RegExp(r'[\s\(\)\-]'), '');
+ // 如果号码以+开头，保留+号
+ if (phoneNumber.startsWith('+')) {
+ phoneNumber = '+' +
+ phoneNumber
+ .substring(1)
+ .replaceAll(RegExp(r'[^\d]'), '');
+ } else {
+ phoneNumber =
+ phoneNumber.replaceAll(RegExp(r'[^\d]'), '');
+ }
+ logic.state.emailOrPhoneController.text = phoneNumber;
+ } else {
+ logic.state.emailOrPhoneController.text = '';
+ }
+
+ // 处理姓名
+ if (currentContact.fullName != null &&
+ currentContact.fullName!.isNotEmpty) {
+ logic.state.keyNameController.text =
+ currentContact.fullName!;
+ } else {
+ logic.state.keyNameController.text = '';
+ }
+ });
+ }
+ },
),
)
else
@@ -736,7 +788,7 @@ class _SendElectronicKeyViewState extends State
child: Text(
'取消'.tr,
style: TextStyle(
- color: Colors.black, fontSize: ScreenUtil().setSp(24)),
+ color: Colors.black, fontSize: 24.sp),
),
onPressed: () {
Navigator.pop(context);
@@ -779,7 +831,7 @@ class _SendElectronicKeyViewState extends State
Text(
titleStr,
style: TextStyle(
- fontSize: ScreenUtil().setSp(20), color: Colors.black),
+ fontSize: 20.sp, color: Colors.black),
),
],
),
diff --git a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
index f3668a2c..3cf6e155 100755
--- a/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
+++ b/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
@@ -59,7 +59,7 @@ class LockDetailLogic extends BaseGetXController {
// 开完锁之后上传记录
if (reply is SenderReferEventRecordTimeReply &&
state.ifCurrentScreen.value == true) {
- _replyReferEventRecordTime(reply);
+ await _replyReferEventRecordTime(reply);
}
});
}
@@ -116,7 +116,9 @@ class LockDetailLogic extends BaseGetXController {
state.animationController!.stop();
//锁数据更新
+ AppLog.log('开锁成功，开始同步所记录:getLockRecordLastUploadDataTime');
getLockRecordLastUploadDataTime();
+ AppLog.log('开锁成功，结束同步所记录:getLockRecordLastUploadDataTime');
// 只有接听状态时才可以重发开门指令
if (StartChartManage().talkStatus.status ==
TalkStatus.answeredSuccessfully) {
@@ -338,6 +340,7 @@ class LockDetailLogic extends BaseGetXController {
reply.data.removeRange(0, 7);
// 把得到的数据按17个字节分割成数组 然后塞进一个新的数组里面
if (reply.data.length < 17) {
+ AppLog.log('数据长度不够17:${reply.data}');
return;
}
final List> getList = splitList(reply.data, 17);
@@ -378,12 +381,13 @@ class LockDetailLogic extends BaseGetXController {
if (i == getList.length - 1) {
//设置最后的时间戳
- state.operateDate = operateDate;
+ state.operateDate = time;
}
} catch (e) {
AppLog.log('操作记录:$indexList,解析失败，跳过该跳记录，进行下一条记录解析。');
}
}
+ AppLog.log('上传数据长度:${uploadList.length}');
lockRecordUploadData(uploadList);
if (dataLength == state.logCountPage) {
@@ -510,6 +514,8 @@ class LockDetailLogic extends BaseGetXController {
});
BlueManage().blueSendData(BlueManage().connectDeviceName,
(BluetoothConnectionState connectionState) async {
+ AppLog.log(
+ '开始发送同步锁记录命令，蓝牙状态是否链接:${connectionState == BluetoothConnectionState.connected}');
if (connectionState == BluetoothConnectionState.connected) {
final List? privateKey =
await Storage.getStringList(saveBluePrivateKey);
@@ -524,6 +530,8 @@ class LockDetailLogic extends BaseGetXController {
final List getPublicKeyList =
changeStringListToIntList(publicKey!);
+ AppLog.log(
+ '发送同步锁记录命令:${BlueManage().connectDeviceName}');
IoSenderManage.senderReferEventRecordTimeCommand(
keyID: BlueManage().connectDeviceName,
userID: await Storage.getUid(),
@@ -602,11 +610,14 @@ class LockDetailLogic extends BaseGetXController {
final LockOperatingRecordGetLastRecordTimeEntity entity =
await ApiRepository.to.getLockRecordLastUploadDataTime(
lockId: state.keyInfos.value.lockId.toString());
+ AppLog.log('开始获取服务端所记录更新时间:${entity}');
if (entity.errorCode!.codeIsSuccessful) {
state.operateDate = entity.data!.operateDate! ~/ 1000;
state.currentDate = entity.data!.currentDate! ~/ 1000;
+ AppLog.log('发送同步所记录命令:---');
senderReferEventRecordTime();
}
+ AppLog.log('结束获取服务端所记录更新时间:${entity}');
}
// 操作记录上传
diff --git a/lib/main_local.dart b/lib/main_local.dart
index 9e30d007..f56b6d65 100755
--- a/lib/main_local.dart
+++ b/lib/main_local.dart
@@ -4,7 +4,7 @@ import 'flavors.dart';
import 'main.dart' as runner;
Future main() async {
- F.appFlavor = Flavor.xhj;
+ F.appFlavor = Flavor.xhj_pre;
// AppLog.log('local调用了main函数');
await runner.main();
}
diff --git a/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart b/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart
index c9cdb870..7c1609c6 100755
--- a/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart
+++ b/lib/mine/mineSet/authorizedAdministrator/addAuthorizedAdministrator/addAuthorizedAdministrator_page.dart
@@ -270,16 +270,46 @@ class _AddAuthorizedAdministratorPageState
alignment: Alignment.center,
child: InkWell(
onTap: () async {
- final Contact? currentContact =
- await state.contactPicker.selectContact();
- setState(() {
- if (currentContact!.phoneNumbers!.isNotEmpty) {
- state.emailOrPhoneController.text = currentContact
- .phoneNumbers![0]
- .replaceAll(RegExp(r'\s+\b|\b\s'), '');
+ final Contact? currentContact =
+ await logic.state.contactPicker.selectContact();
+ if (currentContact != null) {
+ setState(() {
+ logic.state.contact = currentContact;
+
+ // 处理手机号
+ if (currentContact.phoneNumbers != null &&
+ currentContact.phoneNumbers!.isNotEmpty) {
+ // 获取第一个手机号并清理格式
+ String phoneNumber = currentContact.phoneNumbers![0];
+ // 移除所有空格、括号、连字符等特殊字符
+ phoneNumber =
+ phoneNumber.replaceAll(RegExp(r'[\s\(\)\-]'), '');
+ // 如果号码以+开头，保留+号
+ if (phoneNumber.startsWith('+')) {
+ phoneNumber = '+' +
+ phoneNumber
+ .substring(1)
+ .replaceAll(RegExp(r'[^\d]'), '');
+ } else {
+ phoneNumber =
+ phoneNumber.replaceAll(RegExp(r'[^\d]'), '');
+ }
+ logic.state.emailOrPhoneController.text = phoneNumber;
+ } else {
+ logic.state.emailOrPhoneController.text = '';
+ }
+
+ // 处理姓名
+ if (currentContact.fullName != null &&
+ currentContact.fullName!.isNotEmpty) {
+ logic.state.keyNameController.text =
+ currentContact.fullName!;
+ } else {
+ logic.state.keyNameController.text = '';
+ }
+ });
}
- });
- },
+ },
),
)
else
diff --git a/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart b/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart
index 38862cb7..846a4e0f 100755
--- a/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart
+++ b/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart
@@ -146,14 +146,37 @@ class _RecipientInformationPageState extends State {
),
GestureDetector(
onTap: () async {
- Contact? currentContact = await state.contactPicker.selectContact();
- state.contact = currentContact!;
- if (currentContact.phoneNumbers!.isNotEmpty) {
- state.numberController.text = currentContact
- .phoneNumbers![0]
- .replaceAll(RegExp(r'\s+\b|\b\s'), '');
- }
- },
+ final Contact? currentContact =
+ await logic.state.contactPicker.selectContact();
+ if (currentContact != null) {
+ setState(() {
+ logic.state.contact = currentContact;
+
+ // 处理手机号
+ if (currentContact.phoneNumbers != null &&
+ currentContact.phoneNumbers!.isNotEmpty) {
+ // 获取第一个手机号并清理格式
+ String phoneNumber = currentContact.phoneNumbers![0];
+ // 移除所有空格、括号、连字符等特殊字符
+ phoneNumber =
+ phoneNumber.replaceAll(RegExp(r'[\s\(\)\-]'), '');
+ // 如果号码以+开头，保留+号
+ if (phoneNumber.startsWith('+')) {
+ phoneNumber = '+' +
+ phoneNumber
+ .substring(1)
+ .replaceAll(RegExp(r'[^\d]'), '');
+ } else {
+ phoneNumber =
+ phoneNumber.replaceAll(RegExp(r'[^\d]'), '');
+ }
+ logic.state.numberController.text = phoneNumber;
+ } else {
+ logic.state.numberController.text = '';
+ }
+ });
+ }
+ },
child: Image.asset(
'images/icon_addressBook.png',
width: 28.w,
diff --git a/lib/talk/starChart/status/star_chart_talk_status.dart b/lib/talk/starChart/status/star_chart_talk_status.dart
index 54ee1751..939c130b 100644
--- a/lib/talk/starChart/status/star_chart_talk_status.dart
+++ b/lib/talk/starChart/status/star_chart_talk_status.dart
@@ -4,7 +4,7 @@ import 'package:star_lock/talk/starChart/constant/talk_status.dart';
class StartChartTalkStatus {
// 私有字段，用于存储当前状态
- TalkStatus _status = TalkStatus.uninitialized;
+ TalkStatus _status = TalkStatus.none;
// 私有化默认构造函数，防止外部创建实例
StartChartTalkStatus._();
diff --git a/pubspec.yaml b/pubspec.yaml
index 7819d6e8..0cdf858a 100755
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -155,7 +155,7 @@ dependencies:
# 选择日期时间
flutter_cupertino_datetime_picker: ^3.0.0
# 选择原生通讯录
- flutter_native_contact_picker: ^0.0.4
+ flutter_native_contact_picker: 0.0.7
#底部弹出选择器
flutter_picker: ^2.1.0
#生成二维码