✨ Update 로그인/등록화면

-app_lock_state를 내부저장이 아닌 DB저장으로 변경 Related to:#30
APP-Android2 · Jun 28, 2024 · d14bea7 · d14bea7
1 parent 17a9afa
commit d14bea7
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -36,10 +36,8 @@ Future<void> main() async {
     options: DefaultFirebaseOptions.currentPlatform,
   );
 
-  int userIdx =
-      stringToInt((await const FlutterSecureStorage().read(key: "userIdx"))??"");
-  int appLockState =
-      stringToInt((await const FlutterSecureStorage().read(key: "appLockState"))??"");
+  int userIdx = stringToInt((await const FlutterSecureStorage().read(key: "userIdx"))??"");
+  int appLockState =  await getSpecificUserData(userIdx, 'app_lock_state')?? 0;
   int userState = await getSpecificUserData(userIdx, 'user_state')?? 2;
 
   initializeDateFormatting().then((_) async =>
@@ -61,6 +59,10 @@ class WooYeonHi extends StatefulWidget {
 class _WooYeonHiState extends State<WooYeonHi> {
   @override
  build(BuildContext context) {
+    print("4: ${widget.userIdx}");
+    print("5: ${widget.appLockState}");
+    print("6: ${widget.userState}");
+
     return ChangeNotifierProvider(
         create: (context) => UserModel(
             userIdx: 0,
@@ -77,7 +79,9 @@ class _WooYeonHiState extends State<WooYeonHi> {
             alarmsAllow: false,
             topBarActivate: false,
             userState: 2,
-            loveDday: dateToString(DateTime.now())),
+            loveDday: dateToString(DateTime.now()),
+            appLockState: 0
+        ),
         child: MaterialApp(
           debugShowCheckedModeBanner: false,
           title: "WooYeonHi",

diff --git a/lib/model/user_model.dart b/lib/model/user_model.dart
@@ -20,6 +20,7 @@ class UserModel with ChangeNotifier{
   bool topBarActivate;
   int userState;
   String loveDday;
+  int appLockState;
 
   UserModel(
       {required this.userIdx,
@@ -37,6 +38,7 @@ class UserModel with ChangeNotifier{
         required this.topBarActivate,
         required this.userState,
         required this.loveDday,
+        required this.appLockState
       });
 
   factory UserModel.fromData(Map<String, dynamic> data){
@@ -53,9 +55,10 @@ class UserModel with ChangeNotifier{
         topBarType: data['top_bar_type'],
         profileMessage: data['profile_message'],
         alarmsAllow: data['alarms_allow'],
-      topBarActivate: data['top_bar_activate'],
-      userState: data['user_state'],
-      loveDday: data['love_d_day'],
+        topBarActivate: data['top_bar_activate'],
+        userState: data['user_state'],
+        loveDday: data['love_d_day'],
+        appLockState: data['app_lock_state']
     );
   }
 

diff --git a/lib/screen/login/password_enter_screen.dart b/lib/screen/login/password_enter_screen.dart
@@ -15,6 +15,7 @@ import 'package:woo_yeon_hi/style/color.dart';
 import 'package:woo_yeon_hi/style/font.dart';
 import 'package:woo_yeon_hi/style/text_style.dart';
 import 'package:woo_yeon_hi/utils.dart';
+import '../../dao/user_dao.dart';
 import '../../model/user_model.dart';
 
 class PasswordEnterScreen extends StatefulWidget {
@@ -26,8 +27,9 @@ class PasswordEnterScreen extends StatefulWidget {
 
 class _PasswordEnterScreenState extends State<PasswordEnterScreen> {
   static const storage = FlutterSecureStorage();
-  String appLockState = "";
-  String lockPassword = "";
+  late int userIdx;
+  late String appLockState;
+  late String lockPassword;
   dynamic userProvider;
 
   @override
@@ -38,7 +40,8 @@ class _PasswordEnterScreenState extends State<PasswordEnterScreen> {
   }
 
   _asyncMethod() async {
-    appLockState = (await storage.read(key: "appLockState"))??"1";
+    userIdx = stringToInt((await storage.read(key: "lockPassword"))??"");
+    appLockState = await getSpecificUserData(userIdx, 'app_lock_state')?? 1;
     lockPassword = (await storage.read(key: "lockPassword"))??"0,0,0,0";
 
     if(appLockState=="2")

diff --git a/lib/screen/main_screen.dart b/lib/screen/main_screen.dart
@@ -47,7 +47,9 @@ class _MainScreenState extends State<MainScreen> {
                   alarmsAllow: false,
                   topBarActivate: false,
                   userState: 0,
-                  loveDday: dateToString(DateTime.now()))),
+                  loveDday: dateToString(DateTime.now()),
+                  appLockState: 0
+              )),
           ChangeNotifierProvider(create: (context) => DiaryProvider()),
           ChangeNotifierProvider(create: (context) => FootprintProvider()),
           ChangeNotifierProvider(create: (context) => LedgerProvider()),

diff --git a/lib/screen/register/register_done_screen.dart b/lib/screen/register/register_done_screen.dart
@@ -150,9 +150,6 @@ class _RegisterDoneScreen extends State<RegisterDoneScreen>
                                       await storage.write(
                                           key: "userIdx",
                                           value: "${userProvider.userIdx}");
-                                      await storage.write(
-                                          key: "appLockState",
-                                          value: "0");
                                       Future.delayed(const Duration(milliseconds: 500), () {
                                         runApp(const MainScreen());
                                       });
@@ -188,27 +185,18 @@ Future<void> _registerUserData(BuildContext context, UserModel provider) async {
       .get();
   var myDocument = myQuerySnapshot.docs.first;
 
-  // var loverQuerySnapshot = await FirebaseFirestore.instance
-  //     .collection('userData')
-  //     .where('user_idx', isEqualTo: lover_idx)
-  //     .get();
-  // var loverDocument = loverQuerySnapshot.docs.first;
-
   if (myQuerySnapshot.docs.isNotEmpty) {
       myDocument.reference.update({
-        // 'user_nickname': await getMyNickname(
-        //     await getSpecificUserData(provider.userAccount, 'lover_idx')) ??
-        //     "기본닉네임",
         'user_birth': provider.userBirth,
-        // 'lover_nickname': provider.loverNickname,
         'home_preset_type': provider.homePresetType,
-        'user_state': 1,
+        'user_state': 0,
         'login_type': provider.loginType,
         'user_profile_image': "lib/assets/images/default_profile.png",
         'top_bar_type': 0,
         'profile_message': "",
         'alarms_allow': false,
         'top_bar_activate': false,
+        'app_lock_state': 0,
       });
 
   }