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

Merge branch 'master' of gitee.com:starlock-cn/app-starlock

Browse Source
This commit is contained in:
Daisy 2024-01-19 11:45:54 +08:00
commit 95d138f66e
22 changed files with 189 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
star_lock/ios/Podfile.lock
View File

@ -241,7 +241,7 @@ SPEC CHECKSUMS:
audio_session: 4f3e461722055d21515cf3261b64c973c062f345 audio_session: 4f3e461722055d21515cf3261b64c973c062f345
audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40 audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40
auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d
camera_avfoundation: 3125e8cd1a4387f6f31c6c63abb8a55892a9eeeb camera_avfoundation: 8b8d780bcfb6a4a02b0fbe2b4bd17b5b71946e68
connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
EMASRest: 8df6f87836767a9415ad5cc4af739bc9d215b475 EMASRest: 8df6f87836767a9415ad5cc4af739bc9d215b475
@ -254,26 +254,26 @@ SPEC CHECKSUMS:
fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265 fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
g711_flutter: 8f2769052d2cf3549f83d11e1c42d81d94441123 g711_flutter: 8f2769052d2cf3549f83d11e1c42d81d94441123
google_maps_flutter_ios: 590249c67f34f422122c232f2a626192adbc78ee google_maps_flutter_ios: d1318b4ff711612cab16862d7a87e31a7403d458
GoogleMaps: 20d7b12be49a14287f797e88e0e31bc4156aaeb4 GoogleMaps: 20d7b12be49a14287f797e88e0e31bc4156aaeb4
image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5 image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
ios-voice-processor: 8e32d7f980a06d392d128ef1cd19cf6ddcaca3c1 ios-voice-processor: 8e32d7f980a06d392d128ef1cd19cf6ddcaca3c1
just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
network_info_plus: 6d0c3eb8367b8164fa3fb0c19875e3f59d49697f network_info_plus: 6d0c3eb8367b8164fa3fb0c19875e3f59d49697f
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
Protobuf: d94761c33f1239c0a43a0817ca1a5f7f7c900241 Protobuf: d94761c33f1239c0a43a0817ca1a5f7f7c900241
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825 ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
reactive_ble_mobile: 9ce6723d37ccf701dbffd202d487f23f5de03b4c reactive_ble_mobile: 9ce6723d37ccf701dbffd202d487f23f5de03b4c
shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
SwiftProtobuf: 407a385e97fd206c4fbe880cc84123989167e0d1 SwiftProtobuf: 407a385e97fd206c4fbe880cc84123989167e0d1
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126 video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126
webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a webview_flutter_wkwebview: 4f3e50f7273d31e5500066ed267e3ae4309c5ae4
PODFILE CHECKSUM: 42aa7ffc6134b996f93caa6a9b6a2b5b580ff28a PODFILE CHECKSUM: 42aa7ffc6134b996f93caa6a9b6a2b5b580ff28a

6
star_lock/lib/main.dart
View File

