diff --git a/.idea/misc.xml b/.idea/misc.xml index 05a5b6c..d646f39 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -34,6 +34,7 @@ + diff --git a/app/src/main/java/com/qtagger/MainActivity.java b/app/src/main/java/com/qtagger/MainActivity.java index ad118c6..83c6682 100644 --- a/app/src/main/java/com/qtagger/MainActivity.java +++ b/app/src/main/java/com/qtagger/MainActivity.java @@ -39,8 +39,15 @@ public class MainActivity extends AppCompatActivity { mSpinner = findViewById(R.id.spinner_account); dataManager = DataManager.getInstance(); - //Intent intent = new Intent(getApplicationContext(), test.class); - //startActivity(intent); + + //테스트용도 나중에 삭제 + findViewById(R.id.imageView).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getApplicationContext(), test.class); + startActivity(intent); + } + }); //로그인 findViewById(R.id.button_login).setOnClickListener(new View.OnClickListener() { @@ -48,37 +55,19 @@ public class MainActivity extends AppCompatActivity { @Override public void onClick(View v) { //로그인 정보 확인 - String selectName= mSpinner.getSelectedItem().toString(); - if(selectName.contains(",")) + int selId = (int)mSpinner.getSelectedItemId(); + + if(selId == 0) { - String acName = selectName.split(",")[0]; - int selid = Integer.parseInt(acName); - - Account selectAcc = accountList.stream().filter(x->x.getId() == selid).findAny().orElse(null); - - - if(selectAcc != null)//로그인 처리 - { - dataManager.loginAccount = selectAcc; - Intent intent2 = new Intent(getApplicationContext(), NavigationActivity.class); - startActivity(intent2); - - - } - else - { - Toast.makeText(MainActivity.this, "계정을 선택해 주세요", Toast.LENGTH_SHORT).show(); - } - + Toast.makeText(MainActivity.this, "계정을 선택해 주세요", Toast.LENGTH_SHORT).show(); } else { - //로그인 정보 획득 실패 - Toast.makeText(MainActivity.this, "계정을 선택해 주세요", Toast.LENGTH_SHORT).show(); + Account selectAcc = accountList.get(selId-1); + dataManager.loginAccount = selectAcc; + Intent intent2 = new Intent(getApplicationContext(), NavigationActivity.class); + startActivity(intent2); } - - - } }); @@ -122,7 +111,7 @@ public class MainActivity extends AppCompatActivity { //초기 데이터 세팅 accountList = db.accountDao().getAll(); for (Account ac: accountList) { - aa_items.add(Integer.toString( ac.getId())+","+ac.getAccountId()); + aa_items.add(ac.getAccountId()); } mSpinner.setAdapter(aa_items); diff --git a/app/src/main/java/com/qtagger/test.java b/app/src/main/java/com/qtagger/test.java index 0354d04..43f6fec 100644 --- a/app/src/main/java/com/qtagger/test.java +++ b/app/src/main/java/com/qtagger/test.java @@ -24,10 +24,12 @@ public class test extends AppCompatActivity { findViewById(R.id.button3).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + + for (int i = 1;i<=10;i++) { String str = Integer.toString(i) ; - db.accountDao().insert(new Account(str,str,str)); + db.accountDao().insert(new Account("User"+str,"김이박","개발팀")); } } });