添加获取token与鉴权接口

王琳
1 parent 918131e1
Showing 13 changed files with 75 additions and 53 deletions
.idea/misc.xml
IMLib/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
IMLib/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
IMLib/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
IMLib/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
IMLib/build/intermediates/res/resources-debug-androidTest.ap_
IMLib/build/outputs/aar/IMLib-debug.aar
IMLib/build/outputs/aar/IMLib-release.aar
IMLib/src/main/java/io.rong.imlib/Chat.java
IMLib/src/main/java/io.rong.imlib/ChatUtil.java
IMLib/src/main/java/io.rong.imlib/base/IChat.java
IMLib/src/main/java/io.rong.imlib/model/DataEntity.java
IMLib/src/main/java/io.rong.imlib/network/HttpRequest.java
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
-#Thu Mar 02 15:05:54 CST 2017
+#Thu Mar 02 16:41:59 CST 2017
-#Thu Mar 02 15:05:52 CST 2017
+#Thu Mar 02 16:41:58 CST 2017
-#Thu Mar 02 15:05:54 CST 2017
+#Thu Mar 02 16:41:59 CST 2017
-#Thu Mar 02 15:05:54 CST 2017
+#Thu Mar 02 16:42:00 CST 2017
@@ -63,13 +63,12 @@ public class Chat implements IChat {
     private OnResultListener mOnResultListener;
     private OnLatestMessageListener mOnLatestMessageListener;
-    private OnErrorListener mOnErrorListener;
-    private OnInfoListener mOnInfoListener;
+    private OnCNChatListener mOnCNListener;
+//    private OnInfoListener mOnInfoListener;
     private String sid;
-    private static String APP_KEY = "e5t4ouvpe5qea";
-    private static String APP_SECRET = "N16VJFIPE22p";
+    private static String APP_KEY = "8brlm7uf8bqz3";
     private static Chat chat;
@@ -131,9 +130,11 @@ public class Chat implements IChat {
             @Override
             public void onError(Call call, Exception e) {
                 if (!NetUtil.checkNetwork(Config.getContext())) {
-                    if (mOnErrorListener != null) mOnErrorListener.onError(-0x1009, "网络连接失败");
+                    if (mOnCNListener != null)
+                        mOnCNListener.onError(IChat.ERROR_GET_TOKEN_NETWORK, IChat.MSG_GET_TOKEN_NETWORK);
                 } else {
-                    if (mOnErrorListener != null) mOnErrorListener.onError(-0x1010, "内部错误");
+                    if (mOnCNListener != null)
+                        mOnCNListener.onError(IChat.ERROR_GET_TOKEN_OTHER, IChat.MSG_GET_TOKEN_OTHER);
                 }
                 if (e != null) Log.e("Chat", "error ", e);
@@ -142,13 +143,13 @@ public class Chat implements IChat {
             @Override
             public void onResponse(DataEntity dataEntity, Exception e) {
                 if (dataEntity != null && "0".equals(dataEntity.getErrorCode())) {
-                    if (mOnInfoListener != null) mOnInfoListener.onInfo(0x2001, "获取token成功");
+                    if (mOnCNListener != null)
+                        mOnCNListener.onInfo(SUCCESS_GET_TOKEN, dataEntity.getErrorMessage());
                     token = dataEntity.getData().getToken();
-                    Log.e("DemoView", token);
                     connect(token);
                 } else if (dataEntity != null && !TextUtils.isEmpty(dataEntity.getErrorCode())) {
-                    if (mOnErrorListener != null)
-                        mOnErrorListener.onError(-0x1008, dataEntity.getErrorMessage());
+                    if (mOnCNListener != null)
+                        mOnCNListener.onError(IChat.ERROR_GET_TOKEN, IChat.MSG_GET_TOKEN + dataEntity.getErrorMessage());
                 } else {
                     onError(null, e);
                 }
@@ -158,6 +159,7 @@ public class Chat implements IChat {
     //连接融云服务器
     private void connect(String token) {
+        Log.e("DemoView", token);
         RongIMClient.connect(token, new RongIMClient.ConnectCallback() {
             @Override
             public void onTokenIncorrect() {
@@ -192,9 +194,11 @@ public class Chat implements IChat {
             @Override
             public void onError(Call call, Exception e) {
                 if (!NetUtil.checkNetwork(Config.getContext())) {
-                    if (mOnErrorListener != null) mOnErrorListener.onError(-0x1009, "网络连接失败");
+                    if (mOnCNListener != null)
+                        mOnCNListener.onError(ERROR_CHECK_AUTH_NETWORK, MSG_CHECK_AUTH_NETWORK);
                 } else {
-                    if (mOnErrorListener != null) mOnErrorListener.onError(-0x1010, "内部错误");
+                    if (mOnCNListener != null)
+                        mOnCNListener.onError(ERROR_CHECK_AUTH_OTHER, MSG_CHECK_AUTH_OTHER);
                 }
                 if (e != null) Log.e("Chat", "error ", e);
             }
@@ -202,12 +206,13 @@ public class Chat implements IChat {
             @Override
             public void onResponse(DataEntity dataEntity, Exception e) {
                 if (dataEntity != null && "0".equals(dataEntity.getErrorCode())) {
-                    if (mOnInfoListener != null)
-                        mOnInfoListener.onInfo(0x2001, dataEntity.getErrorMessage());
+                    if (mOnCNListener != null)
+                        mOnCNListener.onInfo(SUCCESS_CHECK_AUTH, dataEntity.getErrorMessage());
                     joinExistChatroom(roomId, defMessageCount);
                 } else if (dataEntity != null && !TextUtils.isEmpty(dataEntity.getErrorCode())) {
-                    if (mOnErrorListener != null)
-                        mOnErrorListener.onError(-0x1008, dataEntity.getErrorMessage());
+                    if (mOnCNListener != null)
+                        mOnCNListener.onError(ERROR_CHECK_AUTH, MSG_CHECK_AUTH + dataEntity.getErrorMessage());
+
                 } else {
                     onError(null, e);
                 }
@@ -221,9 +226,11 @@ public class Chat implements IChat {
             @Override
             public void onError(Call call, Exception e) {
                 if (!NetUtil.checkNetwork(Config.getContext())) {
-                    if (mOnErrorListener != null) mOnErrorListener.onError(-0x1009, "网络连接失败");
+                    if (mOnCNListener != null)
+                        mOnCNListener.onError(ERROR_CHECK_AUTH_NETWORK, MSG_CHECK_AUTH_NETWORK);
                 } else {
-                    if (mOnErrorListener != null) mOnErrorListener.onError(-0x1010, "内部错误");
+                    if (mOnCNListener != null)
+                        mOnCNListener.onError(ERROR_CHECK_AUTH_OTHER, MSG_CHECK_AUTH_OTHER);
                 }
                 if (e != null) Log.e("Chat", "error ", e);
             }
@@ -231,12 +238,12 @@ public class Chat implements IChat {
             @Override
             public void onResponse(DataEntity dataEntity, Exception e) {
                 if (dataEntity != null && "0".equals(dataEntity.getErrorCode())) {
-                    if (mOnInfoListener != null)
-                        mOnInfoListener.onInfo(0x2001, dataEntity.getErrorMessage());
+                    if (mOnCNListener != null)
+                        mOnCNListener.onInfo(SUCCESS_CHECK_AUTH, dataEntity.getErrorMessage());
                     joinChatroom(roomId, defMessageCount);
                 } else if (dataEntity != null && !TextUtils.isEmpty(dataEntity.getErrorCode())) {
-                    if (mOnErrorListener != null)
-                        mOnErrorListener.onError(-0x1008, dataEntity.getErrorMessage());
+                    if (mOnCNListener != null)
+                        mOnCNListener.onError(ERROR_CHECK_AUTH, MSG_CHECK_AUTH + dataEntity.getErrorMessage());
                 } else {
                     onError(null, e);
                 }
@@ -543,13 +550,13 @@ public class Chat implements IChat {
         this.mOnLatestMessageListener = listener;
     }
-    public void setOnErrorListener(OnErrorListener listener) {
-        this.mOnErrorListener = listener;
+    public void setOnCNChatListener(OnCNChatListener listener) {
+        this.mOnCNListener = listener;
     }
-    public void setOnInfoListener(OnInfoListener listener) {
-        this.mOnInfoListener = listener;
-    }
+//    public void setOnInfoListener(OnInfoListener listener) {
+//        this.mOnInfoListener = listener;
+//    }
     private UserInfo getCurrentUser() {
         return currentUser;
@@ -80,12 +80,8 @@ public class ChatUtil {
         Chat.getInstance().setOnLatestMessageListener(listener);
     }
-    public static void setOnErrorListener(IChat.OnErrorListener listener) {
-        Chat.getInstance().setOnErrorListener(listener);
-    }
-
-    public static void setOnInfoListener(IChat.OnInfoListener listener) {
-        Chat.getInstance().setOnInfoListener(listener);
+    public static void setOnCNChatListener(IChat.OnCNChatListener listener) {
+        Chat.getInstance().setOnCNChatListener(listener);
     }
     public static void modifyUser(String userName, String headUrl) {
@@ -22,24 +22,30 @@ public interface IChat {
     int TOKEN_INCORRECT = 4;
     int SERVER_INVALID = 5;
-    int ERROR_TOKEN_INCORRECT = -100000;
-    int SUCCESS_CONNECT = 100001;
+    int SUCCESS_GET_TOKEN = 10000;
+    int ERROR_GET_TOKEN = -100000;
+    int ERROR_GET_TOKEN_NETWORK = -10001;
+    int ERROR_GET_TOKEN_OTHER = -10002;
     int SUCCESS_JOIN_CHATROOM = 100002;
     int SUCCESS_JOIN_EXIST_CHATROOM = 100003;
     int SUCCESS_QUIT_CHATROOM = 100004;
-    int SUCCESS_SEND_MESSAGE = 100005;
-    int RECEIVE = 100006;
+    int SUCCESS_CHECK_AUTH = 100005;
+    int ERROR_CHECK_AUTH_NETWORK = -10005;
+    int ERROR_CHECK_AUTH_OTHER = -10006;
+    int ERROR_CHECK_AUTH = -10007;
     String PRIVATE = "private";
     String CHATROOM = "chatRoom";
-    String MSG_TOKEN_INCORRECT = "Token错误";
-    String MSG_SUCCESS_CONNECT = "连接成功";
+    String MSG_GET_TOKEN_NETWORK = "获取token时网络连接错误";
+    String MSG_GET_TOKEN_OTHER = "获取token时内部错误";
+    String MSG_GET_TOKEN = "获取Token失败";
+    String MSG_CHECK_AUTH_NETWORK = "鉴权时网络连接错误";
+    String MSG_CHECK_AUTH_OTHER = "鉴权时内部错误";
+    String MSG_CHECK_AUTH = "鉴权失败";
     String MSG_SUCCESS_JOIN_CHATROOM = "加入聊天室成功";
     String MSG_SUCCESS_JOIN_EXIST_CHATROOM = "加入已存在聊天室成功";
     String MSG_SUCCESS_QUIT_CHATROOM = "退出聊天室成功";
-    String MSG_SUCCESS_SEND_MESSAGE = "发送消息成功";
-    String MSG_RECEIVE = "接收消息";
     String STATUS_NETWORK_UNAVAILABLE = "Network is unavailable.";
     String STATUS_CONNECTED = "Connect Success.";
@@ -99,9 +105,9 @@ public interface IChat {
     //从本地获取私聊历史消息
     void getLatestMessages(String targetId, int count);
-    void setOnErrorListener(OnErrorListener listener);
+    void setOnCNChatListener(OnCNChatListener listener);
-    void setOnInfoListener(OnInfoListener listener);
+//    void setOnInfoListener(OnInfoListener listener);
     //获取历史消息监听
     void setOnLatestMessageListener(OnLatestMessageListener listener);
@@ -156,12 +162,14 @@ public interface IChat {
         void onError(int what, String extra);
     }
-    interface OnErrorListener {
+    interface OnCNChatListener {
         void onError(int what, String extra);
-    }
-    interface OnInfoListener {
         void onInfo(int what, String extra);
     }
+//    interface OnInfoListener {
+//        void onInfo(int what, String extra);
+//    }
+
 }
 package io.rong.imlib.model;
+import com.cnlive.libs.util.model.BaseData;
+
 /**
  * Created by Lynn on 3/2/2017.
  */
@@ -16,7 +18,7 @@ public class DataEntity extends ErrorMessage {
         this.data = data;
     }
-    public class TokenData {
+    public static class TokenData extends BaseData {
         private String sid;
         private String token;
@@ -35,5 +37,14 @@ public class DataEntity extends ErrorMessage {
         public void setToken(String token) {
             this.token = token;
         }
+
+
+    }
+
+    @Override
+    public String toString() {
+        return "DataEntity{" +
+                "data=" + data +
+                '}';
     }
 }
@@ -19,7 +19,7 @@ import io.rong.imlib.model.DataEntity;
 public class HttpRequest {
     private static final String BASE_URL = "https://api.cnlive.com/open/api2";
     private static final String URL_GET_TOKEN = BASE_URL + "/im_chat/getToken";
-    private static final String URL_ROOM_AUTH_CHECK = "/im_chat/user/checkOnline";
+    private static final String URL_ROOM_AUTH_CHECK = BASE_URL + "/im_chat/user/checkOnline";
     public static void getToken(CNUserInfo userInfo, GenericsCallback<DataEntity> callback) {
         Map<String, String> params = new HashMap<>();