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

修改版本号，打包给欧阳测试

Browse Source
This commit is contained in:
魏少阳 2024-04-03 09:51:26 +08:00
parent 95769e6ca8
commit 990f2033c2
5 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
star_lock/lib/main/lockDetail/checkingIn/checkingInDetail/checkingInDetail_page.dart
View File

@ -180,9 +180,10 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
child: Text( child: Text(
array[index], array[index],
style: TextStyle( style: TextStyle(
color: index == 5 || index == 6 color:
? const Color(0xFFC4C8D0) // index == 5 || index == 6
: const Color(0xFF3C3E43), // ? const Color(0xFFC4C8D0) :
const Color(0xFF3C3E43),
fontSize: 26.sp), fontSize: 26.sp),
)); ));
}, },
@ -212,14 +213,14 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
Color backColor = Colors.white; Color backColor = Colors.white;
// Color textColor = const Color(0xFFFFFFFF); // Color textColor = const Color(0xFFFFFFFF);
if(_datas[index].workType == "1"){ if(_datas[index].workType == "1"){
backColor = const Color(0xFFE83523); // 迟到
// textColor = Colors.white; backColor = const Color(0xFFE83523);
}else if( _datas[index].workType == "2"){ }else if( _datas[index].workType == "2"){
// 早退
backColor = const Color(0xFFEDB459); backColor = const Color(0xFFEDB459);
// textColor = Colors.white;
}else if( _datas[index].workType == "3"){ }else if( _datas[index].workType == "3"){
// 未打卡
backColor = const Color(0xFF666666); backColor = const Color(0xFF666666);
// textColor = Colors.white;
} }
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
@ -263,17 +264,13 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
? _datas[index].day.toString() ? _datas[index].day.toString()
: "", : "",
textAlign: TextAlign.center, textAlign: TextAlign.center,
//设置选中字体颜色，以及周末和工作日颜色 //设置选中字体颜色 休息的颜色都是黑色 其余的都是白色因为有背景色
style: (int.parse(_datas[index].workType!) > 0) style: (int.parse(_datas[index].workType!) > 0)
? TextStyle( ? TextStyle(
fontSize: 24.sp, color: const Color(0xFFFFFFFF)) fontSize: 24.sp, color: const Color(0xFFFFFFFF))
: (index % 7 == 5 || index % 7 == 6 : TextStyle(
? TextStyle( fontSize: 24.sp,
fontSize: 24.sp, color: Colors.black),
color: const Color(0xFFC4C8D0))
: TextStyle(
fontSize: 24.sp,
color: const Color(0xFF3C3E43))),
), ),
), ),
), ),
@ -336,7 +333,7 @@ class _CheckingInDetailPageState extends State<CheckingInDetailPage> {
return Column( return Column(
children: [ children: [
Container( Container(
height: 70.h, // height: 70.h,
padding: padding:
EdgeInsets.only(left: 20.w, right: 10.w, top: 20.w, bottom: 20.w), EdgeInsets.only(left: 20.w, right: 10.w, top: 20.w, bottom: 20.w),
child: Row( child: Row(

5
star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_logic.dart
View File

@ -20,6 +20,10 @@ class RecipientInformationLogic extends BaseGetXController{
); );
if(entity.errorCode!.codeIsSuccessful){ if(entity.errorCode!.codeIsSuccessful){
action(entity.data!); action(entity.data!);
}else {
if(entity.errorCode! == 425){
showToast(entity.errorMsg!);
}
} }
} }
@ -32,6 +36,7 @@ class RecipientInformationLogic extends BaseGetXController{
); );
if(entity.errorCode!.codeIsSuccessful){ if(entity.errorCode!.codeIsSuccessful){
Get.back(result: "scuess"); Get.back(result: "scuess");
eventBus.fire(RefreshLockListInfoDataEvent());
} }
} }

27
star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart
View File

@ -227,12 +227,13 @@ class _RecipientInformationPageState extends State<RecipientInformationPage> {
showCupertinoAlertDialog(context, v); showCupertinoAlertDialog(context, v);
}); });
} else { } else {
Get.toNamed(Routers.selectBranchPage, arguments: { logic.showToast("暂不支持跨平台转移，敬请期待");
"idList": state.idList.value, // Get.toNamed(Routers.selectBranchPage, arguments: {
"countryCode": state.countryCode.value, // "idList": state.idList.value,
"number": state.numberController.text, // "countryCode": state.countryCode.value,
"isFromType": state.isFromType.value, // "number": state.numberController.text,
}); // "isFromType": state.isFromType.value,
// });
} }
} else { } else {
// 转移网关 // 转移网关
@ -241,12 +242,14 @@ class _RecipientInformationPageState extends State<RecipientInformationPage> {
showCupertinoAlertDialog(context, v); showCupertinoAlertDialog(context, v);
}); });
} else { } else {
Get.toNamed(Routers.selectBranchPage, arguments: { logic.showToast("暂不支持跨平台转移，敬请期待");
"idList": state.idList.value,
"countryCode": state.countryCode.value, // Get.toNamed(Routers.selectBranchPage, arguments: {
"number": state.numberController.text, // "idList": state.idList.value,
"isFromType": state.isFromType.value // "countryCode": state.countryCode.value,
}); // "number": state.numberController.text,
// "isFromType": state.isFromType.value
// });
} }
} }
}); });

1
star_lock/lib/network/api_provider_base.dart
View File

@ -40,6 +40,7 @@ class BaseProvider extends GetConnect with Api {
query: query, query: query,
decoder: decoder, decoder: decoder,
uploadProgress: uploadProgress); uploadProgress: uploadProgress);
// print('res.body======>${res.body}');
if (res.body == null) { if (res.body == null) {
if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); if (EasyLoading.isShow) EasyLoading.dismiss(animation: true);
var rs = { var rs = {

3
star_lock/pubspec.yaml
View File

@ -24,7 +24,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# 1.0.20+2024032102：修复Apple Store App Tracking Transparency权限问题 # 1.0.20+2024032102：修复Apple Store App Tracking Transparency权限问题
# 1.0.21+2024032801：同为斯凯环境也区分删减版和完整版，通过main_sky_lite.dart/main_sky_full.dart切换 # 1.0.21+2024032801：同为斯凯环境也区分删减版和完整版，通过main_sky_lite.dart/main_sky_full.dart切换
# 1.0.21+2024032802：1、打包斯凯、预发布环境给欧阳测试 # 1.0.21+2024032802：1、打包斯凯、预发布环境给欧阳测试
version: 1.0.21+20240401 # 1.0.22+20240403：1、打包预发布环境给欧阳测试
version: 1.0.22+20240403
environment: environment:
sdk: '>=2.12.0 <3.0.0' sdk: '>=2.12.0 <3.0.0'