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

修复google因为演示模式被拒的问题

Browse Source
This commit is contained in:
魏少阳 2024-03-05 09:28:04 +08:00
parent b8c32103f7
commit 91772036be
7 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
star_lock/ios/Runner.xcodeproj/xcshareddata/xcschemes/pre.xcscheme
View File

@ -7,7 +7,7 @@
buildImplicitDependencies = "YES"> buildImplicitDependencies = "YES">
</BuildAction> </BuildAction>
<TestAction <TestAction
buildConfiguration = "Debug-pre" buildConfiguration = "Release-pre"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"> shouldUseLaunchSchemeArgsEnv = "YES">
@ -24,7 +24,7 @@
</Testables> </Testables>
</TestAction> </TestAction>
<LaunchAction <LaunchAction
buildConfiguration = "Debug-pre" buildConfiguration = "Release-pre"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0" launchStyle = "0"
@ -62,7 +62,7 @@
</BuildableProductRunnable> </BuildableProductRunnable>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug-pre"> buildConfiguration = "Release-pre">
</AnalyzeAction> </AnalyzeAction>
<ArchiveAction <ArchiveAction
buildConfiguration = "Release-pre" buildConfiguration = "Release-pre"

10
star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_page.dart
View File

@ -31,7 +31,7 @@ class SendElectronicKeyPage extends StatefulWidget {
class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> { class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
final logic = Get.put(SendElectronicKeyLogic()); final logic = Get.put(SendElectronicKeyLogic());
final state = Get.find<SendElectronicKeyLogic>().state; final state = Get.find<SendElectronicKeyLogic>().state;
bool isDemoMode = false; bool isDemoMode = true;
@override @override
initState() { initState() {
@ -49,13 +49,12 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
state.type.value = widget.type; state.type.value = widget.type;
return SingleChildScrollView( return SingleChildScrollView(
child: Obx(() => indexChangeWidget()), child: isDemoMode ? indexChangeWidget() : Obx(() => indexChangeWidget()),
); );
} }
Widget indexChangeWidget() { Widget indexChangeWidget() {
if (state.isSendSuccess.value == true && if (state.isSendSuccess.value == true && state.sendSucceedType.value.toString() == widget.type) {
state.sendSucceedType.value.toString() == widget.type) {
return sendElectronicKeySucceed(); return sendElectronicKeySucceed();
} else { } else {
switch (int.parse(widget.type)) { switch (int.parse(widget.type)) {
@ -518,8 +517,7 @@ class _SendElectronicKeyPageState extends State<SendElectronicKeyPage> {
// 远程开锁 // 远程开锁
Widget remoteUnlockingWidget() { Widget remoteUnlockingWidget() {
return Visibility( return Visibility(
visible: visible: isDemoMode ? false: (state.keyInfo.value.lockSetting!.remoteUnlock == 1 ? true : false),
state.keyInfo.value.lockSetting!.remoteUnlock == 1 ? true : false,
child: Column( child: Column(
children: [ children: [
CommonItem( CommonItem(

4
star_lock/lib/main/lockDetail/electronicKey/sendElectronicKey/sendElectronicKey/sendElectronicKey_state.dart
View File

@ -45,6 +45,8 @@ class SendElectronicKeyState {
SendElectronicKeyState() { SendElectronicKeyState() {
Map map = Get.arguments; Map map = Get.arguments;
keyInfo.value = map["keyInfo"]; if ((map["keyInfo"] != null)) {
keyInfo.value = map["keyInfo"];
}
} }
} }

28
star_lock/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_state.dart
View File

@ -25,18 +25,20 @@ class FingerprintDetailState{
final isStressFingerprint = false.obs; final isStressFingerprint = false.obs;
FingerprintDetailState() { FingerprintDetailState() {
Map map = Get.arguments; Map map = Get.arguments;
fingerprintItemData.value = map["fingerprintItemData"]; if ((map["keyInfo"] != null)) {
keyId.value = fingerprintItemData.value.fingerprintId!; fingerprintItemData.value = map["fingerprintItemData"];
typeNumber.value = fingerprintItemData.value.fingerprintNumber!; keyId.value = fingerprintItemData.value.fingerprintId!;
typeName.value = fingerprintItemData.value.fingerprintName!; typeNumber.value = fingerprintItemData.value.fingerprintNumber!;
changeNameController.text = typeName.value; typeName.value = fingerprintItemData.value.fingerprintName!;
effectiveDateTime.value = fingerprintItemData.value.startDate!; changeNameController.text = typeName.value;
failureDateTime.value = fingerprintItemData.value.endDate!; effectiveDateTime.value = fingerprintItemData.value.startDate!;
keyType.value = fingerprintItemData.value.fingerprintType!; failureDateTime.value = fingerprintItemData.value.endDate!;
adder.value = fingerprintItemData.value.senderUsername!; keyType.value = fingerprintItemData.value.fingerprintType!;
addTime.value = fingerprintItemData.value.createDate!; adder.value = fingerprintItemData.value.senderUsername!;
isStressFingerprint.value = fingerprintItemData.value.isCoerced! == 2 ? true : false; addTime.value = fingerprintItemData.value.createDate!;
weekDay.value = fingerprintItemData.value.weekDay!; isStressFingerprint.value =
fingerprintItemData.value.isCoerced! == 2 ? true : false;
weekDay.value = fingerprintItemData.value.weekDay!;
}
} }
} }

10
star_lock/lib/main/lockMian/demoMode/demoModeLockDetail/demoModeLockDetail_page.dart
View File

@ -270,7 +270,7 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
TranslationLoader.lanKeys!.fingerprint!.tr, () { TranslationLoader.lanKeys!.fingerprint!.tr, () {
// gotoLogin(); // gotoLogin();
Get.toNamed(Routers.fingerprintDetailPage, Get.toNamed(Routers.fingerprintListPage,
arguments: {"lockId": 1, "fromType": 1}); arguments: {"lockId": 1, "fromType": 1});
}), }),
@ -290,11 +290,11 @@ class _DemoModeLockDetailPageState extends State<DemoModeLockDetailPage> {
//可视对讲门锁新增->人脸 //可视对讲门锁新增->人脸
showWidgetArr.add( showWidgetArr.add(
bottomItem('images/main/icon_face.png', '人脸', () { bottomItem('images/main/icon_face.png', '人脸', () {
gotoLogin(); // gotoLogin();
// Navigator.pushNamed(context, Routers.otherTypeKeyListPage, Get.toNamed(Routers.faceList, arguments: {
// arguments: 1); "lockId": 1,
// Toast.show(msg: "功能暂未开放"); });
}), }),
); );

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

@ -39,7 +39,7 @@ class _AboutPageState extends State<AboutPage> {
), ),
SizedBox(height: 20.h), SizedBox(height: 20.h),
Text( Text(
"${F.title} 1.0.0.10(preRelease-20240201)", "${F.title} 1.0.0.11(preRelease-20240301)",
style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor), style: TextStyle(fontSize: 24.sp, color: AppColors.blackColor),
), ),
SizedBox(height: 20.h), SizedBox(height: 20.h),

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+10 version: 1.0.0+11
environment: environment:
sdk: '>=2.12.0 <3.0.0' sdk: '>=2.12.0 <3.0.0'