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-05-03 11:24:41 +08:00
commit 2fbe5fcf51
11 changed files with 175 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
star_lock/ios/Podfile.lock
View File

@ -316,7 +316,7 @@ SPEC CHECKSUMS:
flutter_native_contact_picker: bd430ba0fbf82768bb50c2c52a69a65759a8f907
flutter_pcm_sound: de0572ca4f99091cc2abfcc31601b8a4ddd33c0e
flutter_voice_processor: 2b89b93d69b02227ae3fd58589ee0bcfa3ca2a82
fluttertoast: 9f2f8e81bb5ce18facb9748d7855bf5a756fe3db
fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
fluwx: daa284756ce53442b3d0417ceeda66e981906811
google_maps_flutter_ios: d1318b4ff711612cab16862d7a87e31a7403d458
GoogleMaps: 20d7b12be49a14287f797e88e0e31bc4156aaeb4

2
star_lock/lib/flavors.dart
View File

@ -28,6 +28,8 @@ class F {
static String get name => appFlavor?.name ?? '';
static bool get isXHJ => appFlavor == Flavor.xhj;
//便捷判断并返回值
static dynamic sw(
{required fCallFunction defaultCall, fCallFunction? xhjCall}) {

149
star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_page.dart
View File

@ -61,7 +61,8 @@ class _LockEscalationPageState extends State<LockEscalationPage> {
width: 10.w,
),
Text(
TranslationLoader.lanKeys!.haveNewVersion!.tr,
// TranslationLoader.lanKeys!.haveNewVersion!.tr,
"未发现新版本",
style: TextStyle(
fontSize: 24.sp, fontWeight: FontWeight.w600),
)
@ -75,80 +76,6 @@ class _LockEscalationPageState extends State<LockEscalationPage> {
style: TextStyle(
fontSize: 18.sp, color: AppColors.darkGrayTextColor),
),
SizedBox(
height: 10.h,
),
Obx(() {
return !logic.state.otaUpdateIng.value
? Stack(
children: [
Container(
margin: EdgeInsets.only(top: 8, bottom: 8),
width: Get.width,
child: Center(
child: Text(
// "${TranslationLoader.lanKeys!.newVersion!.tr}：1.0.1",
"未发现新版本",
style: TextStyle(
color: AppColors.mainColor,
fontSize: 18.sp),
),
),
),
Positioned(
right: 80.w,
child: GestureDetector(
onTap: () {
logic.otaUpdate();
},
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
'手动升级',
style: TextStyle(
color: AppColors.mainColor,
fontSize: 18.sp,
fontWeight: FontWeight.w400),
),
),
),
)
],
)
: Padding(
padding: EdgeInsets.symmetric(
horizontal: 50.w, vertical: 15.h),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Text(
'固件传输中',
style: TextStyle(
color: AppColors.mainColor,
fontSize: 18.sp,
fontWeight: FontWeight.w400),
),
SizedBox(
width: 10.w,
),
Expanded(
child: ClipRRect(
borderRadius: BorderRadius.all(
Radius.circular(10.r)),
child: LinearProgressIndicator(
value: logic
.state.otaProgress.value, // 50% 进度
backgroundColor: Colors.grey[200],
valueColor:
AlwaysStoppedAnimation<Color>(
AppColors.mainColor),
),
),
),
],
),
);
}),
SizedBox(
height: 40.h,
),
@ -159,6 +86,78 @@ class _LockEscalationPageState extends State<LockEscalationPage> {
onClick: () {})
: SizedBox();
}),
SizedBox(
height: 10.h,
),
Obx(() {
return !logic.state.otaUpdateIng.value
? Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
// Container(
// margin: EdgeInsets.only(top: 8, bottom: 8),
// width: Get.width,
// child: Center(
// child: Text(
// // "${TranslationLoader.lanKeys!.newVersion!.tr}：1.0.1",
// "未发现新版本",
// style: TextStyle(
// color: AppColors.mainColor,
// fontSize: 18.sp),
// ),
// ),
// ),
GestureDetector(
onTap: () {
logic.otaUpdate();
},
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
'手动升级',
style: TextStyle(
color: AppColors.mainColor,
fontSize: 18.sp,
fontWeight: FontWeight.w400),
),
),
)
],
)
: Padding(
padding: EdgeInsets.symmetric(
horizontal: 50.w, vertical: 15.h),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Text(
'固件传输中',
style: TextStyle(
color: AppColors.mainColor,
fontSize: 18.sp,
fontWeight: FontWeight.w400),
),
SizedBox(
width: 10.w,
),
Expanded(
child: ClipRRect(
borderRadius: BorderRadius.all(
Radius.circular(10.r)),
child: LinearProgressIndicator(
value: logic
.state.otaProgress.value, // 50% 进度
backgroundColor: Colors.grey[200],
valueColor:
AlwaysStoppedAnimation<Color>(
AppColors.mainColor),
),
),
),
],
),
);
}),
],
),
));

28
star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_logic.dart
View File

