jchat2.1.0版本增加:群组@、保存图片、呼吸灯、消息撤回、文本消息url识别、呼吸灯;修复进入会话时跳闪问题

jpush · Aug 4, 2017 · 7522af7 · 7522af7
1 parent 3e6e77d
commit 7522af7
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/chatapp/src/main/java/jiguang/chat/controller/ChatItemController.java b/chatapp/src/main/java/jiguang/chat/controller/ChatItemController.java
@@ -1137,22 +1137,28 @@ private ImageView setPictureScale(String extra, Message message, String path, fi
     }
 
     private ImageView setDensity(String extra, Message message, double imageWidth, double imageHeight, ImageView imageView) {
-
         if (extra != null) {
             imageWidth = 200;
             imageHeight = 200;
         } else {
             if (imageWidth > 300) {
-                imageWidth = 450;
-                imageHeight = 300;
+                imageWidth = 550;
+                imageHeight = 250;
             } else if (imageHeight > 450) {
                 imageWidth = 300;
                 imageHeight = 450;
+            } else if ((imageWidth < 50 && imageWidth > 20) || (imageHeight < 50 && imageHeight > 20)) {
+                imageWidth = 200;
+                imageHeight = 300;
+            } else if (imageWidth < 20 || imageHeight < 20) {
+                imageWidth = 100;
+                imageHeight = 150;
             } else {
                 imageWidth = 300;
                 imageHeight = 450;
             }
         }
+
         ViewGroup.LayoutParams params = imageView.getLayoutParams();
         params.width = (int) imageWidth;
         params.height = (int) imageHeight;

diff --git a/chatapp/src/main/java/jiguang/chat/view/ChatView.java b/chatapp/src/main/java/jiguang/chat/view/ChatView.java
@@ -5,7 +5,6 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageButton;
-import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -75,13 +74,12 @@ public DropDownListView getListView() {
     }
     public void setToBottom() {
         mChatListView.clearFocus();
-        mChatListView.setSelection(ListView.FOCUS_DOWN);
-        mChatListView.postDelayed(new Runnable() {
+        mChatListView.post(new Runnable() {
             @Override
             public void run() {
                 mChatListView.setSelection(mChatListView.getAdapter().getCount() - 1);
             }
-        }, 500);
+        });
     }
     public void setConversation(Conversation conv) {
         this.mConv = conv;

diff --git a/chatapp/src/main/res/layout/jmui_chat_item_receive_location.xml b/chatapp/src/main/res/layout/jmui_chat_item_receive_location.xml
@@ -40,7 +40,7 @@
             <ImageView
                 android:id="@+id/jmui_picture_iv"
                 android:layout_width="163dp"
-                android:layout_height="wrap_content"
+                android:layout_height="90dp"
                 android:layout_marginTop="5dp"
                 android:gravity="center"
                 android:scaleType="fitXY"

diff --git a/chatapp/src/main/res/layout/jmui_chat_item_receive_text.xml b/chatapp/src/main/res/layout/jmui_chat_item_receive_text.xml
@@ -27,7 +27,7 @@
 
         <TextView
             android:id="@+id/jmui_msg_content"
-            android:autoLink="email|phone|web"
+            android:autoLink="web"
             android:textColorLink="#157BFB"
             style="@style/jmui_msg_text_style"
             android:layout_width="wrap_content"

diff --git a/chatapp/src/main/res/layout/jmui_chat_item_send_location.xml b/chatapp/src/main/res/layout/jmui_chat_item_send_location.xml
@@ -30,7 +30,7 @@
             <ImageView
                 android:id="@+id/jmui_picture_iv"
                 android:layout_width="163dp"
-                android:layout_height="wrap_content"
+                android:layout_height="90dp"
                 android:gravity="center|bottom"
                 android:scaleType="fitXY"
                 android:src="@drawable/jmui_location_default"/>

diff --git a/chatapp/src/main/res/layout/jmui_chat_item_send_text.xml b/chatapp/src/main/res/layout/jmui_chat_item_send_text.xml
@@ -36,7 +36,7 @@
 
         <TextView
             android:id="@+id/jmui_msg_content"
-            android:autoLink="email|phone|web"
+            android:autoLink="web"
             android:textColorLink="#157BFB"
             style="@style/jmui_msg_text_style"
             android:layout_width="wrap_content"