Double-Slash · hb7829 · Aug 14, 2020 · Aug 14, 2020
diff --git a/DdamiApp/app/.idea/caches/build_file_checksums.ser b/DdamiApp/app/.idea/caches/build_file_checksums.ser
diff --git a/DdamiApp/app/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml b/DdamiApp/app/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml
diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/activity/DetailActivity.java b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/activity/DetailActivity.java
@@ -4,7 +4,6 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
@@ -22,11 +21,8 @@
 import com.doubleslash.ddamiapp.R;
 import com.doubleslash.ddamiapp.adapter.CommentAdapter;
 import com.doubleslash.ddamiapp.adapter.DetailImgAdapter;
-import com.doubleslash.ddamiapp.model.CommentItem;
 import com.doubleslash.ddamiapp.model.DetailImgItem;
-import com.doubleslash.ddamiapp.model.DetailPieceCommentDAO;
 import com.doubleslash.ddamiapp.network.kotlin.ApiService;
-import com.google.gson.JsonObject;
 
 import java.util.ArrayList;
 
@@ -48,6 +44,8 @@ public class DetailActivity extends AppCompatActivity {
     ExpandableListView commentView;
     RecyclerView recyclerView;
 
+    String token;
+
 
     @SuppressLint("CheckResult")
     protected void onCreate(Bundle savedInstanceState) {
@@ -69,36 +67,94 @@ protected void onCreate(Bundle savedInstanceState) {
         addComment=(ImageButton)findViewById(R.id.add_comment);
         commentWrite=(EditText)findViewById(R.id.comment_write);
 
-
+        viewCnt.bringToFront();
+        heartCnt.bringToFront();
+        ImageView heartImag = (ImageView)findViewById(R.id.detail_heart);
+        ImageView viewImag = (ImageView)findViewById(R.id.detail_view);
+        heartImag.bringToFront();
+        viewImag.bringToFront();
 
         detailText = (TextView) findViewById(R.id.detail_text);
         detail_img_recyclerview = (RecyclerView)findViewById(R.id.detail_img_recyclerview);
 
 
-        JsonObject inputJson = new JsonObject();
-
-
         Intent intent = getIntent();
         String fileId = intent.getStringExtra("FileId");
 
-        Log.d("진희: fileId 확인 ",fileId );
+        Log.d("진희: fileId 확인 ",fileId);
+
+        token = getIntent().getStringExtra("token");
+        Toast.makeText(this,"token = " + token, Toast.LENGTH_LONG).show();
+
+        Log.d("진희: token 확인 ",token);
+
+
+        ApiService.INSTANCE.getLikeList().getLikeList(token)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                        it -> {
+                            Log.e("tttestlist",it.toString());
+
+                            for(int i=0; i<it.getLikes().size();i++){
+                                if(it.getLikes().get(i).getId().equals(fileId)){   //좋아요 목록에 존재
+                                    heart.setSelected(true);
+                                    break;
+                                }
+                                else {                                      //좋아요 목록에 없음
+                                    heart.setSelected(false);
+                                }
+                            }
+                            heart.setOnClickListener(new View.OnClickListener() {
+                                @Override
+                                public void onClick(View view) {
+                                    String strCount = heartCnt.getText().toString();
+                                    int count = Integer.parseInt(strCount);
+
+                                    if(heart.isSelected()){
+                                        int result = count-1;
+                                        heart.setSelected(false);
+                                        heartCnt.setText(Integer.toString(result));
+                                    }
+                                    else if(!heart.isSelected()){
+                                        int result = count+1;
+                                        heart.setSelected(true);
+                                        heartCnt.setText(Integer.toString(result));
+                                    }
+
+                                    ApiService.INSTANCE.getLikeTrueFalse().getBoolean(token, fileId)
+                                            .subscribeOn(Schedulers.io())
+                                            .observeOn(AndroidSchedulers.mainThread())
+                                            .subscribe(
+                                                    it -> {
+                                                        Log.e("tttest",it.toString());
+                                                    },it -> {
+                                                        Log.e("ffffailed",it.toString());
+                                                    });
+
+                                }
+                            });
+
+
+                            Log.e("tttestlist",it.toString());
+                        },it -> {
+                            Log.e("ffffailedlist",it.toString());
+                        });
+
         ApiService.INSTANCE.getDetailPieceService().getDeatil(fileId)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                         it -> {
 
+
                             ArrayList<String> hasField = new ArrayList<>();
                             for(int i =0; i<it.getPiece().getHasField().size(); i++){
                                 String fielditem = it.getPiece().getHasField().get(i);
                                 hasField.add(fielditem);
                             }
                             Log.e("진희: hasField list ", hasField.toString());
                             detailCatagoly.setText(hasField.toString());
-//                            String replace = detailCatagoly.getText().toString();
-//                            replace = replace.replace("[","");
-//                            replace = replace.replace("]","");
-//                            replace = replace.replace(","," / ");
 
                             detailTitle.setText(it.getPiece().getTitle());
 
@@ -137,39 +193,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
 
-
-
-
-        //Intent intent2 = getIntent();
-
-        String token = getIntent().getStringExtra("token");
-        Toast.makeText(this,"token = " + token, Toast.LENGTH_LONG).show();
-
-        Log.d("진희: token 확인 ",token );
-
-        heart.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View view) {
-                if(heart.isSelected()){
-                    heart.setSelected(false);
-                }
-                else if(!heart.isSelected()){
-                    heart.setSelected(true);
-                }
-                ApiService.INSTANCE.getLikeTrueFalse().getBoolean(token, fileId)
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(
-                                it -> {
-                                    Log.e("tttest",it.toString());
-                                },it -> {
-                                    Log.e("ffffailed",it.toString());
-                                });
-            }
-        });
-
-
         detailBack.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -309,4 +332,4 @@ private void setExpandableListViewHeight(ExpandableListView listView,
 
     }
 