@ -186,9 +186,9 @@ void openBlueScan() {
} }
} }
void startScanAction() { // void startScanAction() {
BlueManage().startScan(); // BlueManage().startScan();
} // }
///请求蓝牙权限 ///请求蓝牙权限
Future<bool> getMicrophonePermission() async { Future<bool> getMicrophonePermission() async {

54
star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart
View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/app_settings/app_colors.dart'; import 'package:star_lock/app_settings/app_colors.dart';
@ -36,7 +37,9 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
Obx(() => CommonItem( Obx(() => CommonItem(
leftTitel: leftTitel:
"${TranslationLoader.lanKeys!.company!.tr}${TranslationLoader.lanKeys!.name!.tr}", "${TranslationLoader.lanKeys!.company!.tr}${TranslationLoader.lanKeys!.name!.tr}",
rightTitle: state.companyName.value ?? "", // rightTitle: state.companyName.value ?? "",
isHaveRightWidget: true,
rightWidget: getTFWidget(),
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
@ -130,7 +133,7 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
context: context, context: context,
builder: (BuildContext context) { builder: (BuildContext context) {
return ShowTFView( return ShowTFView(
title: "${TranslationLoader.lanKeys!.amend!.tr}${TranslationLoader.lanKeys!.company!.tr}", title: "请输入公司名字",
tipTitle: "", tipTitle: "",
controller: state.changeNameController, controller: state.changeNameController,
sureClick: () { sureClick: () {
@ -146,4 +149,51 @@ class _CheckingInSetPageState extends State<CheckingInSetPage> {
},); },);
}); });
} }
// 接受者信息输入框
Widget getTFWidget() {
state.nameController.text = state.companyName.value ?? "";
return Container(
// color: Colors.red,
height: 65.h,
width: 300.w,
padding: EdgeInsets.only(top: 5.h),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expanded(
child: TextField(
//输入框一行
maxLines: 1,
inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny('\n'),
LengthLimitingTextInputFormatter(30),
],
controller: state.nameController,
autofocus: false,
enabled: false,
style: TextStyle(fontSize: 22.sp, color: AppColors.darkGrayTextColor),
textAlign: TextAlign.end,
decoration: InputDecoration(
//输入里面输入文字内边距设置
// contentPadding: const EdgeInsets.only(top: 12.0, bottom: 8.0),
// hintText: state.companyName.value ?? "",
hintStyle: TextStyle(fontSize: 22.sp),
focusedBorder: const OutlineInputBorder(borderSide: BorderSide(width: 0, color: Colors.transparent)),
disabledBorder: const OutlineInputBorder(borderSide: BorderSide(width: 0, color: Colors.transparent)),
enabledBorder: const OutlineInputBorder(borderSide: BorderSide(width: 0, color: Colors.transparent)),
border: const OutlineInputBorder(borderSide: BorderSide(width: 0, color: Colors.transparent)),
contentPadding: const EdgeInsets.symmetric(vertical: 0),
),
),
),
SizedBox(
width: 10.w,
),
],
),
);
}
} }

1
star_lock/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_state.dart
View File

