diff --git a/app/src/main/java/com/gh/common/util/MessageShareUtils.java b/app/src/main/java/com/gh/common/util/MessageShareUtils.java
index 6964e69613..f991fd6e9e 100644
--- a/app/src/main/java/com/gh/common/util/MessageShareUtils.java
+++ b/app/src/main/java/com/gh/common/util/MessageShareUtils.java
@@ -265,8 +265,6 @@ public class MessageShareUtils {
     private void wechatSahre(){
         Utils.toast(context,"分享跳转中...");
 
-        api = WXAPIFactory.createWXAPI(context, "wx3ffd0785fad18111"); //初始化微信分享
-
         WXImageObject imgObj = new WXImageObject();
         imgObj.setImagePath(context.getExternalCacheDir().getPath() + "/ShareImg/"  + picName);
         WXMediaMessage msg = new WXMediaMessage();
diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
index 3ce685ad84..7f865f6dac 100644
--- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
@@ -1,24 +1,29 @@
 package com.gh.gamecenter;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.graphics.Rect;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.View;
+import android.view.ViewTreeObserver;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.android.volley.VolleyError;
 import com.android.volley.toolbox.DiskBasedCache;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.base.BaseActivity;
 import com.gh.common.constant.Config;
+import com.gh.common.util.DialogUtils;
 import com.gh.common.util.GzipUtils;
 import com.gh.common.util.PostCommentUtils;
 import com.gh.common.util.TimestampUtils;
@@ -36,8 +41,6 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.File;
-import java.util.Date;
-import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -48,7 +51,7 @@ import butterknife.OnTouch;
  * Created by khy on 2016/11/8.
  * 消息详情界面
  */
-public class MessageDetailActivity extends BaseActivity {
+public class MessageDetailActivity extends BaseActivity implements MessageDetailAdapter.OnCommentCallBackListener{
 
     @BindView(R.id.message_detail_rv) RecyclerView mMessageDetailRv;
     @BindView(R.id.message_detail_user_rl) RelativeLayout mMessageDetailUserRl;
@@ -58,6 +61,8 @@ public class MessageDetailActivity extends BaseActivity {
     @BindView(R.id.comment_send) TextView mMessageDetailCommentSend;
     @BindView(R.id.message_detail_comment_et) EditText mMessageDetailEt;
     @BindView(R.id.message_detail_comment_hint) TextView mMessageDetailCommentHint;
+    @BindView(R.id.message_detail_sv) ScrollView mMessageDetailSv;
+    @BindView(R.id.message_detail_hint_line) View mMessageDetailLine;
 
     private LinearLayoutManager mLayoutManager;
 
@@ -65,7 +70,7 @@ public class MessageDetailActivity extends BaseActivity {
 
     private SharedPreferences sp;
 
-    private Toast mToast;
+    private Dialog mSendingDialog;
 
     private CommentDao mCommentDao;
 
@@ -82,7 +87,7 @@ public class MessageDetailActivity extends BaseActivity {
 
         mCommentDao = new CommentDao(this);
 
-        adapter = new MessageDetailAdapter(this, mCommentDao);
+        adapter = new MessageDetailAdapter(this, mCommentDao, mMessageDetailRv);
         mLayoutManager = new LinearLayoutManager(this);
         mMessageDetailRv.setLayoutManager(mLayoutManager);
         mMessageDetailRv.setAdapter(adapter);
@@ -126,6 +131,22 @@ public class MessageDetailActivity extends BaseActivity {
             mMessageDetailUserNameTv.setText(sp.getString("user_name", "光环用户"));
         }
 
+        if (Build.VERSION.SDK_INT >= 19) {
+            //解决透明沉浸栏和软键盘冲突（重置ScrollView高度）
+            final View decorView=getWindow().getDecorView();
+            decorView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+                @Override
+                public void onGlobalLayout() {
+                    Rect rect=new Rect();
+                    decorView.getWindowVisibleDisplayFrame(rect);
+                    int screenHeight = decorView.getRootView().getHeight();
+                    int heightDifference = screenHeight-rect.bottom;//计算软键盘占有的高度  = 屏幕高度 - 视图可见高度
+                    RelativeLayout.LayoutParams layoutParams= (RelativeLayout.LayoutParams) mMessageDetailSv.getLayoutParams();
+                    layoutParams.setMargins(0,0,0,heightDifference);//设置ScrollView的marginBottom的值为软键盘占有的高度即可
+                    mMessageDetailSv.requestLayout();
+                }
+            });
+        }
 
     }
 
@@ -158,22 +179,12 @@ public class MessageDetailActivity extends BaseActivity {
 
     @OnClick(R.id.message_detail_comment_hint)
     public void OnHintClikListener() {
-        mMessageDetailCommentHint.setVisibility(View.GONE);
-        mMessageDetailCommentRl.setVisibility(View.VISIBLE);
-        mMessageDetailUserRl.setVisibility(View.VISIBLE);
-        mMessageDetailEt.setFocusable(true);
-        mMessageDetailEt.setFocusableInTouchMode(true);
-        mMessageDetailEt.requestFocus();
         setSoftInput(true);
     }
 
     @OnTouch(R.id.message_detail_rv)
     public boolean OnRecyclerTouchListener() {
         if (mMessageDetailCommentRl.getVisibility() == View.VISIBLE) {
-            mMessageDetailCommentHint.setVisibility(View.VISIBLE);
-            mMessageDetailCommentRl.setVisibility(View.GONE);
-            mMessageDetailUserRl.setVisibility(View.GONE);
-            mMessageDetailEt.setText("");
             setSoftInput(false);
         }
         return false;
@@ -187,8 +198,8 @@ public class MessageDetailActivity extends BaseActivity {
             Utils.toast(MessageDetailActivity.this, "评论内容不能为空！");
             return;
         }
-        mToast = Toast.makeText(MessageDetailActivity.this, "正在提交评论", Toast.LENGTH_SHORT);
-        mToast.show();
+
+        mSendingDialog = DialogUtils.showWaitDialog(this, "正在提交");
 
         JSONObject jsonObject = new JSONObject();
         try {
@@ -202,11 +213,8 @@ public class MessageDetailActivity extends BaseActivity {
                 , jsonObject.toString(), MessageDetailActivity.this, new PostCommentUtils.PostCommentListener() {
                     @Override
                     public void postSucced(JSONObject response) {
-                        mToast.cancel();
+                        mSendingDialog.dismiss();
                         Utils.toast(MessageDetailActivity.this, "发表成功");
-                        mMessageDetailCommentHint.setVisibility(View.VISIBLE);
-                        mMessageDetailCommentRl.setVisibility(View.GONE);
-                        mMessageDetailUserRl.setVisibility(View.GONE);
                         mMessageDetailEt.setText("");
                         setSoftInput(false);
 
@@ -241,9 +249,10 @@ public class MessageDetailActivity extends BaseActivity {
 
                     @Override
                     public void postFailed(VolleyError error) {
-                        mToast.cancel();
+                        mSendingDialog.dismiss();
 
                         if (error.networkResponse == null) {
+                            Utils.log("评论错误返回为空======");
                             return;
                         }
 
@@ -257,9 +266,6 @@ public class MessageDetailActivity extends BaseActivity {
                                 Utils.toast(MessageDetailActivity.this, "账号状态异常，暂时无法发表评论");
                             } else if ("article blocked".equals(detail)) {
                                 Utils.toast(MessageDetailActivity.this, "文章异常，无法发表评论");
-                                mMessageDetailCommentHint.setVisibility(View.VISIBLE);
-                                mMessageDetailCommentRl.setVisibility(View.GONE);
-                                mMessageDetailUserRl.setVisibility(View.GONE);
                                 setSoftInput(false);
                             } else if ("illegal".equals(detail)) {
                                 Utils.toast(MessageDetailActivity.this, "评论内容可能包括敏感信息，请修改后再发表");
@@ -308,9 +314,26 @@ public class MessageDetailActivity extends BaseActivity {
         if (isShow){
             imm.showSoftInputFromInputMethod(mMessageDetailEt.getWindowToken(), 0);
             imm.toggleSoftInputFromWindow(mMessageDetailEt.getWindowToken(), 0, InputMethodManager.HIDE_NOT_ALWAYS);
+            mMessageDetailCommentHint.setVisibility(View.GONE);
+            mMessageDetailLine.setVisibility(View.GONE);
+            mMessageDetailCommentRl.setVisibility(View.VISIBLE);
+            mMessageDetailUserRl.setVisibility(View.VISIBLE);
+            mMessageDetailEt.setFocusable(true);
+            mMessageDetailEt.setFocusableInTouchMode(true);
+            mMessageDetailEt.requestFocus();
+
         } else {
             imm.hideSoftInputFromWindow(getWindow().getDecorView().getWindowToken(), 0);
+            mMessageDetailCommentHint.setVisibility(View.VISIBLE);
+            mMessageDetailLine.setVisibility(View.VISIBLE);
+            mMessageDetailCommentRl.setVisibility(View.GONE);
+            mMessageDetailUserRl.setVisibility(View.GONE);
         }
     }
 
+    @Override
+    public void showSoftInput() {
+        setSoftInput(true);
+    }
+
 }
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
index 7e9774fde2..31c377ac32 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
@@ -6,6 +6,7 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -62,6 +63,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
 
 /**
  * Created by khy on 2016/11/8.
@@ -73,6 +76,10 @@ public class MessageDetailAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     private ConcernEntity mConcernEntity;
 
+    private OnCommentCallBackListener mCallBackListener;
+
+    private  RecyclerView mRecyclerView;
+
     private List<CommentEntity> mHotCommentList;
     private List<CommentEntity> mNormalCommentList;
 
@@ -87,14 +94,18 @@ public class MessageDetailAdapter extends RecyclerView.Adapter<RecyclerView.View
     private boolean isOver;
     private boolean isLoading;
     private boolean isNetworkError;
+    private boolean isRefreshPosition;
 
     private static final int ITEM_TOP = 100;
     private static final int ITEM_TITLE = 101;
     private static final int ITEM_COMMENT = 102;
     private static final int ITEM_FOOTER = 103;
 
-    public MessageDetailAdapter(MessageDetailActivity context, CommentDao commentDao) {
+    public MessageDetailAdapter(MessageDetailActivity context, CommentDao commentDao, RecyclerView messageDetailRv) {
         this.mContext = context;
+        this.mRecyclerView = messageDetailRv;
+
+        mCallBackListener = context;
 
         mVoteDao = new VoteDao(context);
         mCommentDao = commentDao;
@@ -107,14 +118,20 @@ public class MessageDetailAdapter extends RecyclerView.Adapter<RecyclerView.View
         isOver = false;
         isLoading = false;
         isNetworkError = false;
+        isRefreshPosition = true;
 
         mHotCommentList = new ArrayList<>();
         mNormalCommentList = new ArrayList<>();
 
         mConcernEntity = (ConcernEntity) AppController.get("ConcernEntity", true);
 
-        addHotComment(0);
-}
+        if (mConcernEntity.getCommentnum() != 0) {
+            addHotComment(0);
+        } else {
+            notifyItemChanged(1);
+            mCallBackListener.showSoftInput();
+        }
+    }
 
     private void addHotComment(int offset) {
 
@@ -229,6 +246,16 @@ public class MessageDetailAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        if (isRefreshPosition) {
+            Timer timer = new Timer(); // 延迟半秒，防止出现闪屏现象
+            timer.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    mRecyclerView.smoothScrollBy(0, mConcernEntity.getItemHeight()); //定位到评论顶部
+                }
+            }, 500);
+            isRefreshPosition = false;
+        }
         if (holder instanceof NewsDigestViewHolder) {
             initNewsDigestViewHolder((NewsDigestViewHolder) holder);
         } else if (holder instanceof CommentViewHolder) {
@@ -261,24 +288,41 @@ public class MessageDetailAdapter extends RecyclerView.Adapter<RecyclerView.View
     }
 
     private void initFooterViewHolder(final FooterViewHolder viewHolder) {
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT);
+        LinearLayout.LayoutParams params;
+        int height = 0;
+        if (mRecyclerView.getChildCount() != 1 ) {
+            for (int i = 0; i < mRecyclerView.getChildCount(); i++) {
+                if ( i != 0 ){
+                    height = height + mRecyclerView.getChildAt(i).getHeight();
+                }
+            }
+        }
+        if (mRecyclerView.getHeight() - height < 100) {
+            params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        } else {
+            params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, mRecyclerView.getHeight() - height);
+        }
         viewHolder.itemView.setLayoutParams(params);
+        ((LinearLayout)viewHolder.itemView).setGravity(Gravity.CENTER_HORIZONTAL);
 
         if (!isOver) {
             viewHolder.hint.setText("加载中...");
             viewHolder.loading.setVisibility(View.VISIBLE);
         } else if (isNetworkError || mNormalCommentList.size() == 0 && mHotCommentList.size() == 0) {
             viewHolder.loading.setVisibility(View.GONE);
-            params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DisplayUtils.dip2px(mContext, 185));
             if (isNetworkError) {
                 viewHolder.hint.setText("网络错误，点击重试！");
             } else {
                 viewHolder.itemView.setLayoutParams(params);
+                viewHolder.itemView.setPadding(0, DisplayUtils.dip2px(mContext, 20), 0, 0);
                 viewHolder.hint.setText("目前还没有评论");
             }
         } else {
-            viewHolder.hint.setText("没有更多评论啦..");
+            if (mNormalCommentList.size() > 10) {
+                viewHolder.hint.setText("没有更多评论啦");
+            } else {
+                viewHolder.hint.setText("");
+            }
             viewHolder.loading.setVisibility(View.GONE);
         }
 
@@ -398,6 +442,13 @@ public class MessageDetailAdapter extends RecyclerView.Adapter<RecyclerView.View
                 }
             }
         });
+
+        viewHolder.comment.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mCallBackListener.showSoftInput();
+            }
+        });
     }
 
     private void initCommentViewHolder(final CommentViewHolder holder, int position) {
@@ -619,4 +670,8 @@ public class MessageDetailAdapter extends RecyclerView.Adapter<RecyclerView.View
     public boolean isOver() {
         return isOver;
     }
+
+    public interface OnCommentCallBackListener {
+        void showSoftInput();
+    }
 }
diff --git a/app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java b/app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java
index 3f4cfda5d7..a9628b057f 100644
--- a/app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java
+++ b/app/src/main/java/com/gh/gamecenter/changeskin/SkinConfig.java
@@ -32,7 +32,7 @@ public class SkinConfig {
     public static String JSON_PATCHURL = "http://api.ghzhushou.com/v2d2/game/" + GAME_ID + "/skin/data?page=*&per_page=" + perPage;
 
     // ewan.anfeng 安峰
-    public static String patchVersion = "com.netease.ma.ewan.anfeng";
+    public static String patchVersion = "com.netease.ma.uc";
     // public static String patchVersion = "com.netease.ma.bili";
 
 }
diff --git a/app/src/main/java/com/gh/gamecenter/entity/ConcernEntity.java b/app/src/main/java/com/gh/gamecenter/entity/ConcernEntity.java
index 954dc4bf3f..9064aa8f3c 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/ConcernEntity.java
+++ b/app/src/main/java/com/gh/gamecenter/entity/ConcernEntity.java
@@ -35,6 +35,16 @@ public class ConcernEntity {
 
     private int commentnum;
 
+    private int itemHeight;
+
+    public int getItemHeight() {
+        return itemHeight;
+    }
+
+    public void setItemHeight(int itemHeight) {
+        this.itemHeight = itemHeight;
+    }
+
     public String getId() {
         return id;
     }
diff --git a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
index 984c63bad5..406bba3a5a 100644
--- a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java
@@ -538,6 +538,7 @@ public class News1FragmentAdapter extends RecyclerView.Adapter<RecyclerView.View
             @Override
             public void onClick(View v) {
                 skipPosition = viewHolder.getPosition();
+                concernEntity.setItemHeight(viewHolder.itemView.getHeight());
                 AppController.put("ConcernEntity", concernEntity);
                 Intent intent = new Intent(context, MessageDetailActivity.class);
                 intent.putExtra("entrance", "(资讯-关注)");
diff --git a/app/src/main/res/layout/activity_messagedetail.xml b/app/src/main/res/layout/activity_messagedetail.xml
index 6e904a25a2..2ca72ab332 100644
--- a/app/src/main/res/layout/activity_messagedetail.xml
+++ b/app/src/main/res/layout/activity_messagedetail.xml
@@ -16,43 +16,35 @@
             android:id="@+id/message_detail_rv"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_above="@+id/message_detail_bottom"/>
+            android:layout_marginBottom="45dp"/>
+
         <View
             android:layout_width="match_parent"
             android:layout_height="7dp"
             android:background="@drawable/shadow"
-            android:layout_above="@+id/message_detail_bottom"/>
+            android:layout_above="@+id/message_detail_sv"/>
 
-        <RelativeLayout
-            android:id="@+id/message_detail_bottom"
+        <ScrollView
+            android:id="@+id/message_detail_sv"
+            android:layout_alignParentBottom="true"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:background="#fff"
-            android:paddingLeft="18dp"
-            android:paddingRight="18dp">
-
-            <TextView
-                android:id="@+id/message_detail_comment_hint"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/hint"
-                android:text="发表评论..."
-                android:paddingTop="12dp"
-                android:paddingBottom="12dp"/>
+            android:background="@android:color/white">
 
             <RelativeLayout
                 android:id="@+id/message_detail_comment_rl"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:paddingLeft="18dp"
+                android:paddingRight="18dp"
                 android:visibility="gone">
+
                 <EditText
                     android:id="@+id/message_detail_comment_et"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@null"
                     android:paddingTop="10dp"
-                    android:paddingBottom="75dp"
                     android:drawablePadding="4dp"
                     android:hint="优质评论会被优先展示"
                     android:textCursorDrawable="@drawable/cursor_color"
@@ -61,51 +53,67 @@
                     android:textColorHighlight="@color/back"
                     android:drawableBottom="@drawable/et_line"/>
 
+                <RelativeLayout
+                    android:id="@+id/message_detail_user_rl"
+                    android:layout_width="match_parent"
+                    android:layout_height="70dp"
+                    android:visibility="visible"
+                    android:layout_below="@+id/message_detail_comment_et">
 
+                    <com.facebook.drawee.view.SimpleDraweeView
+                        android:id="@+id/comment_user_icon"
+                        android:layout_width="45dp"
+                        android:layout_height="45dp"
+                        android:layout_marginRight="17dp"
+                        fresco:roundAsCircle="true"
+                        android:layout_centerVertical="true"/>
+
+                    <TextView
+                        android:id="@+id/comment_user_name"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textSize="15sp"
+                        android:layout_centerInParent="true"
+                        android:layout_toRightOf="@+id/comment_user_icon"
+                        android:layout_toLeftOf="@+id/comment_send"
+                        android:textColor="@color/title" />
+
+                    <TextView
+                        android:id="@+id/comment_send"
+                        android:layout_width="60dp"
+                        android:layout_height="28.5dp"
+                        android:clickable="true"
+                        android:background="@drawable/textview_comment_send_style"
+                        android:gravity="center"
+                        android:text="发送"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"/>
+
+                </RelativeLayout>
             </RelativeLayout>
-        </RelativeLayout>
+        </ScrollView>
 
-        <RelativeLayout
-            android:id="@+id/message_detail_user_rl"
+        <View
+            android:id="@+id/message_detail_hint_line"
             android:layout_width="match_parent"
-            android:layout_height="70dp"
-            android:layout_marginTop="30dp"
+            android:layout_height="7dp"
+            android:background="@drawable/shadow"
+            android:layout_above="@+id/message_detail_comment_hint"/>
+
+        <TextView
+            android:id="@+id/message_detail_comment_hint"
+            android:layout_width="match_parent"
+            android:layout_height="44dp"
+            android:textColor="@color/hint"
+            android:text="发表评论..."
             android:paddingLeft="18dp"
             android:paddingRight="18dp"
-            android:visibility="gone"
-            android:layout_alignParentBottom="true">
+            android:background="@android:color/white"
+            android:layout_alignParentBottom="true"
+            android:gravity="center_vertical"
+            android:visibility="visible" />
 
-            <com.facebook.drawee.view.SimpleDraweeView
-                android:id="@+id/comment_user_icon"
-                android:layout_width="45dp"
-                android:layout_height="45dp"
-                android:layout_marginRight="17dp"
-                fresco:roundAsCircle="true"
-                android:layout_centerVertical="true"/>
-
-            <TextView
-                android:id="@+id/comment_user_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="15sp"
-                android:layout_centerInParent="true"
-                android:layout_toRightOf="@+id/comment_user_icon"
-                android:layout_toLeftOf="@+id/comment_send"
-                android:textColor="@color/title" />
-
-            <TextView
-                android:id="@+id/comment_send"
-                android:layout_width="60dp"
-                android:layout_height="28.5dp"
-                android:clickable="true"
-                android:background="@drawable/textview_comment_send_style"
-                android:gravity="center"
-                android:text="发送"
-                android:textColor="@android:color/white"
-                android:textSize="14sp"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"/>
-
-        </RelativeLayout>
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sharecard.xml b/app/src/main/res/layout/activity_sharecard.xml
index c8eab5024d..7cee859d86 100644
--- a/app/src/main/res/layout/activity_sharecard.xml
+++ b/app/src/main/res/layout/activity_sharecard.xml
@@ -23,7 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:background="#f0f0f0">
+                android:background="#ffffff">
 
                 <RelativeLayout
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/comment_item.xml b/app/src/main/res/layout/comment_item.xml
index 98cd824b67..1a886567c5 100644
--- a/app/src/main/res/layout/comment_item.xml
+++ b/app/src/main/res/layout/comment_item.xml
@@ -84,8 +84,8 @@
             android:layout_below="@+id/comment_username_and_time"
             android:layout_toRightOf="@+id/comment_user_icon"
             android:layout_marginRight="15dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="20dp"/>
+            android:paddingTop="10dp"
+            android:paddingBottom="20dp"/>
     </RelativeLayout>
 
 </com.gh.common.view.CardLinearLayout>
\ No newline at end of file