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-12-16 14:31:49 +08:00
parent fe4b3ebaef
commit f212d5dcb1
6 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
star_lock/lib/main/lockDetail/card/addCardType/addCardType_state.dart
View File

@ -19,7 +19,7 @@ class AddCardTypeState{
var weekdaysList = [].obs; var weekdaysList = [].obs;
final TextEditingController nameController = TextEditingController(); final TextEditingController nameController = TextEditingController();
AddCardState() { AddCardTypeState() {
// Map map = Get.arguments; // Map map = Get.arguments;
// lockId.value = map["lockId"]; // lockId.value = map["lockId"];
// fromType.value = map["fromType"]; // fromType.value = map["fromType"];

23
star_lock/lib/main/lockDetail/card/addICCard/addICCard_logic.dart
View File

@ -295,6 +295,13 @@ class AddICCardLogic extends BaseGetXController{
); );
if (entity.errorCode!.codeIsSuccessful) { if (entity.errorCode!.codeIsSuccessful) {
Toast.show(msg: "添加成功"); Toast.show(msg: "添加成功");
if(state.fromType.value == 2){
// 回调指纹号
eventBus.fire(ChickInAddStaffCardAndFingerprintBlockNumberEvent(entity.data!.cardId.toString()));
}else if(state.fromType.value == 1){
eventBus.fire(OtherTypeRefreshListEvent());
}
Get.close(2);
updateIdCardUserNoLoadData(entity.data!.cardId.toString()); updateIdCardUserNoLoadData(entity.data!.cardId.toString());
} }
} }
@ -306,14 +313,14 @@ class AddICCardLogic extends BaseGetXController{
cardUserNo: state.cardNumber.value, cardUserNo: state.cardNumber.value,
); );
if(entity.errorCode!.codeIsSuccessful){ if(entity.errorCode!.codeIsSuccessful){
Toast.show(msg: "添加成功"); // Toast.show(msg: "添加成功");
if(state.fromType.value == 2){ // if(state.fromType.value == 2){
// 回调指纹号 // // 回调指纹号
eventBus.fire(ChickInAddStaffCardAndFingerprintBlockNumberEvent(cardId)); // eventBus.fire(ChickInAddStaffCardAndFingerprintBlockNumberEvent(cardId));
}else if(state.fromType.value == 1){ // }else if(state.fromType.value == 1){
eventBus.fire(OtherTypeRefreshListEvent()); // eventBus.fire(OtherTypeRefreshListEvent());
} // }
Get.close(2); // Get.close(2);
} }
} }

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

@ -48,9 +48,9 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
body: Column( body: Column(
children: [ children: [
Expanded( Expanded(
child: ListView( child: Obx(() => ListView(
children: getListWidget(), children: getListWidget(),
), )),
), ),
], ],
) )
@ -59,6 +59,8 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
// 根据权限显示不同的列表 // 根据权限显示不同的列表
List<Widget> getListWidget(){ List<Widget> getListWidget(){
print("state.lockBasicInfo.value.isLockOwner:${state.lockBasicInfo.value.isLockOwner} state.lockBasicInfo.value.keyRight:${state.lockBasicInfo.value.keyRight}");
if(state.lockBasicInfo.value.isLockOwner == 1 || state.lockBasicInfo.value.keyRight == 1){ if(state.lockBasicInfo.value.isLockOwner == 1 || state.lockBasicInfo.value.keyRight == 1){
// 超级管理员、授权管理员 // 超级管理员、授权管理员
return getAllWidget(); return getAllWidget();

3
star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart
View File

@ -506,7 +506,7 @@ class LockDetailLogic extends BaseGetXController{
token: getTokenList token: getTokenList
); );
} }
}); }, isShowLoading: false);
} }
void startScanAction(){ void startScanAction(){
@ -617,6 +617,7 @@ class LockDetailLogic extends BaseGetXController{
// TODO: implement onReady // TODO: implement onReady
super.onReady(); super.onReady();
print("onReady()"); print("onReady()");
_initReplySubscription(); _initReplySubscription();
initLockSetOpenOrCloseCheckInRefreshLockDetailWithAttendanceAction(); initLockSetOpenOrCloseCheckInRefreshLockDetailWithAttendanceAction();

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

@ -38,7 +38,7 @@ class _AbountPageState extends State<AbountPage> {
), ),
SizedBox(height: 20.h), SizedBox(height: 20.h),
Text( Text(
"星锁 1.0.0.02(preRelease-20231124)", "星锁 1.0.0.03(preRelease-20231216)",
style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor), style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor),
), ),
SizedBox( SizedBox(

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

@ -345,7 +345,7 @@ class ApiProvider extends BaseProvider {
// 删除拥有的当前钥匙 // 删除拥有的当前钥匙
Future<Response> deletOwnerKeyInfo(String lockId, String keyId) => post( Future<Response> deletOwnerKeyInfo(String lockId, String keyId) => post(
deletLockURL.toUrl, deleteElectronicKeyURL.toUrl,
jsonEncode({ jsonEncode({
'lockId': lockId, 'lockId': lockId,
'keyId': keyId 'keyId': keyId