qunarcorp · fanlysir · Nov 20, 2019 · Nov 26, 2019 · Nov 28, 2019 · Jan 16, 2020
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Based on Startalk server and client-side, users can build their own domain,
 Sign up an account, create new domains, add users, download client app, and configure navigation for domain,
 After the 5 steps above, you own strong IM abilities.
 
-Download client app[Download](https://im.qunar.com/new/#/download)
+Download client app[Download](https://i.startalk.im/home/#/download)
 
 - Android
 
@@ -55,7 +55,7 @@ allprojects {
 
 ```gradle
 dependencies {
-  compile project(':imsdk')//compile 'com.qunar.im:sdk-im:3.0.6'
+  compile project(':imsdk')//compile 'com.qunar.im:sdk-im:3.0.7'
 }
 ```
 
@@ -199,4 +199,4 @@ Add style below in “values styles.xml” in the main project
 
 Feedback
 =====
--   qchat@qunar.com（Email）
+-   qchat@qunar.com（Email）
diff --git a/README_zh_CN.md b/README_zh_CN.md
@@ -63,7 +63,7 @@ allprojects {
 
 ```gradle
 dependencies {
-  compile project(':imsdk')//compile 'com.qunar.im:sdk-im:3.0.6'
+  compile project(':imsdk')//compile 'com.qunar.im:sdk-im:3.0.7'
 }
 ```
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-//    buildToolsVersion '25.0.0'
+    compileSdkVersion project.compileSdkVersion as int
     defaultConfig {
         applicationId "sdk.im.qunar.com.qtalksdkdemo"
-        minSdkVersion 16
-        targetSdkVersion 26
+        minSdkVersion project.minSdkVersion as int
+        targetSdkVersion project.targetSdkVersion as int
         versionCode 206
         versionName "8.36"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -110,16 +109,8 @@ repositories {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile ('com.android.support.constraint:constraint-layout:1.0.2'){
-        exclude group: 'com.android.support', module: 'support-v4'
-    }
-    testCompile 'junit:junit:4.12'
-
-    implementation project(':imsdk')//implementation 'com.startalk.im:sdk-im:3.0.6'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    testImplementation 'junit:junit:4.12'
+    implementation project(':imsdk')//implementation 'com.startalk.im:sdk-im:3.0.7'
 }
diff --git a/app/src/main/java/sdk/im/qunar/com/qtalksdkdemo/ConversationListActivity.java b/app/src/main/java/sdk/im/qunar/com/qtalksdkdemo/ConversationListActivity.java
@@ -1,9 +1,10 @@
 package sdk.im.qunar.com.qtalksdkdemo;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.widget.FrameLayout;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.qunar.im.ui.fragment.ConversationFragment;
 
 public class ConversationListActivity extends AppCompatActivity {

diff --git a/app/src/main/java/sdk/im/qunar/com/qtalksdkdemo/MainActivity.java b/app/src/main/java/sdk/im/qunar/com/qtalksdkdemo/MainActivity.java
@@ -68,26 +68,20 @@ public void login(View view) {
         if (!QIMSdk.getInstance().isConnected()){
             final ProgressDialog pd = ProgressDialog.show(this, "提示", "正在登录中。。。");
             if(QIMSdk.getInstance().isCanAutoLogin()){
-                QIMSdk.getInstance().autoLogin(new QIMSdk.LoginStatesListener() {
-                    @Override
-                    public void isScuess(boolean b, String s) {
-                        logcat_text.append(s);
-                        pd.dismiss();
-                        autoLoginButton.setText(s);
-                        toast(s);
-                    }
+                QIMSdk.getInstance().autoLogin((b, s) -> {
+                    logcat_text.append(s);
+                    pd.dismiss();
+                    autoLoginButton.setText(s);
+                    toast(s);
                 });
             }else {
                 final String uid = "";//用户名
                 final String password = "";//密码
-                QIMSdk.getInstance().login(uid, password, new QIMSdk.LoginStatesListener() {
-                    @Override
-                    public void isScuess(boolean b, String s) {
-                        logcat_text.append("Uid：" + uid + "\n" + "Password：" + password);
-                        pd.dismiss();
-                        autoLoginButton.setText(s);
-                        toast(s);
-                    }
+                QIMSdk.getInstance().login(uid, password, (b, s) -> {
+                    logcat_text.append("Uid：" + uid + "\n" + "Password：" + password);
+                    pd.dismiss();
+                    autoLoginButton.setText(s);
+                    toast(s);
                 });
             }
 
@@ -101,15 +95,15 @@ public void isScuess(boolean b, String s) {
      * @param view
      */
     public void goToChat(View view){
-        QIMSdk.getInstance().goToChatConv(this,"hubo.hu@qunar.com",0);
+        QIMSdk.getInstance().goToChatConv(this,"jid",0);
     }
 
     /**
      * 群会话
      * @param view
      */
     public void goToGroup(View view){
-        QIMSdk.getInstance().goToGroupConv(this,"a9e35fe11afc4578a54bb133055042d6@conference.qunar.com",1);
+        QIMSdk.getInstance().goToGroupConv(this,"groupid",1);
     }
 
     public void startMainActivity(View view) {
@@ -126,11 +120,6 @@ public void startConversationActivity(View view){
     }
 
     private void toast(final String msg) {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                Toast.makeText(MainActivity.this, msg, Toast.LENGTH_SHORT).show();
-            }
-        });
+        runOnUiThread(() -> Toast.makeText(MainActivity.this, msg, Toast.LENGTH_SHORT).show());
     }
 }
diff --git a/app/src/main/java/sdk/im/qunar/com/qtalksdkdemo/MyApplication.java b/app/src/main/java/sdk/im/qunar/com/qtalksdkdemo/MyApplication.java
@@ -2,9 +2,9 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.support.multidex.MultiDex;
 
-import com.qunar.im.common.CommonConfig;
+import androidx.multidex.MultiDex;
+
 import com.qunar.im.ui.sdk.QIMSdk;
 
 /**

diff --git a/app/src/main/java/sdk/im/qunar/com/qtalksdkdemo/TestActivity.java b/app/src/main/java/sdk/im/qunar/com/qtalksdkdemo/TestActivity.java
@@ -3,16 +3,17 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 /**
  * Created by lihaibin.li on 2018/3/26.
  */
 
-public class TestActivity extends AppCompatActivity{
+public class TestActivity extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

diff --git a/build.gradle b/build.gradle
@@ -2,11 +2,12 @@
 
 buildscript {
     repositories {
+        maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath 'com.google.gms:google-services:4.2.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,18 +16,20 @@ buildscript {
 
 allprojects {
     repositories {
-        maven { url 'https://dl.google.com/dl/android/maven2' }
         maven {
-            url "https://raw.githubusercontent.com/froyomu/im/master"
+            url "https://jitpack.io"
         }
+        maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
+        maven { url "https://maven.google.com" }
+        maven { url 'https://dl.google.com/dl/android/maven2' }
         maven {
             url "http://developer.huawei.com/repo/"
         }
         jcenter {
             url "http://jcenter.bintray.com/"
         }
         maven {
-            url "https://jitpack.io"
+            url "https://raw.githubusercontent.com/froyomu/im/master"
         }
         google()
         jcenter()

diff --git a/gradle.properties b/gradle.properties
@@ -9,16 +9,16 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-android.useDeprecatedNdk=true
-android.enableAapt2=false
 APP_VERSION=240
 APP_VERSION_NAME=3.6.8
 minSdkVersion=16
 targetSdkVersion=26
-compileSdkVersion=27
+compileSdkVersion=28
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/imsdk/build.gradle b/imsdk/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'com.android.library'
 android {
     compileSdkVersion project.compileSdkVersion as int
-//    buildToolsVersion '26.0.2'
 
     defaultConfig {
         minSdkVersion project.minSdkVersion as int
@@ -31,42 +30,44 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    api 'com.android.support:appcompat-v7:27.1.0'
+    api 'androidx.appcompat:appcompat:1.0.0'
 
-    //local
-    api project(':lib_common')
     api project(':lib_rn')
     api project(':lib_rtc')
     api project(':push_service')
 
     //maven
-//    api 'com.startalk.im:sdk-base:3.0.6'
-//    api 'com.startalk.im:sdk-common:3.0.6'
-//    api 'com.startalk.im:sdk-push:3.0.6'
-//    api 'com.startalk.im:sdk-rn:3.0.6'
-//    api 'com.startalk.im:sdk-rtc:3.0.6'
+//    api 'com.startalk.im:sdk-base:3.0.7'
+//    api 'com.startalk.im:sdk-common:3.0.7'
+//    api 'com.startalk.im:sdk-push:3.0.7'
+//    api 'com.startalk.im:sdk-rn:3.0.7'
+//    api 'com.startalk.im:sdk-rtc:3.0.7'
 
-    //thirdpart
+    //baidu map
     api 'com.startalk.im:map:4.4.1'
     api ('com.loopeer.android.thirdparty.pulltorefresh:Android-PullToRefresh:2.1.1') {
         exclude group: 'com.android.support', module: 'support-v4'
     }
-    api "com.nineoldandroids:library:2.4.0"
     api 'com.google.zxing:core:3.2.0'
     api 'io.pristine:libjingle:11139@aar'
-    api 'com.android.support:design:27.1.0'
+    api 'com.google.android.material:material:1.0.0'
     api 'de.greenrobot:eventbus:2.2.1'
     api 'net.zetetic:android-database-sqlcipher:3.5.4'
     api 'com.github.bumptech.glide:glide:3.8.0'
+
     api 'org.jsoup:jsoup:1.9.2'
+    //日期选择器
     api 'com.contrarywind:Android-PickerView:4.1.6'
+
     api ('com.github.chrisbanes:PhotoView:2.1.4'){
         exclude group: 'com.android.support'
     }
     api 'com.github.yalantis:ucrop:2.2.2'
-    api 'com.android.support.constraint:constraint-layout:1.1.3'
+    api 'androidx.constraintlayout:constraintlayout:1.1.3'
+
     api 'com.danikula:videocache:2.7.0'
     api 'tv.danmaku.ijk.media:ijkplayer-java:0.8.8'
     api 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.4'
+
+    api "com.nineoldandroids:library:2.4.0"
 }
-//apply from: 'release.gradle'
diff --git a/imsdk/src/main/AndroidManifest.xml b/imsdk/src/main/AndroidManifest.xml
@@ -590,7 +590,7 @@
                 android:resource="@xml/provider_paths" />
         </provider>
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileProvider"
             android:exported="false"
             android:grantUriPermissions="true">

diff --git a/imsdk/src/main/java/com/qunar/im/ui/activity/AccountSwitchActivity.java b/imsdk/src/main/java/com/qunar/im/ui/activity/AccountSwitchActivity.java
@@ -33,7 +33,7 @@
 import com.qunar.im.common.CommonConfig;
 import com.qunar.im.core.services.QtalkNavicationService;
 import com.qunar.im.base.util.IMUserDefaults;
-import com.qunar.im.protobuf.common.CurrentPreference;
+import com.qunar.im.common.CurrentPreference;
 import com.qunar.im.protobuf.common.LoginType;
 import com.qunar.im.ui.R;
 import com.qunar.im.ui.adapter.AccountAdapter;

diff --git a/imsdk/src/main/java/com/qunar/im/ui/activity/AdActivity.java b/imsdk/src/main/java/com/qunar/im/ui/activity/AdActivity.java
@@ -27,11 +27,9 @@
 import com.qunar.im.common.CommonConfig;
 import com.qunar.im.ui.R;
 import com.qunar.im.ui.view.MyWebView;
-import com.qunar.im.ui.view.bigimageview.view.MyGlideUrl;
 import com.qunar.im.ui.view.medias.video.VideoView;
 
 import java.io.File;
-import java.util.logging.Logger;
 
 /**
  * Created by xinbo.wang on 2016-09-23.

diff --git a/imsdk/src/main/java/com/qunar/im/ui/activity/AddAuthMessageActivity.java b/imsdk/src/main/java/com/qunar/im/ui/activity/AddAuthMessageActivity.java
@@ -10,6 +10,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.qunar.im.common.CurrentPreference;
 import com.qunar.im.ui.presenter.impl.BuddyPresenter;
 import com.qunar.im.ui.presenter.views.IBuddyView;
 import com.qunar.im.base.util.EventBusEvent;
@@ -79,7 +80,7 @@ public void init() {
         mBuddyPresenter = new BuddyPresenter();
         mBuddyPresenter.setBuddyView(this);
         mBuddyPresenter.addFriend();
-        et_reason.setText(getText(R.string.atom_ui_my_is) + com.qunar.im.protobuf.common.CurrentPreference.getInstance().getUserName());
+        et_reason.setText(getText(R.string.atom_ui_my_is) + CurrentPreference.getInstance().getUserName());
 
     }
 

diff --git a/imsdk/src/main/java/com/qunar/im/ui/activity/AnswerRequestActivity.java b/imsdk/src/main/java/com/qunar/im/ui/activity/AnswerRequestActivity.java
@@ -25,7 +25,7 @@
 import com.qunar.im.base.util.graphics.BitmapHelper;
 import com.qunar.im.base.util.graphics.ImageUtils;
 import com.qunar.im.base.util.graphics.MyDiskCache;
-import com.qunar.im.protobuf.common.CurrentPreference;
+import com.qunar.im.common.CurrentPreference;
 import com.qunar.im.ui.R;
 import com.qunar.im.ui.view.QtNewActionBar;
 

diff --git a/imsdk/src/main/java/com/qunar/im/ui/activity/AtListActivity.java b/imsdk/src/main/java/com/qunar/im/ui/activity/AtListActivity.java
@@ -17,7 +17,7 @@
 import com.qunar.im.ui.presenter.views.IChatMemberAdapter;
 import com.qunar.im.base.util.ListUtil;
 import com.qunar.im.core.manager.IMLogicManager;
-import com.qunar.im.protobuf.common.CurrentPreference;
+import com.qunar.im.common.CurrentPreference;
 import com.qunar.im.ui.R;
 import com.qunar.im.ui.adapter.MembersAdapter;
 import com.qunar.im.ui.view.MySearchView;

diff --git a/imsdk/src/main/java/com/qunar/im/ui/activity/BackgroundTipActivity.java b/imsdk/src/main/java/com/qunar/im/ui/activity/BackgroundTipActivity.java
@@ -3,11 +3,9 @@
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.View;
 import android.widget.TextView;
 
 import com.qunar.im.core.services.QtalkNavicationService;
-import com.qunar.im.core.utils.GlobalConfigManager;
 import com.qunar.im.ui.R;
 import com.qunar.im.ui.view.IconView;
 import com.qunar.im.ui.view.QtNewActionBar;