url 갱신

app/src/main/AndroidManifest.xml

@@ -16,8 +16,9 @@
         android:theme="@style/Theme.Midstart"
         android:usesCleartextTraffic="true"
         tools:targetAPI="m">
-        <activity android:name=".PopupActivity" android:theme="@android:style/Theme.Dialog"></activity>
+
         <activity android:name=".calendarActivity" />
+        <activity android:name=".PopupActivity" android:theme="@android:style/Theme.Dialog"></activity>
         <activity android:name=".DiaryActivity" android:windowSoftInputMode="adjustPan"/>
         <activity android:name=".KresActivity" />
         <activity android:name=".KuppermanActivity" />

app/src/main/java/com/example/midstart/ChatBotActivity.java

@@ -60,8 +60,8 @@ public void onClick(View v) {
 
     private void getResponse(String msg){
         chatsModalArrayList.add(new ChatsModal(msg, USER_KEY));
-        String url=" http://18607213ec4f.ngrok.io/?msg="+msg;
-        String BASE_URL=" http://18607213ec4f.ngrok.io/";
+        String url=" http://624e6cee604a.ngrok.io/?msg="+msg;
+        String BASE_URL="http://624e6cee604a.ngrok.io/";
         Retrofit retrofit = new Retrofit.Builder()
                 .baseUrl(BASE_URL)
                 .addConverterFactory(GsonConverterFactory.create())

app/src/main/java/com/example/midstart/MainActivity.java

@@ -78,7 +78,8 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        mFirebaseAuth= FirebaseAuth.getInstance();
+
+
         mDatabaseRef= FirebaseDatabase.getInstance().getReference("appname");
         FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser(); // 로그인한 유저의 정보 가져오기
         String uid = user != null ? user.getUid() : null; // 로그인한 유저의 고유 uid 가져오기
@@ -178,15 +179,16 @@ public void onClick(View v) {
                 startActivity(intent);
             }
         });
-
+        mFirebaseAuth= FirebaseAuth.getInstance();
         //로그아웃 누르면 로그인화면으로
         Button logout = (Button) findViewById(R.id.logout);
         logout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 mFirebaseAuth.signOut();
-                Intent intent = new Intent(getApplicationContext(), LoginActivity.class);
+                Intent intent = new Intent(MainActivity.this, LoginActivity.class);
                 startActivity(intent);
+                finish();
 
 
             }

app/src/main/java/com/example/midstart/PopupActivity.java

@@ -3,24 +3,37 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.app.Activity;
+import android.app.ActivityManager;
+import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.Window;
 import android.widget.TextView;
 
+import java.util.List;
+
 public class PopupActivity extends Activity {
 
     TextView txtText1;
     TextView txtText2;
     TextView txtText3;
 
-
+    public static Activity popActivity;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+
+        String currentActivityName = getClass().getSimpleName().trim();
+        Log.v("testerr",currentActivityName);
+
+
+
+
         //질문 리스트 16개
         String [] quesList={
                 "Q. 오늘 하루중 기억에 남기고 싶은 것은?",
@@ -49,10 +62,14 @@ protected void onCreate(Bundle savedInstanceState) {
         txtText1 = (TextView)findViewById(R.id.txtText1);
         txtText2 = (TextView)findViewById(R.id.txtText2);
         txtText3 = (TextView)findViewById(R.id.txtText3);
-
-        //데이터 가져오기
-        Intent intent = getIntent();
-
+        Intent intent;
+        try {
+            //데이터 가져오기
+            intent = getIntent();
+        }catch(Exception e){
+            intent = getIntent();
+            finish();
+        }
         String Tempdata = intent.getStringExtra("data");
         String data []=Tempdata.split("\n");
         txtText1.setText(data[0].substring(0,10));
@@ -71,8 +88,8 @@ public void mOnClose(View v){
 
         //액티비티(팝업) 닫기
         finish();
+       // this.onStop();
 
-        //onStop();
     }
 
     @Override
@@ -89,5 +106,6 @@ public void onBackPressed() {
         //안드로이드 백버튼 막기
         return;
     }
+
 }
 

app/src/main/java/com/example/midstart/calendarActivity.java

@@ -227,8 +227,10 @@ public void onCancelled(@NonNull DatabaseError error) {
     //팝업 띄우는 함수
     public void mOnPopupClick(String s){
         //데이터 담아서 팝업(액티비티) 호출
+
         Intent intent = new Intent(this, PopupActivity.class);
         intent.putExtra("data",s);
+        //startActivity(intent);
         startActivityForResult(intent, 1);
     }
     @Override