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

修改显示版本号，切换预发布环境

Browse Source
This commit is contained in:
魏少阳 2023-11-18 15:33:25 +08:00
parent e1c575ca8b
commit 60fe713ded
7 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
star_lock/ios/Podfile
View File

@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '11.0'
platform :ios, '11.0'
#use_modular_headers!
use_frameworks! :linkage => :static
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
@ -50,7 +50,7 @@ post_install do |installer|
# ## dart: PermissionGroup.camera
# 'PERMISSION_CAMERA=1'
#
# Preprocessor definitions can be found in: https://github.com/Baseflow/flutter-permission-handler/blob/master/permission_handler_apple/ios/Classes/PermissionHandlerEnums.h
# Preprocessor definitions can be found inhttps://github.com/Baseflow/flutter-permission-handler/blob/master/permission_handler_apple/ios/Classes/PermissionHandlerEnums.h
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
'$(inherited)',

8
star_lock/lib/main.dart
View File

@ -138,9 +138,11 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver, BaseWidget {
_aliyunPush.getDeviceId().then((deviceId) async {
final data = await Storage.getString('userLoginData');
if (data!.isNotEmpty) {
XSAliyunPushProvider()
.pushBindDeviceID(deviceId, Platform.isAndroid ? 10 : 20);
}
if (Platform.isIOS) {
XSAliyunPushProvider()
.pushBindDeviceID(deviceId, Platform.isAndroid ? 10 : 20);
}
}
});
// //使用userid根据账号推送

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

@ -6,7 +6,6 @@ import 'package:star_lock/blue/io_type.dart';
import '../../../../blue/blue_manage.dart';
import '../../../../blue/io_reply.dart';
import '../../../../blue/io_protocol/io_senderCustomPasswords.dart';
import '../../../../blue/io_tool/io_manager.dart';
import '../../../../blue/io_tool/io_tool.dart';
import '../../../../blue/io_tool/manager_event_bus.dart';
import '../../../../blue/sender_manage.dart';
@ -14,6 +13,7 @@ import '../../../../tools/baseGetXController.dart';
import '../../../../tools/storage.dart';
class PasswordKeyPerpetualLogic extends BaseGetXController {
late DateTime getStartDateTime;
// 监听设备返回的数据
late StreamSubscription<Reply> _replySubscription;

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

@ -72,15 +72,21 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
if (int.parse(widget.type) == 4) {
cyclicModeStr = '周末';
_selectEffectiveDate = formatDate(dateTime, [HH, ':', nn]); //默认为当前时间
_selectFailureDate = formatDate(dateTime, [HH, ':', nn]); //默认为当前时间
_selectEffectiveDate = "${formatDate(dateTime, [HH])}:00"; //默认为当前时间
_selectFailureDate = "${formatDate(dateTime, [HH])}:00"; //默认为当前时间
startHours = _effectiveDateTime.hour;
endHours = _failureDateTime.hour;
} else {
} else if (int.parse(widget.type) == 3) {
// 自定义
_selectEffectiveDate = formatDate(
dateTime, [yyyy, '-', mm, '-', dd, ' ', HH, ':', nn]); //默认为当前时间
_selectFailureDate = formatDate(
dateTime, [yyyy, '-', mm, '-', dd, ' ', HH, ':', nn]); //默认为当前时间
} else {
_selectEffectiveDate = "${formatDate(
dateTime, [yyyy, '-', mm, '-', dd, ' ', HH])}:00"; //默认为当前时间
_selectFailureDate = "${formatDate(
dateTime, [yyyy, '-', mm, '-', dd, ' ', HH])}:00"; //默认为当前时间
}
}
@ -213,10 +219,18 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
Pickers.showDatePicker(context, mode: DateMode.YMDHM,
onConfirm: (p) {
setState(() {
_effectiveDateTime = DateTime.parse(
'${p.year}-${intToStr(p.month!)}-${intToStr(p.day!)} ${intToStr(p.hour!)}:${intToStr(p.minute!)}');
_selectEffectiveDate = formatDate(_effectiveDateTime,
[yyyy, '-', mm, '-', dd, ' ', HH, ':', nn]);
if (int.parse(widget.type) == 3) {
// 自定义
_effectiveDateTime = DateTime.parse(
'${p.year}-${intToStr(p.month!)}-${intToStr(p.day!)} ${intToStr(p.hour!)}:${intToStr(p.minute!)}');
_selectEffectiveDate = formatDate(_effectiveDateTime,
[yyyy, '-', mm, '-', dd, ' ', HH, ':', nn]); //默认为当前时间
} else {
_effectiveDateTime = DateTime.parse(
'${p.year}-${intToStr(p.month!)}-${intToStr(p.day!)} ${intToStr(p.hour!)}');
_selectEffectiveDate = "${formatDate(_effectiveDateTime,
[yyyy, '-', mm, '-', dd, ' ', HH, ':', nn])}00"; //默认为当前时间
}
});
});
}),
@ -228,10 +242,18 @@ class _PasswordKeyPerpetualPageState extends State<PasswordKeyPerpetualPage> {
Pickers.showDatePicker(context, mode: DateMode.YMDHM,
onConfirm: (p) {
setState(() {
_failureDateTime = DateTime.parse(
'${p.year}-${intToStr(p.month!)}-${intToStr(p.day!)} ${intToStr(p.hour!)}:${intToStr(p.minute!)}');
_selectFailureDate = formatDate(_failureDateTime,
[yyyy, '-', mm, '-', dd, ' ', HH, ':', nn]);
if (int.parse(widget.type) == 3) {
// 自定义
_failureDateTime = DateTime.parse(
'${p.year}-${intToStr(p.month!)}-${intToStr(p.day!)} ${intToStr(p.hour!)}:${intToStr(p.minute!)}');
_selectFailureDate = formatDate(_failureDateTime,
[yyyy, '-', mm, '-', dd, ' ', HH, ':', nn]); //默认为当前时间
} else {
_failureDateTime = DateTime.parse(
'${p.year}-${intToStr(p.month!)}-${intToStr(p.day!)} ${intToStr(p.hour!)}');
_selectFailureDate = "${formatDate(_failureDateTime,
[yyyy, '-', mm, '-', dd, ' ', HH])}:00";
}
});
});
}),

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

@ -46,7 +46,7 @@ class _AbountPageState extends State<AbountPage> {
height: 20.h,
),
Text(
"星锁 1.0.0",
"星锁 1.0.0.01(preRelease-20231118)",
style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor),
),
SizedBox(

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

@ -1,11 +1,11 @@
abstract class Api {
static String baseAddress = "https://pre.lock.star-lock.cn:8093"; //预发布环境
// final String baseUrl = "$baseAddress/api";
final String baseUrl = "$baseAddress/api";
// final String baseUrl = "http://test.lock.star-lock.cn/api"; // 葛工
// final String baseUrl = "https://lock.star-lock.cn/api"; // 测试环境
// final String baseUrl = "http://wenlin.lock.star-lock.cn/api"; //曾工
final String baseUrl = "http://192.168.56.101:8099/api"; //曾工本地
// final String baseUrl = "http://192.168.56.101:8099/api"; //曾工本地
// final String baseUrl = "http://192.168.1.14:8099/api"; //葛工开发环境地址
// 登录注册

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

@ -9,8 +9,8 @@ class NoData extends StatelessWidget {
Widget build(BuildContext context) {
return SizedBox(
width: 1.sw,
// height: 1.sh - ScreenUtil().statusBarHeight,
height: 1.sw,
height: 1.sh - ScreenUtil().statusBarHeight,
// height: 1.sw,
child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,