@ -23,6 +23,7 @@ class CheckingInSetState{
var companyName = "".obs;// 公司名称 var companyName = "".obs;// 公司名称
final TextEditingController changeNameController = TextEditingController(); final TextEditingController changeNameController = TextEditingController();
final TextEditingController nameController = TextEditingController();
final checkingInSetInfo = CheckingInSetInfo().obs; final checkingInSetInfo = CheckingInSetInfo().obs;
CheckingInSetState() { CheckingInSetState() {

16
star_lock/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart
View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
@ -247,7 +248,7 @@ class _CheckingInAddStaffPageState extends State<CheckingInAddStaffPage> {
Widget getTFWidget(String tfStr, TextEditingController tf) { Widget getTFWidget(String tfStr, TextEditingController tf) {
return SizedBox( return SizedBox(
height: 50.h, // height: 50.h,
width: 300.w, width: 300.w,
// color: Colors.red, // color: Colors.red,
child: Row( child: Row(
@ -256,16 +257,23 @@ class _CheckingInAddStaffPageState extends State<CheckingInAddStaffPage> {
child: TextField( child: TextField(
//输入框一行 //输入框一行
maxLines: 1, maxLines: 1,
inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny('\n'),
LengthLimitingTextInputFormatter(30),
],
controller: tf, controller: tf,
autofocus: false, autofocus: false,
textAlign: TextAlign.end, textAlign: TextAlign.end,
decoration: InputDecoration( decoration: InputDecoration(
//输入里面输入文字内边距设置 //输入里面输入文字内边距设置
contentPadding: const EdgeInsets.only(top: 12.0, bottom: 8.0), // contentPadding: const EdgeInsets.only(top: 12.0, bottom: 8.0),
hintText: tfStr, hintText: tfStr,
hintStyle: TextStyle(fontSize: 22.sp), hintStyle: TextStyle(fontSize: 22.sp),
//不需要输入框下划线 focusedBorder: const OutlineInputBorder(borderSide: BorderSide(width: 0, color: Colors.transparent)),
border: InputBorder.none, disabledBorder: const OutlineInputBorder(borderSide: BorderSide(width: 0, color: Colors.transparent)),
enabledBorder: const OutlineInputBorder(borderSide: BorderSide(width: 0, color: Colors.transparent)),
border: const OutlineInputBorder(borderSide: BorderSide(width: 0, color: Colors.transparent)),
contentPadding: const EdgeInsets.symmetric(vertical: 0),
), ),
), ),
), ),

28
star_lock/lib/main/lockDetail/lcokSet/checkInCreatCompany/checkInCreatCompany_page.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
@ -36,6 +37,7 @@ class _CheckInCreatCompanyPageState extends State<CheckInCreatCompanyPage> {
CommonItem( CommonItem(
leftTitel: "${TranslationLoader.lanKeys!.company!.tr}${TranslationLoader.lanKeys!.name!.tr}", leftTitel: "${TranslationLoader.lanKeys!.company!.tr}${TranslationLoader.lanKeys!.name!.tr}",
rightTitle: "", rightTitle: "",
isHaveLine: true,
isHaveRightWidget: true, isHaveRightWidget: true,
rightWidget: getTFWidget(false, TranslationLoader.lanKeys!.enterYourName!.tr, 2)), rightWidget: getTFWidget(false, TranslationLoader.lanKeys!.enterYourName!.tr, 2)),
Obx(() => CommonItem( Obx(() => CommonItem(
@ -102,7 +104,7 @@ class _CheckInCreatCompanyPageState extends State<CheckInCreatCompanyPage> {
Widget getTFWidget(bool isHaveBtn, String tfStr, int lineIndex) { Widget getTFWidget(bool isHaveBtn, String tfStr, int lineIndex) {
return SizedBox( return SizedBox(
height: 50.h, // height: 50.h,
width: 320.w, width: 320.w,
child: Row( child: Row(
children: [ children: [
@ -111,16 +113,32 @@ class _CheckInCreatCompanyPageState extends State<CheckInCreatCompanyPage> {
controller:state.companyNameController, controller:state.companyNameController,
//输入框一行 //输入框一行
maxLines: 1, maxLines: 1,
inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny('\n'),
LengthLimitingTextInputFormatter(30),
],
autofocus: false, autofocus: false,
textAlign: TextAlign.end, textAlign: TextAlign.end,
decoration: InputDecoration( decoration: InputDecoration(
//输入里面输入文字内边距设置 //输入里面输入文字内边距设置
contentPadding: const EdgeInsets.only(top: 12.0, bottom: 8.0), // contentPadding: const EdgeInsets.only(top: 12.0, bottom: 8.0),
hintText: TranslationLoader.lanKeys!.pleaseEnter!.tr, hintText: tfStr,
hintStyle: TextStyle(fontSize: 22.sp), hintStyle: TextStyle(fontSize: 22.sp),
//不需要输入框下划线 focusedBorder: const OutlineInputBorder(borderSide: BorderSide(width: 0, color: Colors.transparent)),
border: InputBorder.none, disabledBorder: const OutlineInputBorder(borderSide: BorderSide(width: 0, color: Colors.transparent)),
enabledBorder: const OutlineInputBorder(borderSide: BorderSide(width: 0, color: Colors.transparent)),
border: const OutlineInputBorder(borderSide: BorderSide(width: 0, color: Colors.transparent)),
contentPadding: const EdgeInsets.symmetric(vertical: 0),
), ),
// decoration: InputDecoration(
// //输入里面输入文字内边距设置
// contentPadding: const EdgeInsets.only(top: 12.0, bottom: 8.0),
// hintText: TranslationLoader.lanKeys!.pleaseEnter!.tr,
// hintStyle: TextStyle(fontSize: 22.sp),
// //不需要输入框下划线
// border: InputBorder.none,
// ),
), ),
) )
], ],

7
star_lock/lib/main/lockDetail/lcokSet/configuringWifi/configuringWifi_logic.dart
View File

@ -3,6 +3,7 @@ import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:flutter_reactive_ble/flutter_reactive_ble.dart'; import 'package:flutter_reactive_ble/flutter_reactive_ble.dart';
import 'package:get/get.dart';
import 'package:network_info_plus/network_info_plus.dart'; import 'package:network_info_plus/network_info_plus.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/baseGetXController.dart';
@ -177,7 +178,7 @@ class ConfiguringWifiLogic extends BaseGetXController{
for (var element in itemList) { for (var element in itemList) {
serversList.add(int.parse(element)); serversList.add(int.parse(element));
} }
print('Resolved google.com to address: ${addresses.first.address} serversList：${serversList}'); print('Resolved google.com to address: ${addresses.first.address} serversList：$serversList');
} }
double typeDouble = int.parse(item.port!) / 256; double typeDouble = int.parse(item.port!) / 256;
@ -187,7 +188,9 @@ class ConfiguringWifiLogic extends BaseGetXController{
serversList.add(type2); serversList.add(type2);
} }
var uidList = [Storage.getUid().toString()]; var uidStr = await Storage.getUid();
var uidList = [uidStr.toString()];
// Get.log("uidList:$uidList await Storage.getUid()${await Storage.getUid()}");
IoSenderManage.senderConfiguringWifiCommand( IoSenderManage.senderConfiguringWifiCommand(
keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(), keyID: state.lockSetInfoData.value.lockBasicInfo!.keyId.toString(),
userID: await Storage.getUid(), userID: await Storage.getUid(),

1
star_lock/lib/main/lockDetail/lcokSet/lockSet/lockSet_page.dart
View File

@ -431,6 +431,7 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
SizedBox(height: 10.h), SizedBox(height: 10.h),
*/ */
//-----新增至此 //-----新增至此
SizedBox(height: 10.h),
// 标记房态 // 标记房态
Obx(() { Obx(() {
var title = ""; var title = "";

2
star_lock/lib/main/lockDetail/lcokSet/resetButton/resetButton_page.dart
View File

@ -96,7 +96,7 @@ class _ResetButtonPageState extends State<ResetButtonPage> with RouteAware {
builder: (context) { builder: (context) {
return CupertinoAlertDialog( return CupertinoAlertDialog(
title: const Text("提示"), title: const Text("提示"),
content: Text('确定要${state.resetButtonEnable.value == 1 ? TranslationLoader.lanKeys!.open!.tr : TranslationLoader.lanKeys!.close!.tr}重置键？'), content: Text('确定要${state.resetButtonEnable.value == 1 ? TranslationLoader.lanKeys!.close!.tr : TranslationLoader.lanKeys!.open!.tr}重置键？'),
actions: [ actions: [
CupertinoDialogAction( CupertinoDialogAction(
child: Text(TranslationLoader.lanKeys!.cancel!.tr), child: Text(TranslationLoader.lanKeys!.cancel!.tr),

15
star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart
View File

@ -66,8 +66,7 @@ class _LockDetailPageState extends State<LockDetailPage>
Storage.setStringList(saveBluePrivateKey, savePrivateKeyList); Storage.setStringList(saveBluePrivateKey, savePrivateKeyList);
// signKey // signKey
List<int> signKeyData = List<int> signKeyData = state.keyInfos.value.bluetooth!.signKey!.cast<int>();
state.keyInfos.value.bluetooth!.signKey!.cast<int>();
var saveSignKeyList = changeIntListToStringList(signKeyData); var saveSignKeyList = changeIntListToStringList(signKeyData);
Storage.setStringList(saveBlueSignKey, saveSignKeyList); Storage.setStringList(saveBlueSignKey, saveSignKeyList);
@ -635,11 +634,12 @@ class _LockDetailPageState extends State<LockDetailPage>
BlueManage().stopScan(); BlueManage().stopScan();
BlueManage().disconnect(BlueManage().connectDeviceMacAddress); BlueManage().disconnect(BlueManage().connectDeviceMacAddress);
state.openLockBtnState.value = 0; state.openLockBtnState.value = 0;
if(state.animationController != null){
state.animationController.reset(); // if(state.animationController != null){
state.animationController.forward(); // state.animationController.reset();
state.animationController.dispose(); // state.animationController.forward();
} // state.animationController.dispose();
// }
} }
/// 从下级返回 当前界面即将出现 /// 从下级返回 当前界面即将出现
@ -659,6 +659,7 @@ class _LockDetailPageState extends State<LockDetailPage>
logic.cancelBlueConnetctToastTimer(); logic.cancelBlueConnetctToastTimer();
BlueManage().stopScan(); BlueManage().stopScan();
state.openLockBtnState.value = 0; state.openLockBtnState.value = 0;
state.animationController.reset(); state.animationController.reset();
state.animationController.forward(); state.animationController.forward();
} }

3
star_lock/lib/main/lockMian/lockMain/lockMain_logic.dart
View File

@ -63,6 +63,7 @@ class LockMainLogic extends BaseGetXController {
// // refreshController.refreshCompleted(); // // refreshController.refreshCompleted();
// } // }
// Future<LockListInfoGroupEntity>
void getStarLockInfo() async{ void getStarLockInfo() async{
var entity = await ApiRepository.to.getStarLockListInfo( var entity = await ApiRepository.to.getStarLockListInfo(
pageNo:page, pageNo:page,
@ -93,10 +94,12 @@ class LockMainLogic extends BaseGetXController {
state.dataLength.value = 2; state.dataLength.value = 2;
} }
state.lockListInfoEntity.value = entity; state.lockListInfoEntity.value = entity;
// return entity.data!;
}else{ }else{
print("首页锁列表请求失败"); print("首页锁列表请求失败");
state.dataLength.value = 0; state.dataLength.value = 0;
// refreshController.loadFailed(); // refreshController.loadFailed();
// return entity.data!;
} }
// refreshController.refreshCompleted(); // refreshController.refreshCompleted();
} }

15
star_lock/lib/main/lockMian/lockMain/lockMain_page.dart
View File

@ -12,6 +12,7 @@ import '../../../tools/storage.dart';
import '../../../tools/titleAppBar.dart'; import '../../../tools/titleAppBar.dart';
import '../../../translations/trans_lib.dart'; import '../../../translations/trans_lib.dart';
import '../../lockDetail/lockDetail/lockDetail_page.dart'; import '../../lockDetail/lockDetail/lockDetail_page.dart';
import '../entity/lockListInfo_entity.dart';
import '../lockList/lockList_page.dart'; import '../lockList/lockList_page.dart';
import 'lockMain_logic.dart'; import 'lockMain_logic.dart';
@ -62,6 +63,20 @@ class _StarLockMainPageState extends State<StarLockMainPage> with BaseWidget {
width: 1.sw / 3 * 2, width: 1.sw / 3 * 2,
child: const StarLockMinePage(), child: const StarLockMinePage(),
), ),
// body: FutureBuilder<LockListInfoGroupEntity>(
// future: logic.getStarLockInfo(), // 异步操作
// builder: (BuildContext context, AsyncSnapshot<LockListInfoGroupEntity> snapshot) {
// if (snapshot.connectionState == ConnectionState.waiting) {
// // return CircularProgressIndicator(); // 显示加载指示器
// return Container();
// } else if (snapshot.hasError) {
// // return Text('Error: ${snapshot.error}'); // 显示错误
// return unHaveData();
// } else {
// return getDataReturnUI(snapshot.data!.groupList!.length ?? 0); // 显示获取的数据
// }
// },
// ),
body: Obx(() => getDataReturnUI(state.dataLength.value)), body: Obx(() => getDataReturnUI(state.dataLength.value)),
// body:smartRefresher( // body:smartRefresher(
// logic.refreshController, // logic.refreshController,

2
star_lock/lib/mine/about/about_page.dart
View File

@ -37,7 +37,7 @@ class _AbountPageState extends State<AbountPage> {
), ),
SizedBox(height: 20.h), SizedBox(height: 20.h),
Text( Text(
"星锁 1.0.0.06(preRelease-20240115)", "星锁 1.0.0.07(preRelease-20240118-1)",
style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor), style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor),
), ),
SizedBox( SizedBox(

41
star_lock/lib/mine/addLock/addLock/addLock_page.dart
View File

@ -32,7 +32,7 @@ class _AddLockPageState extends State<AddLockPage> with BaseWidget {
barTitle: TranslationLoader.lanKeys!.addLock!.tr, barTitle: TranslationLoader.lanKeys!.addLock!.tr,
haveBack: true, haveBack: true,
backgroundColor: AppColors.mainColor), backgroundColor: AppColors.mainColor),
body: Column( body: ListView(
// mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
// crossAxisAlignment: CrossAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
@ -73,24 +73,27 @@ class _AddLockPageState extends State<AddLockPage> with BaseWidget {
SizedBox( SizedBox(
height: 120.h, height: 120.h,
), ),
SubmitBtn( Container(
btnName: TranslationLoader.lanKeys!.next!.tr, margin: EdgeInsets.only(left: 20.w, right: 20.w),
borderRadius: 20.w, child: SubmitBtn(
onClick: () { btnName: TranslationLoader.lanKeys!.next!.tr,
if (Platform.isIOS) { borderRadius: 20.w,
Navigator.pushNamed(context, Routers.nearbyLockPage); onClick: () {
} else { if (Platform.isIOS) {
getMicrophonePermission().then((value) { Navigator.pushNamed(context, Routers.nearbyLockPage);
if (value) { } else {
// 有权限 getMicrophonePermission().then((value) {
Navigator.pushNamed(context, Routers.nearbyLockPage); if (value) {
} else { // 有权限
//没有权限 Navigator.pushNamed(context, Routers.nearbyLockPage);
openAppSettings(); //打开app系统设置 } else {
} //没有权限
}); openAppSettings(); //打开app系统设置
} }
}), });
}
}),
),
], ],
), ),
); );

4
star_lock/lib/mine/addLock/saveLock/saveLock_page.dart
View File

@ -94,8 +94,8 @@ class _SaveLockPageState extends State<SaveLockPage> with RouteAware {
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: 50.w, left: 50.w,
right: 50.w, right: 50.w,
top: 30.w, // top: 30.w,
bottom: 30.w // bottom: 30.w
), ),
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 25.w, top: 25.w,

2
star_lock/lib/mine/mine/starLockMine_page.dart
View File

@ -148,7 +148,7 @@ class _StarLockMinePageState extends State<StarLockMinePage> with BaseWidget {
Get.toNamed(Routers.valueAddedServicesPage); Get.toNamed(Routers.valueAddedServicesPage);
}), }),
mineItem('images/mine/icon_mine_main_shoppingcart.png', mineItem('images/mine/icon_mine_main_shoppingcart.png',
TranslationLoader.lanKeys!.shoppingCart!.tr, () { "配件商城".tr, () {
Get.back(); Get.back();
Get.toNamed(Routers.LockMallPage); Get.toNamed(Routers.LockMallPage);
}), }),

2
star_lock/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart
View File

@ -29,7 +29,7 @@ class MinePersonInfoEntity {
class MinePersonInfoData { class MinePersonInfoData {
String? mobile; String? mobile;
String? uid; int? uid;
int? haveSafeAnswer; int? haveSafeAnswer;
String? nickname; String? nickname;
String? headUrl; String? headUrl;

2
star_lock/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_logic.dart
View File

@ -26,7 +26,7 @@ class MinePersonInfoLogic extends GetConnect{
var entity = await ApiRepository.to.getUpToken( var entity = await ApiRepository.to.getUpToken(
module: 'avatar', module: 'avatar',
typeKey: 'userId', typeKey: 'userId',
type: state.mineInfoData.value.uid!, type: state.mineInfoData.value.uid!.toString(),
filename: filename, filename: filename,
size: size size: size
); );

46
star_lock/lib/mine/mineSet/mineSet/mineSet_page.dart
View File

@ -246,7 +246,7 @@ class _MineSetPageState extends State<MineSetPage> {
isDelete: true, isDelete: true,
onClick: () { onClick: () {
//退出登录 //退出登录
logic.userLogoutRequest(); showLoginOutAlertTipDialog();
}), }),
Container( Container(
padding: EdgeInsets.only(right: 30.w, top: 30.h), padding: EdgeInsets.only(right: 30.w, top: 30.h),
@ -303,24 +303,32 @@ class _MineSetPageState extends State<MineSetPage> {
); );
} }
// void showCupertinoAlertDialog(BuildContext context) { void showLoginOutAlertTipDialog() {
// showDialog( showCupertinoDialog(
// context: context, context: context,
// builder: (BuildContext context) { builder: (context) {
// return ShowIosTipView( return CupertinoAlertDialog(
// title: "", title: const Text("提示"),
// tipTitle: TranslationLoader.lanKeys!.deleteAccountTips!.tr, content: const Text('确定要退出吗？'),
// sureClick: () { actions: [
// //安全验证 CupertinoDialogAction(
// Navigator.pushNamed(context, Routers.safeVerifyPage); child: Text(TranslationLoader.lanKeys!.cancel!.tr),
// }, onPressed: () {
// cancelClick: () { Get.back();
// Navigator.pop(context); },
// }, ),
// ); CupertinoDialogAction(
// }, child: const Text("退出"),
// ); onPressed: () {
// } Get.back();
logic.userLogoutRequest();
},
),
],
);
},
);
}
CupertinoSwitch _isPrompToneSwitch() { CupertinoSwitch _isPrompToneSwitch() {
return CupertinoSwitch( return CupertinoSwitch(

2
star_lock/lib/network/api.dart
View File

@ -1,5 +1,5 @@
abstract class Api { abstract class Api {
// static String baseAddress = "https://pre.lock.star-lock.cn:8093"; //预发布环境 // static String baseAddress = "https://pre.lock.star-lock.cn"; //预发布环境
static String baseAddress = "https://dev.lock.star-lock.cn"; //联调环境 static String baseAddress = "https://dev.lock.star-lock.cn"; //联调环境
// static String baseAddress = "http://192.168.1.15:8022"; //谢总本地 // static String baseAddress = "http://192.168.1.15:8022"; //谢总本地
// static String baseAddress = "https://ge.lock.star-lock.cn:8100"; //葛工开发环境地址 // static String baseAddress = "https://ge.lock.star-lock.cn:8100"; //葛工开发环境地址

4
star_lock/lib/tools/commonItem.dart
View File

@ -64,9 +64,7 @@ class CommonItem extends StatelessWidget {
textAlign: TextAlign.right, textAlign: TextAlign.right,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
maxLines: 2, maxLines: 2,
style: TextStyle( style: TextStyle(fontSize: 22.sp, color: AppColors.darkGrayTextColor),
fontSize: 22.sp,
color: AppColors.darkGrayTextColor),
), ),
], ],
), ),

2
star_lock/pubspec.yaml
View File

@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 1.0.0+6 version: 1.0.0+8
environment: environment:
sdk: '>=2.12.0 <3.0.0' sdk: '>=2.12.0 <3.0.0'