修改聊天界面

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/NewsTwoActivity.java

@@ -14,6 +14,7 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -44,6 +45,8 @@ import java.util.Map;
 public class NewsTwoActivity extends BaseActivity {
     @ViewInject(R.id.list_news)
     private PullToRefreshListView mlist;
+    @ViewInject(R.id.progress_bar)
+    private ProgressBar progress_bar;
     private CardItemAdapter adapter;
     public EmptyLayout mEmptyLayout;
     private Context ct;
@@ -58,6 +61,7 @@ public class NewsTwoActivity extends BaseActivity {
 
     public void initView() {
         setContentView(R.layout.act_news_list);
+        progress_bar= (ProgressBar) findViewById(R.id.progress_bar);
         ct = this;
         ViewUtils.inject(this);
         TAG = "NewsTwoActivity";
@@ -103,6 +107,7 @@ public class NewsTwoActivity extends BaseActivity {
                     if (adapter == null) {
                         adapter = new CardItemAdapter(ct, newsEntity);
                         mlist.getRefreshableView().setAdapter(adapter);
+                        progress_bar.setVisibility(View.GONE);
                     } else {
                         adapter.notifyDataSetChanged();
                     }
@@ -126,7 +131,6 @@ public class NewsTwoActivity extends BaseActivity {
 
 
     public class CardItemAdapter extends BaseAdapter {
-
         private NewsEntity newsEntities;
         private Context ct;
         private LayoutInflater inflater;

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/NoticesActivity.java

@@ -12,6 +12,7 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -45,6 +46,8 @@ public class NoticesActivity extends BaseActivity {
 
     @ViewInject(R.id.list_notice)
     private PullToRefreshListView mlist;
+    @ViewInject(R.id.progress_bar)
+    private ProgressBar progress_bar;
     private EmptyLayout mEmptyLayout;
     private CardItemAdapter adapter;
     private int type;
@@ -59,6 +62,7 @@ public class NoticesActivity extends BaseActivity {
 
     public void initView() {
         setContentView(R.layout.act_notice_list);
+        progress_bar = (ProgressBar) findViewById(R.id.progress_bar);
         ViewUtils.inject(this);
         TAG = "NoticesActivity";
         ct = this;
@@ -129,6 +133,9 @@ public class NoticesActivity extends BaseActivity {
                         newsEntity.setData(fiterdata);
                         adapter = new CardItemAdapter(ct, newsEntity);
                         mlist.getRefreshableView().setAdapter(adapter);
+                        if (progress_bar == null)
+                            progress_bar = (ProgressBar) findViewById(R.id.progress_bar);
+                        progress_bar.setVisibility(View.GONE);
                     } else {
                         adapter.notifyDataSetChanged();
                     }

WeiChat/src/main/java/com/sk/weichat/util/SmileyParser.java

@@ -77,10 +77,10 @@ public class SmileyParser {
 		private static final int[][] IDS = { { R.drawable.emoji_001, R.drawable.emoji_002, R.drawable.emoji_003, R.drawable.emoji_004,
 				R.drawable.emoji_005, R.drawable.emoji_006, R.drawable.emoji_007, R.drawable.emoji_008, R.drawable.emoji_009, R.drawable.emoji_010,
 				R.drawable.emoji_011, R.drawable.emoji_012, R.drawable.emoji_013, R.drawable.emoji_014, R.drawable.emoji_015, R.drawable.emoji_016,
-				R.drawable.emoji_017, R.drawable.emoji_018, } };
+				R.drawable.emoji_017, R.drawable.emoji_018 }};
 
 		private static final String[][] TEXTS = { { "[微笑]", "[得意]", "[害羞]", "[汗]", "[奸笑]", "[惊呆了]", "[开心]", "[哭]", "[呕吐]", "[亲亲]", "[色眯眯]", "[生病]",
-				"[生气]", "[爽]", "[委屈]", "[严肃]", "[疑问]", "[晕]" } };
+				"[生气]", "[爽]", "[委屈]", "[严肃]", "[疑问]", "[晕]" }   };
 
 		private static final Map<String, Integer> MAPS = new HashMap<String, Integer>();
 		static {

WeiChat/src/main/java/com/sk/weichat/view/ChatBottomView.java

@@ -1,5 +1,6 @@
 package com.sk.weichat.view;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Handler;
 import android.text.Editable;
@@ -65,6 +66,7 @@ public class ChatBottomView extends LinearLayout implements View.OnClickListener
 		init(context);
 	}
 
+	@SuppressLint("NewApi")
 	public ChatBottomView(Context context, AttributeSet attrs, int defStyle) {
 		super(context, attrs, defStyle);
 		init(context);
@@ -155,7 +157,7 @@ public class ChatBottomView extends LinearLayout implements View.OnClickListener
 				mRecordBtn.setText(R.string.motalk_voice_chat_tip_1);
 				mRecordBtn.setBackgroundResource(R.drawable.im_voice_button_normal);
 				if(timeLen<1){
-					Toast.makeText(mContext, "录音太短了,我还没听清楚呢", 0).show();
+					Toast.makeText(mContext, "录音太短了,我还没听清楚呢", Toast.LENGTH_SHORT).show();
 					return;
 				}
 				if (mBottomListener != null) {

WeiChat/src/main/java/com/sk/weichat/view/RoundCornerImageView.java

@@ -0,0 +1,33 @@
+package com.sk.weichat.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Path;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+
+public class RoundCornerImageView extends ImageView {
+    public RoundCornerImageView(Context context) {
+        super(context);
+    }
+
+    public RoundCornerImageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public RoundCornerImageView(Context context, AttributeSet attrs,
+                                int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        Path clipPath = new Path();
+        int w = this.getWidth();
+        int h = this.getHeight();
+        clipPath.addRoundRect(new RectF(0, 0, w, h), 10.0f, 10.0f, Path.Direction.CW);
+        canvas.clipPath(clipPath);
+        super.onDraw(canvas);
+    }
+}

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

@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg_main"
-    android:orientation="vertical" >
-     <com.handmark.pulltorefresh.library.PullToRefreshListView
-      android:id="@+id/list_news"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:divider="@null"
-      android:listSelector="#00000000"
-      android:fadingEdge="none"
-      android:scrollbars="none" >
-  </com.handmark.pulltorefresh.library.PullToRefreshListView>
-</LinearLayout>
+    android:background="@drawable/bg_main">
+
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true" />
+
+    <com.handmark.pulltorefresh.library.PullToRefreshListView
+        android:id="@+id/list_news"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:divider="@null"
+        android:fadingEdge="none"
+        android:listSelector="#00000000"
+        android:scrollbars="none"></com.handmark.pulltorefresh.library.PullToRefreshListView>
+</RelativeLayout>

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

@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
+
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true" />
+
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/list_notice"
         android:layout_width="match_parent"
@@ -12,6 +18,5 @@
 
         android:fadingEdge="none"
         android:listSelector="#00000000"
-        android:scrollbars="none">
-    </com.handmark.pulltorefresh.library.PullToRefreshListView>
-</LinearLayout>
+        android:scrollbars="none"></com.handmark.pulltorefresh.library.PullToRefreshListView>
+</RelativeLayout>

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

@@ -179,7 +179,7 @@
 
         <com.sk.weichat.view.DataLoadView
             android:id="@+id/data_load_view"
-            android:visibility="gone"
+
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
     </RelativeLayout>

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

@@ -48,7 +48,7 @@
                 android:layout_height="70dp"
                 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_file.xml

@@ -49,7 +49,7 @@
                 	android:layout_height="70dp"
                 	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_image.xml

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/time_tv"
@@ -17,12 +17,13 @@
         android:layout_height="wrap_content"
         android:gravity="right"
         android:orientation="horizontal"
-        android:padding="3dip" >
+        android:padding="3dip">
 
-        <ImageView
+        <com.sk.weichat.view.RoundCornerImageView
             android:id="@+id/chat_head_iv"
             android:layout_width="48dip"
             android:layout_height="48dip"
+            android:scaleType="centerCrop"
             android:layout_alignParentRight="true"
             android:contentDescription="@string/app_name"
             android:src="@drawable/avatar_normal" />
@@ -40,7 +41,7 @@
             android:layout_width="275dp"
             android:layout_height="wrap_content"
             android:layout_below="@+id/nick_name"
-            android:layout_toLeftOf="@+id/chat_head_iv" >
+            android:layout_toLeftOf="@+id/chat_head_iv">
 
             <FrameLayout
                 android:id="@+id/chat_from_warp_view"
@@ -48,22 +49,22 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_alignParentTop="true"
-                android:background="@drawable/chat_bg_blue_press"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center"
-                android:orientation="vertical" >
-
+                android:orientation="vertical">
                 <!-- 所有Item该布局的子布局不能超过210dp -->
 
-                <ImageView
+
+                <com.sk.weichat.view.RoundCornerImageView
                     android:id="@+id/chat_from_image"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
                     android:adjustViewBounds="true"
+                    android:background="@drawable/chat_bg_blue_press"
                     android:contentDescription="@string/app_name"
                     android:maxWidth="210dp"
-                    android:scaleType="fitXY"
+                    android:scaleType="centerCrop"
                     android:src="@drawable/defaultpic" />
 
                 <ProgressBar

WeiChat/src/main/res/layout/chat_from_item_location.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_text.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_voice.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/layout_data_load.xml

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/normal_bg"
+    android:background="@drawable/bg_main"
     android:gravity="center"
     android:orientation="vertical" >
 

libbdupdatesdk/src/androidTest/java/com/example/administrator/libbdupdatesdk/ApplicationTest.java

@@ -1,13 +0,0 @@
-package com.example.administrator.libbdupdatesdk;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}

libbdupdatesdk/src/test/java/com/example/administrator/libbdupdatesdk/ExampleUnitTest.java

@@ -1,15 +0,0 @@
-package com.example.administrator.libbdupdatesdk;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}