shpark0308 Final State

kohseongyeon · Mar 12, 2021 · f3600c9 · f3600c9
1 parent d7749fd
commit f3600c9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/AmongEarth/app/src/main/AndroidManifest.xml b/AmongEarth/app/src/main/AndroidManifest.xml
@@ -58,7 +58,7 @@
         <activity android:name="com.example.amongearth.record.LoadingActivity"/>
         <activity android:name="com.example.amongearth.record.YoloActivity"/>
         <activity android:name="com.example.amongearth.record.PopupActivity"
-            android:theme="@style/popupTheme" android:screenOrientation="portrait"/> <!-- popup style-->
+            android:theme="@style/popupTheme" android:screenOrientation="unspecified"/> <!-- popup style-->
         <activity android:name="com.example.amongearth.mypage.MyStatsActivity" />
         <activity android:name=".mypage.NoStatsActivity"/>
         <activity android:name="com.example.amongearth.mypage.MyRecordActivity" />

diff --git a/AmongEarth/app/src/main/java/com/example/amongearth/MainActivity.java b/AmongEarth/app/src/main/java/com/example/amongearth/MainActivity.java
@@ -377,7 +377,7 @@ public void onDataChange(@NonNull DataSnapshot snapshot) {
                             heartflag=0;
                         }
 
-                        if (Integer.parseInt(data.child("visibility").getValue()+"")==1){
+                        if (data.child("visibility").getValue()!=null && (Integer.parseInt(data.child("visibility").getValue()+"")==1)){
                             ArrayList<String> arr = new ArrayList<>(Arrays.asList(data.child("nickname").getValue() + "",data.getKey(),
                                     data.child("content").getValue() + "", (data.child("likes").getChildrenCount()-1) + "",
                                     data.child("upload_file").getValue()+"", userinfo.get(dataSnapshot.getKey()+"")+"", dataSnapshot.getKey(), Integer.toString(heartflag))); // 모두 String으로 받아옴

diff --git a/AmongEarth/app/src/main/java/com/example/amongearth/community/Zerowaste_Community.java b/AmongEarth/app/src/main/java/com/example/amongearth/community/Zerowaste_Community.java
@@ -99,7 +99,10 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                 if (zero_waste_list.get(position).getHeartflag().equals("0")){
                     Log.d("이 Log코드는 지우지 마세요","");
                     updatechild.put(userId, userId);
-                    databaseReference.child("challenge_board").child(zero_waste_list.get(position).getUserid()+"").child(zero_waste_list.get(position).getDate2()).child("likes").updateChildren(updatechild);
+                    String s = zero_waste_list.get(position).getDate2().substring(0,4)+zero_waste_list.get(position).getDate2().substring(5,7)+zero_waste_list.get(position).getDate2().substring(8,10);
+
+
+                    databaseReference.child("challenge_board").child(zero_waste_list.get(position).getUserid()+"").child(s).child("likes").updateChildren(updatechild);
                     // 한번 db에서 읽어와보기
                     zero_waste_list.get(position).setHeartflag("1");
                     zero_waste_list.get(position).setHeart_number2((Integer.parseInt(zero_waste_list.get(position).getHeart_number2())+1)+"");

diff --git a/AmongEarth/app/src/main/java/com/example/amongearth/record/PopupActivity.java b/AmongEarth/app/src/main/java/com/example/amongearth/record/PopupActivity.java
@@ -1,10 +1,12 @@
 package com.example.amongearth.record;
 
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Gravity;
@@ -54,6 +56,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 WindowManager.LayoutParams.FLAG_FULLSCREEN);
         setContentView(R.layout.activity_popup);
 
+
         mDatabase = FirebaseDatabase.getInstance().getReference();
 
         Intent intent = getIntent();
@@ -72,6 +75,20 @@ protected void onCreate(Bundle savedInstanceState) {
 
     }
 
+    @Override
+
+    public void setRequestedOrientation(int requestedOrientation){
+
+        if(Build.VERSION.SDK_INT != Build.VERSION_CODES.O){
+
+            super.setRequestedOrientation(requestedOrientation);
+
+        }
+
+    }
+
+
+
     //동작 버튼 클릭
     public void mYes(View v){
         firebaseAuth = FirebaseAuth.getInstance();