-}
+}
diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/activity/login/LoginActivity.kt b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/activity/login/LoginActivity.kt
@@ -6,8 +6,12 @@ import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import com.doubleslash.ddamiapp.R
+import com.doubleslash.ddamiapp.activity.DetailActivity
 import com.doubleslash.ddamiapp.activity.MainActivity
+import com.doubleslash.ddamiapp.fragment.LikeFragment
+import com.doubleslash.ddamiapp.fragment.MyRoomFragment
 import com.doubleslash.ddamiapp.network.kotlin.ApiService
 import com.doubleslash.ddamiapp.util.KeyboardVisibilityUtils
 import com.google.gson.JsonObject
@@ -60,6 +64,22 @@ class LoginActivity : AppCompatActivity() {
                     intent.putExtra("id", input.get("userId").toString())
                     startActivity(intent)
                     finish()
+
+
+                    val detailintent = Intent(this@LoginActivity, DetailActivity::class.java)
+                    detailintent.putExtra("token", it.token)
+//                    finish()
+
+                    val fragment: Fragment = LikeFragment() // Fragment 생성
+                    val bundle = Bundle(1) // 파라미터는 전달할 데이터 개수
+                    bundle.putString("token", it.token) // key , value
+                    fragment.setArguments(bundle)
+
+                    val fragment2: Fragment = MyRoomFragment() // Fragment 생성
+                    val bundle2 = Bundle(1) // 파라미터는 전달할 데이터 개수
+                    bundle2.putString("token", it.token) // key , value
+                    fragment2.setArguments(bundle2)
+
                 }, {
                     Toast.makeText(applicationContext, "$it", Toast.LENGTH_SHORT).show()
                     Log.e("영환", it.toString())
@@ -78,4 +98,4 @@ class LoginActivity : AppCompatActivity() {
         }
     }
 
-}
+}
diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/CommentAdapter.java b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/CommentAdapter.java
@@ -74,6 +74,7 @@ public View getGroupView(int groupPosition, boolean isExpanded, View convertView
 
         viewHolder.commentNic.setText(getGroup(groupPosition));
         viewHolder.commentContext.setText(getGroup(groupPosition));
+        viewHolder.commentProfile.setImageResource(R.drawable.img_detailview_commenter2);
 
         return v;
     }
@@ -126,4 +127,4 @@ class ViewHolder{
         public TextView commentNic, cYear, cMonth, cDay,
                 commentContext, recomments;
     }
-}
+}
diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/LikeAdapter.java b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/LikeAdapter.java
@@ -9,28 +9,29 @@
 
 import com.doubleslash.ddamiapp.R;
 import com.doubleslash.ddamiapp.model.LikeItem;
+import com.doubleslash.ddamiapp.model.MainItem;
 import com.doubleslash.ddamiapp.viewholder.LikeViewHolder;
 
 import java.util.ArrayList;
 
 public class LikeAdapter extends RecyclerView.Adapter<LikeViewHolder> {
 
 
-    public LikeAdapter(ArrayList<LikeItem> list_like) {
-        this.list_like = list_like;
-    }
-
     private ArrayList<LikeItem> list_like;
+    public OnLikeItemClickListener onLikeListItemClicked;
 
-    public OnItemClickListener mOnItemClickListener = null;
-
-    public interface OnItemClickListener {
-        void onItemClick(View view, LikeItem likeVO);
-    }
-
-    public void setOnItemClickListener(OnItemClickListener listener) {
-        mOnItemClickListener = listener;
+    public LikeAdapter(ArrayList<LikeItem> list_like, OnLikeItemClickListener itemViewClickListener) {
+        this.list_like = list_like;
+        this.onLikeListItemClicked = itemViewClickListener;
     }
+//
+//    public interface OnItemClickListener {
+//        void onItemClick(LikeItem likeVO);
+//    }
+//
+//    public void setOnItemClickListener(OnItemClickListener listener) {
+//        this.mOnItemClickListener = listener;
+//    }
 
     @NonNull
     @Override
@@ -41,24 +42,7 @@ public LikeViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType
 
     @Override
     public void onBindViewHolder(@NonNull LikeViewHolder holder, int position) {
-        holder.adapt(list_like.get(position));
-//
-//        holder.heartPiece.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//
-//
-//                holder.heartPiece.setImageResource(R.drawable.btn_detailview_heart);
-//            }
-//        });
-//        holder.layoutLikeList.setOnClickListener(new View.OnClickListener() {
-//
-//            @Override
-//            public void onClick(View v) {
-//                //작업물 상세로 이동
-//                mOnItemClickListener.onItemClick(v, likeVO);
-//            }
-//        });
+        holder.adapt(list_like.get(position),onLikeListItemClicked);
     }
 
     @Override

diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/OnItemClickListener.java b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/OnItemClickListener.java
@@ -1,5 +1,6 @@
 package com.doubleslash.ddamiapp.adapter;
 
+import com.doubleslash.ddamiapp.model.LikeItem;
 import com.doubleslash.ddamiapp.model.MainItem;
 
 public interface OnItemClickListener {

diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/OnLikeItemClickListener.java b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/OnLikeItemClickListener.java
@@ -0,0 +1,7 @@
+package com.doubleslash.ddamiapp.adapter;
+
+import com.doubleslash.ddamiapp.model.LikeItem;
+
+public interface OnLikeItemClickListener {
+    void onLikeListItemClicked(LikeItem item);
+}