Merge pull request #273 from ksxkq/develop

[release] v4.0.18

CHANGELOG.md

@@ -1,5 +1,9 @@
 Change Log
 ==========
+Version 4.0.17 *(2024-11-07)*
+----------------------------
+- 修复 排队状态，可能出现界面显示异常问题
+
 Version 4.0.17 *(2024-10-28)*
 ----------------------------
 - 修复 复制富文本消息，会将标签一起复制的问题

README.md

@@ -11,7 +11,7 @@
 ### AndroidStudio  [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.meiqia/androidx/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.meiqia/androidx)
 
 ```
-implementation 'com.meiqia:androidx:4.0.17'
+implementation 'com.meiqia:androidx:4.0.18'
 implementation 'com.github.bumptech.glide:glide:4.9.0'
 annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 ```

demo/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.meiqia.meiqiasdk.demo"
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdkVersion 23
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
     }
@@ -39,7 +39,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 //    implementation project(path: ':meiqiasdk')
 
-    implementation 'com.meiqia:androidx:4.0.17'
+    implementation 'com.meiqia:androidx:4.0.18'
     implementation 'com.github.bumptech.glide:glide:4.9.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 }

demo/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
         android:name=".App"
         android:theme="@style/Theme.AppCompat.Light.NoActionBar">
         <activity
+            android:exported="true"
             android:name=".MainActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait">

meiqiasdk/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         minSdk 21
-        targetSdk 32
+        targetSdk 34
         versionCode 1
         versionName "1.0"
     }

meiqiasdk/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.meiqia.meiqiasdk">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-sdk tools:overrideLibrary="org.xutils" />
 

meiqiasdk/src/main/java/com/meiqia/meiqiasdk/activity/MQConversationActivity.java

@@ -1134,7 +1134,7 @@ private void setClientOnline(final boolean isForceRedirectHuman) {
             String surveyMsg = "";
             if (getIntent() != null) {
                 surveyMsg = getIntent().getStringExtra(SURVEY_MSG);
-                getIntent().putExtra(SURVEY_MSG,"");
+                getIntent().putExtra(SURVEY_MSG, "");
             }
             MQManager.getInstance(this).setSurveyMsg(surveyMsg);
             // 上线
@@ -1655,6 +1655,7 @@ public void onSuccess(int position) {
                         addRedirectQueueLeaveMsg(position);
                         sendGetClientPositionInQueueMsg();
                     } else {
+                        MQManager.getInstance(MQConversationActivity.this).resetCurrentAgent();
                         setClientOnline(true);
                     }
                 }

meiqiasdk/src/main/java/com/meiqia/meiqiasdk/third/swiperefresh/CircularProgressDrawable.java

@@ -120,7 +120,7 @@ public class CircularProgressDrawable extends Drawable implements Animatable {
      * @param context application context
      */
     public CircularProgressDrawable(@NonNull Context context) {
-        mResources = Preconditions.checkNotNull(context).getResources();
+        mResources = context.getResources();
 
         mRing = new Ring();
         mRing.setColors(COLORS);