From c7f644ac4e0b40710581548adbf650f195697876 Mon Sep 17 00:00:00 2001 From: yeeunyuk Date: Thu, 12 Jan 2023 00:19:47 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=9E=90=EB=8F=99=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8,=20ID=20=ED=81=B4=EB=9D=BC=EC=9D=B4=EC=96=B8=ED=8A=B8?= =?UTF-8?q?=EC=97=90=20=EA=B8=B0=EC=96=B5=ED=95=98=EB=8A=94=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=EB=84=88=20=EC=9E=91=EC=84=B1.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../myapplication/ui/login/LoginActivity.java | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/application/app/src/main/java/com/mnchatbot/myapplication/ui/login/LoginActivity.java b/application/app/src/main/java/com/mnchatbot/myapplication/ui/login/LoginActivity.java index b5ebf89..665767f 100644 --- a/application/app/src/main/java/com/mnchatbot/myapplication/ui/login/LoginActivity.java +++ b/application/app/src/main/java/com/mnchatbot/myapplication/ui/login/LoginActivity.java @@ -41,7 +41,7 @@ public class LoginActivity extends AppCompatActivity { private CheckBox autoLogin; private LoginFormState LoginFormState = new LoginFormState(); - private SharedPreferences pre, pre2; + private SharedPreferences preferences, pre2; //서버 통신 private ServiceAPI service = ServiceGenerator.createService(ServiceAPI.class); @@ -134,6 +134,24 @@ public void onClick(View view) { //LoginResponse(); } }); + + //(TEST) 자동 로그인 체크됨에 따라 저장하기 + autoLogin.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + preferences = getSharedPreferences("autoLogin", Activity.MODE_PRIVATE); + SharedPreferences.Editor editor = preferences.edit(); + + editor.putString("userId", String.valueOf(login_email.getText())); + editor.commit(); + String ID = preferences.getString("userId", null); + Log.d("아이디", ID); + //autoLoginEdit.putString("passwordNo", passwordNo); + //autoLoginEdit.putString("userRole", loginInfo.getUserRole()); + //autoLoginEdit.putString("userName", loginInfo.getUserNm()); + + } + }); } public void LoginResponse() { @@ -152,8 +170,8 @@ public void onResponse(Call call, Response respons //받은 코드 저장 int statusCode = result.getStatusCode(); - pre = getSharedPreferences("TOKEN", Context.MODE_PRIVATE); - SharedPreferences.Editor editor = pre.edit(); + preferences = getSharedPreferences("TOKEN", Context.MODE_PRIVATE); + SharedPreferences.Editor editor = preferences.edit(); String token = response.headers().value(3); editor.putString("TOKEN", token); editor.commit(); @@ -161,13 +179,6 @@ public void onResponse(Call call, Response respons //자동 로그인 체크됨에 따라 저장하기 if(autoLogin.isChecked()) { - pre2 = getSharedPreferences("autoLogin", Activity.MODE_PRIVATE); - SharedPreferences.Editor autoLoginEdit = pre2.edit(); - autoLoginEdit.putString("userId", userID); - //autoLoginEdit.putString("passwordNo", passwordNo); - //autoLoginEdit.putString("userRole", loginInfo.getUserRole()); - //autoLoginEdit.putString("userName", loginInfo.getUserNm()); - autoLoginEdit.commit(); } if (statusCode==200) { From c0d4860264dd5dd15fb7745ade8c800c4b93b4ef Mon Sep 17 00:00:00 2001 From: yeeunyuk Date: Thu, 12 Jan 2023 00:53:52 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=9E=90=EB=8F=99=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8,=20ID=20=ED=81=B4=EB=9D=BC=EC=9D=B4=EC=96=B8=ED=8A=B8?= =?UTF-8?q?=EC=97=90=20=EA=B8=B0=EC=96=B5=ED=95=98=EB=8A=94=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=EB=84=88=20=EC=9E=91=EC=84=B1.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../myapplication/ui/login/LoginActivity.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/application/app/src/main/java/com/mnchatbot/myapplication/ui/login/LoginActivity.java b/application/app/src/main/java/com/mnchatbot/myapplication/ui/login/LoginActivity.java index 665767f..3f22ce9 100644 --- a/application/app/src/main/java/com/mnchatbot/myapplication/ui/login/LoginActivity.java +++ b/application/app/src/main/java/com/mnchatbot/myapplication/ui/login/LoginActivity.java @@ -35,13 +35,15 @@ public class LoginActivity extends AppCompatActivity { + String ID; + private TextView pw_change; private EditText login_email, login_password; private Button login_button, join_button; private CheckBox autoLogin; private LoginFormState LoginFormState = new LoginFormState(); - private SharedPreferences preferences, pre2; + private SharedPreferences preferences; //서버 통신 private ServiceAPI service = ServiceGenerator.createService(ServiceAPI.class); @@ -122,6 +124,7 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { }); login_button = findViewById( R.id.login ); + login_button.setOnClickListener( new View.OnClickListener() { @Override public void onClick(View view) { @@ -132,6 +135,11 @@ public void onClick(View view) { .create() .show(); //LoginResponse(); + if (ID != null) { + Intent intent = new Intent(LoginActivity.this, PetSelectActivity.class); + startActivity(intent); + LoginActivity.this.finish(); + } } }); @@ -141,17 +149,13 @@ public void onClick(View view) { public void onClick(View view) { preferences = getSharedPreferences("autoLogin", Activity.MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); - editor.putString("userId", String.valueOf(login_email.getText())); editor.commit(); - String ID = preferences.getString("userId", null); + ID = preferences.getString("userId", null); Log.d("아이디", ID); - //autoLoginEdit.putString("passwordNo", passwordNo); - //autoLoginEdit.putString("userRole", loginInfo.getUserRole()); - //autoLoginEdit.putString("userName", loginInfo.getUserNm()); - } }); + } public void LoginResponse() {