[release] v3.4.0

Meiqia · Dec 29, 2016 · 795dd96 · 795dd96
1 parent e2b4a73
commit 795dd96
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 Change Log
 ==========
+Version 3.4.0 *(2016-12-29)*
+----------------------------
+- 优化 替换掉以前的 WebSocket 库，提高连接稳定性
+
 Version 3.3.7、3.3.8、3.3.9*(2016-12-05)*
 ----------------------------
 - 修复 在 socket 断掉的情况下, 对话结束后, 发送消息会失败的问题

diff --git a/README.md b/README.md
@@ -11,11 +11,11 @@
 ### AndroidStudio  [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.meiqia/meiqiasdk/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.meiqia/meiqiasdk)
 
 ```
-// -------------------- 以下三个库是必须依赖的 ----------------------------
+// -------------------- 以下三个库是必须依赖的 okhttp 必须 3.5.0 或者更高版本 ----------------------------
 compile 'com.meiqia:meiqiasdk:3.3.9@aar'
 compile 'com.android.support:support-v4:23.1.1'
-compile 'com.squareup.okhttp3:okhttp:3.3.1'
-// -------------------- 以上三个库是必须依赖的 ----------------------------
+compile 'com.squareup.okhttp3:okhttp:3.5.0'
+// -------------------- 以上三个库是必须依赖的 okhttp 必须 3.5.0 或者更高版本 ----------------------------
 
 // 目前支持常见的 4 种图片加载库，必须在下面四个图片加载库中选择一个添加依赖
 compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'

diff --git a/demo/build.gradle b/demo/build.gradle
@@ -26,9 +26,9 @@ dependencies {
 //    compile project(':meiqiasdk')
 
     // -------------------- 以下三个库是必须依赖的 ----------------------------
-    compile 'com.meiqia:meiqiasdk:3.3.9@aar'
+    compile 'com.meiqia:meiqiasdk:3.4.0@aar'
     compile 'com.android.support:support-v4:23.1.1'
-    compile 'com.squareup.okhttp3:okhttp:3.3.1'
+    compile 'com.squareup.okhttp3:okhttp:3.5.0'
     // -------------------- 以上三个库是必须依赖的 ----------------------------
 
     // 目前支持常见的 4 种图片加载库，必须在下面四个图片加载库中选择一个添加依赖

diff --git a/eclipse/MeiqiaSdk/libs/meiqia-v3.3.9.jar b/eclipse/MeiqiaSdk/libs/meiqia-v3.3.9.jar
diff --git a/eclipse/MeiqiaSdk/libs/meiqia-v3.4.0.jar b/eclipse/MeiqiaSdk/libs/meiqia-v3.4.0.jar
diff --git a/eclipse/MeiqiaSdk/libs/okhttp-3.2.0.jar b/eclipse/MeiqiaSdk/libs/okhttp-3.2.0.jar
diff --git a/eclipse/MeiqiaSdk/libs/okhttp-3.5.0.jar b/eclipse/MeiqiaSdk/libs/okhttp-3.5.0.jar
diff --git a/eclipse/MeiqiaSdk/libs/okio-1.11.0.jar b/eclipse/MeiqiaSdk/libs/okio-1.11.0.jar
diff --git a/eclipse/MeiqiaSdk/libs/okio-1.6.0.jar b/eclipse/MeiqiaSdk/libs/okio-1.6.0.jar
diff --git a/eclipse/MeiqiaSdk/src/com/meiqia/meiqiasdk/widget/MQImageView.java b/eclipse/MeiqiaSdk/src/com/meiqia/meiqiasdk/widget/MQImageView.java
@@ -141,18 +141,21 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 
     @Override
     protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-
-        if (mBorderWidth > 0) {
-            if (mIsCircle) {
-                canvas.drawCircle(getWidth() / 2, getHeight() / 2, getWidth() / 2 - mBorderWidth / 2, mBorderPaint);
-            } else {
-                mRect.left = 0;
-                mRect.top = 0;
-                mRect.right = getWidth();
-                mRect.bottom = getHeight();
-                canvas.drawRoundRect(mRect, mCornerRadius, mCornerRadius, mBorderPaint);
+        try {
+            super.onDraw(canvas);
+            if (mBorderWidth > 0) {
+                if (mIsCircle) {
+                    canvas.drawCircle(getWidth() / 2, getHeight() / 2, getWidth() / 2 - mBorderWidth / 2, mBorderPaint);
+                } else {
+                    mRect.left = 0;
+                    mRect.top = 0;
+                    mRect.right = getWidth();
+                    mRect.bottom = getHeight();
+                    canvas.drawRoundRect(mRect, mCornerRadius, mCornerRadius, mBorderPaint);
+                }
             }
+        } catch (Exception e) {
+
         }
     }
 

diff --git a/meiqiasdk/build.gradle b/meiqiasdk/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
 
     provided 'com.android.support:support-v4:23.1.1'
-    provided 'com.squareup.okhttp3:okhttp:3.3.1'
+    provided 'com.squareup.okhttp3:okhttp:3.5.0'
     provided 'com.github.bumptech.glide:glide:3.7.0'
     provided 'com.squareup.picasso:picasso:2.5.2'
     provided 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'

diff --git a/meiqiasdk/libs/meiqia-v3.3.9.jar b/meiqiasdk/libs/meiqia-v3.3.9.jar
diff --git a/meiqiasdk/libs/meiqia-v3.4.0.jar b/meiqiasdk/libs/meiqia-v3.4.0.jar
diff --git a/meiqiasdk/src/main/java/com/meiqia/meiqiasdk/widget/MQImageView.java b/meiqiasdk/src/main/java/com/meiqia/meiqiasdk/widget/MQImageView.java
@@ -141,18 +141,21 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 
     @Override
     protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-
-        if (mBorderWidth > 0) {
-            if (mIsCircle) {
-                canvas.drawCircle(getWidth() / 2, getHeight() / 2, getWidth() / 2 - mBorderWidth / 2, mBorderPaint);
-            } else {
-                mRect.left = 0;
-                mRect.top = 0;
-                mRect.right = getWidth();
-                mRect.bottom = getHeight();
-                canvas.drawRoundRect(mRect, mCornerRadius, mCornerRadius, mBorderPaint);
+        try {
+            super.onDraw(canvas);
+            if (mBorderWidth > 0) {
+                if (mIsCircle) {
+                    canvas.drawCircle(getWidth() / 2, getHeight() / 2, getWidth() / 2 - mBorderWidth / 2, mBorderPaint);
+                } else {
+                    mRect.left = 0;
+                    mRect.top = 0;
+                    mRect.right = getWidth();
+                    mRect.bottom = getHeight();
+                    canvas.drawRoundRect(mRect, mCornerRadius, mCornerRadius, mBorderPaint);
+                }
             }
+        } catch (Exception e) {
+
         }
     }