Merge branch 'dev_im' of http://113.105.137.151:22280/lify/rvapp into dev-john-im-improve

RvClient/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         flavorDimensions "default"
-        versionCode 150
-        versionName "1.5.0"
+        versionCode 154
+        versionName "1.5.4"
         multiDexEnabled true
 
 

plugin_im/src/main/java/com/rv/im/CustomerListActivity.java

@@ -106,7 +106,7 @@ public class CustomerListActivity extends BaseStatusActivity<CommonPresenter> im
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (!Settings.canDrawOverlays(this)) {
                 new AlertDialog.Builder(this).setTitle("提示")
-                        .setMessage("允许滴房车在其他应用上层显示,实时获知新消息")
+                        .setMessage("允许在手机上层显示,实时获知新消息")
                         .setNegativeButton("下次再说", (dialogInterface, i) -> {
                             dialogInterface.dismiss();
                         }).setPositiveButton("好的", (dialogInterface, i) -> {

plugin_im/src/main/java/com/rv/im/bean/ImBaseBean.java

+package com.rv.im.bean;
+
+import com.ruiwenliu.wrapper.base.BaseBean;
+
+public class ImBaseBean extends BaseBean {
+
+    public transient int status;
+    public transient String message;
+}

plugin_im/src/main/java/com/rv/im/bean/User.java

+package com.rv.im.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+/**
+ * 用户表
+ */
+public class User extends ImBaseBean {
+
+    private UserData data ;
+
+    public UserData getData() {
+        return data;
+    }
+
+    public void setData(UserData data) {
+        this.data = data;
+    }
+
+    public class UserData{
+        private String userId ;
+        private String telephone ;
+        private String phone ;
+        private int onlinestate ;
+
+        public String getUserId() {
+            return userId;
+        }
+
+        public void setUserId(String userId) {
+            this.userId = userId;
+        }
+
+        public String getTelephone() {
+            return telephone;
+        }
+
+        public void setTelephone(String telephone) {
+            this.telephone = telephone;
+        }
+
+        public String getPhone() {
+            return phone;
+        }
+
+        public void setPhone(String phone) {
+            this.phone = phone;
+        }
+
+        public int getOnlinestate() {
+            return onlinestate;
+        }
+
+        public void setOnlinestate(int onlinestate) {
+            this.onlinestate = onlinestate;
+        }
+    }
+
+}

plugin_im/src/main/java/com/rv/im/util/RvImTimerTask.java

+package com.rv.im.util;
+
+import java.util.TimerTask;
+
+public class RvImTimerTask extends TimerTask {
+
+    private TimerListener listener;
+
+    public RvImTimerTask(TimerListener listener) {
+        this.listener = listener;
+    }
+
+    @Override
+    public void run() {
+        if (listener != null)
+            listener.timer();
+    }
+
+    public interface TimerListener {
+        void timer();
+    }
+}

plugin_im/src/main/java/com/rv/im/view/TitleTextWindow.java

@@ -103,7 +103,7 @@ public class TitleTextWindow implements View.OnTouchListener {
         createTitleView();
         animShow();
         //3S后自动关闭
-        mHander.sendEmptyMessageDelayed(20, 1000);
+        mHander.sendEmptyMessageDelayed(20, 2000);
     }
 
     /**