修改聊天界面和朋友圈页面

WeiChat/src/main/java/com/sk/weichat/adapter/PublicMessageAdapter.java

@@ -310,6 +310,11 @@ public class PublicMessageAdapter extends BaseAdapter implements ListenerAudio,
             viewHolder.command_listView = (ListView) convertView.findViewById(R.id.command_listView);
             viewHolder.viewLine = convertView.findViewById(R.id.line);
             viewHolder.praise_rl = (RelativeLayout) convertView.findViewById(R.id.praise_rl);
+
+
+            viewHolder.img_praise_top = (ImageView) convertView.findViewById(R.id.img_praise_top);
+            viewHolder.img_praise_line = convertView.findViewById(R.id.img_praise_line);
+
             if (innerView != null) {
                 viewHolder.content_fl.addView(innerView);
             }
@@ -319,13 +324,6 @@ public class PublicMessageAdapter extends BaseAdapter implements ListenerAudio,
             viewHolder = (ViewHolder) convertView.getTag(R.id.tag_key_list_item_view);
         }
 
-//        if (position % 2 == 0) {
-//            convertView.setBackgroundColor(mContext.getResources().getColor(R.color.item_color1));
-//        } else {
-//            convertView.setBackgroundColor(mContext.getResources().getColor(R.color.item_color2));
-//        }
-
-
         final ViewHolder finalHolder = viewHolder;// 和ViewHolder一样的，只不过用作匿名内部类里面调用需要final
         // set data
         final PublicMessage message = mMessages.get(position);
@@ -444,28 +442,20 @@ public class PublicMessageAdapter extends BaseAdapter implements ListenerAudio,
             viewHolder.command_listView.setAdapter(null);
         }
 
-//        int height = 0;
-//
-//        if (viewHolder.multi_praise_tv.getVisibility() == View.VISIBLE)
-//        {
-//            height += viewHolder.multi_praise_tv.getHeight()+50;
-//            Log.i("gongpengming","优点是"+height);
-//        }
-//        if (viewHolder.command_listView.getVisibility() == View.VISIBLE)
-//        {
-//            height += viewHolder.command_listView.getHeight();
-//            Log.i("gongpengming","有评论"+height);
-//
-//        }
-//        ViewGroup.LayoutParams p = viewHolder.praise_rl.getLayoutParams();
-//        p.height = height + 20;
-//        viewHolder.praise_rl.setLayoutParams(p);
-//        Log.i("gongpengming","height="+height);
-//        if (height == 0) viewHolder.praise_rl.setVisibility(View.GONE);
-        if (viewHolder.multi_praise_tv.getVisibility() == View.GONE&&viewHolder.command_listView.getVisibility() == View.GONE)
-            viewHolder.praise_rl.setVisibility(View.GONE);
-        else
+        if (viewHolder.multi_praise_tv.getVisibility() == View.VISIBLE && viewHolder.command_listView.getVisibility() == View.VISIBLE) {
+            viewHolder.img_praise_top.setVisibility(View.VISIBLE);
+            viewHolder.praise_rl.setVisibility(View.VISIBLE);
+            viewHolder.img_praise_line.setVisibility(View.VISIBLE);
+        } else if (viewHolder.command_listView.getVisibility() == View.VISIBLE || viewHolder.multi_praise_tv.getVisibility() == View.VISIBLE) {
+            viewHolder.img_praise_top.setVisibility(View.VISIBLE);
+            viewHolder.img_praise_line.setVisibility(View.GONE);
             viewHolder.praise_rl.setVisibility(View.VISIBLE);
+        } else if (viewHolder.multi_praise_tv.getVisibility() == View.GONE && viewHolder.command_listView.getVisibility() == View.GONE) {
+            viewHolder.praise_rl.setVisibility(View.GONE);
+            viewHolder.img_praise_top.setVisibility(View.GONE);
+            viewHolder.img_praise_line.setVisibility(View.GONE);
+        }
+
         // //////////////////上面是公用的部分，下面是每个Type不同的部分/////////////////////////////////////////
         // 转载的消息会有一个转载人和text
         SpannableStringBuilder forwardingBuilder = null;
@@ -614,6 +604,8 @@ public class PublicMessageAdapter extends BaseAdapter implements ListenerAudio,
         TextView multi_praise_tv;
         ListView command_listView;
         RelativeLayout praise_rl;
+        ImageView img_praise_top;
+        View img_praise_line;
     }
 
     /* 普通的Text */

WeiChat/src/main/res/drawable/chat_from_warp_bg.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/chat_bg_blue_press" android:state_pressed="true"/>
-    <item android:drawable="@drawable/chat_bg_blue_press" android:state_focused="true"/>
+    <item android:drawable="@drawable/chat_bg_blue" android:state_pressed="true"/>
+    <item android:drawable="@drawable/chat_bg_blue" android:state_focused="true"/>
     <item android:drawable="@drawable/chat_bg_blue"/>
 
 </selector>

WeiChat/src/main/res/layout/chat_from_item_image.xml

@@ -48,7 +48,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_alignParentTop="true"
-                android:background="@drawable/chat_from_warp_bg"
+                android:background="@drawable/chat_bg_blue_press"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center"

WeiChat/src/main/res/layout/chat_from_item_video.xml

@@ -48,7 +48,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_alignParentTop="true"
-                android:background="@drawable/chat_from_warp_bg"
+                android:background="@drawable/chat_bg_blue_press"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center"

WeiChat/src/main/res/layout/p_msg_item_main_body.xml

@@ -99,31 +99,48 @@
             android:background="@color/item_line"
             android:visibility="gone" />
 
-        <RelativeLayout
-            android:id="@+id/praise_rl"
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="#f2f2f2"
-          >
-            <!--android:background="@drawable/praise_bg"-->
-            <TextView
-                android:id="@+id/multi_praise_tv"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:drawableLeft="@drawable/likes"
-                android:paddingBottom="2dp"
-                android:paddingTop="10dp"
-                android:text="safddsafdsafdsafdsafdsafadsfewqewqdfdsafdsafdsafdsa法国人完全覆盖对方的身份为亲人"
-                android:textSize="@dimen/text_min" />
+            android:layout_height="wrap_content">
+
 
-            <com.sk.weichat.view.MyListView
-                android:id="@+id/command_listView"
-                android:layout_width="fill_parent"
+            <RelativeLayout
+                android:id="@+id/praise_rl"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/multi_praise_tv"
-                android:paddingTop="5dp" />
-        </RelativeLayout>
+                android:background="#f2f2f2">
+                <!--android:background="@drawable/praise_bg"-->
+                <ImageView
+                    android:id="@+id/img_praise_top"
+                    android:layout_width="match_parent"
+                    android:layout_height="10dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/friend_prialy_top" />
+
+                <TextView
+                    android:id="@+id/multi_praise_tv"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:drawableLeft="@drawable/likes"
+                    android:paddingBottom="2dp"
+                    android:paddingTop="10dp"
+                    android:textSize="@dimen/text_min" />
+
+                <View
+                    android:id="@+id/img_praise_line"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_below="@+id/multi_praise_tv"
+                    android:background="@color/item_line" />
 
+                <com.sk.weichat.view.MyListView
+                    android:id="@+id/command_listView"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/multi_praise_tv"
+                    android:paddingTop="5dp" />
+            </RelativeLayout>
+        </FrameLayout>
 
     </LinearLayout>