更新聊天室SDK

朱显松
1 parent 841cfbca
Showing 7 changed files with 329 additions and 76 deletions
app/libs/libcnlivechat.jar
app/libs/libcnliveutil.jar
app/proguard-rules.pro
app/src/main/java/com/cnlive/demo/chat/MainActivity.java
app/src/main/java/com/cnlive/demo/chat/util/ChatUtil.java
app/src/main/java/com/cnlive/demo/chat/util/IChatUtil.java
app/src/main/res/layout/activity_main.xml
 -keepattributes Signature
--dontwarn com.cnlive.**
--keep class com.cnlive.** {*;}
+-dontwarn com.cnlive.libs.**
+-keep class com.cnlive.libs.** {*;}
 -keep class org.jivesoftware.** {*;}
 -dontwarn org.jivesoftware.**
 package com.cnlive.demo.chat;
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
@@ -13,17 +11,14 @@ import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.TextView;
-import com.cnlive.libs.chat.ChatCallback;
-import com.cnlive.libs.chat.ChatConnect;
-import com.cnlive.libs.chat.ChatState;
+import com.cnlive.demo.chat.util.ChatUtil;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-public class MainActivity extends AppCompatActivity implements ChatCallback {
+public class MainActivity extends AppCompatActivity {
-    private ChatConnect chatConnect;
+    private ChatUtil mChatUtil;
     private static final String name = "游客";
     //测试聊天室 房间号
     private static final String room = "60_123456";
@@ -31,6 +26,7 @@ public class MainActivity extends AppCompatActivity implements ChatCallback {
     private EditText editText;
     private ListView listView;
     private Button button;
+    private TextView chatState;
     private List<String> list = new ArrayList<>();
     private BaseAdapter adapter;
@@ -38,6 +34,7 @@ public class MainActivity extends AppCompatActivity implements ChatCallback {
         editText = (EditText) findViewById(R.id.edit_send);
         listView = (ListView) findViewById(android.R.id.list);
         button = (Button) findViewById(R.id.btn_send);
+        chatState = (TextView) findViewById(R.id.chat_state);
         button.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -78,86 +75,37 @@ public class MainActivity extends AppCompatActivity implements ChatCallback {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         initTestView();
-    }
-    @Override
-    public void setContentView(@LayoutRes int layoutResID) {
-        super.setContentView(layoutResID);
-        //当前SDK版本号
-        Log.e("Chat", "Version " + ChatConnect.getVersion());
-        //创建ChatConnect对象 传入回调接口
-        chatConnect = new ChatConnect(this);
-        //初始化ChatConnect对象 传入房间号
-        chatConnect.init(room);
-        //设置最大历史条数
-        chatConnect.setMaxStanzas(10);
+        mChatUtil = new ChatUtil(this);
+        mChatUtil.setStateView(chatState);
+        mChatUtil.setOnMessageListener(new ChatUtil.OnMessageListener() {
+            @Override
+            public void onMessage(String message) {
+                list.add(message);
+                adapter.notifyDataSetChanged();
+                listView.setSelection(list.size() - 1);
+            }
+        });
+
+        mChatUtil.initChat(room, name);
+        mChatUtil.connectChat();
     }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
         //页面关闭 销毁ChatConnect对象
-        if (chatConnect != null) chatConnect.destroy();
+        mChatUtil.destroy();
     }
     public void sendMessage(String msg) {
         if (TextUtils.isEmpty(msg)) return;
         //判断登录状态 发送消息
-        if (chatConnect != null && chatConnect.isJoin()) {
+        if (mChatUtil.isJoin()) {
             //发送聊天信息
-            chatConnect.send(msg);
-        }
-    }
-
-    @Override
-    public void onChatState(int what, String extra) {
-        switch (what) {
-            case ChatState.StateInitDone: //初始化完成
-                // 连接聊天室
-                connectChat();
-                break;
-            case ChatState.ErrorInitAuth: //认证失败
-            case ChatState.ErrorInitNetwork: //未检测到网络
-            case ChatState.ErrorInitOther: //初始化错误
-                //TODO chatConnect.init(roomId); 重新初始化聊天室
-                break;
-            case ChatState.StateConnect: //与服务器建立连接
-                break;
-            case ChatState.StateJoin: //聊天室登录成功
-                //TODO 可以发送消息
-                break;
-            case ChatState.StateReconnect: //与服务器重新连接
-                //TODO 自动重连后 调用connectChat();重新连接聊天室
-                connectChat();
-                break;
-            case ChatState.ErrorConnect: //连接服务器失败
-            case ChatState.ErrorChat: //聊天室连接失败
-            case ChatState.ErrorName: //昵称冲突
-                //TODO connectChat();重新连接聊天室
-                break;
-            case ChatState.ErrorConnectCloseOnError: //聊天室异常断开
-                //TODO
-                break;
-            case ChatState.ErrorSendOther: //消息发送失败
-                //TODO
-                break;
-            case ChatState.ErrorSendNoConnect: //消息发送失败 没有连接聊天室
-                //TODO
-                break;
+            mChatUtil.sendMessage(msg);
         }
-
-        Log.e("Chat", extra);
     }
-    private void connectChat() {
-        chatConnect.connect(name + System.currentTimeMillis());
-    }
-
-    @Override
-    public void onChatMessage(String body, Date date) {
-        list.add(body);
-        adapter.notifyDataSetChanged();
-        listView.setSelection(list.size() - 1);
-        Log.e("Chat", " Body " + body + " Date " + date.getTime());
-    }
 }
+package com.cnlive.demo.chat.util;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Handler;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.UnderlineSpan;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.cnlive.libs.chat.Chat;
+import com.cnlive.libs.chat.base.IChat;
+
+import org.jivesoftware.smack.packet.Message;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ChatUtil implements IChatUtil, IChat.OnInfoListener, IChat.OnErrorListener, IChat.OnMessageListener {
+
+    public interface OnMessageListener {
+        void onMessage(String message);
+    }
+
+    private TextView mStateTextView;
+
+    private Chat mChat;
+
+    private Handler mHandler;
+
+    private Context mContext;
+
+    private OnMessageListener mMessageListener;
+
+    private List<String> mMessageList;
+
+    private class UpdateMessageCallback implements Handler.Callback {
+        @Override
+        public boolean handleMessage(android.os.Message msg)  {
+            String message = null;
+            if (mMessageList.size() > 0) message = mMessageList.remove(0);
+            if (mMessageListener != null && message != null)
+                mMessageListener.onMessage(message);
+            mHandler.sendEmptyMessageDelayed(0, 500);
+            return true;
+        }
+    }
+
+
+    public ChatUtil(Context context) {
+        mContext = context;
+        mChat = new Chat(context);
+        mMessageList = new ArrayList<>();
+    }
+
+    @Override
+    public void setStateView(TextView textView) {
+        mStateTextView = textView;
+        if (mStateTextView != null) mStateTextView.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showMessage(String msg, View.OnClickListener listener) {
+        if (mStateTextView != null) mStateTextView.setOnClickListener(listener);
+        showMessage(msg);
+    }
+
+    @Override
+    public void showMessage(SpannableString msg, View.OnClickListener listener) {
+        if (mStateTextView != null) mStateTextView.setOnClickListener(listener);
+        showMessage(msg);
+    }
+
+    @Override
+    public void showMessage(String msg) {
+        if (mStateTextView == null) return;
+        mStateTextView.setVisibility(View.VISIBLE);
+        mStateTextView.setText(msg);
+    }
+
+    @Override
+    public void showMessage(SpannableString msg) {
+        if (mStateTextView == null) return;
+        mStateTextView.setVisibility(View.VISIBLE);
+        mStateTextView.setText(msg);
+    }
+
+    @Override
+    public void hideMessage() {
+        if (mStateTextView == null) return;
+        mStateTextView.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void initChat(String room, String name) {
+        destroy();
+
+        mChat.setMaxStanzas(10);
+        mChat.init(room, name);
+        mChat.setOnMessageListener(this);
+        mChat.setOnInfoListener(this);
+        mChat.setOnErrorListener(this);
+
+        mHandler = new Handler(new UpdateMessageCallback());
+        mHandler.sendEmptyMessageDelayed(0, 1_000);
+
+        mMessageList.clear();
+    }
+
+    @Override
+    public void connectChat() {
+        showMessage("正在连接聊天室...");
+        mChat.connect();
+    }
+
+    @Override
+    public boolean isJoin() {
+        return mChat != null && mChat.isJoin();
+    }
+
+    @Override
+    public void sendMessage(String message) {
+        mChat.send(message);
+    }
+
+    public void destroy() {
+        if (mMessageList != null) mMessageList.clear();
+        if (mChat != null) mChat.destroy();
+        if (mHandler != null) mHandler.removeCallbacks(null);
+    }
+
+    @Override
+    public void setOnMessageListener(OnMessageListener listener) {
+        mMessageListener = listener;
+    }
+
+    @Override
+    public void onError(int what, String s) {
+        switch (what) {
+            case IChat.ErrorInitRoomId://RoomId为空
+            case IChat.ErrorInitAuth://认证失败
+            case IChat.ErrorInitNetwork://未检测到网络
+            case IChat.ErrorInitOther://初始化失败
+                showMessage("聊天室初始化失败,点击重试", clickErrorConnect);//设置错误信息
+                break;
+            case IChat.ErrorConnect://连接服务器失败
+            case IChat.ErrorChat://聊天室连接失败
+            case IChat.ErrorName://昵称冲突
+                String message = "聊天室连接失败,点击重试";
+                SpannableString spannableString = new SpannableString(message); //定义文字样式
+                spannableString.setSpan(new UnderlineSpan(), message.length() - 2, message.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+                spannableString.setSpan(new ForegroundColorSpan(Color.rgb(255, 213, 0)), message.length() - 2, message.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+                showMessage(spannableString, clickErrorConnect);//设置错误信息
+                break;
+            case IChat.ErrorConnectCloseOnError://聊天室异常断开
+                showMessage("聊天室已断开,请检查网络");
+                break;
+            case IChat.ErrorSendNoConnect://消息发送失败 没有连接聊天室
+                Toast.makeText(mContext, "聊天室未连接", Toast.LENGTH_SHORT).show();
+                break;
+            case IChat.ErrorSendOther://消息发送失败
+                Toast.makeText(mContext, "消息发送失败", Toast.LENGTH_SHORT).show();
+                break;
+        }
+    }
+
+    @Override
+    public void onInfo(int what, String s) {
+        switch (what) {
+            case IChat.StateInitDone:
+                //初始化完成
+                break;
+            case IChat.StateConnect:
+                //服务器连接成功
+                break;
+            case IChat.StateJoin:
+                //登录成功
+                hideMessage();
+                break;
+            case IChat.StateReconnect:
+                //重连成功
+                connectChat();
+                break;
+        }
+    }
+
+
+    @Override
+    public void processMessage(Message message) {
+        String from = message.getFrom().substring(message.getFrom().indexOf("/") + 1);
+        String body = message.getBody();
+
+        mMessageList.add(from + " : " + body);
+    }
+
+    //聊天室连接失败 点击事件
+    private View.OnClickListener clickErrorConnect = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            v.setOnClickListener(null);
+            connectChat();
+        }
+    };
+}
+package com.cnlive.demo.chat.util;
+
+import android.text.SpannableString;
+import android.view.View;
+import android.widget.TextView;
+
+
+public interface IChatUtil {
+
+    /**
+     * 设置聊天室状态视图
+     *
+     * @param textView 状态视图
+     */
+    void setStateView(TextView textView);
+
+    /**
+     * 设置聊天状态信息及点击事件并显示
+     *
+     * @param msg      状态信息
+     * @param listener 点击事件
+     */
+    void showMessage(String msg, View.OnClickListener listener);
+
+    /**
+     * 设置聊天状态信息及点击事件并显示
+     *
+     * @param msg      状态信息
+     * @param listener 点击事件
+     */
+    void showMessage(SpannableString msg, View.OnClickListener listener);
+
+    /**
+     * 设置聊天状态信息并显示
+     *
+     * @param msg 状态信息
+     */
+    void showMessage(String msg);
+
+    /**
+     * 设置聊天状态信息并显示
+     *
+     * @param msg 状态信息
+     */
+    void showMessage(SpannableString msg);
+
+    /**
+     * 隐藏状态信息
+     */
+    void hideMessage();
+
+    /**
+     * 初始化聊天室
+     * @param roomId 房间号
+     * @param userName 用户名
+     */
+    void initChat(String roomId, String userName);
+
+    /**
+     * 连接聊天室
+     */
+    void connectChat();
+
+    /**
+     * 获取聊天室登录状态
+     * @return 是否登录
+     */
+    boolean isJoin();
+
+    /**
+     * 发送消息
+     * @param message 信息
+     */
+    void sendMessage(String message);
+
+    /**
+     * 释放聊天室
+     */
+    void destroy();
+
+    /**
+     * 设置聊天室消息监听
+     * @param listener 消息监听
+     */
+    void setOnMessageListener(ChatUtil.OnMessageListener listener);
+}
@@ -9,6 +9,7 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="com.cnlive.demo.chat.MainActivity">
+
     <ListView
         android:id="@android:id/list"
         android:layout_width="match_parent"
@@ -33,4 +34,15 @@
         android:layout_toStartOf="@+id/btn_send"
         android:layout_alignParentBottom="true"
         android:imeOptions="flagNoExtractUi"/>
+
+    <TextView
+        android:id="@+id/chat_state"
+        android:layout_width="match_parent"
+        android:layout_height="42dp"
+        android:background="#6f2b2b2b"
+        android:gravity="center_vertical"
+        android:paddingLeft="25dp"
+        android:textColor="@android:color/black"
+        android:textSize="14dp" />
+
 </RelativeLayout>