添加获取token与鉴权接口

王琳
1 parent 0d324f23
Showing 17 changed files with 283 additions and 35 deletions
IMLib/build.gradle
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/libs/libcnliveutil.jar
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/model/ErrorMessage.java
IMLib/src/main/java/io.rong.imlib/network/HttpRequest.java
app/src/main/java/com/cnlive/chat/CNLiveApplication.java
app/src/main/java/com/cnlive/chat/ui/ChatRoomActivity.java
@@ -21,7 +21,7 @@ android {
  
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -31,8 +31,9 @@ android {
 }
  
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:support-v4:21.0.0'
+    compile files('libs/libcnliveutil.jar')
 }
  
 ext {
-#Wed Mar 01 16:14:59 CST 2017
+#Thu Mar 02 15:05:54 CST 2017
-#Wed Mar 01 16:14:58 CST 2017
+#Thu Mar 02 15:05:52 CST 2017
-#Wed Mar 01 16:14:59 CST 2017
+#Thu Mar 02 15:05:54 CST 2017
-#Wed Mar 01 16:15:00 CST 2017
+#Thu Mar 02 15:05:54 CST 2017
@@ -3,10 +3,19 @@ package io.rong.imlib;
 import android.content.Context;
 import android.net.Uri;
 import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
  
+import com.cnlive.libs.util.Config;
+import com.cnlive.libs.util.NetUtil;
+import com.cnlive.libs.util.data.okhttp3.Call;
+import com.cnlive.libs.util.data.okhttpUtil.callback.GenericsCallback;
+
+import org.apache.http.HttpResponse;
 import org.json.JSONException;
 import org.json.JSONObject;
  
+import java.lang.annotation.Target;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -16,9 +25,11 @@ import io.rong.imlib.model.CNMessage;
 import io.rong.imlib.model.CNUserInfo;
 import io.rong.imlib.model.ConnectionStatus;
 import io.rong.imlib.model.Conversation;
+import io.rong.imlib.model.DataEntity;
 import io.rong.imlib.model.Message;
 import io.rong.imlib.model.MessageContent;
 import io.rong.imlib.model.UserInfo;
+import io.rong.imlib.network.HttpRequest;
 import io.rong.imlib.network.HttpUtil;
 import io.rong.message.TextMessage;
  
@@ -52,6 +63,11 @@ public class Chat implements IChat {
     private OnResultListener mOnResultListener;
     private OnLatestMessageListener mOnLatestMessageListener;
  
+    private OnErrorListener mOnErrorListener;
+    private OnInfoListener mOnInfoListener;
+
+    private String sid;
+
     private static String APP_KEY = "e5t4ouvpe5qea";
     private static String APP_SECRET = "N16VJFIPE22p";
  
@@ -96,29 +112,48 @@ public class Chat implements IChat {
             headUrl = cnUserInfo.getHeadUrl() == null ? "" : cnUserInfo.getHeadUrl();
             currentUser = new UserInfo(userId, userName, Uri.parse(headUrl));
         }
-        getToken(cnUserInfo, new HttpUtil.OnResponse() {
+        sid = currentUser.getUserId();
+        getToken(cnUserInfo);
+    }
+
+//    //获得token
+//    private static void getToken(CNUserInfo user, HttpUtil.OnResponse callback) {
+//        final String HTTP_GET_TOKEN = "https://api.cn.ronghub.com/user/getToken.json";
+//        HttpUtil.Header header = HttpUtil.getRcHeader(APP_KEY, APP_SECRET);
+//        String body = "userId=" + user.getUserId() + "&name=" + user.getUserName() + "&portraitUri=" + Uri.parse(user.getHeadUrl());
+//        HttpUtil httpUtil = new HttpUtil();
+//        httpUtil.post(HTTP_GET_TOKEN, header, body, callback);
+//    }
+
+    private void getToken(CNUserInfo userInfo) {
+        Log.e("DemoView", userInfo.getUserId() + " : " + userInfo.getUserName() + " : " + userInfo.getHeadUrl());
+        HttpRequest.getToken(userInfo, new GenericsCallback<DataEntity>() {
             @Override
-            public void onResponse(int code, String body) {
-                if (code != 200) return;
-                try {
-                    JSONObject jsonObject = new JSONObject(body);
-                    token = jsonObject.getString("token");
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                    return;
+            public void onError(Call call, Exception e) {
+                if (!NetUtil.checkNetwork(Config.getContext())) {
+                    if (mOnErrorListener != null) mOnErrorListener.onError(-0x1009, "网络连接失败");
+                } else {
+                    if (mOnErrorListener != null) mOnErrorListener.onError(-0x1010, "内部错误");
                 }
-                connect(token);
+                if (e != null) Log.e("Chat", "error ", e);
+
             }
-        });
-    }
  
-    //获得token
-    private static void getToken(CNUserInfo user, HttpUtil.OnResponse callback) {
-        final String HTTP_GET_TOKEN = "https://api.cn.ronghub.com/user/getToken.json";
-        HttpUtil.Header header = HttpUtil.getRcHeader(APP_KEY, APP_SECRET);
-        String body = "userId=" + user.getUserId() + "&name=" + user.getUserName() + "&portraitUri=" + Uri.parse(user.getHeadUrl());
-        HttpUtil httpUtil = new HttpUtil();
-        httpUtil.post(HTTP_GET_TOKEN, header, body, callback);
+            @Override
+            public void onResponse(DataEntity dataEntity, Exception e) {
+                if (dataEntity != null && "0".equals(dataEntity.getErrorCode())) {
+                    if (mOnInfoListener != null) mOnInfoListener.onInfo(0x2001, "获取token成功");
+                    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());
+                } else {
+                    onError(null, e);
+                }
+            }
+        });
     }
  
     //连接融云服务器
@@ -151,8 +186,66 @@ public class Chat implements IChat {
         else RongIMClient.getInstance().logout();
     }
  
+    //用户鉴权成功后加入已经存在聊天室
+    public void joinExistChatRoom(final String roomId, final int defMessageCount) {
+        HttpRequest.getRoomAuthCheck(roomId, sid, new GenericsCallback<DataEntity>() {
+            @Override
+            public void onError(Call call, Exception e) {
+                if (!NetUtil.checkNetwork(Config.getContext())) {
+                    if (mOnErrorListener != null) mOnErrorListener.onError(-0x1009, "网络连接失败");
+                } else {
+                    if (mOnErrorListener != null) mOnErrorListener.onError(-0x1010, "内部错误");
+                }
+                if (e != null) Log.e("Chat", "error ", e);
+            }
+
+            @Override
+            public void onResponse(DataEntity dataEntity, Exception e) {
+                if (dataEntity != null && "0".equals(dataEntity.getErrorCode())) {
+                    if (mOnInfoListener != null)
+                        mOnInfoListener.onInfo(0x2001, dataEntity.getErrorMessage());
+                    joinExistChatroom(roomId, defMessageCount);
+                } else if (dataEntity != null && !TextUtils.isEmpty(dataEntity.getErrorCode())) {
+                    if (mOnErrorListener != null)
+                        mOnErrorListener.onError(-0x1008, dataEntity.getErrorMessage());
+                } else {
+                    onError(null, e);
+                }
+            }
+        });
+    }
+
+    //用户鉴权成功后加入已经存在聊天室
+    public void joinChatRoom(final String roomId, final int defMessageCount) {
+        HttpRequest.getRoomAuthCheck(roomId, sid, new GenericsCallback<DataEntity>() {
+            @Override
+            public void onError(Call call, Exception e) {
+                if (!NetUtil.checkNetwork(Config.getContext())) {
+                    if (mOnErrorListener != null) mOnErrorListener.onError(-0x1009, "网络连接失败");
+                } else {
+                    if (mOnErrorListener != null) mOnErrorListener.onError(-0x1010, "内部错误");
+                }
+                if (e != null) Log.e("Chat", "error ", e);
+            }
+
+            @Override
+            public void onResponse(DataEntity dataEntity, Exception e) {
+                if (dataEntity != null && "0".equals(dataEntity.getErrorCode())) {
+                    if (mOnInfoListener != null)
+                        mOnInfoListener.onInfo(0x2001, dataEntity.getErrorMessage());
+                    joinChatroom(roomId, defMessageCount);
+                } else if (dataEntity != null && !TextUtils.isEmpty(dataEntity.getErrorCode())) {
+                    if (mOnErrorListener != null)
+                        mOnErrorListener.onError(-0x1008, dataEntity.getErrorMessage());
+                } else {
+                    onError(null, e);
+                }
+            }
+        });
+    }
+
     //加入聊天室，如果存在则加入，如果不存在，则创建
-    private void joinChatRoom(String roomId, int messageCount) {
+    private void joinChatroom(String roomId, int messageCount) {
         defMessageCount = messageCount;
         currentRoomId = roomId;
         RongIMClient.getInstance().joinChatRoom(currentRoomId, defMessageCount, new RongIMClient.OperationCallback() {
@@ -171,7 +264,7 @@ public class Chat implements IChat {
     }
  
     //加入聊天室，如果存在则加入，如果不存在则加入失败
-    public void joinExistChatRoom(String roomId, int messageCount) {
+    private void joinExistChatroom(String roomId, int messageCount) {
         defMessageCount = messageCount;
         currentRoomId = roomId;
         roomIdList.add(currentRoomId);
@@ -229,14 +322,6 @@ public class Chat implements IChat {
         return connectionStatus;
     }
  
-    //切换用户
-    public void exchangeUser(CNUserInfo userInfo) {
-        disconnect(false);
-        connect(userInfo);
-        //TODO 在token获取成功时做连接操作，连接成功之后做加入聊天室操作
-        joinChatRoom(currentRoomId, -1);
-    }
-
     private void sendChatRoomMessage(String targetId, final MessageContent msgContent) {
         if (currentUser == null) {
             throw new RuntimeException("currentUser should not be null.");
@@ -458,6 +543,14 @@ public class Chat implements IChat {
         this.mOnLatestMessageListener = listener;
     }
  
+    public void setOnErrorListener(OnErrorListener listener) {
+        this.mOnErrorListener = listener;
+    }
+
+    public void setOnInfoListener(OnInfoListener listener) {
+        this.mOnInfoListener = listener;
+    }
+
     private UserInfo getCurrentUser() {
         return currentUser;
     }
@@ -476,4 +569,12 @@ public class Chat implements IChat {
         currentUser.setPortraitUri(Uri.parse(headUrl));
         setCurrentUser(currentUser);
     }
+
+    //切换用户
+    public void exchangeUser(CNUserInfo userInfo) {
+        disconnect(false);
+        connect(userInfo);
+        //TODO 在token获取成功时做连接操作，连接成功之后做加入聊天室操作
+        joinExistChatRoom(currentRoomId, -1);
+    }
 }
@@ -80,6 +80,14 @@ 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 modifyUser(String userName, String headUrl) {
         Chat.getInstance().modifyUser(userName, headUrl);
     }
@@ -99,6 +99,10 @@ public interface IChat {
     //从本地获取私聊历史消息
     void getLatestMessages(String targetId, int count);
  
+    void setOnErrorListener(OnErrorListener listener);
+
+    void setOnInfoListener(OnInfoListener listener);
+
     //获取历史消息监听
     void setOnLatestMessageListener(OnLatestMessageListener listener);
  
@@ -152,4 +156,12 @@ public interface IChat {
         void onError(int what, String extra);
     }
  
+    interface OnErrorListener {
+        void onError(int what, String extra);
+    }
+
+    interface OnInfoListener {
+        void onInfo(int what, String extra);
+    }
+
 }
+package io.rong.imlib.model;
+
+/**
+ * Created by Lynn on 3/2/2017.
+ */
+
+public class DataEntity extends ErrorMessage {
+
+    private TokenData data;
+
+    public TokenData getData() {
+        return data;
+    }
+
+    public void setData(TokenData data) {
+        this.data = data;
+    }
+
+    public class TokenData {
+        private String sid;
+        private String token;
+
+        public String getSid() {
+            return sid;
+        }
+
+        public void setSid(String sid) {
+            this.sid = sid;
+        }
+
+        public String getToken() {
+            return token;
+        }
+
+        public void setToken(String token) {
+            this.token = token;
+        }
+    }
+}
+package io.rong.imlib.model;
+
+import com.cnlive.libs.util.model.BaseData;
+
+/**
+ * Created by Lynn on 3/2/2017.
+ */
+
+public class ErrorMessage extends BaseData {
+    private String errorCode;
+    private String errorMessage;
+
+    public String getErrorCode() {
+        return errorCode;
+    }
+
+    public void setErrorCode(String errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+}
+package io.rong.imlib.network;
+
+import android.util.Log;
+
+import com.cnlive.libs.util.Config;
+import com.cnlive.libs.util.HttpUtils;
+import com.cnlive.libs.util.data.okhttpUtil.callback.GenericsCallback;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.rong.imlib.model.CNUserInfo;
+import io.rong.imlib.model.DataEntity;
+
+/**
+ * Created by Lynn on 3/2/2017.
+ */
+
+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";
+
+    public static void getToken(CNUserInfo userInfo, GenericsCallback<DataEntity> callback) {
+        Map<String, String> params = new HashMap<>();
+        params.put("appId", Config.getAppId());
+        params.put("sid", userInfo.getUserId());
+        params.put("nickName", userInfo.getUserName());
+        params.put("faceUrl", userInfo.getHeadUrl());
+        HttpUtils.doPostAsyn(URL_GET_TOKEN, params, callback);
+    }
+
+    public static void getRoomAuthCheck(String chatroomId, String sid, GenericsCallback<DataEntity> callback) {
+        Map<String, String> params = new HashMap<>();
+        params.put("appId", Config.getAppId());
+        params.put("chatroomId", chatroomId);
+        params.put("sid", sid);
+        HttpUtils.doPostAsyn(URL_ROOM_AUTH_CHECK, params, callback);
+    }
+}
@@ -2,6 +2,8 @@ package com.cnlive.chat;
  
 import android.app.Application;
  
+import com.cnlive.libs.util.Config;
+
 import io.rong.imlib.ChatUtil;
  
 /**
@@ -13,6 +15,7 @@ public class CNLiveApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        Config.init(this, "60_irn9cdak77", "a425987ebc86e352b3373c25d5bd082d0cc248b4043028");
         ChatUtil.init(this);
     }
 }
@@ -57,6 +57,8 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
 //        ChatUtil.connect(null);
  
         mHandler = new Handler(this.getMainLooper());
+        ChatUtil.setOnErrorListener(onErrorListener);
+        ChatUtil.setOnInfoListener(onInfoListener);
         ChatUtil.setOnSendMessageListener(onSendMessageListener);
         ChatUtil.setOnOperationListener(onOperationListener);
         ChatUtil.setOnResultListener(onResultListener);
@@ -284,6 +286,20 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         }
     };
  
+    private IChat.OnErrorListener onErrorListener = new IChat.OnErrorListener() {
+        @Override
+        public void onError(int what, String extra) {
+            Log.e("DemoView", what + " : " + extra);
+        }
+    };
+
+    private IChat.OnInfoListener onInfoListener = new IChat.OnInfoListener() {
+        @Override
+        public void onInfo(int what, String extra) {
+            Log.e("DemoView", what + " : " + extra);
+        }
+    };
+
     @Override
     protected void onDestroy() {
         super.onDestroy();