Commit ce07866ace75021a15519cf73533e2a5441b3b12
1 parent
4392346d
添加融云
Showing
4 changed files
with
120 additions
and
0 deletions
app/src/main/AndroidManifest.xml
| @@ -88,6 +88,21 @@ | @@ -88,6 +88,21 @@ | ||
| 88 | android:configChanges="orientation|keyboardHidden|screenSize" | 88 | android:configChanges="orientation|keyboardHidden|screenSize" |
| 89 | android:screenOrientation="portrait" | 89 | android:screenOrientation="portrait" |
| 90 | android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> | 90 | android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> |
| 91 | + | ||
| 92 | + <service | ||
| 93 | + android:name="io.rong.imlib.ipc.RongService" | ||
| 94 | + android:exported="true" | ||
| 95 | + android:process=":ipc" /> | ||
| 96 | + | ||
| 97 | + <service android:name="io.rong.imlib.ReConnectService" | ||
| 98 | + android:exported="true"/> | ||
| 99 | + | ||
| 100 | + <receiver android:name="io.rong.imlib.ConnectChangeReceiver" | ||
| 101 | + android:exported="true"/> | ||
| 102 | + | ||
| 103 | + <receiver | ||
| 104 | + android:name="io.rong.imlib.HeartbeatReceiver" | ||
| 105 | + android:process=":ipc" /> | ||
| 91 | </application> | 106 | </application> |
| 92 | 107 | ||
| 93 | </manifest> | 108 | </manifest> |
| 94 | \ No newline at end of file | 109 | \ No newline at end of file |
app/src/main/java/com/cnlive/gundam/user/model/ChannelInfoModel.java
0 → 100644
| 1 | +package com.cnlive.gundam.user.model; | ||
| 2 | + | ||
| 3 | + | ||
| 4 | +import com.cnlive.gundam.user.model.base.ErrorMessage; | ||
| 5 | + | ||
| 6 | +import java.io.Serializable; | ||
| 7 | + | ||
| 8 | +/** | ||
| 9 | + * Created by Lynn on 5/26/2017. | ||
| 10 | + */ | ||
| 11 | + | ||
| 12 | +public class ChannelInfoModel extends ErrorMessage { | ||
| 13 | + private ChannelInfo data; | ||
| 14 | + | ||
| 15 | + public ChannelInfoModel() { | ||
| 16 | + } | ||
| 17 | + | ||
| 18 | + public ChannelInfoModel(ChannelInfo data) { | ||
| 19 | + this.data = data; | ||
| 20 | + } | ||
| 21 | + | ||
| 22 | + public ChannelInfo getData() { | ||
| 23 | + return data; | ||
| 24 | + } | ||
| 25 | + | ||
| 26 | + public void setData(ChannelInfo data) { | ||
| 27 | + this.data = data; | ||
| 28 | + } | ||
| 29 | + | ||
| 30 | + public class ChannelInfo implements Serializable { | ||
| 31 | + private String coverImgUrl; | ||
| 32 | + private String channelId; | ||
| 33 | + private String channelName; | ||
| 34 | + private int status; | ||
| 35 | + | ||
| 36 | + public ChannelInfo() { | ||
| 37 | + } | ||
| 38 | + | ||
| 39 | + public ChannelInfo(String coverImgUrl, String channelId, String channelName, int status) { | ||
| 40 | + this.coverImgUrl = coverImgUrl; | ||
| 41 | + this.channelId = channelId; | ||
| 42 | + this.channelName = channelName; | ||
| 43 | + this.status = status; | ||
| 44 | + } | ||
| 45 | + | ||
| 46 | + public String getCoverImgUrl() { | ||
| 47 | + return coverImgUrl; | ||
| 48 | + } | ||
| 49 | + | ||
| 50 | + public void setCoverImgUrl(String coverImgUrl) { | ||
| 51 | + this.coverImgUrl = coverImgUrl; | ||
| 52 | + } | ||
| 53 | + | ||
| 54 | + public String getChannelId() { | ||
| 55 | + return channelId; | ||
| 56 | + } | ||
| 57 | + | ||
| 58 | + public void setChannelId(String channelId) { | ||
| 59 | + this.channelId = channelId; | ||
| 60 | + } | ||
| 61 | + | ||
| 62 | + public String getChannelName() { | ||
| 63 | + return channelName; | ||
| 64 | + } | ||
| 65 | + | ||
| 66 | + public void setChannelName(String channelName) { | ||
| 67 | + this.channelName = channelName; | ||
| 68 | + } | ||
| 69 | + | ||
| 70 | + public int getStatus() { | ||
| 71 | + return status; | ||
| 72 | + } | ||
| 73 | + | ||
| 74 | + public void setStatus(int status) { | ||
| 75 | + this.status = status; | ||
| 76 | + } | ||
| 77 | + | ||
| 78 | + @Override | ||
| 79 | + public String toString() { | ||
| 80 | + return "ChannelInfo{" + | ||
| 81 | + "coverImgUrl='" + coverImgUrl + '\'' + | ||
| 82 | + ", channelId='" + channelId + '\'' + | ||
| 83 | + ", channelName='" + channelName + '\'' + | ||
| 84 | + ", status=" + status + | ||
| 85 | + '}'; | ||
| 86 | + } | ||
| 87 | + } | ||
| 88 | + | ||
| 89 | + @Override | ||
| 90 | + public String toString() { | ||
| 91 | + return "ChannelInfoModel{" + | ||
| 92 | + "data=" + data + | ||
| 93 | + '}'; | ||
| 94 | + } | ||
| 95 | +} |
app/src/main/java/com/cnlive/gundam/video/fragment/chat/ChatRoomFragment.java
| @@ -7,6 +7,7 @@ import android.support.annotation.Nullable; | @@ -7,6 +7,7 @@ import android.support.annotation.Nullable; | ||
| 7 | import android.support.v4.app.Fragment; | 7 | import android.support.v4.app.Fragment; |
| 8 | import android.support.v7.widget.GridLayoutManager; | 8 | import android.support.v7.widget.GridLayoutManager; |
| 9 | import android.support.v7.widget.OrientationHelper; | 9 | import android.support.v7.widget.OrientationHelper; |
| 10 | +import android.util.Log; | ||
| 10 | import android.view.LayoutInflater; | 11 | import android.view.LayoutInflater; |
| 11 | import android.view.View; | 12 | import android.view.View; |
| 12 | import android.view.ViewGroup; | 13 | import android.view.ViewGroup; |
| @@ -186,6 +187,7 @@ public class ChatRoomFragment extends Fragment implements View.OnClickListener { | @@ -186,6 +187,7 @@ public class ChatRoomFragment extends Fragment implements View.OnClickListener { | ||
| 186 | onConnectListener = new IChat.OnConnectListener() { | 187 | onConnectListener = new IChat.OnConnectListener() { |
| 187 | @Override | 188 | @Override |
| 188 | public void onTokenIncorrect(String s) { | 189 | public void onTokenIncorrect(String s) { |
| 190 | + Log.v("hcatRooomFragment","onTokenIncorrect"); | ||
| 189 | 191 | ||
| 190 | } | 192 | } |
| 191 | 193 | ||
| @@ -193,11 +195,15 @@ public class ChatRoomFragment extends Fragment implements View.OnClickListener { | @@ -193,11 +195,15 @@ public class ChatRoomFragment extends Fragment implements View.OnClickListener { | ||
| 193 | public void onSuccess(String s) { | 195 | public void onSuccess(String s) { |
| 194 | joinChatRoom(); | 196 | joinChatRoom(); |
| 195 | 197 | ||
| 198 | + Log.v("hcatRooomFragment","onSuccess"); | ||
| 199 | + | ||
| 200 | + | ||
| 196 | } | 201 | } |
| 197 | 202 | ||
| 198 | 203 | ||
| 199 | @Override | 204 | @Override |
| 200 | public void onError(int i, String s) { | 205 | public void onError(int i, String s) { |
| 206 | + Log.v("hcatRooomFragment","onError"); | ||
| 201 | 207 | ||
| 202 | } | 208 | } |
| 203 | }; | 209 | }; |
| @@ -210,12 +216,15 @@ public class ChatRoomFragment extends Fragment implements View.OnClickListener { | @@ -210,12 +216,15 @@ public class ChatRoomFragment extends Fragment implements View.OnClickListener { | ||
| 210 | ChatUtil.joinChatRoom(roomId, 0, new IChat.OnOperationListener() { | 216 | ChatUtil.joinChatRoom(roomId, 0, new IChat.OnOperationListener() { |
| 211 | @Override | 217 | @Override |
| 212 | public void onSuccess(int what, String extra) { | 218 | public void onSuccess(int what, String extra) { |
| 219 | + Log.v("hcatRooomFragment","joinChatRoomnonSuccess"); | ||
| 220 | + | ||
| 213 | String objToJsonString = ToStringUtils.objToJsonString(new ToStringUtils.CNMessageModole("加入聊天室", ToStringUtils.JoinType)); | 221 | String objToJsonString = ToStringUtils.objToJsonString(new ToStringUtils.CNMessageModole("加入聊天室", ToStringUtils.JoinType)); |
| 214 | ChatUtil.sendMessage(IChat.CHATROOM, roomId, objToJsonString, onSendMessageListener); | 222 | ChatUtil.sendMessage(IChat.CHATROOM, roomId, objToJsonString, onSendMessageListener); |
| 215 | } | 223 | } |
| 216 | 224 | ||
| 217 | @Override | 225 | @Override |
| 218 | public void onError(int what, String extra) { | 226 | public void onError(int what, String extra) { |
| 227 | + Log.v("hcatRooomFragment","joinChatRoomnError"); | ||
| 219 | 228 | ||
| 220 | } | 229 | } |
| 221 | }); | 230 | }); |
app/src/main/res/values/strings.xml
| @@ -36,5 +36,6 @@ | @@ -36,5 +36,6 @@ | ||
| 36 | <string name="request_null">暂无数据</string> | 36 | <string name="request_null">暂无数据</string> |
| 37 | <string name="request_state_error">获取活动状态失败</string> | 37 | <string name="request_state_error">获取活动状态失败</string> |
| 38 | <string name="request_state_play_error">此活动状态无法播放</string> | 38 | <string name="request_state_play_error">此活动状态无法播放</string> |
| 39 | + <string name="verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&plat=a&appId=%s </string> | ||
| 39 | 40 | ||
| 40 | </resources> | 41 | </resources> |