From c499eb5a50c6c593b158104c52919982243a6285 Mon Sep 17 00:00:00 2001
From: boomerr <1046702958@qq.com>
Date: Wed, 5 Sep 2018 21:31:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/caches/build_file_checksums.ser           | Bin 537 -> 537 bytes
 .../com/fy/weibo/activity/ContentActivity.java  |  14 +++++++-------
 .../main/java/com/fy/weibo/util/HttpUtil.java   |   2 ++
 app/src/main/res/layout/comment_popupwindow.xml |   5 +----
 app/src/main/res/layout/content_layout.xml      |  16 +++++++++++++---
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 37c0288b718a7a39d58bb4e1729d02b8ffd0736d..42f7bbe050c9cd4fdf01e6b3b96228fa3d4d266e 100644
GIT binary patch
delta 15
XcmbQqGLvP(43?EqCvI$<Q_BbdGq48L

delta 15
XcmbQqGLvP(43-shG_G!(Q_BbdF{cJ|

diff --git a/app/src/main/java/com/fy/weibo/activity/ContentActivity.java b/app/src/main/java/com/fy/weibo/activity/ContentActivity.java
index 088d7cd..d08223b 100644
--- a/app/src/main/java/com/fy/weibo/activity/ContentActivity.java
+++ b/app/src/main/java/com/fy/weibo/activity/ContentActivity.java
@@ -94,7 +94,7 @@ public void initData() {
         TextView commentCounts = findViewById(R.id.comment_counts);
         TextView shareCounts = findViewById(R.id.share_counts);
         TextView thumbUpCounts = findViewById(R.id.thumb_up_counts);
-        ImageView commentImage=findViewById(R.id.comment);//评论点击处，
+        Button commentButton=findViewById(R.id.comment_btn);//评论点击处，
         weiBoText.setMaxLines(100);
         weiBoText.setText(weiBo.getText());
         RequestOptions options = new RequestOptions().placeholder(new ColorDrawable(Color.WHITE));
@@ -122,7 +122,7 @@ public void initData() {
             imgRecyclerView.setAdapter(adapter);
         }
 
-        commentImage.setOnClickListener(this);//评论点击事件
+        commentButton.setOnClickListener(this);//评论点击事件
     }
 
 
@@ -163,7 +163,7 @@ public void setComments(List<Comments> comments) {
     @Override
     public void onClick(View v) {
         switch(v.getId()){
-            case R.id.comment:
+            case R.id.comment_btn:
                 WeiBo userInfo = (WeiBo) getIntent().getSerializableExtra("weibo");
                 String id=userInfo.getIdstr();
                 showPopupWindow(ContentActivity.this,R.layout.comment_popupwindow, Constants.ACCESS_TOKEN,id);
@@ -194,16 +194,16 @@ public void onClick(View view) {
                     case R.id.btn_comfirm:
                         String CcommentText= String.valueOf(editText.getText());
                         Map<String,String> info=new HashMap<>() ;
-                        info.put("token",access_token);
+                        info.put("access_token",access_token);
                         info.put("id",id);
-                        info.put("commentInfo",CcommentText);
+                        info.put("comment",CcommentText);
                         HttpUtil.getHttpUtil().post(POST_WEIBO_COMMENT,info,new Callback() {
                             @Override
                             public void onFailure(Call call, IOException e) {
                                 runOnUiThread(new Runnable() {
                                     @Override
                                     public void run() {
-                                        Toast.makeText(ContentActivity.this, "fail", Toast.LENGTH_SHORT).show();
+                                        Toast.makeText(ContentActivity.this, "发送失败", Toast.LENGTH_SHORT).show();
                                         finish();
                                     }
                                 });
@@ -214,7 +214,7 @@ public void onResponse(Call call, Response response) throws IOException {
                                 runOnUiThread(new Runnable() {
                                     @Override
                                     public void run() {
-                                        Toast.makeText(ContentActivity.this, "success", Toast.LENGTH_SHORT).show();
+                                        Toast.makeText(ContentActivity.this, "发送成功", Toast.LENGTH_SHORT).show();
                                     }
                                 });
 
diff --git a/app/src/main/java/com/fy/weibo/util/HttpUtil.java b/app/src/main/java/com/fy/weibo/util/HttpUtil.java
index e1ee8b4..f648a28 100644
--- a/app/src/main/java/com/fy/weibo/util/HttpUtil.java
+++ b/app/src/main/java/com/fy/weibo/util/HttpUtil.java
@@ -84,6 +84,8 @@ public  void post(String baseUrl, Map<String, String> params, Callback callback)
 
         FormBody.Builder formBodyBuilder = new FormBody.Builder();
         for (Entry<String, String> entry : params.entrySet()) {
+            Log.e("key",entry.getKey());
+            Log.e("Value",entry.getValue());
             formBodyBuilder.add(entry.getKey(), entry.getValue());
         }
         FormBody formBody = formBodyBuilder.build();
diff --git a/app/src/main/res/layout/comment_popupwindow.xml b/app/src/main/res/layout/comment_popupwindow.xml
index 9cb93ec..23356f7 100644
--- a/app/src/main/res/layout/comment_popupwindow.xml
+++ b/app/src/main/res/layout/comment_popupwindow.xml
@@ -4,10 +4,6 @@
     android:layout_width="match_parent"
     android:orientation="vertical"
     android:layout_height="match_parent">
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/black"/>
 
     <TextView
         android:id="@+id/title"
@@ -23,6 +19,7 @@
         android:id="@+id/dialog_edit"
         android:layout_width="match_parent"
         android:layout_height="200dp"
+        android:gravity="top"
         android:background="@android:color/white"
         android:hint="请输入评论（不超过140字）" />
 <View
diff --git a/app/src/main/res/layout/content_layout.xml b/app/src/main/res/layout/content_layout.xml
index cc20178..683a872 100644
--- a/app/src/main/res/layout/content_layout.xml
+++ b/app/src/main/res/layout/content_layout.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusable="true"
     android:focusableInTouchMode="true"
     xmlns:tools="http://schemas.android.com/tools">
-
+    <android.support.v4.widget.NestedScrollView
+        android:layout_height="match_parent"
+        android:layout_width="match_parent">
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -71,6 +73,14 @@
         </RelativeLayout>
 
     </RelativeLayout>
-</android.support.v4.widget.NestedScrollView>
+    </android.support.v4.widget.NestedScrollView>
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:id="@+id/comment_btn"
+        android:text="发表评论"
+        android:layout_alignParentBottom="true"
+        android:background="@android:color/holo_orange_light"/>
+</RelativeLayout>
 
 <!-- 微博正文 -->
\ No newline at end of file