@ -143,17 +143,17 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
//是否为永久
if (state.isPermanent.value == false) {
getKeyType = '3';
getEffectiveDateTime = DateTool().dateToTimestamp(state.beginTime.value, 1).toString();
getFailureDateTime = DateTool().dateToTimestamp(state.endTime.value, 1).toString();
getEffectiveDateTime = DateTool().dateToTimestamp(state.customBeginTime.value, 1).toString();
getFailureDateTime = DateTool().dateToTimestamp(state.customEndTime.value, 1).toString();
}
var entity = await ApiRepository.to.addPasswordKey(
lockId,
state.nameController.text,
state.pwdController.text,
getKeyType,
getEffectiveDateTime,
getFailureDateTime,
'1');
lockId:lockId,
keyboardPwdName:state.nameController.text,
keyboardPwd:state.pwdController.text,
keyboardPwdType:getKeyType,
startDate:getEffectiveDateTime,
endDate:getFailureDateTime,
addType:'1');
if (entity.errorCode!.codeIsSuccessful) {
state.isSendSuccess.value = true;
state.sendSucceedType.value = state.widgetType.value;
@ -234,8 +234,8 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
pwdNo: state.isAdministrator.value == true ? 254 : 0,
pwd:state.pwdController.text,
useCountLimit: 0xff,
startTime: DateTool().dateToTimestamp(state.beginTime.value, 1)~/1000,
endTime: DateTool().dateToTimestamp(state.endTime.value, 1)~/1000,
startTime: DateTool().dateToTimestamp(state.customBeginTime.value, 1)~/1000,
endTime: DateTool().dateToTimestamp(state.customEndTime.value, 1)~/1000,
needAuthor: 1,
isBeforeAddUser: false,
signKey: signKeyDataList,
@ -265,8 +265,8 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
// 设置自定义密码
Future<void> senderCustomPasswords() async {
var startDate = DateTool().dateToTimestamp(state.beginTime.value, 1);
var endDate = DateTool().dateToTimestamp(state.endTime.value, 1);
var startDate = DateTool().dateToTimestamp(state.customBeginTime.value, 1);
var endDate = DateTool().dateToTimestamp(state.customEndTime.value, 1);
//非永久 须有时限
if (state.isPermanent.value == false) {
if (startDate < DateTool().dateToTimestamp(DateTool().getNowDateWithType(3), 1)) {
@ -359,7 +359,7 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
case 3:
//自定义
if (state.isPermanent.value == false) {
'类型:自定义-限时\n有效期:${state.beginTime.value} -- ${state.endTime.value}';
'类型:自定义-限时\n有效期:${state.customBeginTime.value} -- ${state.customEndTime.value}';
} else {
useDateStr = '类型:自定义-永久';
}

56
star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_page.dart
View File

@ -139,7 +139,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> wit
children: [
keyIfPerpetualWidget(),
state.isPermanent.value == false
? keyTimeLimitWidget()
? keyCustomTimeLimitWidget()
: Container(),
perpetualKeyWidget(
false,
@ -228,14 +228,9 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> wit
context,
maxDate: PDuration(year: DateTime.now().year + 3, month: DateTime.now().month, day: DateTime.now().day, hour: 24),
// minDate: PDuration.now(),
mode: state.widgetType.value == 3 ? DateMode.YMDHM:DateMode.YMDH,
mode: DateMode.YMDHM,
onConfirm: (p) {
if (state.widgetType.value == 3) {
// 自定义
state.beginTime.value = DateTool().getYMDHNDateString(p, 1);
} else {
state.beginTime.value = DateTool().getYMDHNDateString(p, 4);
}
state.beginTime.value = DateTool().getYMDHNDateString(p, 4);
});
}),
),
@ -251,12 +246,7 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> wit
minDate: PDuration(year: DateTime.now().year, month: DateTime.now().month, day: DateTime.now().day),
mode: DateMode.YMDH,
onConfirm: (p) {
if (state.widgetType.value == 3) {
// 自定义
state.endTime.value = DateTool().getYMDHNDateString(p, 1);
} else {
state.endTime.value = DateTool().getYMDHNDateString(p, 4);
}
state.endTime.value = DateTool().getYMDHNDateString(p, 4);
});
}),
Container(height: 10.h),
@ -264,6 +254,44 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> wit
);
}
// 自定义限时顶部选择日期
Widget keyCustomTimeLimitWidget() {
return Column(
children: [
CommonItem(
leftTitel: TranslationLoader.lanKeys!.effectiveTime!.tr,
rightTitle: state.customBeginTime.value,
isHaveLine: true,
isHaveDirection: true,
action: () {
Pickers.showDatePicker(
context,
// maxDate: PDuration(year: DateTime.now().year + 3, month: DateTime.now().month, day: DateTime.now().day, hour: 24),
// minDate: PDuration.now(),
mode: DateMode.YMDHM,
onConfirm: (p) {
state.customBeginTime.value = DateTool().getYMDHNDateString(p, 1);
});
}),
CommonItem(
leftTitel: TranslationLoader.lanKeys!.failureTime!.tr,
rightTitle: state.customEndTime.value,
isHaveDirection: true,
action: () {
Pickers.showDatePicker(context,
// maxDate传入三年以后得今天的时间
// maxDate: PDuration(year: DateTime.now().year + 3, month: DateTime.now().month, day: DateTime.now().day),
// minDate: PDuration(year: DateTime.now().year, month: DateTime.now().month, day: DateTime.now().day),
mode: DateMode.YMDHM,
onConfirm: (p) {
state.customEndTime.value = DateTool().getYMDHNDateString(p, 1);
});
}),
Container(height: 10.h),
],
);
}
// 自定义是否永久
Widget keyIfPerpetualWidget() {
return Column(

3
star_lock/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_state.dart
View File

@ -25,6 +25,9 @@ class PasswordKeyPerpetualState {
var loopEndHours = DateTime.now().hour.obs;
var loopModeStr = '周末'.obs; //循环模式
var customBeginTime = DateTool().getNowDateWithType(2).obs; //默认为当前时间 开始时间
var customEndTime = DateTool().getNowDateWithType(2).obs;//默认为当前时间 结束时间
final widgetType = 0.obs;
final sendSucceedType = 0.obs;
final keyInfo = LockListInfoItemEntity().obs;

2
star_lock/lib/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart
View File

@ -15,6 +15,8 @@ class LockMainXHJLogic extends BaseGetXController {
update();
}
bool get isMall => state.index ==1;
//打开设备弹窗
void openEquipment() {
showModalBottomSheet(

1
star_lock/lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart
View File

@ -25,6 +25,7 @@ class StarLockMainXHJPage extends StatefulWidget {
class _StarLockMainXHJPageState extends State<StarLockMainXHJPage>
with BaseWidget {
@override
void initState() {
super.initState();

30
star_lock/lib/mine/mall/lockMall_logic.dart
View File

@ -1,8 +1,12 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:fluwx/fluwx.dart';
import 'package:get/get.dart';
import 'package:star_lock/flavors.dart';
import 'package:star_lock/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart';
import 'package:star_lock/mine/mall/lockMall_entity.dart';
import 'package:star_lock/mine/mall/lockMall_state.dart';
import 'package:star_lock/network/api_repository.dart';
@ -16,8 +20,10 @@ import '../../tools/baseGetXController.dart';
class LockMallLogic extends BaseGetXController {
late LockMallState state;
DateTime? _lastPressedAt; // 记录上一次按下返回键的时间
LockMallLogic({required bool allowReturn})
: state = LockMallState(allowReturn: allowReturn );
: state = LockMallState(allowReturn: allowReturn);
//获取商城跳转地址
Future<void> getMallURLRequest() async {
@ -98,19 +104,33 @@ class LockMallLogic extends BaseGetXController {
//判断webview 是否可以有路由可以回退，无则退出当前页面
Future<bool> canGoBack(bool didPop) async {
bool canGoBack = await state.mallWebView.canGoBack();
if (canGoBack) {
bool isMall = true;
if (Get.isRegistered<LockMainXHJLogic>() && F.isXHJ) {
isMall = Get.find<LockMainXHJLogic>().isMall;
}
if (canGoBack && isMall) {
await state.mallWebView.goBack();
} else if (state.allowReturn) {
} else if (state.allowReturn && isMall) {
Get.back();
} else {
if (_lastPressedAt == null ||
DateTime.now().difference(_lastPressedAt!) > Duration(seconds: 2)) {
// 如果两次返回键时间间隔大于 2 秒，则提示再次按下返回键退出
_lastPressedAt = DateTime.now();
showToast('再返回一次退出${F.title}');
return false; // 阻止返回操作
}
SystemNavigator.pop();
return true;
}
refreshGoBack();
return false;
}
//刷新当前路由状态
void refreshGoBack(){
void refreshGoBack() {
//如果属于一直返回按钮，则根据是否有路由可以回退刷新
if(state.allowReturn){
if (state.allowReturn) {
return;
}
state.mallWebView.canGoBack().then((value) {

17
star_lock/lib/network/api_repository.dart
View File

@ -466,14 +466,15 @@ class ApiRepository {
//自定义密码
Future<PasswordKeyEntity> addPasswordKey(
String lockId,
String keyboardPwdName,
String keyboardPwd,
String keyboardPwdType,
String startDate,
String endDate,
String addType,
) async {
{
required String lockId,
required String keyboardPwdName,
required String keyboardPwd,
required String keyboardPwdType,
required String startDate,
required String endDate,
required String addType,
}) async {
final res = await apiProvider.addKeyboardPwd(lockId, keyboardPwdName,
keyboardPwd, keyboardPwdType, startDate, endDate, addType);
return PasswordKeyEntity.fromJson(res.body);

3
star_lock/pubspec.yaml
View File

@ -38,8 +38,9 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# 1.0.28+2024042601 打包鑫锁提审华为
# 1.0.29+2024042901 打包给欧阳测试
# 1.0.30+2024043001 打包鑫锁提审ios
# 1.0.31+2024050301 打包鑫锁提审华为
version: 1.0.30+2024043001
version: 1.0.31+2024050301
environment:
sdk: '>=2.12.0 <3.0.0'